searchlight 3.1.1 → 4.0.0

data/spec/spec_helper.rb

@@ -2,12 +2,9 @@ require 'capybara/rspec'
 require 'searchlight'
 $LOAD_PATH << '.'
 require 'support/mock_model'
-require 'support/account_search'
-require 'support/spiffy_account_search'
-require 'support/proc_search'
+require 'support/book_search'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/support/book_search.rb

@@ -0,0 +1,46 @@
+# Mostly taken from example app
+class BookSearch < Searchlight::Search
+  Book   = Class.new(MockModel)
+  Author = Class.new(MockModel)
+
+  def base_query
+    Book.all.order("title ASC")
+  end
+
+  def options
+    super.tap { |opts|
+      opts[:in_print] ||= "either"
+    }
+  end
+
+  def search_title_like
+    query.merge(Book.title_like(options[:title_like]))
+  end
+
+  def search_category_in
+    query.where(category_id: options.fetch(:category_in).reject {|v| blank?(v) })
+  end
+
+  def search_author_name_like
+    query.joins(:author).merge(Author.name_like(options[:author_name_like]))
+  end
+
+  def search_author_also_wrote_in_category_id
+    query_string = <<-YE_OLDE_QUERY_LANGUAGE.strip_heredoc
+    INNER JOIN authors    AS category_authors ON books.author_id         = category_authors.id
+    INNER JOIN books      AS other_books      ON other_books.author_id   = category_authors.id
+    INNER JOIN categories AS other_categories ON other_books.category_id = other_categories.id
+    YE_OLDE_QUERY_LANGUAGE
+    query.joins(query_string).where("other_categories.id = ?", options[:author_also_wrote_in_category_id])
+  end
+
+  def search_board_book
+    query.where(board_book: checked?(options[:board_book]))
+  end
+
+  def search_in_print
+    return query if options[:in_print].to_s == "either"
+    query.where(in_print: checked?(options[:in_print]))
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlight
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Nathan Long
@@ -9,36 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: named
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +109,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -132,18 +119,17 @@ files:
 - gemfiles/Gemfile.rails-4.0.x
 - lib/searchlight.rb
 - lib/searchlight/adapters/action_view.rb
-- lib/searchlight/dsl.rb
+- lib/searchlight/options.rb
 - lib/searchlight/search.rb
 - lib/searchlight/version.rb
 - searchlight.gemspec
 - spec/searchlight/adapters/action_view_spec.rb
+- spec/searchlight/options_spec.rb
 - spec/searchlight/search_spec.rb
 - spec/searchlight_spec.rb
 - spec/spec_helper.rb
-- spec/support/account_search.rb
+- spec/support/book_search.rb
 - spec/support/mock_model.rb
-- spec/support/proc_search.rb
-- spec/support/spiffy_account_search.rb
 homepage: https://github.com/nathanl/searchlight
 licenses:
 - MIT
@@ -164,16 +150,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Searchlight is a low-magic way to build database searches using an ORM.
 test_files:
 - spec/searchlight/adapters/action_view_spec.rb
+- spec/searchlight/options_spec.rb
 - spec/searchlight/search_spec.rb
 - spec/searchlight_spec.rb
 - spec/spec_helper.rb
-- spec/support/account_search.rb
+- spec/support/book_search.rb
 - spec/support/mock_model.rb
-- spec/support/proc_search.rb
-- spec/support/spiffy_account_search.rb

data/lib/searchlight/dsl.rb

@@ -1,33 +0,0 @@
-module Searchlight
-  module DSL
-
-    def search_on(target)
-      @search_target = target
-    end
-
-    def searches(*attribute_names)
-
-      # Ensure this class only adds one accessors module to the ancestors chain
-      if @accessors_module.nil?
-        @accessors_module = Named::Module.new("SearchlightAccessors(#{self})") do
-          private
-          # Treat 0 (eg, from checkboxes) as false
-          def truthy?(value)
-            !(['0', 'false', ''].include?(value.to_s.strip))
-          end
-        end
-        include @accessors_module
-      end
-
-      eval_string = "attr_accessor *#{attribute_names}\n"
-      eval_string << attribute_names.map { |attribute_name|
-        <<-LEPRECHAUN_JUICE
-          def #{attribute_name}?
-            truthy?(public_send("#{attribute_name}"))
-          end
-        LEPRECHAUN_JUICE
-      }.join
-      @accessors_module.module_eval(eval_string, __FILE__, __LINE__)
-    end
-  end
-end

data/spec/support/account_search.rb

@@ -1,16 +0,0 @@
-class AccountSearch < Searchlight::Search
-
-  search_on MockModel
-
-  searches :paid_amount, :business_name, :balance, :active
-  attr_accessor :other_attribute
-
-  def search_paid_amount
-    search.where('amount > ?', paid_amount)
-  end
-
-  def search_business_name
-    search.where(business_name: business_name)
-  end
-
-end

data/spec/support/proc_search.rb

@@ -1,17 +0,0 @@
-class ProcSearch < Searchlight::Search
-
-  searches :first_name
-
-  search_on proc { MockModel.some_scope }
-
-  def search_first_name
-    search.where(first_name: first_name)
-  end
-
-end
-
-class ChildProcSearch < ProcSearch
-
-  search_on proc { superclass.search_target.call.other_scope }
-
-end

data/spec/support/spiffy_account_search.rb

@@ -1,2 +0,0 @@
-class SpiffyAccountSearch < AccountSearch
-end