tinia 2.3.0 → 3.0.0

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "aws_cloud_search"
-gem "rails", "~> 2.3"
+gem "rails", "~> 3.0.9"
 
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -1,21 +1,42 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
+    abstract (1.0.0)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
     archive-tar-minitar (0.5.2)
+    arel (2.0.10)
     aws_cloud_search (0.0.1)
       faraday_middleware (>= 0.8.0)
+    builder (2.1.2)
     columnize (0.3.6)
     diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     faraday (0.8.0)
       multipart-post (~> 1.1)
     faraday_middleware (0.8.7)
@@ -27,6 +48,7 @@ GEM
       thor (~> 0.14.6)
     guard-rspec (0.7.0)
       guard (>= 0.10.0)
+    i18n (0.5.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -35,19 +57,37 @@ GEM
     json (1.6.6)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     metaclass (0.0.1)
+    mime-types (1.18)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.3.2)
     multipart-post (1.1.5)
-    rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
+      bundler (~> 1.0)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -75,6 +115,10 @@ GEM
     simplecov-html (0.5.3)
     sqlite3 (1.3.5)
     thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
     yard (0.7.5)
 
 PLATFORMS
@@ -86,7 +130,7 @@ DEPENDENCIES
   guard-rspec
   jeweler (~> 1.8.3)
   mocha
-  rails (~> 2.3)
+  rails (~> 3.0.9)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
   ruby-debug19

data/VERSION

@@ -1 +1 @@
-2.3.0
+3.0.0

data/lib/tinia/connection.rb

@@ -4,7 +4,7 @@ module Tinia
     def self.included(klass)
       klass.send(:extend, ClassMethods)
       klass.class_eval do
-        class_inheritable_accessor :cloud_search_domain
+        class_attribute :cloud_search_domain
       end
     end
 

data/lib/tinia/search.rb

@@ -7,13 +7,9 @@ module Tinia
       klass.class_eval do 
         # lambda block for the scope
         scope_def = lambda{|*ids|
-          {
-            :conditions => [
-              "#{self.table_name}.#{self.primary_key} IN (?)", ids.flatten
-            ]
-          }
+          where("#{self.table_name}.#{self.primary_key} IN (?)", ids.flatten)
         }
-        named_scope :tinia_scope, scope_def do 
+        scope :tinia_scope, scope_def do 
           include WillPaginateMethods
         end
       end

data/spec/tinia/index_spec.rb

@@ -11,7 +11,7 @@ describe Tinia::Index do
       t.timestamps
     end
 
-    conn.create_table(:mock_index_with_datas, :force => true) do |t|
+    conn.create_table(:mock_index_with_data, :force => true) do |t|
       t.string(:name)
       t.string(:type)
       t.timestamps

data/spec/tinia/search_spec.rb

@@ -15,8 +15,8 @@ describe Tinia::Search do
         config.cloud_search_domain = "mock-class"
       end
 
-      named_scope :name_like, lambda{|n|
-        {:conditions => ["name LIKE ?", n]}
+      scope :name_like, lambda{|n|
+        where("name LIKE ?", n)
       }
 
     end
@@ -51,8 +51,8 @@ describe Tinia::Search do
       an Arel-like object" do
 
       proxy = MockClass.cloud_search("my query")
-      proxy.proxy_options[:conditions].should eql(
-        ["mock_classes.id IN (?)", [1, 2]]
+      proxy.where_values.should eql(
+        ["mock_classes.id IN (1,2)"]
       )
     end
 
@@ -73,8 +73,8 @@ describe Tinia::Search do
 
       it "should allow for a complex query" do
         proxy = MockClass.cloud_search("(and 'x' other_field:'y')")
-        proxy.proxy_options[:conditions].should eql(
-          ["mock_classes.id IN (?)", [1, 2]]
+        proxy.where_values.should eql(
+          ["mock_classes.id IN (1,2)"]
         )
       end
     end

data/tinia.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tinia"
-  s.version = "2.3.0"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<aws_cloud_search>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, ["~> 2.3"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0.9"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, ["~> 0.7"])
     else
       s.add_dependency(%q<aws_cloud_search>, [">= 0"])
-      s.add_dependency(%q<rails>, ["~> 2.3"])
+      s.add_dependency(%q<rails>, ["~> 3.0.9"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -78,7 +78,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<aws_cloud_search>, [">= 0"])
-    s.add_dependency(%q<rails>, ["~> 2.3"])
+    s.add_dependency(%q<rails>, ["~> 3.0.9"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinia
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cloud_search
-  requirement: &2177020500 !ruby/object:Gem::Requirement
+  requirement: &2166206220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2177020500
+  version_requirements: *2166206220
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2177019440 !ruby/object:Gem::Requirement
+  requirement: &2166203920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *2177019440
+  version_requirements: *2166203920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2177018420 !ruby/object:Gem::Requirement
+  requirement: &2166201980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2177018420
+  version_requirements: *2166201980
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2177017300 !ruby/object:Gem::Requirement
+  requirement: &2166200380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2177017300
+  version_requirements: *2166200380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2177016240 !ruby/object:Gem::Requirement
+  requirement: &2166199160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2177016240
+  version_requirements: *2166199160
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2177015360 !ruby/object:Gem::Requirement
+  requirement: &2166197280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2177015360
+  version_requirements: *2166197280
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2177014500 !ruby/object:Gem::Requirement
+  requirement: &2166195120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2177014500
+  version_requirements: *2166195120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2177008360 !ruby/object:Gem::Requirement
+  requirement: &2166192780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2177008360
+  version_requirements: *2166192780
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2177007240 !ruby/object:Gem::Requirement
+  requirement: &2166191000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2177007240
+  version_requirements: *2166191000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2177006580 !ruby/object:Gem::Requirement
+  requirement: &2166189920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2177006580
+  version_requirements: *2166189920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2177005780 !ruby/object:Gem::Requirement
+  requirement: &2166188660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2177005780
+  version_requirements: *2166188660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2177004860 !ruby/object:Gem::Requirement
+  requirement: &2166187500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2177004860
+  version_requirements: *2166187500
 description: Rails integration for CloudSearch
 email: dan.langevin@lifebooker.com
 executables: []
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -634642939761900410
+      hash: -3860505524591393351
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: