filterrific 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d44cdb5ab999e5e889376c0d0eb35f1964f13b82
-  data.tar.gz: b48205b853f675acc7c4013f211f5b67333e231d
+  metadata.gz: cfeeb89ecbb8633a86e9714443be0e1dec39b28b
+  data.tar.gz: 29795af6901eab99af4dcdd8009defb4fb3295fb
 SHA512:
-  metadata.gz: 858c6cb75d9f41facd855fb8a41c9ebce9dbdf737f4e76a370588c819ebd9336727cab61d67751a79750a8b08b27f10fffe19825689ab991ea6d87381bd7dd69
-  data.tar.gz: e78690c520dc35c8e89e533cbcbf135e3a031487331078f6d98255a17deb14fbf25c86d44fe89ec6d864536f0cc78e8e18c6970d341cae0db8b0d11409673c5c
+  metadata.gz: 1162e9fb2f9f4338355d0467d5c014968fe1f7599bc9144eeede2f3b497eb6f5a9d60f1d1104c615bbaf56bfcac1493aac09a7a8049fd15e437c2e04e054ac29
+  data.tar.gz: 26b93548f73deaf22da434d237e1b4adea446abb2ece75bc68c2ee57cbd8e3440f381a4e1f4f7cf16948a725b7125ae9fc07f7ae02b9f8358272fb137eaf8a2d

data/CHANGELOG.md

@@ -1,3 +1,63 @@
+# 2.0.0
+
+API changes
+
+* Filterrific can build the `sorted_by` and `search_query` scopes automatically,
+  based on some configuration in the including model.
+
+    filterrific(
+      default_settings: { sorted_by: 'name_asc' },
+      search_query: {
+        match: :any
+        wildcard: :suffix,
+        adaptor: :postgres
+      },
+      sorted_by: {
+        name_asc: 'Name (A-Z)',
+        name_desc: 'Name (Z-A)'
+      },
+      filter_names: [
+        :with_country,
+        ...
+      ]
+    )
+
+* Filterrific can handle persistence of search params in session for you.
+* Simplified `@filterrific.find` method to load collection from DB.
+  Replaces `Student.filterrific_find(@filterrific)`
+
+    @filterrific = initialize_filterrific(
+      Student,
+      default_settings: {},
+      filter_names: [],
+      params_key: :filterrific,
+      select_options: {},
+      session_persistence: 'asdf',
+    )
+    @students = @filterrific.find
+
+* The filterrific form builder now doesn't override the standard
+  `form_for` method. It is used via `form_for_filterrific` instead:
+
+    form_for_filterrific @filterrific do |f|
+
+* Dropped support for Ruby 1.8.7 (because of 1.9 Hash syntax)
+* Dropped support for Rails <= 3.0.0 (because of ActiveRecord
+  bug fixes in 3.1, and use of asset pipeline)
+
+
+
+### 1.4.0
+
+* Better support for new versions of Rails (integration tests are done in filterrific_demo)
+* Fixed asset pipeline for filterrific-spinner.gif.
+* Isolate_namespace
+* Update Gem dependencies
+* Switch from Rspec to Minitest
+* Require Rails 3.1 or greater
+
+
+
 ### 1.3.1
 
 * Changed ParamSet#select_options so that a complete hash can be assigned
@@ -32,7 +92,6 @@
 
 
 
-
 ## 1.1.0
 
 * Major refactor.
@@ -41,13 +100,13 @@
 * Added gh-pages branch for documentation.
 
 
+
 ### 1.0.1
 
 * Bug fix: Replaced stringify_keys with map.to_s (filter_names is an Array, not a Hash!).
 
 
 
-
 # 1.0.0
 
 * Support for Rails 3.1.
@@ -60,6 +119,7 @@
 * Replicate functionality of Rails 2.3 version.
 
 
+
 ### 0.0.1, released 2010-07-30
 
 * Initial setup.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Jo Hund
+Copyright (c) 2010-2014 Jo Hund
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -7,7 +7,7 @@ searching, and sorting to your ActiveRecord lists.
 Make sure to go to the fantastic [Filterrific documentation](http://filterrific.clearcove.ca)
 to find out more!
 
-
+TODO: look at Jeff's email suggestions (June 23, 2014)
 
 ### Installation
 
@@ -18,6 +18,18 @@ or with bundler in your Gemfile:
 `gem 'filterrific'`
 
 
+### Guidelines for submitting issues
+
+I'm happy to help you if you encounter problems when using filterrific. You'll make my job easier if you follow these guidelines:
+
+* Please keep in mind that I do this in my spare time. I appreciate it if you first do everything you can on your own: read the detailed filterrific documentation, look for similar issues on StackOverflow, search the internets, etc.
+* If you're stuck, give me sufficient context so that I have a chance to identify the issue:
+    * what version of filterrific are you using? (look in your `Gemfile.lock`)
+    * what version of Rails are you using? (look in your `Gemfile.lock`)
+    * what version of Ruby are you using? (run `ruby -v` in your app root)
+* If you get an exception, include the entire stack trace, including the error message.
+* Include any relevant code snippets (your model, controller, and view code).
+
 
 ### Resources
 
@@ -28,6 +40,8 @@ or with bundler in your Gemfile:
 * [Issues](https://github.com/jhund/filterrific/issues)
 * [Rubygems.org](http://rubygems.org/gems/filterrific)
 
+[![Build Status](https://travis-ci.org/jhund/filterrific.svg?branch=master)](https://travis-ci.org/jhund/filterrific)
+
 [![Code Climate](https://codeclimate.com/github/jhund/filterrific.png)](https://codeclimate.com/github/jhund/filterrific)
 
 ### License
@@ -38,4 +52,4 @@ or with bundler in your Gemfile:
 
 ### Copyright
 
-Copyright (c) 2010 - 2013 Jo Hund. See [(MIT) LICENSE](https://github.com/jhund/filterrific/blob/master/MIT-LICENSE) for details.
+Copyright (c) 2010 - 2014 Jo Hund. See [(MIT) LICENSE](https://github.com/jhund/filterrific/blob/master/MIT-LICENSE) for details.

data/Rakefile

@@ -1,17 +1,17 @@
-# encoding: utf-8
-
 begin
-  require 'bundler'
+  require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-Bundler::GemHelper.install_tasks
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+Bundler::GemHelper.install_tasks
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+require 'rake/testtask'
+Rake::TestTask.new do |test|
+  test.libs << 'spec'
+  test.pattern = 'spec/**/*_spec.rb'
+  test.verbose = true
 end
 
-task :default => :spec
+require 'wwtd/tasks'
+task default: 'wwtd:local'

data/bin/rails

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/filterrific/engine', __FILE__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/doc/meta.md

@@ -32,3 +32,14 @@ How to run specs
 ----------------
 
 `bundle exec rake`
+
+
+Travis CI
+---------
+
+filterrific uses Travis CI for testing. Currently we test the following ruby
+versions:
+
+* 1.9.3
+* 2.0.0
+* 2.1.1

data/doc/scratchpad.md

@@ -0,0 +1,58 @@
+# Filterrific scratchpad
+
+## TODO
+
+* add check that no filter_name conflicts with existing methods on included ActiveRecord class (See https://github.com/jhund/filterrific/issues/17)
+
+## Travis
+
+Example setups:
+
+* https://github.com/mislav/will_paginate/blob/master/.travis.yml
+* https://github.com/stripe/stripe-ruby/blob/master/.travis.yml
+
+Filterrific 2
+
+* requires Ruby 1.9.3 or later
+* requires Rails 3.1 or later
+* new syntax
+* better test coverage
+
+test matrix
+
+            Rails 2.x  Rails 3.0  Rails 3.1  Rails 3.2  Rails 4.0  Rails 4.1  Rails Edge
+Ruby 1.8.7
+Ruby 1.9.3
+Ruby 2.0
+Ruby 2.1
+
+Each combination is also tested for postgres and mysql
+
+wwtd to simulate travis
+
+plataformatec/devise uses the rails stable branch from git.
+That's an interesting idea.
+
+## Options for proper test matrix
+
+* appraisal by thoughtbot -1
+* wwtd: ++ for being able to run tests locally
+* ENV vars (steve klabnik's approach)
+* use combustion gem for testing without dummy app? nah. It doesn't support Rails 4
+
+Preferred method:
+
+* use ENV vars in travis.yml for Rails versions
+* use steve klabnik's approach for selecting the correct gemfile
+* use ENV vars to choose correct dummy app
+
+Apps to generate dummy apps for each version:
+
+    bundle exec rails plugin new ~/development/filterrific_4.1/filterrific -T --mountable --dummy-path=spec/dummy --database=postgresql
+
+[differences between full and mountable engine](http://stackoverflow.com/a/17263429)
+
+* 3.1: ibo-pts
+* 3.2: filterrific_demo (sqlite3)
+* 4.0: yikesite (mysql)
+* 4.1: utilibase (postgresql)

data/lib/filterrific/action_view_extension.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 #
 # Adds view helpers to ActionView
 #
@@ -14,14 +16,95 @@ module Filterrific::ActionViewExtension
     end
     super
   end
+  # TODO: change this to form_for_filterrific!
 
   # Renders a spinner while the list is being updated
   def render_filterrific_spinner
     %(
       <span class="filterrific_spinner" style="display:none;">
-        #{ image_tag('filterrific-spinner.gif') }
+        #{ image_tag('filterrific/filterrific-spinner.gif') }
       </span>
     ).html_safe
   end
+  #alias: filterrific_spinner
+
+  # Renders a link which indicates the current sorting and which can be used to
+  # toggle the list sorting (set column and direction).
+  # NOTE: Make sure that this is used in the list partial that is re-rendered
+  # when the filterrific params are changed, so that the filterrific params in
+  # the URL are always current.
+  # @param[Filterrific::ParamSet] filterrific the current filterrific instance
+  # @param[String, Symbol] sort_key the key to sort by, without direction.
+  #     Example: 'name', 'created_at'
+  # @param[Hash, optional] options:
+  #     * active_column_class: CSS class applied to current sort column.
+  #       Default: 'filterrific_current_sort_column'
+  #     * ascending_indicator: HTML string to indicate ascending sort direction.
+  #       Default: Triangle pointing up.
+  #     * default_sort_direction: override the default sorting when selecting
+  #       a new sort column. Default: 'asc'.
+  #     * descending_indicator: HTML string to indicate descending sort direction.
+  #       Default: Triangle pointing down.
+  #     * html_attrs: HTML attributes to be added to the sorting link. Default: {}
+  #     * label: override label. Default: `sort_key.humanize`.
+  #     * sorting_scope_name: override the name of the scope used for sorting.
+  #       Default: `:sorted_by`
+  #     * url_for_attrs: override the target URL attributes to be used for `url_for`.
+  #       Default: {} (current URL).
+  # TODO: update documentation
+  # TODO: update demo app
+  # TODO: synchronize with sorting select in filter
+  def filterrific_sorting_link(filterrific, sort_key, options = {})
+    options = {
+      :active_column_class => 'filterrific_current_sort_column',
+      :ascending_indicator => '⬆',
+      :default_sort_direction => 'asc',
+      :descending_indicator => '⬇',
+      :html_attrs => {},
+      :label => sort_key.to_s.humanize,
+      :sorting_scope_name => :sorted_by,
+      :url_for_attrs => {},
+    }.merge(options)
+    options[:html_attrs] = options[:html_attrs].with_indifferent_access
+    current_sorting = filterrific.send(options[:sorting_scope_name])
+    current_sort_key = current_sorting ? current_sorting.gsub(/_asc|_desc/, '') : nil
+    current_sort_direction = current_sorting ? (current_sorting =~ /_desc\z/ ? 'desc' : 'asc') : nil
+    new_sort_key = sort_key.to_s
+    if new_sort_key == current_sort_key
+      # current sort column, toggle search_direction
+      new_sort_direction, current_sort_direction_indicator = if 'asc' == current_sort_direction
+        ['desc', options[:ascending_indicator]]
+      else
+        ['asc', options[:descending_indicator]]
+      end
+      new_sorting = [new_sort_key, new_sort_direction].join('_')
+      css_classes = [
+        options[:active_column_class],
+        options[:html_attrs].delete(:class)
+      ].compact.join(' ')
+      new_filterrific_params = filterrific.to_hash
+                                          .with_indifferent_access
+                                          .merge(options[:sorting_scope_name] => new_sorting)
+      url_for_attrs = options[:url_for_attrs].merge(:filterrific => new_filterrific_params)
+      link_to(
+        [options[:label], current_sort_direction_indicator].join(' '),
+        url_for(url_for_attrs),
+        options[:html_attrs].reverse_merge(:class => css_classes, :method => :get, :remote => true)
+      )
+    else
+      # new sort column, change sort column
+      new_sort_direction = options[:default_sort_direction]
+      new_sorting = [new_sort_key, new_sort_direction].join('_')
+      new_filterrific_params = filterrific.to_hash
+                                          .with_indifferent_access
+                                          .merge(options[:sorting_scope_name] => new_sorting)
+      url_for_attrs = options[:url_for_attrs].merge(:filterrific => new_filterrific_params)
+      link_to(
+        options[:label],
+        url_for(url_for_attrs),
+        options[:html_attrs].reverse_merge(:method => :get, :remote => true)
+      )
+    end
+  end
 
 end

data/lib/filterrific/engine.rb

@@ -1,11 +1,11 @@
-require 'rails'
-
 module Filterrific
   class Engine < ::Rails::Engine
 
     # It's an engine so that we can add javascript and image assets
     # to the asset pipeline.
 
+    isolate_namespace Filterrific
+
     require 'filterrific/param_set'
 
     initializer "filterrific.active_record_extension" do |app|
@@ -22,5 +22,9 @@ module Filterrific
       end
     end
 
+    initializer "filterrific.assets.precompile" do |app|
+      app.config.assets.precompile += %w(filterrific-spinner.gif)
+    end
+
   end
 end

data/lib/filterrific/param_set.rb

@@ -25,6 +25,12 @@ module Filterrific
       define_attr_accessors_for_each_filter(filterrific_params)
     end
 
+    # A shortcut to run the ActiveRecord query on resource_class. Use this if
+    # you want to start with the resource_class, and not a special ActiveRecord::Relation.
+    def find
+      resource_class.filterrific_find(self)
+    end
+
     # Returns Filterrific::ParamSet as hash (used for URL params and serialization)
     def to_hash
       {}.tap { |h|

data/lib/filterrific/version.rb

@@ -1,3 +1,3 @@
 module Filterrific
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/spec/filterrific/action_view_extension_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'filterrific/action_view_extension'
+
+module Filterrific
+
+  class ViewContext
+    include ActionViewExtension
+  end
+
+  describe ActionViewExtension do
+
+    describe '#render_filterrific_spinner' do
+      it "renders filterrific spinner" do
+        ViewContext.new.must_respond_to(:render_filterrific_spinner)
+      end
+    end
+
+    describe '#filterrific_sorting_link' do
+      it 'changes sorting on new column' do
+      end
+    end
+
+  end
+end

data/spec/filterrific/active_record_extension_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+require 'active_record'
+require 'filterrific/active_record_extension'
+
+ActiveRecord::Base.extend Filterrific::ActiveRecordExtension::ClassMethods
+
+module Filterrific
+
+  # Container for test data
+  class TestData
+
+    def self.filterrific_filter_names
+      %w[sorted_by search_query with_country_id]
+    end
+
+    def self.filterrific_default_settings
+      { 'sorted_by' => 'name_asc' }
+    end
+
+  end
+
+  describe ActiveRecordExtension do
+
+    let(:filterrific_class){
+      Class.new(ActiveRecord::Base) do
+        filterrific(
+          :filter_names => TestData.filterrific_filter_names,
+          :default_settings => TestData.filterrific_default_settings
+        )
+      end
+    }
+
+    describe "Class method extensions" do
+
+      it "adds a 'filterrific' class method" do
+        filterrific_class.must_respond_to(:filterrific)
+      end
+
+      it "adds a 'filterrific_find' class method" do
+        filterrific_class.must_respond_to(:filterrific_find)
+      end
+
+    end
+
+    describe "Filterrific initialization" do
+
+      it "initializes filterrific_filter_names" do
+        filterrific_class.filterrific_filter_names.must_equal(TestData.filterrific_filter_names)
+      end
+
+      it "initializes filterrific_default_settings" do
+        filterrific_class.filterrific_default_settings.must_equal(TestData.filterrific_default_settings)
+      end
+
+      it "raises when no filter_names are given" do
+        proc {
+          Class.new(ActiveRecord::Base) do
+            filterrific(
+              :filter_names => []
+            )
+          end
+        }.must_raise(ArgumentError)
+      end
+
+      it "raises when default_settings contains keys that are not in filter_names" do
+        proc {
+          Class.new(ActiveRecord::Base) do
+            filterrific(
+              :filter_names => [:one, :two],
+              :default_settings => { :three => '' }
+            )
+          end
+        }.must_raise(ArgumentError)
+      end
+
+    end
+
+    describe "filterrific_find" do
+
+      it "raises when given invalid params" do
+        proc {
+          filterrific_class.filterrific_find('an invalid argument')
+        }.must_raise(ArgumentError)
+      end
+
+    end
+
+  end
+end

data/spec/filterrific/param_set_spec.rb

@@ -0,0 +1,136 @@
+require 'spec_helper'
+require 'filterrific/param_set'
+
+module Filterrific
+
+  # Container for test data
+  class TestData
+
+    def self.filterrific_filter_names
+      %w[
+        filter_proc
+        filter_array_int
+        filter_array_string
+        filter_int
+        filter_string
+      ]
+    end
+
+    def self.filterrific_default_settings
+      { 'filter_int' => 42 }
+    end
+
+    def self.filterrific_params
+      {
+        'filter_proc' => lambda { 1 + 1 },
+        'filter_array_int' => %w[1 2 3],
+        'filter_array_string' => %w[one two three],
+        'filter_int' => '42',
+        'filter_string' => 'forty-two'
+      }
+    end
+
+    def self.filterrific_params_after_sanitizing
+      {
+        'filter_proc' => 2,
+        'filter_array_int' => [1, 2, 3],
+        'filter_array_string' => %w[one two three],
+        'filter_int' => 42,
+        'filter_string' => 'forty-two'
+      }
+    end
+
+  end
+
+  # Simulates a class that would include the filterrific directive
+  class ResourceClass
+
+    def self.filterrific_default_settings
+      TestData.filterrific_default_settings
+    end
+    def self.filterrific_filter_names
+      TestData.filterrific_filter_names
+    end
+
+  end
+
+  describe ParamSet do
+
+    let(:filterrific_param_set){
+      Filterrific::ParamSet.new(ResourceClass, TestData.filterrific_params)
+    }
+
+    describe "initialization" do
+
+      it "assigns resource class" do
+        filterrific_param_set.resource_class.must_equal(ResourceClass)
+      end
+
+      describe "dynamic filter_name attr_accessors" do
+
+        TestData.filterrific_filter_names.each do |filter_name|
+
+          it "defines a getter for '#{ filter_name }'" do
+            filterrific_param_set.must_respond_to(filter_name)
+          end
+
+          it "defines a setter for '#{ filter_name }'" do
+            filterrific_param_set.must_respond_to("#{ filter_name }=")
+          end
+
+        end
+
+        TestData.filterrific_params.keys.each do |key|
+
+          it "assigns sanitized param to '#{ key }' attr" do
+            filterrific_param_set.send(key).must_equal(TestData.filterrific_params_after_sanitizing[key])
+          end
+
+        end
+
+      end
+
+    end
+
+    describe "to_hash" do
+
+      it "returns all filterrific_params as hash" do
+        filterrific_param_set.to_hash.must_equal(TestData.filterrific_params_after_sanitizing)
+      end
+
+    end
+
+    describe "to_json" do
+
+      it "returns all filterrific_params as json string" do
+        filterrific_param_set.to_json.must_equal(TestData.filterrific_params_after_sanitizing.to_json)
+      end
+
+    end
+
+    describe "#select_options" do
+      it "exists" do
+        filterrific_param_set.select_options.must_equal({})
+      end
+
+      it "lets you assign a hash" do
+        # Make sure it doesn't raise an exception
+        filterrific_param_set.select_options = {}
+        1.must_equal(1)
+      end
+
+      it "lets you set a value" do
+        # Make sure it doesn't raise an exception
+        filterrific_param_set.select_options[:value] = 1
+        1.must_equal(1)
+      end
+
+      it "returns the same value you set" do
+        value = rand(1..200)
+        filterrific_param_set.select_options[:value] = value
+        filterrific_param_set.select_options[:value].must_equal(value)
+      end
+    end
+
+  end
+end

data/spec/filterrific_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
 
 describe Filterrific do
-  pending "write it"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
-require 'rubygems'
+ENV["RAILS_ENV"] = "test"
 require 'bundler/setup'
+require 'minitest/autorun'
+require 'rails'
+require 'filterrific'
 
-RSpec.configure do |config|
-  # Nothing to do
-end
+#MiniTest::Unit.autorun

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterrific
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Jo Hund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.5
 description: Filterrific is a Rails Engine plugin that makes it easy to add filtering,
   searching, and sorting to your ActiveRecord lists.
 email: jhund@clearcove.ca
@@ -91,6 +91,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/images/filterrific/filterrific-spinner.gif
+- app/assets/javascripts/filterrific/filterrific-jquery.js
+- bin/rails
 - doc/Overview diagram.graffle/data.plist
 - doc/Overview diagram.graffle/image1.tiff
 - doc/development_notes/api_design.txt
@@ -98,19 +101,18 @@ files:
 - doc/development_notes/model_api.rb
 - doc/development_notes/view_api.txt
 - doc/meta.md
+- doc/scratchpad.md
 - lib/filterrific.rb
 - lib/filterrific/action_view_extension.rb
 - lib/filterrific/active_record_extension.rb
 - lib/filterrific/engine.rb
 - lib/filterrific/param_set.rb
 - lib/filterrific/version.rb
-- spec/action_view_extension_spec.rb
-- spec/active_record_extension_spec.rb
+- spec/filterrific/action_view_extension_spec.rb
+- spec/filterrific/active_record_extension_spec.rb
+- spec/filterrific/param_set_spec.rb
 - spec/filterrific_spec.rb
-- spec/param_set_spec.rb
 - spec/spec_helper.rb
-- vendor/assets/images/filterrific-spinner.gif
-- vendor/assets/javascripts/filterrific-jquery.js
 homepage: http://filterrific.clearcove.ca
 licenses:
 - MIT
@@ -131,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Rails engine plugin for filtering ActiveRecord lists.

data/spec/action_view_extension_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-require 'filterrific/action_view_extension'
-
-class ViewContext
-
-  include Filterrific::ActionViewExtension
-
-end
-
-describe Filterrific::ActionViewExtension do
-
-  it "renders filterrific spinner" do
-    ViewContext.new.should respond_to(:render_filterrific_spinner)
-  end
-
-end

data/spec/active_record_extension_spec.rb

@@ -1,85 +0,0 @@
-require 'spec_helper'
-require 'active_record'
-require 'filterrific/active_record_extension'
-::ActiveRecord::Base.extend Filterrific::ActiveRecordExtension::ClassMethods
-
-# Container for test data
-class TestData
-
-  def self.filterrific_filter_names
-    %w[sorted_by search_query with_country_id]
-  end
-
-  def self.filterrific_default_settings
-    { 'sorted_by' => 'name_asc' }
-  end
-
-end
-
-describe Filterrific::ActiveRecordExtension do
-
-  let(:filterrific_class){
-    Class.new(ActiveRecord::Base) do
-      filterrific(
-        :filter_names => TestData.filterrific_filter_names,
-        :default_settings => TestData.filterrific_default_settings
-      )
-    end
-  }
-
-  describe "Class method extensions" do
-
-    it "adds a 'filterrific' class method" do
-      filterrific_class.should respond_to(:filterrific)
-    end
-
-    it "adds a 'filterrific_find' class method" do
-      filterrific_class.should respond_to(:filterrific_find)
-    end
-
-  end
-
-  describe "Filterrific initialization" do
-
-    it "initializes filterrific_filter_names" do
-      filterrific_class.filterrific_filter_names.should == TestData.filterrific_filter_names
-    end
-
-    it "initializes filterrific_default_settings" do
-      filterrific_class.filterrific_default_settings.should == TestData.filterrific_default_settings
-    end
-
-    it "raises when no filter_names are given" do
-      expect {
-        Class.new(ActiveRecord::Base) do
-          filterrific(
-            :filter_names => []
-          )
-        end
-      }.to raise_error(ArgumentError)
-    end
-
-    it "raises when default_settings contains keys that are not in filter_names" do
-      expect {
-        Class.new(ActiveRecord::Base) do
-          filterrific(
-            :filter_names => [:one, :two],
-            :default_settings => { :three => '' }
-          )
-        end
-      }.to raise_error(ArgumentError)
-    end
-
-  end
-
-  describe "filterrific_find" do
-
-    it "raises when given invalid params" do
-      expect {
-        filterrific_class.filterrific_find('an invalid argument')
-      }.to raise_error(ArgumentError)
-    end
-
-  end
-
-end

data/spec/param_set_spec.rb

@@ -1,129 +0,0 @@
-require 'spec_helper'
-require 'filterrific/param_set'
-
-# Container for test data
-class TestData
-
-  def self.filterrific_filter_names
-    %w[
-      filter_proc
-      filter_array_int
-      filter_array_string
-      filter_int
-      filter_string
-    ]
-  end
-
-  def self.filterrific_default_settings
-    { 'filter_int' => 42 }
-  end
-
-  def self.filterrific_params
-    {
-      'filter_proc' => lambda { 1 + 1 },
-      'filter_array_int' => %w[1 2 3],
-      'filter_array_string' => %w[one two three],
-      'filter_int' => '42',
-      'filter_string' => 'forty-two'
-    }
-  end
-
-  def self.filterrific_params_after_sanitizing
-    {
-      'filter_proc' => 2,
-      'filter_array_int' => [1, 2, 3],
-      'filter_array_string' => %w[one two three],
-      'filter_int' => 42,
-      'filter_string' => 'forty-two'
-    }
-  end
-
-end
-
-# Simulates a class that would include the filterrific directive
-class ResourceClass
-
-  def self.filterrific_default_settings
-    TestData.filterrific_default_settings
-  end
-  def self.filterrific_filter_names
-    TestData.filterrific_filter_names
-  end
-
-end
-
-describe Filterrific::ParamSet do
-
-  let(:filterrific_param_set){
-    Filterrific::ParamSet.new(ResourceClass, TestData.filterrific_params)
-  }
-
-  describe "initialization" do
-
-    it "assigns resource class" do
-      filterrific_param_set.resource_class.should == ResourceClass
-    end
-
-    describe "dynamic filter_name attr_accessors" do
-
-      TestData.filterrific_filter_names.each do |filter_name|
-
-        it "defines a getter for '#{ filter_name }'" do
-          filterrific_param_set.should respond_to(filter_name)
-        end
-
-        it "defines a setter for '#{ filter_name }'" do
-          filterrific_param_set.should respond_to("#{ filter_name }=")
-        end
-
-      end
-
-      TestData.filterrific_params.keys.each do |key|
-
-        it "assigns sanitized param to '#{ key }' attr" do
-          filterrific_param_set.send(key).should == TestData.filterrific_params_after_sanitizing[key]
-        end
-
-      end
-
-    end
-
-  end
-
-  describe "to_hash" do
-
-    it "returns all filterrific_params as hash" do
-      filterrific_param_set.to_hash.should == TestData.filterrific_params_after_sanitizing
-    end
-
-  end
-
-  describe "to_json" do
-
-    it "returns all filterrific_params as json string" do
-      filterrific_param_set.to_json.should == TestData.filterrific_params_after_sanitizing.to_json
-    end
-
-  end
-
-  describe "#select_options" do
-    it "exists" do
-      expect(filterrific_param_set.select_options).to eq({})
-    end
-
-    it "lets you assign a hash" do
-      expect{filterrific_param_set.select_options = {}}.not_to raise_error
-    end
-
-    it "lets you set a value" do
-      expect{filterrific_param_set.select_options[:value] = 1}.not_to raise_error
-    end
-
-    it "returns the same value you set" do
-      value = rand(1..200)
-      filterrific_param_set.select_options[:value] = value
-      expect(filterrific_param_set.select_options[:value]).to eq(value)
-    end
-  end
-
-end