tinia 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/tinia/search.rb

@@ -41,11 +41,9 @@ module Tinia
       
       # return a scope with the subset of ids
       def cloud_search(*args)
-        opts = {
-          :page => 1,
-          :per_page => 20
-        }
+        opts = {:page => 1, :per_page => 20}
         opts = opts.merge(args.extract_options!)
+        opts[:page] ||= 1
         query = args.first
         
         response = self.cloud_search_response(args.first, opts)
@@ -72,6 +70,9 @@ module Tinia
         AWSCloudSearch::SearchRequest.new.tap do |req|
           if query.nil?
             req.bq = "type:'#{self.base_class.name}'"
+          # this is a rich query using Solr syntax of () or : or ''
+          elsif query =~ /[:\)\(']/
+            req.bq = "(and #{query} type:'#{self.base_class.name}')" 
           else
             req.bq = "(and '#{query}' type:'#{self.base_class.name}')" 
           end

data/spec/tinia/search_spec.rb

@@ -62,6 +62,23 @@ describe Tinia::Search do
       proxy.offset.should eql(0)
     end
 
+    context "Rich Search" do
+      let(:search_request) do
+        AWSCloudSearch::SearchRequest.new.tap do |req|
+          req.expects(:bq=).with(
+            "(and (and 'x' other_field:'y') type:'MockClass')"
+          )
+        end
+      end
+
+      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]]
+        )
+      end
+    end
+
     context "#current_page" do
 
       it "should default to 1" do
@@ -69,6 +86,11 @@ describe Tinia::Search do
         proxy.current_page.should eql(1)
       end
 
+      it "should set nil arguments to 1" do
+        proxy = MockClass.cloud_search("my query", :page => nil)
+        proxy.current_page.should eql(1)
+      end
+
       it "should be able to be set" do
         search_request.expects(:start=).with(80)
         proxy = MockClass.cloud_search("my query", :page => 5)

data/tinia.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tinia"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2012-05-05"
+  s.date = "2012-05-07"
   s.description = "Rails integration for CloudSearch"
   s.email = "dan.langevin@lifebooker.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinia
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cloud_search
-  requirement: &2174119940 !ruby/object:Gem::Requirement
+  requirement: &2156425220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2174119940
+  version_requirements: *2156425220
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2174119280 !ruby/object:Gem::Requirement
+  requirement: &2156421360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2174119280
+  version_requirements: *2156421360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2174118640 !ruby/object:Gem::Requirement
+  requirement: &2156412400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2174118640
+  version_requirements: *2156412400
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2174117960 !ruby/object:Gem::Requirement
+  requirement: &2156408400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2174117960
+  version_requirements: *2156408400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2174117360 !ruby/object:Gem::Requirement
+  requirement: &2156405480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2174117360
+  version_requirements: *2156405480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2174116820 !ruby/object:Gem::Requirement
+  requirement: &2156404600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2174116820
+  version_requirements: *2156404600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2174116020 !ruby/object:Gem::Requirement
+  requirement: &2156403580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2174116020
+  version_requirements: *2156403580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2174115340 !ruby/object:Gem::Requirement
+  requirement: &2156402680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2174115340
+  version_requirements: *2156402680
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2174114660 !ruby/object:Gem::Requirement
+  requirement: &2156401800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2174114660
+  version_requirements: *2156401800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2174113540 !ruby/object:Gem::Requirement
+  requirement: &2156401140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2174113540
+  version_requirements: *2156401140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2174106740 !ruby/object:Gem::Requirement
+  requirement: &2156400380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2174106740
+  version_requirements: *2156400380
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2174106180 !ruby/object:Gem::Requirement
+  requirement: &2156399480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2174106180
+  version_requirements: *2156399480
 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: 3361378746140145809
+      hash: -3938940901443444034
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: