sunspot_matchers 1.2.1.0 → 1.2.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sunspot_matchers (1.2.1.0)
+    sunspot_matchers (1.2.1.1)
 
 GEM
   remote: http://rubygems.org/

data/README.markdown

@@ -58,13 +58,17 @@ the `with` restrictions are simply ignored.
 
 ### wildcard matching
 
-keywords, with, and without support wildcard expectations using the `any_param` parameter:
+keywords, with, without, and order_by support wildcard expectations using the `any_param` parameter:
 
     Sunspot.search(Post) do
       with :blog_id, 4
+      order_by :blog_id, :desc
     end
 
     Sunspot.session.should have_search_params(:with, :blog_id, any_param)
+    Sunspot.session.should have_search_params(:order_by, :blog_id, any_param)
+    Sunspot.session.should have_search_params(:order_by, any_param)
+    Sunspot.session.should_not have_search_params(:order_by, :category_ids, any_param)
 
 ### :keywords
 

data/lib/sunspot_matchers/matchers.rb

@@ -1,8 +1,21 @@
 module SunspotMatchers
   class BaseMatcher
-    def initialize(actual_search, comparison_search, args)
+    attr_accessor :args
+
+    def initialize(actual, args)
+      @actual = actual
       @args = args
-      @actual_search, @comparison_search = actual_search, comparison_search
+      build_comparison_search
+    end
+
+    def build_comparison_search
+      @comparison_search = if(@args.last.is_a?(Proc))
+        SunspotMatchers::SunspotSessionSpy.new(nil).build_search(search_types, &args.last)
+      else
+        SunspotMatchers::SunspotSessionSpy.new(nil).build_search(search_types) do
+          send(search_method, *args)
+        end
+      end
     end
 
     def search_tuple
@@ -32,7 +45,7 @@ module SunspotMatchers
     end
 
     def actual_params
-      @actual_params ||= query_params_for_search(@actual_search)
+      @actual_params ||= query_params_for_search(actual_search)
     end
 
     def comparison_params
@@ -83,7 +96,7 @@ module SunspotMatchers
     def compare_single_value(actual, comparison)
       if comparison.is_a?(Regexp)
         return [] if comparison =~ actual
-        return [comparison]
+        return [comparison.source]
       end
       return [comparison] unless actual == comparison
       []
@@ -97,10 +110,6 @@ module SunspotMatchers
       end
     end
 
-    def normalize_value(value)
-
-    end
-
     def filter_values(values)
       return values unless wildcard?
       field_matcher = Regexp.new(field.to_s)
@@ -112,7 +121,7 @@ module SunspotMatchers
     end
   end
 
-  class HaveSearchParams < BaseMatcher
+  class HaveSearchParams
     def initialize(method, *args)
       @method = method
       @args = args
@@ -120,7 +129,7 @@ module SunspotMatchers
 
     def matches?(actual)
       @actual = actual
-      @matcher = build_matcher
+      @matcher = get_matcher.new(@actual, @args)
       @matcher.match?
     end
 
@@ -132,20 +141,6 @@ module SunspotMatchers
       @matcher.unexpected_match_error_message
     end
 
-    def build_matcher
-      comparison_search = if(@args.last.is_a?(Proc))
-        SunspotMatchers::SunspotSessionSpy.new(nil).build_search(search_types, &@args.last)
-      else
-        method = @method
-        args = @args
-        SunspotMatchers::SunspotSessionSpy.new(nil).build_search(search_types) do
-          send(method, *args)
-        end
-      end
-
-      get_matcher.new(actual_search, comparison_search, @args)
-    end
-
     def get_matcher
       case @method
         when :with, :without
@@ -157,7 +152,7 @@ module SunspotMatchers
         when :facet
           FacetMatcher
         when :order_by
-          SortMatcher
+          OrderByMatcher
         when :paginate
           PaginationMatcher
       end
@@ -169,12 +164,20 @@ module SunspotMatchers
   end
 
   class WithMatcher < BaseMatcher
+    def search_method
+      :with
+    end
+
     def keys_to_compare
       [:fq]
     end
   end
 
   class KeywordsMatcher < BaseMatcher
+    def search_method
+      :keywords
+    end
+
     def keys_to_compare
       [:q, :qf]
     end
@@ -185,30 +188,79 @@ module SunspotMatchers
   end
 
   class BoostMatcher < BaseMatcher
