jtable-rails 0.1.1 → 0.1.2

data/Gemfile

@@ -5,6 +5,6 @@ group :development do
   gem "rspec"
   gem "fabrication"
   gem "jeweler", "~> 1.5.2"
-  gem "rails", "3.0.3"
+  gem "rails", "3.0.5"
   gem 'sqlite3-ruby', :require => 'sqlite3'
 end

data/Gemfile.lock

@@ -2,33 +2,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.7)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
@@ -52,17 +52,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -89,6 +89,6 @@ DEPENDENCIES
   bundler
   fabrication
   jeweler (~> 1.5.2)
-  rails (= 3.0.3)
+  rails (= 3.0.5)
   rspec
   sqlite3-ruby

data/Rakefile

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = "A Rails gem to power the jTable jQuery plugin"
   gem.email = "tny5357@gmail.com"
   gem.authors = ["Taylor Yelverton"]
-  gem.add_runtime_dependency 'rails', '3.0.3'
+  gem.add_runtime_dependency 'rails', '3.0.5'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/jtable-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jtable-rails}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Taylor Yelverton"]
-  s.date = %q{2011-02-11}
+  s.date = %q{2011-02-28}
   s.description = %q{A Rails gem to power the jTable jQuery plugin}
   s.email = %q{tny5357@gmail.com}
   s.extra_rdoc_files = [
@@ -111,26 +111,26 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<fabrication>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rails>, ["= 3.0.3"])
+      s.add_development_dependency(%q<rails>, ["= 3.0.5"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, ["= 3.0.3"])
+      s.add_runtime_dependency(%q<rails>, ["= 3.0.5"])
     else
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<fabrication>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rails>, ["= 3.0.3"])
+      s.add_dependency(%q<rails>, ["= 3.0.5"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<rails>, ["= 3.0.3"])
+      s.add_dependency(%q<rails>, ["= 3.0.5"])
     end
   else
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<fabrication>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rails>, ["= 3.0.3"])
+    s.add_dependency(%q<rails>, ["= 3.0.5"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<rails>, ["= 3.0.3"])
+    s.add_dependency(%q<rails>, ["= 3.0.5"])
   end
 end
 

data/lib/jtable-rails/active_record.rb

@@ -36,7 +36,7 @@ module JTable
               end
               wheres << where(where_query.inject(&:or))
             end
-            wheres.inject(&:&)
+            wheres.inject(&:merge)
           end
         }
         
@@ -46,7 +46,7 @@ module JTable
             search_terms.split(" ").each do |term|
               wheres << where(self.send("jtable_search_#{column}", term))
             end
-            wheres.inject(&:&)
+            wheres.inject(&:merge)
           end
         }
         
@@ -75,7 +75,7 @@ module JTable
             end
           end
           queries << jtable_order(jtable_params[:sort_column], jtable_params[:sort_direction])
-          queries.inject(&:&)
+          queries.inject(&:merge)
         }
       end
     end

data/spec/support/rails_app/Gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
-gem 'rails', '3.0.3'
+gem 'rails', '3.0.5'
 gem 'sqlite3-ruby', :require => 'sqlite3'
 gem 'jtable-rails', :path => File.expand_path(File.dirname(__FILE__) + '/../../../.')

data/spec/support/rails_app/Gemfile.lock

@@ -1,40 +1,40 @@
 PATH
   remote: /Users/yelvert/projects/jtable/jtable-rails
   specs:
-    jtable-rails (0.0.0)
-      rails (= 3.0.3)
+    jtable-rails (0.1.1)
+      rails (= 3.0.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.7)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -51,17 +51,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -78,5 +78,5 @@ PLATFORMS
 
 DEPENDENCIES
   jtable-rails!
-  rails (= 3.0.3)
+  rails (= 3.0.5)
   sqlite3-ruby

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Taylor Yelverton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -06:00
+date: 2011-02-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,8 +81,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 5
+        version: 3.0.5
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -109,8 +109,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 5
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: *id007
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 508901484492006863
+      hash: -3208820710179703731
       segments: 
       - 0
       version: "0"