scoped_search 2.5.1 → 2.6.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 gem 'activerecord'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Willem van Bergen
+Copyright (c) 2008-2013 Willem van Bergen & contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/assets/stylesheets/scoped_search.scss

@@ -18,12 +18,9 @@
   font-weight: bold;
   color: black;
   display: inline-block;
-  width: 14px;
-  height: 14px;
   margin-left: -6px;
-  margin-bottom: -5px;
-  text-shadow: 0 1px 0 rgba(255,255,255,1);
   @include opacity(20);
+  vertical-align: middle;
   &:hover,
   &:focus {
     text-decoration: none;

data/lib/scoped_search.rb

@@ -90,19 +90,6 @@ require 'scoped_search/auto_complete_builder'
 ActiveRecord::Base.send(:extend, ScopedSearch::ClassMethods)
 ActiveRecord::Base.send(:extend, ScopedSearch::BackwardsCompatibility)
 
-if defined?(ActionController)
-  require "scoped_search/rails_helper"
-  ActionController::Base.helper(ScopedSearch::RailsHelper)
-end
-
-#asset pipeline
-if defined?(::Sprockets)
-  require 'scoped_search/engine'
-end
-
-#Compass
-if  defined?(::Compass)
-  base = File.join(File.dirname(__FILE__), '..')
-  styles = File.join(base, 'vendor', 'assets', 'stylesheets')
-  ::Compass::Frameworks.register('scoped_search', :path => base, :stylesheets_directory => styles)
-end
+# Rails & Compass integration
+require 'scoped_search/railtie' if defined?(::Rails)
+require 'scoped_search/compass' if defined?(::Compass)

data/lib/scoped_search/compass.rb

@@ -0,0 +1,3 @@
+  base = File.join(File.dirname(__FILE__), '..')
+  styles = File.join(base, 'vendor', 'assets', 'stylesheets')
+  ::Compass::Frameworks.register('scoped_search', :path => base, :stylesheets_directory => styles)

data/lib/scoped_search/definition.rb

@@ -134,8 +134,7 @@ module ScopedSearch
 
       def default_order(options)
         return nil if options[:default_order].nil?
-        field_name = options[:on] unless options[:rename]
-        field_name = options[:rename] if options[:rename]
+        field_name = options[:rename].nil? ? options[:on] : options[:rename]
         order = (options[:default_order].to_s.downcase.include?('desc')) ? "DESC" : "ASC"
         return "#{field_name} #{order}"
       end

data/lib/scoped_search/query_builder.rb

@@ -59,9 +59,9 @@ module ScopedSearch
         case notification
           when :keycondition then keyconditions << value
           when :keyparameter then keyparameters << value
-          when :parameter then parameters << value
-          when :include   then includes   << value
-          when :joins   then joins   << value
+          when :parameter    then parameters    << value
+          when :include      then includes      << value
+          when :joins        then joins         << value
           else raise ScopedSearch::QueryNotSupported, "Cannot handle #{notification.inspect}: #{value.inspect}"
         end
       end
@@ -70,7 +70,7 @@ module ScopedSearch
         case notification
           when :parameter then parameters << value
           when :include   then includes   << value
-          when :joins   then joins   << value
+          when :joins     then joins      << value
           else raise ScopedSearch::QueryNotSupported, "Cannot handle #{notification.inspect}: #{value.inspect}"
         end
       end
@@ -78,9 +78,9 @@ module ScopedSearch
       # Build hash for ActiveRecord::Base#find for the named scope
       find_attributes = {}
       find_attributes[:conditions] = [sql] + keyparameters + parameters unless sql.blank?
-      find_attributes[:include]    = includes.uniq      unless includes.empty?
-      find_attributes[:joins]      = joins.uniq         unless joins.empty?
-      find_attributes[:order]      = order              unless order.nil?
+      find_attributes[:include]    = includes.uniq                      unless includes.empty?
+      find_attributes[:joins]      = joins.uniq                         unless joins.empty?
+      find_attributes[:order]      = order                              unless order.nil?
 
       # p find_attributes # Uncomment for debugging
       return find_attributes
@@ -220,6 +220,18 @@ module ScopedSearch
         return datetime_test(field, operator, value, &block)
       elsif field.set?
         return set_test(field, operator, value, &block)
+      elsif field.definition.klass.reflections[field.relation].try(:macro) == :has_many
+        if field.definition.klass.reflections[field.relation].options.has_key?(:through)
+          value = value.to_i if field.offset
+          yield(:parameter, value)
+          join = has_many_through_join(field)
+          middle_table = field.definition.klass.reflections[field.relation].options[:through]
+          return "#{field.definition.klass.table_name}.id IN (SELECT #{field.reflection_keys(field.definition.klass.reflections[middle_table])[1]} FROM #{join} WHERE #{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ? )"
+        else
+          value = value.to_i if field.offset
+          yield(:parameter, value)
+          return "#{field.definition.klass.table_name}.id IN (SELECT #{field.reflection_keys(field.definition.klass.reflections[field.relation])[1]} FROM #{field.klass.table_name} WHERE #{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ? )"
+        end
       else
         value = value.to_i if field.offset
         yield(:parameter, value)
@@ -227,6 +239,20 @@ module ScopedSearch
       end
     end
 
+    def has_many_through_join(field)
+      endpoint_table_name = field.klass.table_name
+      middle_table = field.definition.klass.reflections[field.relation].options[:through]
+      middle_table_name = field.definition.klass.reflections[middle_table].klass.table_name
+
+      <<-SQL
+        #{field.definition.klass.table_name}
+        INNER JOIN #{middle_table_name}
+        ON #{field.definition.klass.table_name}.id = #{middle_table_name}.#{field.reflection_keys(field.definition.klass.reflections[middle_table])[1]}
+        INNER JOIN #{endpoint_table_name}
+        ON #{middle_table_name}.#{field.reflection_keys(field.klass.reflections[middle_table])[1]} = #{endpoint_table_name}.id
+      SQL
+    end
+
     # This module gets included into the Field class to add SQL generation.
     module Field
 

data/lib/scoped_search/rails_helper.rb

@@ -1,3 +1,4 @@
+
 module ScopedSearch
   module RailsHelper
     # Creates a link that alternates between ascending and descending.
@@ -188,8 +189,8 @@ module ScopedSearch
     # auto_complete_method to respond the AJAX calls,
     def auto_complete_field_tag(method, val,tag_options = {}, completion_options = {})
       auto_completer_options = { :url => { :action => "auto_complete_#{method}" } }.update(completion_options)
-
-      text_field_tag(method, val,tag_options.merge(:class => "auto_complete_input")) +
+      options = tag_options.merge(:class => "auto_complete_input " << tag_options[:class].to_s)
+      text_field_tag(method, val,options) +
           auto_complete_clear_value_button(method) +
           content_tag("div", "", :id => "#{method}_auto_complete", :class => "auto_complete") +
           auto_complete_field(method, auto_completer_options)
@@ -201,7 +202,7 @@ module ScopedSearch
     # auto_complete_method to respond the JQuery calls,
     def auto_complete_field_tag_jquery(method, val,tag_options = {}, completion_options = {})
       url = url_for(:action => "auto_complete_#{method}", :filter => completion_options[:filter])
-      options = tag_options.merge(:class => "auto_complete_input")
+      options = tag_options.merge(:class => "auto_complete_input " << tag_options[:class].to_s)
       text_field_tag(method, val, options) + auto_complete_clear_value_button(method) +
           auto_complete_field_jquery(method, url, completion_options)
     end

data/lib/scoped_search/railtie.rb

@@ -0,0 +1,8 @@
+if defined?(ActionController)
+  require "scoped_search/rails_helper"
+  ActionController::Base.helper(ScopedSearch::RailsHelper)
+end
+
+if defined?(::Rails::Engine)
+  require 'scoped_search/engine'
+end

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "2.5.1"
+  VERSION = "2.6.0"
 end

data/spec/integration/relation_querying_spec.rb

@@ -72,6 +72,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         ActiveRecord::Migration.create_table(:goos) { |t| t.string :foo }
         class Goo < ActiveRecord::Base
           has_many :jars
+          scoped_search :on => :foo
           scoped_search :in => :jars, :on => :related
         end
 
@@ -104,6 +105,22 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       it "should find all records for which none related bar records exist" do
         ::Goo.search_for('null? related').should have(1).items
       end
+      
+      it "should find all records which has relation with both related values" do
+        ::Goo.search_for('related=bar AND related="another bar"').should have(1).items
+      end
+
+      it "should find all records searching with both parent and child fields" do
+        ::Goo.search_for('foo bar').should have(2).items
+      end
+
+      it "should find the only record with two Jars" do
+        ::Goo.search_for('foo bar "another bar"').should have(1).item
+      end
+
+      it "shouldn't find any records as there isn't an intersect" do
+        ::Goo.search_for('too another').should have(0).items
+      end
 
     end
 
@@ -252,6 +269,10 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       it "should find the two records that are related to a baz record" do
         Koo.search_for('baz').should have(2).items
       end
+
+      it "should find the two records that are related to a baz record" do
+        Koo.search_for('related=baz AND related="baz too!"').should have(1).items
+      end
     end
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 2.5.1
   prerelease: 
+  version: 2.6.0
 platform: ruby
 authors:
 - Amos Benari
@@ -11,56 +11,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
+    none: false
+  name: activerecord
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+    none: false
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: ! "    Scoped search makes it easy to search your ActiveRecord-based
   models.\n    \n    It will create a named scope :search_for that can be called with
   a query string. It will build an SQL query using\n    the provided query string
@@ -82,7 +82,6 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .gitignore
-- .infinity_test
 - .travis.yml
 - Gemfile
 - Gemfile.activerecord2
@@ -97,6 +96,7 @@ files:
 - init.rb
 - lib/scoped_search.rb
 - lib/scoped_search/auto_complete_builder.rb
+- lib/scoped_search/compass.rb
 - lib/scoped_search/definition.rb
 - lib/scoped_search/engine.rb
 - lib/scoped_search/query_builder.rb
@@ -105,6 +105,7 @@ files:
 - lib/scoped_search/query_language/parser.rb
 - lib/scoped_search/query_language/tokenizer.rb
 - lib/scoped_search/rails_helper.rb
+- lib/scoped_search/railtie.rb
 - lib/scoped_search/version.rb
 - scoped_search.gemspec
 - spec/database.jruby.yml
@@ -140,26 +141,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3142613325770757127
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3142613325770757127
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easily search you ActiveRecord models with a simple query language using

data/.infinity_test

@@ -1,8 +0,0 @@
-infinity_test do
-  
-  use :rubies => %w(1.8.7 1.9.2 ree jruby rbx), :test_framework => :rspec
-  
-  before(:each_ruby) do |environment|
-    environment.system('bundle install')
-  end
-end