paraphrase 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 495b5b3b50b22aed23b4b684084c4213dfa6648d
-  data.tar.gz: 25742c98d2fea7b1b65f64c0694a5b6fa2888005
+  metadata.gz: 54d269a79cf5f4ab55d4afe39c4f9e0c4dd6841f
+  data.tar.gz: e95b97c71c317d9e6f534bb7dcfb10037cde2bfe
 SHA512:
-  metadata.gz: 900028635ad15f53e571fc5af6f589886b4b814930a91f084ce8c387798a379b04d29c8876d373685e9434b33e207f948d87e3ced0e2f0f8f8ba7258f8fc7fce
-  data.tar.gz: 11deef4d8d8a299018766bd1f7d9ced8dea177594e9a549e0479b0035e1cbe1df9da1f8e82aaa554ceba33492d76371f5d0fe1c685deb6213f0949f4cd3c4472
+  metadata.gz: f69b9ef6eb394171092763aa92144d0f044e0f7668c374a4d609da84d0a2e163d39fa2679771fa9a32894150a8a478002d531acd6f3ff139c521742fa5494b75
+  data.tar.gz: 93221d4cd686cd4f7a84d958df0608264a4869045ce891239e4dc47d7330c68c2712faf6a049fde322cd3f79fd938e709caf0bea14a96e45822a395ca6d35ce4

data/.gitignore

@@ -3,3 +3,4 @@ doc/
 *.gem
 vendor/cache/*.gem
 .yardoc
+coverage

data/.travis.yml

@@ -1,12 +1,17 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - jruby-19mode
 gemfile:
   - gemfiles/3.0.gemfile
   - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
-install: 'bundle install -j 4'
+  - gemfiles/4.1.gemfile
+install: 'travis_retry bundle install -j 4'
 script: 'bundle exec rake'
+env:
+  global:
+    # Code Climate coverage reporting
+    - secure: "VylP1haJogwCq04GRrM3hVfNT4YJiZ4RJoklOQLgqPMRalOCzVPOIRoTz3qpVbdQHf3l18VhVDrDbu2W2qfBKJq7/anIuYYgPd0uRAGliZD4h5B2PgQDqvPeTEftj/g3IYDh6PvZCuhgnxMdldmSnxd9WAjAnkLtjoiLgE6elCE="

data/Appraisals

@@ -21,3 +21,9 @@ appraise '4.0' do
   gem 'activesupport', '~> 4.0'
   gem 'actionpack', '~> 4.0'
 end
+
+appraise '4.1' do
+  gem 'activerecord', '~> 4.1'
+  gem 'activesupport', '~> 4.1'
+  gem 'actionpack', '~> 4.1'
+end

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.9.0
+
+* Define methods to process query params on a subclass of `Paraphrase::Params`
+  that also handles filtering blank query params.
+* `Query.keys` and `Query#keys` expose the keys that have been mapped.
+
 ## 0.8.0 / 2-5-2014
 
 * Remove `ActiveSupport::Notifications`

data/README.md

@@ -1,6 +1,7 @@
 # paraphrase
 
 [![Code Climate](https://codeclimate.com/github/ecbypi/paraphrase.png)](https://codeclimate.com/github/ecbypi/paraphrase)
+[![Build Status](https://travis-ci.org/ecbypi/paraphrase.png?branch=master)](https://travis-ci.org/ecbypi/paraphrase)
 
 Paraphrase provides a way to map query params to model scopes and
 only apply scopes when the mapped query params are present.
@@ -29,10 +30,6 @@ be applied to which scopes.
 class PostQuery < Paraphrase::Query
   map :author, to: :by_user
   map :start_date, :end_date, to: :published_within
-
-  def start_date
-    Time.zone.parse(params[:start_date])
-  end
 end
 ```
 
@@ -49,16 +46,16 @@ class AdminPostQuery < Paraphrase::Query
 end
 ```
 
-In the controller, call `.paraphrase` on your model, passing a hash of query
-params.  This will filter out the registered query params, calling the scopes
-whose inputs are supplied. If a query param for a scope is missing or empty,
-the scope is skipped.
+To build the query, call `.paraphrase` on your model.  Only scopes whose keys are all
+provided will be applied.
 
-`Paraphrase::Query` will intelligently determine if the value of the query
-param is empty. If the value is an array containing empty strings, the empty
-strings will be removed before being passed to the scope. If the array is empty
-after removing empty strings, the scope will not be called since an empty array
-is considered a blank value.
+```ruby
+# Based on the example `PostQuery` above, this will only apply `Post.by_user`
+# and skip `Post.published_within` since `:end_date` is missing.
+Post.paraphrase(author: 'Jim')
+```
+
+All unregistered keys are filered out of the params that are passed to `.paraphrase`.
 
 ```ruby
 class PostsController < ApplicationController
@@ -72,6 +69,30 @@ class PostsController < ApplicationController
 end
 ```
 
+`Paraphrase::Query` will recursively determine if the value of the query
+param is empty. If the value is an array containing empty strings, the empty
+strings will be removed before being passed to the scope. If the array is empty
+after removing empty strings, the scope will not be called since an empty array
+is considered a blank value.
+
+```ruby
+class UserQuery < Paraphrase::Query
+  map :names, to: :with_name
+end
+
+class User < ActiveRecord::Base
+  def self.with_name(names)
+    where(name: names)
+  end
+end
+
+User.paraphrase(names: ['', 'Jim']).to_sql
+# => SELECT "users".* FROM "users" WHERE "users"."name" IN ['Jim']
+
+User.paraphrase(names: ['', '']).to_sql
+# => SELECT "users".* FROM "users"
+```
+
 You can chain queries on an `ActiveRecord::Relation`. This avoids adding scopes
 that replicate the functionality of an association like
 `Post.for_user(user_id)` or allow you to build a default scope.
@@ -100,8 +121,7 @@ end
 
 ### Query Class DSL
 
-Scopes are mapped to param keys using the `map` class method provided by
-`Paraphrase::Query`.  You can specify one or more keys.
+Scopes are mapped to param keys using `map`.  You can specify one or more keys.
 
 ```ruby
 class PostQuery < Paraphrase::Query
@@ -121,7 +141,7 @@ end
 ```
 
 If multiple query params are mapped to a scope, but only a subset are required,
-use the `:whitelist` option to allow them to be missing. The `:whitelist`
+use the `:whitelist` option to allow them to be blank. The `:whitelist`
 option can be set to `true`, an individual key or an array of keys.
 
 ```ruby
@@ -151,12 +171,11 @@ Post.paraphrase(first_name: 'John', last_name: 'Smith').to_sql
 
 ### Boolean Scopes
 
-Some filter records based on a boolean column. It doesn't make sense for these
-methods to take any arguments.
+For scopes that filter records based on a boolean column, it doesn't make to
+force the scope to take an argument.
 
-Paraphrase will detect if the method specified takes no arguments.  If not, it
-will call the method without any arguments, assuming the inputs are present and
-valid.
+If the mapped query params are present and a scope takes no arguments,
+`paraphrase` will not attempt to pass those values to the query.
 
 ```ruby
 class PostQuery < Paraphrase::Query
@@ -178,8 +197,7 @@ Post.paraphrase(published: '1').to_sql
 ### Pre-processing Query Params
 
 By default, for each query param specified that maps to a model scope, a method
-is defined on the query class that fetches the value for that key. This is used
-internally to determine if model scopes need to be applied. To pre-process a
+is defined on the query class that fetches the value for that key. To pre-process a
 query param, such as an ISO formatted date, override the method in the query
 class.
 
@@ -187,12 +205,14 @@ class.
 class PostQuery < Paraphrase::Query
   map :start_date, :end_date, to: :published_within
 
-  def start_date
-    @start_date ||= Time.zone.parse(params[:start_date]) rescue nil
-  end
+  class Params < Paraphrase::Params
+    def start_date
+      @start_date ||= Time.zone.parse(params[:start_date]) rescue nil
+    end
 
-  def end_date
-    @start_date ||= Time.zone.parse(params[:end_date]) rescue nil
+    def end_date
+      @start_date ||= Time.zone.parse(params[:end_date]) rescue nil
+    end
   end
 end
 

data/gemfiles/3.0.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/edd_d/Work/paraphrase
   specs:
-    paraphrase (0.8.0)
-      activemodel (>= 3.0, < 4.1)
-      activerecord (>= 3.0, < 4.1)
-      activesupport (>= 3.0, < 4.1)
+    paraphrase (0.9.0)
+      activemodel (>= 3.0, < 4.2)
+      activerecord (>= 3.0, < 4.2)
+      activesupport (>= 3.0, < 4.2)
 
 GEM
   remote: https://rubygems.org/
@@ -35,8 +35,11 @@ GEM
       rake
     arel (3.0.3)
     builder (3.0.4)
+    codeclimate-test-reporter (0.3.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    docile (1.1.3)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.9)
@@ -62,6 +65,11 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     slop (3.4.7)
     sprockets (2.2.2)
       hike (~> 1.2)
@@ -82,6 +90,7 @@ DEPENDENCIES
   activesupport (~> 3.0)
   appraisal (~> 0.4)
   bundler (~> 1.0)
+  codeclimate-test-reporter (~> 0.3)
   paraphrase!
   pry (~> 0.9)
   rake (~> 0.9.2)

data/gemfiles/3.1.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/edd_d/Work/paraphrase
   specs:
-    paraphrase (0.8.0)
-      activemodel (>= 3.0, < 4.1)
-      activerecord (>= 3.0, < 4.1)
-      activesupport (>= 3.0, < 4.1)
+    paraphrase (0.9.0)
+      activemodel (>= 3.0, < 4.2)
+      activerecord (>= 3.0, < 4.2)
+      activesupport (>= 3.0, < 4.2)
 
 GEM
   remote: https://rubygems.org/
@@ -35,8 +35,11 @@ GEM
       rake
     arel (3.0.3)
     builder (3.0.4)
+    codeclimate-test-reporter (0.3.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    docile (1.1.3)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.9)
@@ -62,6 +65,11 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     slop (3.4.7)
     sprockets (2.2.2)
       hike (~> 1.2)
@@ -82,6 +90,7 @@ DEPENDENCIES
   activesupport (~> 3.1)
   appraisal (~> 0.4)
   bundler (~> 1.0)
+  codeclimate-test-reporter (~> 0.3)
   paraphrase!
   pry (~> 0.9)
   rake (~> 0.9.2)

data/gemfiles/3.2.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/edd_d/Work/paraphrase
   specs:
-    paraphrase (0.8.0)
-      activemodel (>= 3.0, < 4.1)
-      activerecord (>= 3.0, < 4.1)
-      activesupport (>= 3.0, < 4.1)
+    paraphrase (0.9.0)
+      activemodel (>= 3.0, < 4.2)
+      activerecord (>= 3.0, < 4.2)
+      activesupport (>= 3.0, < 4.2)
 
 GEM
   remote: https://rubygems.org/
@@ -35,8 +35,11 @@ GEM
       rake
     arel (3.0.3)
     builder (3.0.4)
+    codeclimate-test-reporter (0.3.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    docile (1.1.3)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.9)
@@ -62,6 +65,11 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     slop (3.4.7)
     sprockets (2.2.2)
       hike (~> 1.2)
@@ -82,6 +90,7 @@ DEPENDENCIES
   activesupport (~> 3.2)
   appraisal (~> 0.4)
   bundler (~> 1.0)
+  codeclimate-test-reporter (~> 0.3)
   paraphrase!
   pry (~> 0.9)
   rake (~> 0.9.2)

data/gemfiles/4.0.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: /Users/edd_d/Work/paraphrase
   specs:
-    paraphrase (0.8.0)
-      activemodel (>= 3.0, < 4.1)
-      activerecord (>= 3.0, < 4.1)
-      activesupport (>= 3.0, < 4.1)
+    paraphrase (0.9.0)
+      activemodel (>= 3.0, < 4.2)
+      activerecord (>= 3.0, < 4.2)
+      activesupport (>= 3.0, < 4.2)
 
 GEM
   remote: https://rubygems.org/
@@ -36,8 +36,11 @@ GEM
     arel (4.0.1)
     atomic (1.1.14)
     builder (3.1.4)
+    codeclimate-test-reporter (0.3.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    docile (1.1.3)
     erubis (2.7.0)
     i18n (0.6.9)
     method_source (0.8.2)
@@ -60,6 +63,11 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     slop (3.4.7)
     sqlite3 (1.3.8)
     thread_safe (0.1.3)
@@ -76,6 +84,7 @@ DEPENDENCIES
   activesupport (~> 4.0)
   appraisal (~> 0.4)
   bundler (~> 1.0)
+  codeclimate-test-reporter (~> 0.3)
   paraphrase!
   pry (~> 0.9)
   rake (~> 0.9.2)

data/gemfiles/4.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.1"
+gem "activesupport", "~> 4.1"
+gem "actionpack", "~> 4.1"
+
+gemspec :path=>"../"

data/gemfiles/4.1.gemfile.lock

@@ -0,0 +1,95 @@
+PATH
+  remote: ../
+  specs:
+    paraphrase (0.9.0)
+      activemodel (>= 3.0, < 4.2)
+      activerecord (>= 3.0, < 4.2)
+      activesupport (>= 3.0, < 4.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    codeclimate-test-reporter (0.3.0)
+      simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
+    erubis (2.7.0)
+    i18n (0.6.9)
+    json (1.8.1)
+    method_source (0.8.2)
+    minitest (5.3.3)
+    multi_json (1.9.3)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (0.9.6)
+    redcarpet (2.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.5.0)
+    sqlite3 (1.3.8)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+    yard (0.8.7.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 4.1)
+  activerecord (~> 4.1)
+  activesupport (~> 4.1)
+  appraisal (~> 0.4)
+  bundler (~> 1.0)
+  codeclimate-test-reporter (~> 0.3)
+  paraphrase!
+  pry (~> 0.9)
+  rake (~> 0.9.2)
+  redcarpet (~> 2.1.1)
+  rspec (~> 2.14)
+  sqlite3 (~> 1.3.6)
+  yard (~> 0.7)

data/lib/paraphrase/params.rb

@@ -0,0 +1,34 @@
+module Paraphrase
+  class Params
+    attr_reader :params, :result
+
+    def initialize(params, keys)
+      @params = params.with_indifferent_access.slice(*keys)
+
+      @result = @params.inject(HashWithIndifferentAccess.new) do |result, (key, value)|
+        value = respond_to?(key) ? send(key) : scrub(@params[key])
+
+        if value.present?
+          result[key] = value
+        end
+
+        result
+      end
+    end
+
+    private
+
+    def scrub(value)
+      case value
+      when Array
+        value.delete_if { |v| scrub(v).blank? }
+      when Hash
+        value.delete_if { |k, v| scrub(v).blank? }
+      when String
+        value.strip
+      else
+        value
+      end
+    end
+  end
+end

data/lib/paraphrase/query.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/hash_with_indifferent_access'
 require 'paraphrase/active_model'
+require 'paraphrase/params'
 
 module Paraphrase
   class Query
@@ -14,7 +15,7 @@ module Paraphrase
     class_attribute :scopes, :_source, instance_writer: false
 
     # @!attribute [r] params
-    #   @return [HashWithIndifferentAccess] filters parameters based on keys defined in scopes
+    #   @return [HashWithIndifferentAccess] filtered parameters based on keys defined in scopes
     #
     # @!attribute [r] result
     #   @return [ActiveRecord::Relation]
@@ -33,6 +34,20 @@ module Paraphrase
       self._source = name.to_s
     end
 
+    # Keys being mapped to scopes
+    #
+    # @return [Array<Symbol>]
+    def self.keys
+      scopes.flat_map(&:keys)
+    end
+
+    # Returns the class for processing and filtering query params.
+    def self.param_processor
+      self::Params
+    rescue NameError
+      Paraphrase::Params
+    end
+
     # Add a {Scope} instance to {Query#scopes}. Defines a reader for each key
     # to read from {Query#params}.
     #
@@ -48,7 +63,7 @@ module Paraphrase
       scopes << Scope.new(keys, options)
 
       keys.each do |key|
-        define_method(key) { params[key] } unless method_defined?(key)
+        define_method(key) { params[key] }
       end
     end
 
@@ -58,18 +73,13 @@ module Paraphrase
     # @param [Hash] params query parameters
     # @param [ActiveRecord::Relation] relation object to apply methods to
     def initialize(params = {}, relation = source)
-      keys = scopes.map(&:keys).flatten.map(&:to_s)
-
-      @params = params.with_indifferent_access.slice(*keys)
-      scrub_params!
+      @params = process_params(params)
 
-      @result = scopes.inject(relation) do |r, scope|
-        scope.chain(self, r)
+      @result = scopes.inject(relation) do |result, scope|
+        scope.chain(@params, result)
       end
     end
 
-    alias :[] :send
-
     # Return an `ActiveRecord::Relation` corresponding to the source class
     # determined from the `_source` class attribute or the name of the query
     # class.
@@ -82,25 +92,15 @@ module Paraphrase
       end
     end
 
-    private
-
-    def scrub_params!
-      params.delete_if { |key, value| scrub(value) }
+    # @see Query.keys
+    def keys
+      self.class.keys
     end
 
-    def scrub(value)
-      value = case value
-      when Array
-        value.delete_if { |v| scrub(v) }
-      when Hash
-        value.delete_if { |k, v| scrub(v) }
-      when String
-        value.strip
-      else
-        value
-      end
+    private
 
-      value.blank?
+    def process_params(params)
+      self.class.param_processor.new(params, keys).result
     end
   end
 end

data/lib/paraphrase/scope.rb

@@ -13,11 +13,11 @@ module Paraphrase
     #   @return [Array<Symbol>] keys required for query
     attr_reader :keys, :name, :required_keys
 
-    # @param [Symbol] name name of the scope
+    # @param [Symbol] keys query params to be mapped to the scope
     # @param [Hash] options options to configure {Scope Scope} instance
-    # @option options [Symbol, Array<Symbol>] :to param key(s) to extract values from
-    # @option options [true, Symbol, Array<Symbol>] :require lists all or a
-    #   subset of param keys as required
+    # @option options [Symbol, Array<Symbol>] :to scope to map query params to
+    # @option options [true, Symbol, Array<Symbol>] :whitelist lists all or a
+    #   subset of param keys as optional
     def initialize(keys, options)
       @keys = keys
       @name = options[:to]
@@ -34,18 +34,18 @@ module Paraphrase
     # values are missing.  Detects if the scope takes no arguments to determine
     # if values should be passed to the scope.
     #
-    # @param [Paraphrase::Query] query instance of {Query} class
+    # @param [Hash] params filtered params from the query
     # @param [ActiveRecord::Relation] relation scope chain
     # @return [ActiveRecord::Relation]
-    def chain(query, relation)
-      if required_keys.all? { |key| query[key] }
+    def chain(params, relation)
+      if required_keys.all? { |key| params[key] }
         klass = relation.respond_to?(:klass) ? relation.klass : relation
         arity = klass.method(name).arity
 
         if arity == 0
           relation.send(name)
         else
-          values = keys.map { |key| query[key] }
+          values = keys.map { |key| params[key] }
           relation.send(name, *values)
         end
       else

data/lib/paraphrase/version.rb

@@ -1,3 +1,3 @@
 module Paraphrase
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/paraphrase.gemspec

@@ -24,26 +24,24 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency 'activerecord', '>= 3.0', '< 4.1'
-  gem.add_dependency 'activesupport', '>= 3.0', '< 4.1'
-  gem.add_dependency 'activemodel', '>= 3.0', '< 4.1'
+  gem.add_dependency 'activerecord', '>= 3.0', '< 4.2'
+  gem.add_dependency 'activesupport', '>= 3.0', '< 4.2'
+  gem.add_dependency 'activemodel', '>= 3.0', '< 4.2'
 
-  gem.add_development_dependency 'actionpack', '>= 3.0', '< 4.1'
+  gem.add_development_dependency 'actionpack', '>= 3.0', '< 4.2'
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'rspec', '~> 2.14'
   gem.add_development_dependency 'rake', '~> 0.9.2'
   gem.add_development_dependency 'appraisal', '~> 0.4'
   gem.add_development_dependency 'pry', '~> 0.9'
-
-  if RUBY_PLATFORM != 'java'
-    gem.add_development_dependency 'redcarpet', '~> 2.1.1'
-  end
+  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.3'
 
   if RUBY_PLATFORM == 'java'
     gem.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
     gem.add_development_dependency 'jdbc-sqlite3'
   else
     gem.add_development_dependency 'sqlite3',  '~> 1.3.6'
+    gem.add_development_dependency 'redcarpet', '~> 2.1.1'
   end
 end

data/spec/paraphrase/query_spec.rb

@@ -9,12 +9,14 @@ module Paraphrase
       map :authors, to: :by_users
       map :start_date, :end_date, to: :published_between
 
-      def start_date
-        @start_date ||= Time.parse(params[:start_date]) rescue nil
-      end
+      class Params < Paraphrase::Params
+        def start_date
+          @start_date ||= Time.parse(params[:start_date]) rescue nil
+        end
 
-      def end_date
-        @end_date ||= Time.parse(params[:end_date]) rescue nil
+        def end_date
+          @end_date ||= Time.parse(params[:end_date]) rescue nil
+        end
       end
     end
 
@@ -55,16 +57,6 @@ module Paraphrase
       end
     end
 
-    describe '#[]' do
-      it 'retreives values from #params or uses custom reader if defined' do
-        query = PostQuery.new(title: 'Morning Joe', start_date: '2010-10-30', end_date: 'foo')
-
-        expect(query[:title]).to eq 'Morning Joe'
-        expect(query[:start_date]).to eq Time.local(2010, 10, 30)
-        expect(query[:end_date]).to be_nil
-      end
-    end
-
     describe "#params" do
       it "filters out params not specified in scopes" do
         query = PostQuery.new(nickname: 'bill', title: 'william')

data/spec/spec_helper.rb

@@ -1,8 +1,15 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 require 'rspec'
 require 'pry'
 require 'paraphrase'
 require 'active_record'
 
+RSpec.configure do |config|
+  config.order = 'random'
+end
+
 I18n.enforce_available_locales = false
 
 ActiveRecord::Base.establish_connection(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paraphrase
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Eduardo Gutierrez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -175,19 +175,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 description: "\n                        Map query params to model scopes, pairing
   one or\n                        more keys to a scope. Parameters can be required,
   or\n                        whitelisted providing fine tuned control over how\n
@@ -229,9 +243,12 @@ files:
 - gemfiles/3.2.gemfile.lock
 - gemfiles/4.0.gemfile
 - gemfiles/4.0.gemfile.lock
+- gemfiles/4.1.gemfile
+- gemfiles/4.1.gemfile.lock
 - lib/paraphrase.rb
 - lib/paraphrase/active_model.rb
 - lib/paraphrase/errors.rb
+- lib/paraphrase/params.rb
 - lib/paraphrase/query.rb
 - lib/paraphrase/rails.rb
 - lib/paraphrase/scope.rb