+    def search_method
+      :boost
+    end
+
+
     def keys_to_compare
       [:qf, :bq, :bf]
     end
   end
 
   class FacetMatcher < BaseMatcher
+    def search_method
+      :facet
+    end
+
     def keys_to_compare
       comparison_params.keys.select {|key| /facet/ =~ key.to_s}
     end
   end
 
-  class SortMatcher < BaseMatcher
+  class OrderByMatcher < BaseMatcher
+    def search_method
+      :order_by
+    end
+
     def keys_to_compare
       [:sort]
     end
+
+    def wildcard_matcher_for_keys
+      return {:sort => /./} if field_wildcard?
+      param = comparison_params[:sort]
+      regex = Regexp.new(param.gsub(any_param, '.*'))
+      {:sort => regex}
+    end
+
+    def field_wildcard?
+      @args.first == any_param
+    end
+
+    def direction_wildcard?
+      @args.length == 2 && @args.last == any_param
+    end
+
+    def args
+      return @args unless direction_wildcard?
+      @args[0...-1] + [:asc]
+    end
+
+    def build_comparison_search
+      if field_wildcard?
+        @comparison_params = {:sort => any_param}
+      elsif direction_wildcard?
+        super
+        @comparison_params = comparison_params
+        @comparison_params[:sort].gsub!("asc", any_param)
+      else
+        super
+      end
+    end
   end
 
   class PaginationMatcher < BaseMatcher
+    def search_method
+      :paginate
+    end
+
     def keys_to_compare
       [:rows, :start]
     end
   end
 
-  class BeASearchFor < BaseMatcher
+  class BeASearchFor
     def initialize(expected_class)
       @expected_class = expected_class
     end
@@ -218,6 +270,16 @@ module SunspotMatchers
       search_types.include?(@expected_class)
     end
 
+    def search_tuple
+      search_tuple = @actual.is_a?(Array) ? @actual : @actual.searches.last
+      raise 'no search found' unless search_tuple
+      search_tuple
+    end
+
+    def search_types
+      search_tuple.first
+    end
+
     def failure_message_for_should
       "expected search class: #{search_types.join(' and ')} to match expected class: #{@expected_class}"
     end

data/lib/sunspot_matchers/version.rb

@@ -1,3 +1,3 @@
 module SunspotMatchers
-  VERSION = "1.2.1.0"
+  VERSION = "1.2.1.1"
 end

data/spec/sunspot_matchers_spec.rb

@@ -6,6 +6,7 @@ class Blog; end
 
 Sunspot.setup(Post) do
   text :body
+  text :name
   string :author_name
   integer :blog_id
   integer :category_ids
@@ -434,6 +435,48 @@ describe "Sunspot Matchers" do
           order_by :average_rating, :asc
         })
       end
+
+      it "should work with any_param match on direction" do
+        Sunspot.search(Post) do
+          order_by :average_rating, :asc
+        end
+        Sunspot.session.should have_search_params(:order_by, :average_rating, any_param)
+      end
+
+      it "should work with any_param match on field" do
+        Sunspot.search(Post) do
+          order_by :average_rating, :asc
+        end
+        Sunspot.session.should have_search_params(:order_by, any_param)
+      end
+
+      it "should work with any_param negative match on direction" do
+        Sunspot.search(Post) do
+          order_by :score
+        end
+        Sunspot.session.should_not have_search_params(:order_by, :average_rating, any_param)
+      end
+
+      it "should work with any_param negative match on field" do
+        Sunspot.search(Post) do
+          keywords 'great pizza'
+        end
+        Sunspot.session.should_not have_search_params(:order_by, any_param)
+      end
+
+      it "should work with any_param match on field and direction" do
+        Sunspot.search(Post) do
+          order_by :score, :desc
+        end
+        Sunspot.session.should have_search_params(:order_by, any_param, any_param)
+      end
+
+      it "should work with any_param negative match on field and direction" do
+        Sunspot.search(Post) do
+          keywords 'great pizza'
+        end
+        Sunspot.session.should_not have_search_params(:order_by, any_param, any_param)
+      end
     end
 
     describe "facet matcher" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_matchers
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 73
   prerelease: false
   segments: 
   - 1
   - 2
   - 1
-  - 0
-  version: 1.2.1.0
+  - 1
+  version: 1.2.1.1
 platform: ruby
 authors: 
 - Joseph Palermo
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -08:00
+date: 2011-02-13 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency