searchlight 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d87d47fdacfae5b1d8d87d2c34b6443610fb4f88
-  data.tar.gz: 639cb63efe19379336e0fbcd65b8d66f0d265f2a
+  metadata.gz: 6535dc6c570b01a67e7a25a51819bd57c155abb5
+  data.tar.gz: 6741f5d2dd6a1bc93641263848b926662df22307
 SHA512:
-  metadata.gz: 9785b92c697fb59b0ae3aebd88af3f1913c04df0ff99aed3b73923b13d2d313d9923f98b217a7646be742c163ab892d61ce3eb8cff77960da21a132979a1717d
-  data.tar.gz: 5438b35af95bcf804ff0898f8989f0d804f7bb1b46f9f74642e59d3a98c5a27ac70c681a988b8ffca545aa9253a9339b3f3efca9fe29e7beaca868b70b0d73df
+  metadata.gz: 06768634ad235bb9b45fe93ceaf2f5d1a07fcfc016f396d1fa70b727721ac802ac8956869bcc2715539b413f6b22126e614a9042277b2bfe04c80af213d2fe9f
+  data.tar.gz: 4350283762d804a7c1747b49815598f5b17eddd28ca8ee591ad0857ace1f578099d57d8e1f517d03cacbaf18cda126ab04e1a6d37eeb2eb5d7636cfa028f74a6

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 Searchlight does its best to use [semantic versioning](http://semver.org).
 
+## v3.0.0
+
+Two major releases in two days!? Well, I thought of another good, but breaking, change. To the major version bump, Robin!
+
+Inputs generated using `ActionView` forms are now named after your search form. Eg, the form for 'UserSearch' will submit parameters under 'user_search', not just 'search'. This makes the code more standard and namespaces the form, in case, eg, you want to have two forms on the same page.
+
+Note that to upgrade, Rails users will need to change references to `params[:search]` to something like `params[:user_search]` (depending on name of the search class).
+
 ## v2.0.0
 
 Now with fewer features! :D

data/TODO.md

@@ -1,7 +1,4 @@
 # TODO
 
-- Only have `options` method return values that map to search methods; it doesn't track any `attr_accessor` you may have. This guarantees consistent contents.
-- Run rcov and mutant
+- Do some mutation testing
 - Make nice Github page
-- Test with ActiveRecord 4
-- Add more complex example searches to show where Searchlight shines. Eg: for a given disease, find people who've traveled in a given time period and visited countries that had an outbreak of that disease during their visit.

data/lib/searchlight.rb

@@ -7,4 +7,6 @@ end
 
 require 'searchlight/dsl'
 require 'searchlight/search'
-require 'searchlight/adapters/action_view'   if defined?(::ActionView)
+if defined?(::ActionView) && defined?(::ActiveModel)
+  require 'searchlight/adapters/action_view'
+end

data/lib/searchlight/adapters/action_view.rb

@@ -1,30 +1,23 @@
+require 'action_view'
+require 'active_model'
+require 'active_support/core_ext'
+
 module Searchlight
   module Adapters
     module ActionView
 
-      module ClassMethods
-
-        def model_name
-          ::ActiveModel::Name.new(self, nil, 'search')
-        end
+      include ::ActiveModel::Conversion
 
+      def self.included(target)
+        target.extend ::ActiveModel::Naming
       end
 
-      module InstanceMethods
-
-        def to_key
-          []
-        end
-
-        def persisted?
-          false
-        end
-
+      def persisted?
+        false
       end
 
     end
   end
 end
 
-Searchlight::Search.send(:include, Searchlight::Adapters::ActionView::InstanceMethods)
-Searchlight::Search.extend(Searchlight::Adapters::ActionView::ClassMethods)
+Searchlight::Search.send(:include, Searchlight::Adapters::ActionView)

data/lib/searchlight/version.rb

@@ -1,3 +1,3 @@
 module Searchlight
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/spec/searchlight/adapters/action_view_spec.rb

@@ -6,10 +6,8 @@ describe 'Searchlight::Adapters::ActionView', type: :feature, adapter: true do
   let(:search) { AccountSearch.new(paid_amount: 15) }
 
   before :all do
+    # Only required when running these tests
     require 'searchlight/adapters/action_view'
-    require 'action_view'
-    require 'active_model'
-    require 'active_support/core_ext'
   end
 
   before :each do
@@ -21,7 +19,7 @@ describe 'Searchlight::Adapters::ActionView', type: :feature, adapter: true do
       f.text_field(:paid_amount)
     end
 
-    expect(form).to have_selector("form input[name='search[paid_amount]'][value='15']")
+    expect(form).to have_selector("form input[name='account_search[paid_amount]'][value='15']")
   end
 
   it "tells the form that it is not persisted" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlight
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Nathan Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: named