scoped_search 2.6.0 → 2.6.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzUyZjNjZjdmMDY2MTgzNzJkYjExNWI2NzY5MjMyYmMwNWEzMzUwNQ==
+  data.tar.gz: !binary |-
+    MDc4ZmFjZTRlYmMyZDRhZjljYzg2NzFmYWM1OWJkNDllOGQwMmUzOQ==
+SHA512:
+  metadata.gz: !binary |-
+    YzE3ZjUwNmJlZjc4YTMyM2Q1YmM4NmI3MmI2ZGY1MzUxY2RiZDExZThiMDYw
+    ZjBhMmI2YmZlNGNlYTBmNzBmMmZjMjg0Y2NjN2YzZjgwOTA5NjJmMDhlYzg4
+    ODI0MmEyYTI0NGZiN2NjYzBiN2ZlNzA1ZGY1ZDM0Y2FkZDcyMzg=
+  data.tar.gz: !binary |-
+    NmU5N2UwN2FiOWE1MGI2NDNjNWZkMWEyNGI5YTk2MzIxM2Q5ZTc5YjIwOGQ5
+    N2UzMTg0ODlhMTljZDQ5NDAxNGZiNTMwMDhkODg5MmQ3Yzc3NzNhMGU1Y2I0
+    NTlmMDEwODgxMTk3ZWNiZjI5NjU5N2RjNzE3MzBjMDYwZDk0NzM=

data/Gemfile.activerecord2

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

data/Gemfile.activerecord3

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

data/Gemfile.activerecord4

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

data/lib/scoped_search/query_language/ast.rb

@@ -53,6 +53,10 @@ module ScopedSearch::QueryLanguage::AST
     def eql?(node) # :nodoc
       node.kind_of?(LeafNode) && node.value == value
     end
+
+    def empty?
+      false
+    end
   end
 
   # AST class for representing operators in the query. An operator node has an operator
@@ -64,9 +68,11 @@ module ScopedSearch::QueryLanguage::AST
     attr_reader :operator
     attr_reader :children
 
-    def initialize(operator, children) # :nodoc
+    def initialize(operator, children, root_node = false) # :nodoc
       @operator = operator
       @children = children
+
+      raise ScopedSearch::QueryNotSupported, "Empty list of operands" if @children.empty? && !root_node
     end
 
     # Tree simplicication: returns itself after simpifying its children
@@ -97,6 +103,10 @@ module ScopedSearch::QueryLanguage::AST
       children.length == 1 ? children[0] : children[1]
     end
 
+    def empty?
+      children.length == 0
+    end
+
     # Returns true if this is an infix operator
     def infix?
       children.length > 1

data/lib/scoped_search/query_language/parser.rb

@@ -25,12 +25,14 @@ module ScopedSearch::QueryLanguage::Parser
   end
 
   # Parses a sequence of expressions
-  def parse_expression_sequence(initial = false)
+  def parse_expression_sequence(root_node = false)
     expressions = []
-    next_token if !initial && peek_token == :lparen # skip staring :lparen
+
+    next_token if !root_node && peek_token == :lparen # skip starting :lparen
     expressions << parse_logical_expression until peek_token.nil? || peek_token == :rparen
-    next_token if !initial && peek_token == :rparen # skip final :rparen
-    return ScopedSearch::QueryLanguage::AST::LogicalOperatorNode.new(DEFAULT_SEQUENCE_OPERATOR, expressions)
+    next_token if !root_node && peek_token == :rparen # skip final :rparen
+    
+    return ScopedSearch::QueryLanguage::AST::LogicalOperatorNode.new(DEFAULT_SEQUENCE_OPERATOR, expressions, root_node)
   end
 
   # Parses a logical expression.
@@ -60,6 +62,8 @@ module ScopedSearch::QueryLanguage::Parser
       when :lparen; parse_expression_sequence
       else          parse_comparison
     end
+
+    raise ScopedSearch::QueryNotSupported, "No operands found" if negated_expression.empty?
     return ScopedSearch::QueryLanguage::AST::OperatorNode.new(:not, [negated_expression])
   end
 

data/lib/scoped_search/version.rb

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

data/spec/database.ruby.yml

@@ -2,14 +2,15 @@ sqlite:
   adapter: "sqlite3"
   database: ":memory:"
 
-mysql:
-  adapter: "mysql2"
-  host: "localhost"
-  username: "root"
-  database: "scoped_search_test"
+# mysql:
+#   adapter: "mysql2"
+#   host: "127.0.0.1"
+#   port: 13306
+#   username: "root"
+#   database: "scoped_search_test"
 
-postgresql:
-  adapter: "postgresql"
-  host: "localhost"
-  username: "postgres"
-  database: "scoped_search_test"
+# postgresql:
+#   adapter: "postgresql"
+#   host: "127.0.0.1"
+#   port: 5432
+#   database: "scoped_search_test"

data/spec/integration/ordinal_querying_spec.rb

@@ -87,7 +87,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       it "encoded string should not raise TypeError when querying non-indexed column without a value" do
         if defined? Encoding
           query = 'unindexed ='.force_encoding(Encoding::UTF_8).encode
-          lambda { @class.search_for(query) }.should_not raise_error(TypeError)
+          lambda { @class.search_for(query) }.should_not raise_error
         end
       end
 

