Skip to content

Commit 085f925

Browse files
hron84hron84
committed
Merge branch 'develop'
2 parents fb9dc3f + 0da48f0 commit 085f925

14 files changed

+177
-27
lines changed

Diff for: ‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "vendor/assets/javascripts"]
2+
path = vendor/assets/javascripts
3+
url = git://github.com/geraldb/jquery.table.js.git

Diff for: ‎.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-1.9.3-p392
1+
ruby-1.9.3

Diff for: ‎.travis.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
language: ruby
2+
rvm:
3+
- 1.9.3
4+
- 1.9.2
5+
- jruby-18mode
6+
- jruby-19mode
7+
- ruby-head
8+
- jruby-head
9+
- 1.8.7
10+
- ree

Diff for: ‎Gemfile

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
source "http://rubygems.org"
2-
# Add dependencies required to use your gem here.
3-
# Example:
4-
# gem "activesupport", ">= 2.3.5"
2+
3+
gem 'jquery-rails', :require => false
54

65
# Add dependencies to develop your gem here.
76
# Include everything needed to run rake, tests, features, etc.
87
group :development do
9-
gem "rdoc", "~> 3.12"
10-
gem "bundler", "~> 1.0.0"
8+
gem "rdoc"
9+
gem "bundler"
1110
gem "jeweler", "~> 1.8.4"
12-
gem "rcov", ">= 0"
1311
end
12+

Diff for: ‎Gemfile.lock

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
GEM
2+
remote: http://rubygems.org/
3+
specs:
4+
actionpack (3.2.13)
5+
activemodel (= 3.2.13)
6+
activesupport (= 3.2.13)
7+
builder (~> 3.0.0)
8+
erubis (~> 2.7.0)
9+
journey (~> 1.0.4)
10+
rack (~> 1.4.5)
11+
rack-cache (~> 1.2)
12+
rack-test (~> 0.6.1)
13+
sprockets (~> 2.2.1)
14+
activemodel (3.2.13)
15+
activesupport (= 3.2.13)
16+
builder (~> 3.0.0)
17+
activesupport (3.2.13)
18+
i18n (= 0.6.1)
19+
multi_json (~> 1.0)
20+
builder (3.0.4)
21+
erubis (2.7.0)
22+
git (1.2.5)
23+
hike (1.2.2)
24+
i18n (0.6.1)
25+
jeweler (1.8.4)
26+
bundler (~> 1.0)
27+
git (>= 1.2.5)
28+
rake
29+
rdoc
30+
journey (1.0.4)
31+
jquery-rails (2.2.1)
32+
railties (>= 3.0, < 5.0)
33+
thor (>= 0.14, < 2.0)
34+
json (1.8.0)
35+
multi_json (1.7.3)
36+
rack (1.4.5)
37+
rack-cache (1.2)
38+
rack (>= 0.4)
39+
rack-ssl (1.3.3)
40+
rack
41+
rack-test (0.6.2)
42+
rack (>= 1.0)
43+
railties (3.2.13)
44+
actionpack (= 3.2.13)
45+
activesupport (= 3.2.13)
46+
rack-ssl (~> 1.3.2)
47+
rake (>= 0.8.7)
48+
rdoc (~> 3.4)
49+
thor (>= 0.14.6, < 2.0)
50+
rake (10.0.4)
51+
rdoc (3.12.2)
52+
json (~> 1.4)
53+
sprockets (2.2.2)
54+
hike (~> 1.2)
55+
multi_json (~> 1.0)
56+
rack (~> 1.0)
57+
tilt (~> 1.1, != 1.3.0)
58+
thor (0.18.1)
59+
tilt (1.4.1)
60+
61+
PLATFORMS
62+
ruby
63+
64+
DEPENDENCIES
65+
bundler
66+
jeweler (~> 1.8.4)
67+
jquery-rails
68+
rdoc

Diff for: ‎README.rdoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ Asset pipeline integration for https://github.com/geraldb/jquery.table.js
1414

1515
== Copyright
1616

17-
Copyright (c) 2013 Gabor Garami. See LICENSE.txt for
18-
further details.
17+
Copyright (c) 2013 Gabor Garami. This project is licensed to public domain.
18+
You can use it without any restrictions but mention is welcomed.
1919

Diff for: ‎Rakefile

+5-10
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,18 @@ Jeweler::Tasks.new do |gem|
2121
gem.description = %Q{Asset pipeline integration for https://github.com/geraldb/jquery.table.js}
2222
gem.email = "[email protected]"
2323
gem.authors = ["Gabor Garami"]
24+
gem.files = Dir["lib/**/*"] +
25+
['vendor/assets/javascripts/jquery.table.js',
26+
'vendor/assets/javascripts/demo/style.css'] +
27+
['Rakefile','Gemfile', 'VERSION', 'LICENSE.txt', 'README.rdoc']
2428
# dependencies defined in Gemfile
2529
end
2630
Jeweler::RubygemsDotOrgTasks.new
2731

2832
require 'rake/testtask'
2933
Rake::TestTask.new(:test) do |test|
3034
test.libs << 'lib' << 'test'
31-
test.pattern = 'test/**/test_*.rb'
32-
test.verbose = true
33-
end
34-
35-
require 'rcov/rcovtask'
36-
Rcov::RcovTask.new do |test|
37-
test.libs << 'test'
38-
test.pattern = 'test/**/test_*.rb'
39-
test.verbose = true
40-
test.rcov_opts << '--exclude "gems/*"'
35+
test.pattern = 'test/**/*_test.rb'
4136
end
4237

4338
task :default => :test

Diff for: ‎VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.0.0

Diff for: ‎jquery-table-js-rails.gemspec

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Generated by jeweler
2+
# DO NOT EDIT THIS FILE DIRECTLY
3+
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4+
# -*- encoding: utf-8 -*-
5+
6+
Gem::Specification.new do |s|
7+
s.name = "jquery-table-js-rails"
8+
s.version = "0.0.0"
9+
10+
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11+
s.authors = ["Gabor Garami"]
12+
s.date = "2013-06-06"
13+
s.description = "Asset pipeline integration for https://github.com/geraldb/jquery.table.js"
14+
s.email = "[email protected]"
15+
s.extra_rdoc_files = [
16+
"LICENSE.txt",
17+
"README.rdoc"
18+
]
19+
s.files = [
20+
"Gemfile",
21+
"LICENSE.txt",
22+
"README.rdoc",
23+
"Rakefile",
24+
"VERSION",
25+
"lib/jquery-table-js-rails.rb",
26+
"vendor/assets/javascripts/demo/style.css",
27+
"vendor/assets/javascripts/jquery.table.js"
28+
]
29+
s.homepage = "http://github.com/hron84/jquery-table-js-rails"
30+
s.licenses = ["MIT"]
31+
s.require_paths = ["lib"]
32+
s.rubygems_version = "1.8.25"
33+
s.summary = "jQuery Table Rails"
34+
35+
if s.respond_to? :specification_version then
36+
s.specification_version = 3
37+
38+
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
39+
s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
40+
s.add_development_dependency(%q<rdoc>, [">= 0"])
41+
s.add_development_dependency(%q<bundler>, [">= 0"])
42+
s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
43+
else
44+
s.add_dependency(%q<jquery-rails>, [">= 0"])
45+
s.add_dependency(%q<rdoc>, [">= 0"])
46+
s.add_dependency(%q<bundler>, [">= 0"])
47+
s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
48+
end
49+
else
50+
s.add_dependency(%q<jquery-rails>, [">= 0"])
51+
s.add_dependency(%q<rdoc>, [">= 0"])
52+
s.add_dependency(%q<bundler>, [">= 0"])
53+
s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
54+
end
55+
end
56+

Diff for: ‎lib/jquery-table-js-rails.rb

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
require 'rails/engine' unless defined?(::Rails)
2+
3+
module JqueryTableJs
4+
module Rails
5+
VERSION = File.read(File.expand_path('../../VERSION', __FILE__))
6+
class Engine < ::Rails::Engine
7+
end
8+
end
9+
end
10+

Diff for: ‎test/jquery-table-js-rails_test.rb

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
require 'test_helper'
2+
3+
class TestJqueryTableJsRails < ActiveSupport::TestCase
4+
test 'gem is a module' do
5+
assert_kind_of Module, JqueryTableJs::Rails
6+
end
7+
8+
test 'engine is a Rails engine' do
9+
assert_equal Rails::Engine, JqueryTableJs::Rails::Engine.superclass
10+
end
11+
end

Diff for: ‎test/helper.rb renamed to ‎test/test_helper.rb

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
require 'rubygems'
22
require 'bundler'
3+
34
begin
45
Bundler.setup(:default, :development)
56
rescue Bundler::BundlerError => e
67
$stderr.puts e.message
78
$stderr.puts "Run `bundle install` to install missing gems"
89
exit e.status_code
910
end
10-
require 'test/unit'
11+
12+
require 'rails/all'
13+
require 'rails/test_help'
1114

1215
$LOAD_PATH.unshift(File.dirname(__FILE__))
1316
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

Diff for: ‎test/test_jquery-table-js-rails.rb

-7
This file was deleted.

Diff for: ‎vendor/assets/javascripts

Submodule javascripts added at a9bd552

0 commit comments

Comments
 (0)