supernova 0.6.8 → 0.7.0

data/Gemfile

@@ -18,6 +18,9 @@ group :development do
   gem "mysql2", "~> 0.2.18"
   gem "ZenTest", "4.5.0"
   gem "geokit"
+  gem "guard"
+  gem "rb-fsevent"
+  gem "growl_notify"
   gem "autotest"
   gem "autotest-growl"
   gem "rspec", "~> 2.8.0"

data/Gemfile.lock

@@ -22,6 +22,10 @@ GEM
     diff-lcs (1.1.3)
     geokit (1.6.0)
     git (1.2.5)
+    growl_notify (0.0.3)
+      rb-appscript
+    guard (0.8.4)
+      thor (~> 0.14.6)
     i18n (0.5.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -33,6 +37,8 @@ GEM
     mime-types (1.17.2)
     mysql2 (0.2.18)
     rake (0.9.2)
+    rb-appscript (0.6.1)
+    rb-fsevent (0.4.3.1)
     rcov (0.9.9)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -52,6 +58,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    thor (0.14.6)
     typhoeus (0.3.3)
       mime-types
     tzinfo (0.3.29)
@@ -68,10 +75,13 @@ DEPENDENCIES
   autotest-growl
   bundler (~> 1.0.0)
   geokit
+  growl_notify
+  guard
   i18n
   jeweler (~> 1.6.0)
   json
   mysql2 (~> 0.2.18)
+  rb-fsevent
   rcov
   rspec (~> 2.8.0)
   ruby-debug19

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.7.0

data/lib/supernova/criteria.rb

@@ -71,7 +71,7 @@ class Supernova::Criteria
   end
 
   def with(filters)
-    merge_filters :with, filters
+    merge_search_options :with, filters
   end
   
   def where(*args)
@@ -170,7 +170,14 @@ class Supernova::Criteria
   def merge_filters_or_search_options(reference_method, key, value)
     self_or_clone.tap do |soc|
       reference = soc.send(reference_method)
-      if value.is_a?(Hash)
+      if key == :with
+        reference[:with] ||= Array.new
+        if value.is_a?(Array)
+          reference[:with] += value
+        else
+          reference[:with] << value
+        end
+      elsif value.is_a?(Hash)
         reference[key] ||= Hash.new
         reference[key].merge!(value)
       elsif [:select, :order].include?(key)

data/lib/supernova/solr_criteria.rb

@@ -5,7 +5,7 @@ class Supernova::SolrCriteria < Supernova::Criteria
   def to_params
     solr_options = { :fq => [], :q => "*:*" }
     solr_options[:wt] = search_options[:wt] if search_options[:wt]
-    solr_options[:fq] += fq_from_with(self.filters[:with])
+    solr_options[:fq] += fq_from_with(self.search_options[:with])
     if self.filters[:without]
      self.filters[:without].each do |field, values| 
        solr_options[:fq] += values.map { |value| "!#{solr_field_from_field(field)}:#{value}" }
@@ -67,14 +67,20 @@ class Supernova::SolrCriteria < Supernova::Criteria
     if with.blank?
       []
     else
-      with.map do |key_or_condition, values|
-        values_from_key_or_condition_and_values(key_or_condition, values).map do |value|
-          if key_or_condition.respond_to?(:solr_filter_for)
-            key_or_condition.key = solr_field_from_field(key_or_condition.key)
-            key_or_condition.solr_filter_for(value)
-          else
-            fq_filter_for_key_and_value(solr_field_from_field(key_or_condition), value)
+      with.map do |with_part|
+        if with_part.is_a?(Hash)
+          with_part.map do |key_or_condition, values|
+            values_from_key_or_condition_and_values(key_or_condition, values).map do |value|
+              if key_or_condition.respond_to?(:solr_filter_for)
+                key_or_condition.key = solr_field_from_field(key_or_condition.key)
+                key_or_condition.solr_filter_for(value)
+              else
+                fq_filter_for_key_and_value(solr_field_from_field(key_or_condition), value)
+              end
+            end
           end
+        else
+          with_part
         end
       end.flatten
     end

data/spec/spec_helper.rb

@@ -23,6 +23,7 @@ end
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
   config.before(:each) do
     ActiveRecord::Base.connection.execute("TRUNCATE offers")
     Supernova::Criteria.mutable_by_default!

data/spec/supernova/criteria_spec.rb

@@ -94,14 +94,12 @@ describe "Supernova::Criteria" do
     end
   end
   
-  [:with, :conditions].each do |method|
+  
+  
+  [:conditions].each do |method|
     describe "##{method}" do
       it "adds all filters to the #{method} block" do
-        scope.send(method, { :length => 3, :height => 99 }).filters[method].should == { :length => 3, :height => 99 }
-      end
-    
-      it "overwrites before set filters" do
-        scope.send(method, { :length => 3, :height => 88 }).send(method, { :length => 4 }).filters[method].should == { :length => 4, :height => 88 }
+        scope.send(method, { :length => 3, :height => 99 }).filters[:conditions].should == { :length => 3, :height => 99 }
       end
     end
   end
@@ -138,6 +136,20 @@ describe "Supernova::Criteria" do
     end
   end
   
+  describe "#with" do
+    it "accepts string filters" do
+      scope.with("a=1").search_options[:with].should == ["a=1"]
+    end
+    
+    it "also accepts hashes" do
+      scope.with(:a => 1).search_options[:with].should == [{ :a => 1 }]
+    end
+    
+    it "merges various scopes" do
+      scope.with(:a => 1).with("a=b").search_options[:with].should == [{ :a => 1 }, "a=b"]
+    end
+  end
+  
   it "to_parameters raises an implement in subclass error" do
     lambda {
       scope.to_parameters
@@ -361,7 +373,7 @@ describe "Supernova::Criteria" do
         a.immutable!
         b = a.except(:order)
         b.search_options[:order].should be_nil
-        b.filters[:with].should == { :a => 1 }
+        b.search_options[:with].should == [{ :a => 1 }]
         a.search_options[:order].should == ["id"]
       end
     end
@@ -430,7 +442,7 @@ describe "Supernova::Criteria" do
     end
     
     it "merges e.g. the with filters" do
-      new_crit.merge(criteria).filters[:with].should == { :c => 8, :a => 1 }
+      new_crit.merge(criteria).search_options[:with].should == [{ :c => 8 }, { :a => 1 }]
     end
     
     it "merges e.g. the conditions filters" do
@@ -488,9 +500,9 @@ describe "Supernova::Criteria" do
         c = a.merge(b)
         c.should_not == a
         c.should_not == b
-        a.filters[:with].should == { :a => 1 }
-        b.filters[:with].should == { :b => 2 }
-        c.filters[:with].should == { :a => 1, :b => 2 }
+        a.search_options[:with].should == [{ :a => 1 }]
+        b.search_options[:with].should == [{ :b => 2 }]
+        c.search_options[:with].should == [{ :a => 1 }, { :b => 2 }]
       end
     end
   end

data/spec/supernova/solr_criteria_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require "ostruct"
 
-describe Supernova::SolrCriteria do
+describe "Supernova::SolrCriteria" do
   let(:criteria) { Supernova::SolrCriteria.new }
   let(:docs) do
     [
@@ -15,21 +15,35 @@ describe Supernova::SolrCriteria do
     }
   end
   
+  describe "#where" do
+    it "sets the correct simple filters" do
+      criteria.where("a_i:10").to_params[:fq].should == ["a_i:10"]
+    end
+    
+    it "combines multiple filters" do
+      criteria.where("a_i:10").where(:a => 1).to_params[:fq].should == ["a_i:10", "a:1"]
+    end
+    
+    it "combines multiple filters with mappings" do
+      criteria.attribute_mapping(:title => { :type => :string }).where(:title => "some_title").to_params[:fq].should == ["title_s:some_title"]
+    end
+  end
+  
   describe "#fq_from_with" do
     it "returns the correct filter for with ranges" do
-      criteria.fq_from_with(:user_id => Range.new(10, 12)).should == ["user_id:[10 TO 12]"]
+      criteria.fq_from_with([:user_id => Range.new(10, 12)]).should == ["user_id:[10 TO 12]"]
     end
     
     it "returns the correct filter for nin" do
-      criteria.fq_from_with(:user_id.nin => [1, 2]).should == ["!(user_id:1 OR user_id:2)"]
+      criteria.fq_from_with([:user_id.nin => [1, 2]]).should == ["!(user_id:1 OR user_id:2)"]
     end
     
     it "returns the correct filter for in" do
-      criteria.fq_from_with(:user_id.in => [1, 2]).should == ["user_id:1 OR user_id:2"]
+      criteria.fq_from_with([:user_id.in => [1, 2]]).should == ["user_id:1 OR user_id:2"]
     end
     
     it "returns the correct filter for not queries" do
-      criteria.fq_from_with(:user_id.not => nil).should == ["user_id:[* TO *]"]
+      criteria.fq_from_with([:user_id.not => nil]).should == ["user_id:[* TO *]"]
     end
   end
   
@@ -111,7 +125,6 @@ describe Supernova::SolrCriteria do
       scope.order("title asc").order("visits desc").to_params[:sort].should == "title_s asc,visits_i desc"
     end
     
-    
     %w(asc desc).each do |order|
       it "uses a mapped field for order even when #{order} is present" do
         criteria.attribute_mapping(:title => { :type => :string }).order("title #{order}").to_params[:sort].should == "title_s #{order}"
@@ -339,7 +352,7 @@ describe Supernova::SolrCriteria do
       criteria.execute
     end
     
-    it "calls replace on collection wit returned docs" do
+    it "calls replace on collection with returned docs" do
       col = double("collection", :original_response= => true, :facets= => true)
       Supernova::Collection.stub!(:new).and_return col
       built_docs = double("built docs")

data/spec/supernova_spec.rb

@@ -76,7 +76,10 @@ describe Supernova do
       end
       
       it "sets the correct filters" do
-        clazz.for_artists(%w(1 3 2)).filters[:with][:artist_id].should == %w(1 3 2)
+        filters = clazz.for_artists(%w(1 3 2)).to_params[:fq]
+        filters.should include("artist_id:1")
+        filters.should include("artist_id:2")
+        filters.should include("artist_id:3")
       end
       
       it "allows chaining of named_search_scopes" do

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "supernova"
-  s.version = "0.6.8"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = "2012-02-08"
+  s.date = "2012-02-09"
   s.description = "Unified search scopes"
   s.email = "tobias.schwab@dynport.de"
   s.executables = ["start_solr"]
@@ -111,6 +111,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mysql2>, ["~> 0.2.18"])
       s.add_development_dependency(%q<ZenTest>, ["= 4.5.0"])
       s.add_development_dependency(%q<geokit>, [">= 0"])
+      s.add_development_dependency(%q<guard>, [">= 0"])
+      s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_development_dependency(%q<growl_notify>, [">= 0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<autotest-growl>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
@@ -128,6 +131,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mysql2>, ["~> 0.2.18"])
       s.add_dependency(%q<ZenTest>, ["= 4.5.0"])
       s.add_dependency(%q<geokit>, [">= 0"])
+      s.add_dependency(%q<guard>, [">= 0"])
+      s.add_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_dependency(%q<growl_notify>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<autotest-growl>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
@@ -146,6 +152,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mysql2>, ["~> 0.2.18"])
     s.add_dependency(%q<ZenTest>, ["= 4.5.0"])
     s.add_dependency(%q<geokit>, [">= 0"])
+    s.add_dependency(%q<guard>, [">= 0"])
+    s.add_dependency(%q<rb-fsevent>, [">= 0"])
+    s.add_dependency(%q<growl_notify>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<autotest-growl>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supernova
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-02-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70194489138220 !ruby/object:Gem::Requirement
+  requirement: &70227376852280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194489138220
+  version_requirements: *70227376852280
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70194489137740 !ruby/object:Gem::Requirement
+  requirement: &70227376851780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194489137740
+  version_requirements: *70227376851780
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70194489137260 !ruby/object:Gem::Requirement
+  requirement: &70227376851260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194489137260
+  version_requirements: *70227376851260
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70194489136780 !ruby/object:Gem::Requirement
+  requirement: &70227376850700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70194489136780
+  version_requirements: *70227376850700
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70194489136300 !ruby/object:Gem::Requirement
+  requirement: &70227376850180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194489136300
+  version_requirements: *70227376850180
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70194489135820 !ruby/object:Gem::Requirement
+  requirement: &70227376849640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70194489135820
+  version_requirements: *70227376849640
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70194489135340 !ruby/object:Gem::Requirement
+  requirement: &70227376849080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194489135340
+  version_requirements: *70227376849080
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70194489134860 !ruby/object:Gem::Requirement
+  requirement: &70227376848580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.2.18
   type: :development
   prerelease: false
-  version_requirements: *70194489134860
+  version_requirements: *70227376848580
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70194489038360 !ruby/object:Gem::Requirement
+  requirement: &70227376848060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *70194489038360
+  version_requirements: *70227376848060
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &70194489037880 !ruby/object:Gem::Requirement
+  requirement: &70227376847540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,43 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194489037880
+  version_requirements: *70227376847540
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70227376846980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70227376846980
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70227376846460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70227376846460
+- !ruby/object:Gem::Dependency
+  name: growl_notify
+  requirement: &70227376845940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70227376845940
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70194489037400 !ruby/object:Gem::Requirement
+  requirement: &70227376845420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194489037400
+  version_requirements: *70227376845420
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70194489036920 !ruby/object:Gem::Requirement
+  requirement: &70227376844880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194489036920
+  version_requirements: *70227376844880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70194489036440 !ruby/object:Gem::Requirement
+  requirement: &70227376844340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +186,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70194489036440
+  version_requirements: *70227376844340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70194489035960 !ruby/object:Gem::Requirement
+  requirement: &70227376843820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +197,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70194489035960
+  version_requirements: *70227376843820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70194489035480 !ruby/object:Gem::Requirement
+  requirement: &70227376843300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +208,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70194489035480
+  version_requirements: *70227376843300
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70194489035000 !ruby/object:Gem::Requirement
+  requirement: &70227376842780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +219,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194489035000
+  version_requirements: *70227376842780
 description: Unified search scopes
 email: tobias.schwab@dynport.de
 executables:
@@ -283,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1145340675698901426
+      hash: 3047902273407419465
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: