mundane-search 0.0.3 → 0.0.5

data/spec/filters/shortcuts_integration_spec.rb

@@ -8,7 +8,7 @@ describe MundaneSearch::Filters::Shortcuts do
 
   it "should match based on param_key" do
     built = MundaneSearch::Builder.new do
-      employ :attribute_filter, param_key: 'title'
+      employ :attribute_filter, key: 'title'
     end
 
     built.call(all_books, {"title" => "A Tale of Two Cities"}).must_equal([a_tale_of_two_cities])

data/spec/filters/typical_spec.rb

@@ -1,7 +1,6 @@
 require_relative '../minitest_helper'
 
 describe MundaneSearch::Filters::Typical do
-  # let(:typical) { MundaneSearch::Filters::Typical.new(collection, params) }
   let(:standin) { Object.new }
   def typical(options = {})
     MundaneSearch::Filters::Typical.new(collection, params, options)
@@ -13,7 +12,7 @@ describe MundaneSearch::Filters::Typical do
     end
 
     it "should default to param_key" do
-      typical(param_key: "foo").target.must_equal "foo"
+      typical(key: "foo").target.must_equal "foo"
     end
   end
 
@@ -44,14 +43,14 @@ describe MundaneSearch::Filters::Typical do
 
   describe "#param_key" do
     it "should take param_key from options" do
-      param_key = Object.new
-      typical(param_key: param_key).param_key.must_equal param_key
+      key = Object.new
+      typical(key: key).key.must_equal key
     end
   end
 
   describe "#match_value" do
     it "should return param value matching param_key" do
-      typical(param_key: "foo").match_value.must_equal "bar"
+      typical(key: "foo").match_value.must_equal "bar"
     end
 
     it "should use explicit match value when supplied" do
@@ -61,12 +60,12 @@ describe MundaneSearch::Filters::Typical do
 
   describe "#param_key_type" do
     it "should default to :string" do
-      typical.param_key_type.must_equal :string
+      typical.key_type.must_equal :string
     end
 
     it "should use options[:type]" do
       type = Object.new
-      typical(type: type).param_key_type.must_equal type
+      typical(type: type).key_type.must_equal type
     end
   end
 end

data/spec/filters_spec.rb

@@ -6,4 +6,4 @@ describe MundaneSearch::Filters do
   it "should be a module" do
     Filters.must_be_kind_of Module
   end
-end
+end

data/spec/form_integration_spec.rb

@@ -19,7 +19,7 @@ describe "integration with Rails forms" do
     end
 
     it "should extract values from param_key for text_field accessors" do
-      result_class.builder.use MundaneSearch::Filters::AttributeMatch, param_key: 'title'
+      result_class.builder.use MundaneSearch::Filters::AttributeMatch, key: 'title'
       form = formed.form_for(result_model) do |f|
         f.text_field :title
       end

data/spec/minitest_helper.rb

@@ -1,12 +1,20 @@
 require 'rubygems'
 gem 'minitest' # ensures we're using the gem, and not the built in MT
 
+require 'coveralls'
+require 'simplecov'
+SimpleCov.start do
+  coverage_dir 'tmp/coverage'
+  add_filter   'spec'
+end
+Coveralls.wear!
+
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'minitest/mock'
-require "mocha/setup"
+require 'mocha/setup'
 
 require 'mundane-search'
 require 'pry' rescue nil
@@ -39,7 +47,7 @@ end
 Minitest.backtrace_filter = AgressiveBacktraceFilter.new
 
 # fail_fast hack
-module MiniTest
+module Minitest
   class Unit
     def puke_with_immediate_feedback(klass, meth, e)
       # Workaround for minitest weirdness: When puke gets called *again* after
@@ -71,10 +79,17 @@ def params
 end
 
 def requirements_for_search_url_for_tests!
+  require_relative 'demo_data'
+  %w(capture url sanitize text form).each do |name|
+    require "action_view/helpers/#{name}_helper"
+  end
   require 'action_dispatch/routing/polymorphic_routes'
+  require 'action_view/helpers/url_helper'
+
   def view_with_url_class
     Class.new do
       include ActionDispatch::Routing::PolymorphicRoutes
+      include ActionView::Helpers::UrlHelper
       %w(generic_search_url).each do  |path|
         define_method path do |a=nil,b=nil|
           "/#{path}"

data/spec/param_key_types_spec.rb

@@ -0,0 +1,29 @@
+require_relative 'minitest_helper'
+
+describe MundaneSearch::ParamKeyTypes do
+
+  let(:options) { { key: "sort", type: :date, precedence_key: "sort-precedence", precedence_type: :string } }
+  let(:filter)  { Object.new }
+
+  def pkt(options, filter)
+    MundaneSearch::ParamKeyTypes.new(options, filter)
+  end
+
+  it "should find main key" do
+    keys = pkt(options, filter).pairs.collect(&:first)
+    keys.must_include "sort"
+  end
+
+  it "should find additional key" do
+    keys = pkt(options, filter).pairs.collect(&:first)
+    keys.must_include "sort-precedence"
+  end
+
+  it "should find correct type of main key" do
+    pkt(options, filter).pairs["sort"].must_equal :date
+  end
+
+  it "should find correct type of main key" do
+    pkt(options, filter).pairs["sort-precedence"].must_equal :string
+  end
+end

data/spec/result_integration_spec.rb

@@ -3,7 +3,7 @@ require_relative 'minitest_helper'
 describe MundaneSearch::Result do
   let(:result_class) do
     Class.new(MundaneSearch::Result) do
-      use MundaneSearch::Filters::ExactMatch, param_key: "foo"
+      use MundaneSearch::Filters::ExactMatch, key: "foo"
     end
   end
 

data/spec/result_model_spec.rb

@@ -4,8 +4,9 @@ require 'ostruct'
 describe MundaneSearch::ResultModel do
   let(:builder) do
     builder, filter_canister = Object.new, Object.new
-    def filter_canister.param_key      ; "foo" ; end
-    def filter_canister.param_key_type ; :date ; end
+    def filter_canister.option_keys_with_types
+      [["foo",:date]]
+    end
     builder.define_singleton_method :filter_canisters, -> { [filter_canister] }
     builder
   end

data/spec/search_url_for_integration_spec.rb

@@ -17,4 +17,19 @@ describe "integration search_url_for" do
     form = search_url_view.search_url_for(result_model) { }
     form.must_match %r{\A/}
   end
+
+  it "should generate link" do
+    form = search_url_view.search_link_for("anchor", result_model) { }
+    form.must_match %r{\A<a}
+  end
+
+  it "should add class 'unchanged-search' when search object isn't changed" do
+    form = search_url_view.search_link_for("anchor", result_model) { }
+    form.must_match %r{class="unchanged-search"}
+  end
+
+  it "should not class 'unchanged-search' when search object isn't changed" do
+    form = search_url_view.search_link_for("anchor", result_model, {"foo" => "something else"}) { }
+    form.wont_match %r{class="unchanged-search"}
+  end
 end

data/spec/simple_form_integration_spec.rb

@@ -24,13 +24,11 @@ describe "intgration with simple_form" do
   end
 
   it "should determine input" do
-    result_class.builder.use MundaneSearch::Filters::AttributeMatch, param_key: 'title'
+    result_class.builder.use MundaneSearch::Filters::AttributeMatch, key: 'title'
     form = formed.simple_form_for(result_model) do |f|
       f.input :title
     end
-    form.must_match %{<input class="string optional" id="#{search_prefix}_title"
-                             name="#{search_prefix}[title]"
-                             size="50" type="text" />}.gsub(/\s+/,' ')
+    match_tag = form.match(%{<input[^>]*id="#{search_prefix}_title"[^>]*/>})
+    match_tag[0].must_match %{name="#{search_prefix}[title]"}
   end
 end
-

metadata

@@ -1,224 +1,198 @@
 --- !ruby/object:Gem::Specification
 name: mundane-search
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Sam Schenkman-Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: attribute_column
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.5
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Makes everyday search easy-ish.
 email:
 - samsm@samsm.com
-executables:
-- coderay
-- erubis
-- guard
-- pry
-- rackup
-- rake
-- sprockets
-- thor
-- tilt
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/coderay
-- bin/erubis
-- bin/guard
-- bin/pry
-- bin/rackup
-- bin/rake
-- bin/sprockets
-- bin/thor
-- bin/tilt
-- lib/columns_hash.rb
 - lib/mundane-search.rb
 - lib/mundane-search/buildable.rb
 - lib/mundane-search/builder.rb
@@ -229,11 +203,13 @@ files:
 - lib/mundane-search/filters/base.rb
 - lib/mundane-search/filters/blank_params_are_nil.rb
 - lib/mundane-search/filters/exact_match.rb
+- lib/mundane-search/filters/multi_order.rb
 - lib/mundane-search/filters/operator.rb
 - lib/mundane-search/filters/order.rb
 - lib/mundane-search/filters/shortcuts.rb
 - lib/mundane-search/filters/typical.rb
 - lib/mundane-search/initial_stack.rb
+- lib/mundane-search/param_key_types.rb
 - lib/mundane-search/railtie.rb
 - lib/mundane-search/result.rb
 - lib/mundane-search/result_model.rb
@@ -247,7 +223,6 @@ files:
 - spec/buildable_spec.rb
 - spec/builder_integration_spec.rb
 - spec/builder_spec.rb
-- spec/columns_hash_spec.rb
 - spec/demo_data.rb
 - spec/filter_canister_spec.rb
 - spec/filters/attribute_match_integration_spec.rb
@@ -256,6 +231,8 @@ files:
 - spec/filters/base_spec.rb
 - spec/filters/blank_params_are_nil_spec.rb
 - spec/filters/exact_match_spec.rb
+- spec/filters/multi_order_integration_spec.rb
+- spec/filters/multi_order_spec.rb
 - spec/filters/operator_integration_spec.rb
 - spec/filters/operator_spec.rb
 - spec/filters/order_integration_spec.rb
@@ -267,6 +244,7 @@ files:
 - spec/form_integration_spec.rb
 - spec/initial_stack_spec.rb
 - spec/minitest_helper.rb
+- spec/param_key_types_spec.rb
 - spec/result_integration_spec.rb
 - spec/result_model_spec.rb
 - spec/result_spec.rb
@@ -277,33 +255,26 @@ files:
 - spec/stack_spec.rb
 homepage: https://github.com/samsm/mundane-search
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2671507479759182852
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2671507479759182852
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Makes everyday search easy-ish.
 test_files:
 - spec/active_record_setup.rb
@@ -311,7 +282,6 @@ test_files:
 - spec/buildable_spec.rb
 - spec/builder_integration_spec.rb
 - spec/builder_spec.rb
-- spec/columns_hash_spec.rb
 - spec/demo_data.rb
 - spec/filter_canister_spec.rb
 - spec/filters/attribute_match_integration_spec.rb
@@ -320,6 +290,8 @@ test_files:
 - spec/filters/base_spec.rb
 - spec/filters/blank_params_are_nil_spec.rb
 - spec/filters/exact_match_spec.rb
+- spec/filters/multi_order_integration_spec.rb
+- spec/filters/multi_order_spec.rb
 - spec/filters/operator_integration_spec.rb
 - spec/filters/operator_spec.rb
 - spec/filters/order_integration_spec.rb
@@ -331,6 +303,7 @@ test_files:
 - spec/form_integration_spec.rb
 - spec/initial_stack_spec.rb
 - spec/minitest_helper.rb
+- spec/param_key_types_spec.rb
 - spec/result_integration_spec.rb
 - spec/result_model_spec.rb
 - spec/result_spec.rb
@@ -339,3 +312,4 @@ test_files:
 - spec/simple_form_integration_spec.rb
 - spec/simple_search_form_for_integration_spec.rb
 - spec/stack_spec.rb
+has_rdoc: