jtable-rails 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/Gemfile +1 -1
  2. data/Gemfile.lock +28 -28
  3. data/Rakefile +1 -1
  4. data/VERSION +1 -1
  5. data/jtable-rails.gemspec +8 -8
  6. data/lib/jtable-rails/active_record.rb +3 -3
  7. data/spec/support/rails_app/Gemfile +1 -1
  8. data/spec/support/rails_app/Gemfile.lock +30 -30
  9. metadata +8 -8
data/Gemfile CHANGED
@@ -5,6 +5,6 @@ group :development do
5
5
  gem "rspec"
6
6
  gem "fabrication"
7
7
  gem "jeweler", "~> 1.5.2"
8
- gem "rails", "3.0.3"
8
+ gem "rails", "3.0.5"
9
9
  gem 'sqlite3-ruby', :require => 'sqlite3'
10
10
  end
data/Gemfile.lock CHANGED
@@ -2,33 +2,33 @@ GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
4
  abstract (1.0.0)
5
- actionmailer (3.0.3)
6
- actionpack (= 3.0.3)
7
- mail (~> 2.2.9)
8
- actionpack (3.0.3)
9
- activemodel (= 3.0.3)
10
- activesupport (= 3.0.3)
5
+ actionmailer (3.0.5)
6
+ actionpack (= 3.0.5)
7
+ mail (~> 2.2.15)
8
+ actionpack (3.0.5)
9
+ activemodel (= 3.0.5)
10
+ activesupport (= 3.0.5)
11
11
  builder (~> 2.1.2)
12
12
  erubis (~> 2.6.6)
13
13
  i18n (~> 0.4)
14
14
  rack (~> 1.2.1)
15
15
  rack-mount (~> 0.6.13)
16
- rack-test (~> 0.5.6)
16
+ rack-test (~> 0.5.7)
17
17
  tzinfo (~> 0.3.23)
18
- activemodel (3.0.3)
19
- activesupport (= 3.0.3)
18
+ activemodel (3.0.5)
19
+ activesupport (= 3.0.5)
20
20
  builder (~> 2.1.2)
21
21
  i18n (~> 0.4)
22
- activerecord (3.0.3)
23
- activemodel (= 3.0.3)
24
- activesupport (= 3.0.3)
22
+ activerecord (3.0.5)
23
+ activemodel (= 3.0.5)
24
+ activesupport (= 3.0.5)
25
25
  arel (~> 2.0.2)
26
26
  tzinfo (~> 0.3.23)
27
- activeresource (3.0.3)
28
- activemodel (= 3.0.3)
29
- activesupport (= 3.0.3)
30
- activesupport (3.0.3)
31
- arel (2.0.7)
27
+ activeresource (3.0.5)
28
+ activemodel (= 3.0.5)
29
+ activesupport (= 3.0.5)
30
+ activesupport (3.0.5)
31
+ arel (2.0.9)
32
32
  builder (2.1.2)
33
33
  diff-lcs (1.1.2)
34
34
  erubis (2.6.6)
@@ -52,17 +52,17 @@ GEM
52
52
  rack (>= 1.0.0)
53
53
  rack-test (0.5.7)
54
54
  rack (>= 1.0)
55
- rails (3.0.3)
56
- actionmailer (= 3.0.3)
57
- actionpack (= 3.0.3)
58
- activerecord (= 3.0.3)
59
- activeresource (= 3.0.3)
60
- activesupport (= 3.0.3)
55
+ rails (3.0.5)
56
+ actionmailer (= 3.0.5)
57
+ actionpack (= 3.0.5)
58
+ activerecord (= 3.0.5)
59
+ activeresource (= 3.0.5)
60
+ activesupport (= 3.0.5)
61
61
  bundler (~> 1.0)
62
- railties (= 3.0.3)
63
- railties (3.0.3)
64
- actionpack (= 3.0.3)
65
- activesupport (= 3.0.3)
62
+ railties (= 3.0.5)
63
+ railties (3.0.5)
64
+ actionpack (= 3.0.5)
65
+ activesupport (= 3.0.5)
66
66
  rake (>= 0.8.7)
67
67
  thor (~> 0.14.4)
68
68
  rake (0.8.7)
@@ -89,6 +89,6 @@ DEPENDENCIES
89
89
  bundler
90
90
  fabrication
91
91
  jeweler (~> 1.5.2)
92
- rails (= 3.0.3)
92
+ rails (= 3.0.5)
93
93
  rspec
94
94
  sqlite3-ruby
data/Rakefile CHANGED
@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
20
20
  gem.description = "A Rails gem to power the jTable jQuery plugin"
21
21
  gem.email = "tny5357@gmail.com"
22
22
  gem.authors = ["Taylor Yelverton"]
23
- gem.add_runtime_dependency 'rails', '3.0.3'
23
+ gem.add_runtime_dependency 'rails', '3.0.5'
24
24
  end
25
25
  Jeweler::RubygemsDotOrgTasks.new
26
26
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.1
1
+ 0.1.2
data/jtable-rails.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{jtable-rails}
8
- s.version = "0.1.1"
8
+ s.version = "0.1.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Taylor Yelverton"]
12
- s.date = %q{2011-02-11}
12
+ s.date = %q{2011-02-28}
13
13
  s.description = %q{A Rails gem to power the jTable jQuery plugin}
14
14
  s.email = %q{tny5357@gmail.com}
15
15
  s.extra_rdoc_files = [
@@ -111,26 +111,26 @@ Gem::Specification.new do |s|
111
111
  s.add_development_dependency(%q<rspec>, [">= 0"])
112
112
  s.add_development_dependency(%q<fabrication>, [">= 0"])
113
113
  s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
114
- s.add_development_dependency(%q<rails>, ["= 3.0.3"])
114
+ s.add_development_dependency(%q<rails>, ["= 3.0.5"])
115
115
  s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
116
- s.add_runtime_dependency(%q<rails>, ["= 3.0.3"])
116
+ s.add_runtime_dependency(%q<rails>, ["= 3.0.5"])
117
117
  else
118
118
  s.add_dependency(%q<bundler>, [">= 0"])
119
119
  s.add_dependency(%q<rspec>, [">= 0"])
120
120
  s.add_dependency(%q<fabrication>, [">= 0"])
121
121
  s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
122
- s.add_dependency(%q<rails>, ["= 3.0.3"])
122
+ s.add_dependency(%q<rails>, ["= 3.0.5"])
123
123
  s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
124
- s.add_dependency(%q<rails>, ["= 3.0.3"])
124
+ s.add_dependency(%q<rails>, ["= 3.0.5"])
125
125
  end
126
126
  else
127
127
  s.add_dependency(%q<bundler>, [">= 0"])
128
128
  s.add_dependency(%q<rspec>, [">= 0"])
129
129
  s.add_dependency(%q<fabrication>, [">= 0"])
130
130
  s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
131
- s.add_dependency(%q<rails>, ["= 3.0.3"])
131
+ s.add_dependency(%q<rails>, ["= 3.0.5"])
132
132
  s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
133
- s.add_dependency(%q<rails>, ["= 3.0.3"])
133
+ s.add_dependency(%q<rails>, ["= 3.0.5"])
134
134
  end
135
135
  end
136
136
 
data/lib/jtable-rails/active_record.rb CHANGED
@@ -36,7 +36,7 @@ module JTable
36
36
  end
37
37
  wheres << where(where_query.inject(&:or))
38
38
  end
39
- wheres.inject(&:&)
39
+ wheres.inject(&:merge)
40
40
  end
41
41
  }
42
42
 
@@ -46,7 +46,7 @@ module JTable
46
46
  search_terms.split(" ").each do |term|
47
47
  wheres << where(self.send("jtable_search_#{column}", term))
48
48
  end
49
- wheres.inject(&:&)
49
+ wheres.inject(&:merge)
50
50
  end
51
51
  }
52
52
 
@@ -75,7 +75,7 @@ module JTable
75
75
  end
76
76
  end
77
77
  queries << jtable_order(jtable_params[:sort_column], jtable_params[:sort_direction])
78
- queries.inject(&:&)
78
+ queries.inject(&:merge)
79
79
  }
80
80
  end
81
81
  end
data/spec/support/rails_app/Gemfile CHANGED
@@ -1,5 +1,5 @@
1
1
  source "http://rubygems.org"
2
2
 
3
- gem 'rails', '3.0.3'
3
+ gem 'rails', '3.0.5'
4
4
  gem 'sqlite3-ruby', :require => 'sqlite3'
5
5
  gem 'jtable-rails', :path => File.expand_path(File.dirname(__FILE__) + '/../../../.')
data/spec/support/rails_app/Gemfile.lock CHANGED
@@ -1,40 +1,40 @@
1
1
  PATH
2
2
  remote: /Users/yelvert/projects/jtable/jtable-rails
3
3
  specs:
4
- jtable-rails (0.0.0)
5
- rails (= 3.0.3)
4
+ jtable-rails (0.1.1)
5
+ rails (= 3.0.5)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
10
  abstract (1.0.0)
11
- actionmailer (3.0.3)
12
- actionpack (= 3.0.3)
13
- mail (~> 2.2.9)
14
- actionpack (3.0.3)
15
- activemodel (= 3.0.3)
16
- activesupport (= 3.0.3)
11
+ actionmailer (3.0.5)
12
+ actionpack (= 3.0.5)
13
+ mail (~> 2.2.15)
14
+ actionpack (3.0.5)
15
+ activemodel (= 3.0.5)
16
+ activesupport (= 3.0.5)
17
17
  builder (~> 2.1.2)
18
18
  erubis (~> 2.6.6)
19
19
  i18n (~> 0.4)
20
20
  rack (~> 1.2.1)
21
21
  rack-mount (~> 0.6.13)
22
- rack-test (~> 0.5.6)
22
+ rack-test (~> 0.5.7)
23
23
  tzinfo (~> 0.3.23)
24
- activemodel (3.0.3)
25
- activesupport (= 3.0.3)
24
+ activemodel (3.0.5)
25
+ activesupport (= 3.0.5)
26
26
  builder (~> 2.1.2)
27
27
  i18n (~> 0.4)
28
- activerecord (3.0.3)
29
- activemodel (= 3.0.3)
30
- activesupport (= 3.0.3)
28
+ activerecord (3.0.5)
29
+ activemodel (= 3.0.5)
30
+ activesupport (= 3.0.5)
31
31
  arel (~> 2.0.2)
32
32
  tzinfo (~> 0.3.23)
33
- activeresource (3.0.3)
34
- activemodel (= 3.0.3)
35
- activesupport (= 3.0.3)
36
- activesupport (3.0.3)
37
- arel (2.0.7)
33
+ activeresource (3.0.5)
34
+ activemodel (= 3.0.5)
35
+ activesupport (= 3.0.5)
36
+ activesupport (3.0.5)
37
+ arel (2.0.9)
38
38
  builder (2.1.2)
39
39
  erubis (2.6.6)
40
40
  abstract (>= 1.0.0)
@@ -51,17 +51,17 @@ GEM
51
51
  rack (>= 1.0.0)
52
52
  rack-test (0.5.7)
53
53
  rack (>= 1.0)
54
- rails (3.0.3)
55
- actionmailer (= 3.0.3)
56
- actionpack (= 3.0.3)
57
- activerecord (= 3.0.3)
58
- activeresource (= 3.0.3)
59
- activesupport (= 3.0.3)
54
+ rails (3.0.5)
55
+ actionmailer (= 3.0.5)
56
+ actionpack (= 3.0.5)
57
+ activerecord (= 3.0.5)
58
+ activeresource (= 3.0.5)
59
+ activesupport (= 3.0.5)
60
60
  bundler (~> 1.0)
61
- railties (= 3.0.3)
62
- railties (3.0.3)
63
- actionpack (= 3.0.3)
64
- activesupport (= 3.0.3)
61
+ railties (= 3.0.5)
62
+ railties (3.0.5)
63
+ actionpack (= 3.0.5)
64
+ activesupport (= 3.0.5)
65
65
  rake (>= 0.8.7)
66
66
  thor (~> 0.14.4)
67
67
  rake (0.8.7)
@@ -78,5 +78,5 @@ PLATFORMS
78
78
 
79
79
  DEPENDENCIES
80
80
  jtable-rails!
81
- rails (= 3.0.3)
81
+ rails (= 3.0.5)
82
82
  sqlite3-ruby
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 1
8
- - 1
9
- version: 0.1.1
8
+ - 2
9
+ version: 0.1.2
10
10
  platform: ruby
11
11
  authors:
12
12
  - Taylor Yelverton
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2011-02-11 00:00:00 -06:00
17
+ date: 2011-02-28 00:00:00 -06:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
@@ -81,8 +81,8 @@ dependencies:
81
81
  segments:
82
82
  - 3
83
83
  - 0
84
- - 3
85
- version: 3.0.3
84
+ - 5
85
+ version: 3.0.5
86
86
  type: :development
87
87
  prerelease: false
88
88
  version_requirements: *id005
@@ -109,8 +109,8 @@ dependencies:
109
109
  segments:
110
110
  - 3
111
111
  - 0
112
- - 3
113
- version: 3.0.3
112
+ - 5
113
+ version: 3.0.5
114
114
  type: :runtime
115
115
  prerelease: false
116
116
  version_requirements: *id007
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
190
190
  requirements:
191
191
  - - ">="
192
192
  - !ruby/object:Gem::Version
193
- hash: 508901484492006863
193
+ hash: -3208820710179703731
194
194
  segments:
195
195
  - 0
196
196
  version: "0"