scoped_search 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3291810a245c631791ecafd20c61946c46f7edc1
-  data.tar.gz: cb14f9b463fa22b0537f48fcda37ecdd836302bc
+  metadata.gz: 8d62827c492fb99894adbd0b01e0a1341c6744a5
+  data.tar.gz: 2ee3ede28bcd6b96e12ca1a7629b7cbef38aee4d
 SHA512:
-  metadata.gz: 43d3a5b905d957079ea970b3f7e936fc453200811edd3017f257fc9f0d052cececffc7ea6e1a4a073ddc909df3b5d0d0b34393aea6c24aebefba69cb4e284f20
-  data.tar.gz: 1fe059d3579a6c51bb3c29c977bd956dc0294c6993098bebb4712ece85854ddead8d7d294ff02fb63914db8020cb9e405a1e864ee4b6ee3776b40251b4aa15ea
+  metadata.gz: 9e26efdc791ad2fde5e975f44c8512a5089c4774f41f299e68f2c03fab3657323be4668e0668deb86f448dce2b02fe92b95d8d180cfff76b6f7dacd6e4bb01df
+  data.tar.gz: 206daf327aa65a9de4b2ac8ed049620b4df5c4b71330b846413c9140d0f83aed95f612db37d9154d624d2f8c3a54a8d9fd785e41a76fa9e223b0b4e9b81a7497

data/.travis.yml

@@ -14,7 +14,8 @@ rvm:
 - "1.9"
 - "2.0"
 - "2.1"
-- "2.2"
+- "2.2.2"
+- "2.3.1"
 - ruby-head
 - jruby-19mode
 - jruby-head
@@ -24,9 +25,19 @@ gemfile:
 - Gemfile.activerecord40
 - Gemfile.activerecord41
 - Gemfile.activerecord42
+- Gemfile.activerecord50
 
 matrix:
   allow_failures:
-  - rvm: ruby-head
-  - rvm: jruby-head
-  - rvm: jruby-19mode
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: jruby-19mode
+  exclude:
+    - rvm: "1.9"
+      gemfile: Gemfile.activerecord50
+    - rvm: "2.0"
+      gemfile: Gemfile.activerecord50
+    - rvm: "2.1"
+      gemfile: Gemfile.activerecord50
+    - rvm: "2.3.1"
+      gemfile: Gemfile.activerecord32

data/CHANGELOG.rdoc

@@ -8,6 +8,10 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 *Nothing yet*
 
+=== Version 3.3.0
+
+- Support for ActiveRecord 5.0
+
 === Version 3.2.0
 
 - In MySQL, case sensitivity is now determined by the collation of the column, and

data/Gemfile.activerecord50

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activerecord', '5.0.0.rc1'
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
+
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'mysql2', '~> 0.3.11'
+  gem 'pg'
+end

data/lib/scoped_search/auto_complete_builder.rb

@@ -178,10 +178,10 @@ module ScopedSearch
         .where(value_conditions(field_name, val))
         .select(field_name)
         .limit(20)
+        .uniq
         .map(&field.key_field)
         .compact
         .map { |f| "#{name}.#{f} " }
-        .uniq
     end
 
     # this method auto-completes values of fields that have a :complete_value marker
@@ -205,10 +205,10 @@ module ScopedSearch
         .where(value_conditions(field.quoted_field, val))
         .select(field.quoted_field)
         .limit(20)
+        .uniq
         .map(&field.field)
         .compact
         .map { |v| v.to_s =~ /\s/ ? "\"#{v}\"" : v }
-        .uniq
     end
 
     def completer_scope(field)

data/lib/scoped_search/definition.rb

@@ -250,7 +250,19 @@ module ScopedSearch
     def register_named_scope! # :nodoc
       definition = self
       @klass.scope(:search_for, proc { |query, options|
-        search_scope = ActiveRecord::VERSION::MAJOR == 3 ? @klass.scoped : (ActiveRecord::VERSION::MINOR < 1 ? @klass.where(nil) : @klass.all)
+        klass = definition.klass
+
+        search_scope = case ActiveRecord::VERSION::MAJOR
+          when 3
+            klass.scoped
+          when 4
+            (ActiveRecord::VERSION::MINOR < 1) ? klass.where(nil) : klass.all
+          when 5
+            klass.all
+          else
+            raise ScopedSearch::DefinitionError, 'version ' \
+              "#{ActiveRecord::VERSION::MAJOR} of activerecord is not supported"
+          end
 
         find_options = ScopedSearch::QueryBuilder.build_query(definition, query || '', options || {})
         search_scope = search_scope.where(find_options[:conditions])   if find_options[:conditions]

data/lib/scoped_search/query_builder.rb

@@ -28,9 +28,12 @@ module ScopedSearch
     # Loads the QueryBuilder class for the connection of the given definition.
     # If no specific adapter is found, the default QueryBuilder class is returned.
     def self.class_for(definition)
-      self.const_get(definition.klass.connection.class.name.split('::').last)
-    rescue
-      self
+      case definition.klass.connection.class.name.split('::').last
+      when /postgresql/i
+        PostgreSQLAdapter
+      else
+        self
+      end
     end
 
     # Initializes the instance by setting the relevant parameters

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "3.2.2"
+  VERSION = "3.3.0"
 end

data/spec/integration/auto_complete_spec.rb

@@ -52,6 +52,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       @foo_1 = Foo.create!(:string => 'foo', :another => 'temp 1', :explicit => 'baz', :int => 9  , :date => 'February 8, 2011' , :unindexed => 10)
       Foo.create!(:string => 'bar', :another => 'temp 2', :explicit => 'baz', :int => 22  , :date => 'February 10, 2011', :unindexed => 10)
       Foo.create!(:string => 'baz', :another => nil,      :explicit => nil  , :int => nil, :date => nil                 , :unindexed => nil)
+      20.times { Foo.create!(:explicit => "aaa") }
 
       Bar.create!(:related => 'lala',         :foo => @foo_1)
       Bar.create!(:related => 'another lala', :foo => @foo_1)
@@ -136,7 +137,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
     context 'value auto complete' do
       it "should complete values list of values " do
-        Foo.complete_for('explicit = ').length.should == 1
+        Foo.complete_for('explicit = ').length.should == 2
       end
 
       it "should complete values should contain baz" do

data/spec/unit/query_builder_spec.rb

@@ -8,6 +8,7 @@ describe ScopedSearch::QueryBuilder do
     @definition.stub(:profile).and_return(:default)
     @definition.stub(:default_order).and_return(nil)
     @definition.stub(:profile=).and_return(true)
+    @definition.klass.stub(:connection).and_return(double())
   end
 
   it "should raise an ArgumentError if the query is not set" do
@@ -22,4 +23,14 @@ describe ScopedSearch::QueryBuilder do
     ScopedSearch::QueryBuilder.build_query(@definition, "\t ").should == {  }
   end
 
+  it "should use default adapter when connection type is unknown" do
+    ScopedSearch::QueryBuilder.class_for(@definition).should == ScopedSearch::QueryBuilder
+  end
+
+  it "should use postgres adapter for postgres-like connection" do
+    connection = double()
+    connection.stub("name").and_return("SomePostgreSQLAdapter")
+    @definition.klass.connection.stub("class").and_return(connection)
+    ScopedSearch::QueryBuilder.class_for(@definition).should == ScopedSearch::QueryBuilder::PostgreSQLAdapter
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -86,6 +86,7 @@ files:
 - Gemfile.activerecord40
 - Gemfile.activerecord41
 - Gemfile.activerecord42
+- Gemfile.activerecord50
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using