data/spec/lib/mocks.rb

@@ -5,17 +5,17 @@ module ScopedSearch::RSpec::Mocks
   end
 
   def mock_activerecord_class
-    ar_mock = mock('ActiveRecord::Base')
-    ar_mock.stub!(:named_scope).with(:search_for, anything)
-    ar_mock.stub!(:scope).with(:search_for, anything)
-    ar_mock.stub!(:connection).and_return(mock_database_connection)
-    ar_mock.stub!(:ancestors).and_return([ActiveRecord::Base])
-    ar_mock.stub!(:columns_hash).and_return({'existing' => mock('column')})
+    ar_mock = double('ActiveRecord::Base')
+    ar_mock.stub(:named_scope).with(:search_for, anything)
+    ar_mock.stub(:scope).with(:search_for, anything)
+    ar_mock.stub(:connection).and_return(mock_database_connection)
+    ar_mock.stub(:ancestors).and_return([ActiveRecord::Base])
+    ar_mock.stub(:columns_hash).and_return({'existing' => double('column')})
     return ar_mock
   end
 
   def mock_database_connection
-    c_mock = mock('ActiveRecord::Base.connection')
+    c_mock = double('ActiveRecord::Base.connection')
     return c_mock
   end
 

data/spec/unit/auto_complete_builder_spec.rb

@@ -3,10 +3,10 @@ require "spec_helper"
 describe ScopedSearch::AutoCompleteBuilder do
 
   before(:each) do
-    @definition = mock('ScopedSearch::Definition')
-    @definition.stub!(:klass).and_return(Class.new(ActiveRecord::Base))
-    @definition.stub!(:profile).and_return(:default)
-    @definition.stub!(:profile=).and_return(true)
+    @definition = double('ScopedSearch::Definition')
+    @definition.stub(:klass).and_return(Class.new(ActiveRecord::Base))
+    @definition.stub(:profile).and_return(:default)
+    @definition.stub(:profile=).and_return(true)
   end
 
   it "should return empty suggestions if the search query is nil" do

data/spec/unit/definition_spec.rb

@@ -5,7 +5,7 @@ describe ScopedSearch::Definition do
   before(:each) do
     @klass      = mock_activerecord_class
     @definition = ScopedSearch::Definition.new(@klass)
-    @definition.stub!(:setup_adapter)
+    @definition.stub(:setup_adapter)
   end
 
   describe ScopedSearch::Definition::Field do
@@ -19,7 +19,7 @@ describe ScopedSearch::Definition do
       it "should not raise an exception when using an unknown field" do
         lambda {
           @definition.define(:on => 'existing').column
-        }.should_not raise_error(ActiveRecord::UnknownAttributeError)
+        }.should_not raise_error
       end
     end
   end
@@ -34,7 +34,7 @@ describe ScopedSearch::Definition do
       end
 
       it "should not create the named scope if it already exists" do
-        @klass.stub!(:search_for)
+        @klass.stub(:search_for)
         @klass.should_not_receive(:named_scope)
         ScopedSearch::Definition.new(@klass)
       end
@@ -47,7 +47,7 @@ describe ScopedSearch::Definition do
       end
 
       it "should not create the named scope if it already exists" do
-        @klass.stub!(:search_for)
+        @klass.stub(:search_for)
         @klass.should_not_receive(:scope)
         ScopedSearch::Definition.new(@klass)
       end

data/spec/unit/parser_spec.rb

@@ -101,4 +101,8 @@ describe ScopedSearch::QueryLanguage::Parser do
   it "should parse a null? keyword" do
     'set? a b null? c'.should parse_to([:and, [:notnull, 'a'], 'b', [:null, 'c']])
   end
+
+  it "should refuse to parse an empty not expression" do
+    lambda { ScopedSearch::QueryLanguage::Compiler.parse('!()|*') }.should raise_error(ScopedSearch::QueryNotSupported)
+  end  
 end

data/spec/unit/query_builder_spec.rb

@@ -3,11 +3,11 @@ require "spec_helper"
 describe ScopedSearch::QueryBuilder do
 
   before(:each) do
-    @definition = mock('ScopedSearch::Definition')
-    @definition.stub!(:klass).and_return(Class.new(ActiveRecord::Base))
-    @definition.stub!(:profile).and_return(:default)
-    @definition.stub!(:default_order).and_return(nil)
-    @definition.stub!(:profile=).and_return(true)
+    @definition = double('ScopedSearch::Definition')
+    @definition.stub(:klass).and_return(Class.new(ActiveRecord::Base))
+    @definition.stub(:profile).and_return(:default)
+    @definition.stub(:default_order).and_return(nil)
+    @definition.stub(:profile=).and_return(true)
   end
 
   it "should return empty conditions if the search query is nil" do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Amos Benari
@@ -11,56 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
-    none: false
-  name: activerecord
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
-  name: rspec
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !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
@@ -130,6 +123,7 @@ files:
 - spec/unit/tokenizer_spec.rb
 homepage: https://github.com/wvanbergen/scoped_search/wiki
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -145,18 +139,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using
   a named scope
 test_files:
@@ -180,3 +172,4 @@ test_files:
 - spec/unit/parser_spec.rb
 - spec/unit/query_builder_spec.rb
 - spec/unit/tokenizer_spec.rb
+has_rdoc: