paraphrase 0.9.0 → 0.10.0

data/lib/paraphrase/rails.rb

@@ -4,6 +4,8 @@ module Paraphrase
   class Railtie < Rails::Railtie
     initializer 'paraphrase.extend_active_record' do
       ActiveSupport.on_load :active_record do
+        require 'paraphrase/syntax'
+
         extend Paraphrase::Syntax
       end
     end

data/lib/paraphrase/repository.rb

@@ -0,0 +1,36 @@
+module Paraphrase
+  class Repository
+    attr_reader :relation, :mapping, :params
+
+    def self.chain(relation, mapping, params)
+      new(relation, mapping, params).chain
+    end
+
+    def initialize(relation, mapping, params)
+      @relation, @mapping, @params = relation, mapping, params
+    end
+
+    def chain
+      if mapping.satisfied?(params)
+
+        if scope.arity.zero?
+          relation.scoping { scope.call }
+        else
+          values = mapping.values(params)
+          relation.scoping { scope.call(*values) }
+        end
+      else
+        relation
+      end
+    end
+
+    def scope
+      @scope ||=
+        if respond_to?(mapping.name)
+          method(mapping.name)
+        else
+          relation.klass.method(mapping.name)
+        end
+    end
+  end
+end

data/lib/paraphrase/syntax.rb

@@ -7,7 +7,7 @@ module Paraphrase
       name.constantize
     rescue NameError => e
       if e.message =~ /uninitialized constant/
-        raise Paraphrase::NoQueryDefined.new("No query class found. #{name} must be defined as a subclass of Paraphrase::Query")
+        raise Paraphrase::NoQueryDefined.new(name)
       end
     end
 
@@ -15,7 +15,17 @@ module Paraphrase
     #
     # @param [Hash] params query parameters
     def paraphrase(params = {})
-      paraphraser.new(params, self).result
+      paraphraser.new(params, default_paraphrase_relation).result
+    end
+
+    def default_paraphrase_relation
+      if is_a? ActiveRecord::Relation
+        self
+      elsif ActiveRecord::VERSION::MAJOR > 3
+        all
+      else
+        scoped
+      end
     end
   end
 

data/lib/paraphrase/version.rb

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

data/paraphrase.gemspec

@@ -24,14 +24,14 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  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_dependency 'activerecord', '>= 3.1', '< 4.2'
+  gem.add_dependency 'activesupport', '>= 3.1', '< 4.2'
+  gem.add_dependency 'activemodel', '>= 3.1', '< 4.2'
 
-  gem.add_development_dependency 'actionpack', '>= 3.0', '< 4.2'
+  gem.add_development_dependency 'actionpack', '>= 3.1', '< 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 'rspec', '~> 3.0'
   gem.add_development_dependency 'rake', '~> 0.9.2'
   gem.add_development_dependency 'appraisal', '~> 0.4'
   gem.add_development_dependency 'pry', '~> 0.9'

data/spec/paraphrase/query_spec.rb

@@ -9,28 +9,38 @@ module Paraphrase
       map :authors, to: :by_users
       map :start_date, :end_date, to: :published_between
 
-      class Params < Paraphrase::Params
+      class ParamsFilter
         def start_date
-          @start_date ||= Time.parse(params[:start_date]) rescue nil
+          Time.parse(params[:start_date]) rescue nil
         end
+      end
 
-        def end_date
-          @end_date ||= Time.parse(params[:end_date]) rescue nil
+      class Repository
+        def published_between(start_date, end_date)
+          where(published_at: start_date..end_date)
         end
       end
+
+      param :end_date do
+        Time.parse(params[:end_date]) rescue nil
+      end
+
+      scope :by_users do |authors|
+        relation.joins(:user).where(users: { name: authors })
+      end
     end
 
     describe ".map" do
       it "adds information to Query.scopes" do
-        expect(PostQuery.scopes).not_to be_empty
+        expect(PostQuery.mappings).not_to be_empty
       end
 
       it "raises an error if a scope is added twice" do
-        expect { PostQuery.map :name, to: :titled }.to raise_error Paraphrase::DuplicateScopeError
+        expect { PostQuery.map :name, to: :titled }.to raise_error Paraphrase::DuplicateMappingError
       end
 
       it 'defines readers for each key' do
-        query = PostQuery.new
+        query = PostQuery.new(Hash.new)
 
         expect(query).to respond_to :title
         expect(query).to respond_to :is_published
@@ -45,15 +55,15 @@ module Paraphrase
 
     describe '#source' do
       it 'is determined via query class name' do
-        expect(PostQuery.new.result).to eq Post
+        expect(PostQuery.source).to eq 'Post'
       end
 
       it 'can be manually specified in the class' do
         klass = Class.new(Query) do
-          source :User
+          self.source = :User
         end
 
-        expect(klass.new.result).to eq User
+        expect(klass.source).to eq :User
       end
     end
 
@@ -93,6 +103,25 @@ module Paraphrase
       )
     end
 
+    it 'supports defining scopes in the query class' do
+      robert = User.create!(name: 'Robert')
+      frank = User.create!(name: 'Frank')
+      susie = User.create!(name: 'Susie')
+
+      # Combination of all three attributes ensures that the scope is preserved
+      # before and after the call to the method on the query class
+      Post.create!(title: 'Summer', published: false, user: robert)
+      Post.create!(title: 'Summer', published: true, user: frank)
+      susie_post = Post.create!(title: 'Summer', published: true, user: susie)
+
+      params = { authors: ['Robert', 'Susie'], title: 'Summer', is_published: '1' }
+      query = PostQuery.new(params)
+      result = Post.paraphrase(params)
+
+      expect(query.result).to eq [susie_post]
+      expect(result).to eq [susie_post]
+    end
+
     it 'preserves the original scope used to initialize the query' do
       user = User.create!
       blue_post = Post.create!(user: user, title: 'Blue', published: false)

data/spec/paraphrase/syntax_spec.rb

@@ -11,7 +11,7 @@ module Paraphrase
         expect_any_instance_of(AccountQuery).to receive(:result).and_call_original
 
         result = Account.paraphrase
-        expect(result).to eq Account
+        expect(result).to eq Account.all
       end
 
       it 'raises if query class is not defined' do

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+if ENV.key?('CODECLIMATE_REPO_TOKEN')
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
+end
 
 require 'rspec'
 require 'pry'
@@ -19,7 +21,8 @@ ActiveRecord::Base.establish_connection(
 
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Schema.define do
-  create_table :users, force: true do
+  create_table :users, force: true do |t|
+    t.string :name
   end
 
   create_table :posts, force: true do |t|
@@ -35,8 +38,8 @@ ActiveRecord::Schema.define do
   end
 end
 
+require 'paraphrase/syntax'
 ActiveRecord::Base.extend Paraphrase::Syntax
-ActiveRecord::Relation.send(:include, Paraphrase::Syntax)
 
 class User < ActiveRecord::Base
   has_many :accounts
@@ -55,10 +58,6 @@ class Post < ActiveRecord::Base
   def self.by_users(names)
     joins(:user).where(users: { name: names })
   end
-
-  def self.published_between(start_date, end_date)
-    where(published_at: start_date..end_date)
-  end
 end
 
 class Account < ActiveRecord::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paraphrase
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Eduardo Gutierrez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -124,14 +124,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -235,8 +235,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/3.0.gemfile
-- gemfiles/3.0.gemfile.lock
 - gemfiles/3.1.gemfile
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
@@ -247,16 +245,15 @@ files:
 - gemfiles/4.1.gemfile.lock
 - lib/paraphrase.rb
 - lib/paraphrase/active_model.rb
-- lib/paraphrase/errors.rb
-- lib/paraphrase/params.rb
+- lib/paraphrase/mapping.rb
+- lib/paraphrase/params_filter.rb
 - lib/paraphrase/query.rb
 - lib/paraphrase/rails.rb
-- lib/paraphrase/scope.rb
+- lib/paraphrase/repository.rb
 - lib/paraphrase/syntax.rb
 - lib/paraphrase/version.rb
 - paraphrase.gemspec
 - spec/paraphrase/query_spec.rb
-- spec/paraphrase/scope_spec.rb
 - spec/paraphrase/syntax_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ecbypi/paraphrase
@@ -285,7 +282,6 @@ specification_version: 4
 summary: Map query params to model scopes
 test_files:
 - spec/paraphrase/query_spec.rb
-- spec/paraphrase/scope_spec.rb
 - spec/paraphrase/syntax_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/gemfiles/3.0.gemfile

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

data/gemfiles/3.0.gemfile.lock

@@ -1,100 +0,0 @@
-PATH
-  remote: /Users/edd_d/Work/paraphrase
-  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 (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.16)
-      activesupport (= 3.2.16)
-      builder (~> 3.0.0)
-    activerecord (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.16)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    appraisal (0.5.2)
-      bundler
-      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)
-    journey (1.0.4)
-    method_source (0.8.2)
-    multi_json (1.8.4)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    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.7)
-    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)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
-    tilt (1.4.1)
-    tzinfo (0.3.38)
-    yard (0.8.7.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (~> 3.0)
-  activerecord (~> 3.0)
-  activesupport (~> 3.0)
-  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)