parelation 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 909bd90faf2386e45af33c7f28586f14a5ae442c
-  data.tar.gz: d8792b67b2a9d034dbdfb17dadae325513de1c92
+SHA256:
+  metadata.gz: 3651db9977c88f30420fd909134881fe7ef7ba6b3bd3a2cd146e9abe127a35f7
+  data.tar.gz: a0c55adcad2ed07452b61714cd59e332a8cd6aca186f71ebacddc1383281822f
 SHA512:
-  metadata.gz: ad4fd5fd7970aa0f453af670ed7875acaf0add58d8105b512d3da7d93d836a21316507d8e5c48f4aeeb6199a869d14b5cae5eef33b8f8ae97c7bcde0dca0e1d4
-  data.tar.gz: 5d8dc24b0bd2bb21b2a8b6cab208aec76523d7378bbdef3f465954eac496c8f2b09ed0a358a7c3ba88028ef06aa9a3ab63b276e88d64aa015f4c474e71019764
+  metadata.gz: ad0c471f8f0ea459c38882755ab7a2a19326433b4097f929d0f8045f3a79735a2dbd01a46a6680ed74bf596342428cff8c2a2e1019db6f4bbdeadd2951326c19
+  data.tar.gz: 1ab3d55b7510484cf932e474b69385ebf0f77784a81d2540ab8c5e679b05c2725a1d03a535109721c5688789cfd544b159ba2725dbe2c75ffc6ec1db0e8a8b67

data/.gemfiles/5.0.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gem "activerecord", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.0"
+gemspec path: "../"

data/.gemfiles/5.1.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gem "activerecord", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.0"
+gemspec path: "../"

data/.gemfiles/5.2.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gem "activerecord", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.0"
+gemspec path: "../"

data/.gemfiles/6.0.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gem "activerecord", "~> 6.0.0"
+gem "sqlite3", "~> 1.4.0"
+gemspec path: "../"

data/.github/workflows/test.yml

@@ -0,0 +1,35 @@
+name: Test
+
+on:
+  - push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+        gemfile:
+          - .gemfiles/5.0.gemfile
+          - .gemfiles/5.1.gemfile
+          - .gemfiles/5.2.gemfile
+          - .gemfiles/6.0.gemfile
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Ruby ${{ matrix.ruby }}
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install libsqlite3
+      run: |
+        sudo apt-get install libsqlite3-dev
+    - name: Run tests
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake
+      env:
+        BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 .DS_Store
+.gemfiles/*.lock
 Gemfile.lock
 InstalledFiles
 _yardoc

data/README.md

@@ -1,10 +1,10 @@
 # Parelation
 
 [![Gem Version](https://badge.fury.io/rb/parelation.svg)](http://badge.fury.io/rb/parelation)
-[![Code Climate](https://codeclimate.com/github/meskyanichi/parelation.png)](https://codeclimate.com/github/meskyanichi/parelation)
-[![Build Status](https://travis-ci.org/meskyanichi/parelation.svg)](https://travis-ci.org/meskyanichi/parelation)
+[![Code Climate](https://codeclimate.com/github/mrrooijen/parelation.png)](https://codeclimate.com/github/mrrooijen/parelation)
+[![Build Status](https://travis-ci.org/mrrooijen/parelation.svg)](https://travis-ci.org/mrrooijen/parelation)
 
-Parelation, for Rails/ActiveRecord 4.1.0+, allows you to query your ActiveRecord-mapped database easily, securely and quite flexibly using simple GET requests. It's used in your controller layer where it uses HTTP GET parameters to build on the ActiveRecord::Relation chain. This provides the client-side with the out-of-the-box flexibility to perform fairly dynamic queries without having to write boilerplate on the server.
+Parelation, for Rails/ActiveRecord 5.0+, allows you to query your ActiveRecord-mapped database easily, securely and quite flexibly using simple GET requests. It's used in your controller layer where it uses HTTP GET parameters to build on the ActiveRecord::Relation chain. This provides the client-side with the out-of-the-box flexibility to perform fairly dynamic queries without having to write boilerplate on the server.
 
 This library was developed for- and extracted from [HireFire].
 
@@ -12,8 +12,8 @@ The documentation can be found on [RubyDoc].
 
 ### Compatibility
 
-- Rails/ActiveRecord 4.1.0+
-- Ruby (MRI) 2.0+
+- Rails/ActiveRecord 5.0+
+- Ruby (MRI) 2.5+
 
 ### Installation
 
@@ -241,8 +241,8 @@ This will tell client developers what parameter failed in the HTTP response. Thi
 
 Contributions are welcome, but please conform to these requirements:
 
-- Ruby (MRI) 2.0+
-- ActiveRecord 4.1.0+
+- Ruby (MRI) 2.5+
+- ActiveRecord 5.0+
 - 100% Spec Coverage
   - Generated by when running the test suite
 - 100% [Passing Specs]
@@ -286,9 +286,10 @@ Submit a pull request.
 
 Released under the [MIT License] by [Michael van Rooijen].
 
-[Michael van Rooijen]: https://twitter.com/meskyanichi
+[Michael van Rooijen]: https://twitter.com/mrrooijen
 [HireFire]: http://hirefire.io
-[Passing Specs]: https://travis-ci.org/meskyanichi/parelation
-[Code Climate Score]: https://codeclimate.com/github/meskyanichi/parelation
-[RubyDoc]: http://rubydoc.info/github/meskyanichi/parelation/master/frames
-[MIT License]: https://github.com/meskyanichi/parelation/blob/master/LICENSE
+[Passing Specs]: https://travis-ci.org/mrrooijen/parelation
+[Code Climate Score]: https://codeclimate.com/github/mrrooijen/parelation
+[RubyDoc]: http://rubydoc.info/github/mrrooijen/parelation/master/frames
+[MIT License]: https://github.com/mrrooijen/parelation/blob/master/LICENSE
+

data/lib/parelation/applier.rb

@@ -9,7 +9,7 @@ class Parelation::Applier
     Parelation::Criteria::Offset,
     Parelation::Criteria::Order,
     Parelation::Criteria::Query,
-    Parelation::Criteria::Where
+    Parelation::Criteria::Where,
   ]
 
   # @return [ActiveRecord::Relation]

data/lib/parelation/criteria/limit.rb

@@ -1,23 +1,19 @@
 class Parelation::Criteria::Limit < Parelation::Criteria
 
+  # @return [Regexp] the limit format.
+  #
+  LIMIT_FORMAT = /^limit$/
+
   # @param param [String]
   # @return [TrueClass, FalseClass]
   #
   def self.match?(param)
-    !!(param =~ /^limit$/)
+    !!param.match(LIMIT_FORMAT)
   end
 
   # @return [ActiveRecord::Relation]
   #
   def call
-    chain.limit(limit)
-  end
-
-  private
-
-  # Alias for {#value}.
-  #
-  def limit
-    value
+    chain.limit(value)
   end
 end

data/lib/parelation/criteria/offset.rb

@@ -1,23 +1,19 @@
 class Parelation::Criteria::Offset < Parelation::Criteria
 
+  # @return [Regexp] the offset format.
+  #
+  OFFSET_FORMAT = /^offset$/
+
   # @param param [String]
   # @return [TrueClass, FalseClass]
   #
   def self.match?(param)
-    !!(param =~ /^offset$/)
+    !!param.match(OFFSET_FORMAT)
   end
 
   # @return [ActiveRecord::Relation]
   #
   def call
-    chain.offset(offset)
-  end
-
-  private
-
-  # Alias for {#value}.
-  #
-  def offset
-    value
+    chain.offset(value)
   end
 end

data/lib/parelation/criteria/order.rb

@@ -2,11 +2,15 @@ class Parelation::Criteria::Order < Parelation::Criteria
 
   require_relative "order/object"
 
+  # @return [Regexp] The order format.
+  #
+  ORDER_FORMAT = /^order$/
+
   # @param param [String]
   # @return [TrueClass, FalseClass]
   #
   def self.match?(param)
-    !!(param =~ /^order$/)
+    !!param.match(ORDER_FORMAT)
   end
 
   # Applies the specified orderings to {#chain}.
@@ -25,6 +29,8 @@ class Parelation::Criteria::Order < Parelation::Criteria
   #   array of attributes to order.
   #
   def orders
-    @orders ||= [value].flatten.map { |order| Object.new(order) }
+    @orders ||= [value].flatten.map do |order|
+      Object.new(order)
+    end
   end
 end

data/lib/parelation/criteria/order/object.rb

@@ -1,5 +1,13 @@
 class Parelation::Criteria::Order::Object
 
+  # @return [Hash] the possible directions (asc, desc)
+  #   for database queries.
+  #
+  DIRECTIONS = {
+    "asc" => :asc,
+    "desc" => :desc,
+  }
+
   # @return [String]
   #
   attr_reader :order
@@ -28,14 +36,10 @@ class Parelation::Criteria::Order::Object
   end
 
   # @return [Symbol, nil] the direction to order {#field},
-  #   eiter :asc or :desc.
+  #   either :asc or :desc.
   #
   def direction
-    case parts.last
-    when "asc" then :asc
-    when "desc" then :desc
-    else nil
-    end
+    DIRECTIONS[parts.last]
   end
 
   # @return [Array<String, nil>] the criteria chunks (separated by +:+).

data/lib/parelation/criteria/query.rb

@@ -1,10 +1,14 @@
 class Parelation::Criteria::Query < Parelation::Criteria
 
+  # @return [Regexp] the query format.
+  #
+  QUERY_FORMAT = /^query$/
+
   # @param param [String]
   # @return [TrueClass, FalseClass]
   #
   def self.match?(param)
-    !!(param =~ /^query$/)
+    !!param.match(QUERY_FORMAT)
   end
 
   # @return [ActiveRecord::Relation]

data/lib/parelation/criteria/select.rb

@@ -1,23 +1,19 @@
 class Parelation::Criteria::Select < Parelation::Criteria
 
+  # @return [Regexp] the select format.
+  #
+  SELECT_FORMAT = /^select$/
+
   # @param param [String]
   # @return [TrueClass, FalseClass]
   #
   def self.match?(param)
-    !!(param =~ /^select$/)
+    !!param.match(SELECT_FORMAT)
   end
 
   # @return [ActiveRecord::Relation]
   #
   def call
-    chain.select(*attributes)
-  end
-
-  private
-
-  # Alias for {#value}.
-  #
-  def attributes
-    value
+    chain.select(*value)
   end
 end

data/lib/parelation/criteria/where.rb

@@ -4,11 +4,15 @@ class Parelation::Criteria::Where < Parelation::Criteria
   require_relative "where/directional_query_applier"
   require_relative "where/criteria_builder"
 
+  # @return [Regexp] the "where" format.
+  #
+  WHERE_FORMAT = /^(where|where_(not|gt|gte|lt|lte))$/
+
   # @param param [String]
   # @return [true, false]
   #
   def self.match?(param)
-    !!(param =~ /^(where|where_(not|gt|gte|lt|lte))$/)
+    !!param.match(WHERE_FORMAT)
   end
 
   # @return [ActiveRecord::Relation]

data/lib/parelation/criteria/where/criteria_builder.rb

@@ -62,6 +62,6 @@ class Parelation::Criteria::Where::CriteriaBuilder
   #
   def cast(field, value)
     Parelation::Criteria::Where::Caster
-      .new(field, value, chain.arel_table.engine).cast
+      .new(field, value, chain.model).cast
   end
 end

data/lib/parelation/version.rb

@@ -1,3 +1,3 @@
 module Parelation
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/parelation.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["Michael van Rooijen"]
   spec.email = ["michael@vanrooijen.io"]
   spec.summary = %q{Translates HTTP parameters to ActiveRecord queries.}
-  spec.homepage = "http://meskyanichi.github.io/store_schema/"
+  spec.homepage = "http://mrrooijen.github.io/store_schema/"
   spec.license = "MIT"
 
   spec.files = `git ls-files -z`.split("\x0")
@@ -16,13 +16,12 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 4.1.0"
+  spec.add_dependency "activerecord", ">= 5.0.0", "< 6.1.0"
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.4.2"
-  spec.add_development_dependency "rspec", "~> 3.1.0"
-  spec.add_development_dependency "sqlite3", "~> 1.3.10"
-  spec.add_development_dependency "database_cleaner", "~> 1.4.0"
-  spec.add_development_dependency "pry", "~> 0.10.1"
-  spec.add_development_dependency "simplecov", "~> 0.9.1"
-  spec.add_development_dependency "yard", "~> 0.8.7.6"
+  spec.add_development_dependency "rake", "~> 13.0.0"
+  spec.add_development_dependency "rspec", "~> 3.9.0"
+  spec.add_development_dependency "database_cleaner", "~> 1.8.0"
+  spec.add_development_dependency "pry", "~> 0.12.0"
+  spec.add_development_dependency "simplecov", "~> 0.18.0"
+  spec.add_development_dependency "yard", "~> 0.9.0"
 end

data/spec/lib/applier_spec.rb

@@ -28,10 +28,10 @@ describe Parelation::Applier do
       .select(:id, :name, :state, :message)
       .where(state: ["open", "pending"])
       .where.not(state: "closed")
-      .where(%Q{"tickets".'created_at' > ?}, "2014-01-01 00:00:00.000000")
-      .where(%Q{"tickets".'updated_at' >= ?}, "2014-01-01 00:00:00.000000")
-      .where(%Q{"tickets".'created_at' < ?}, "2014-01-01 01:00:00.000000")
-      .where(%Q{"tickets".'updated_at' <= ?}, "2014-01-01 01:00:00.000000")
+      .where(%Q{"tickets".'created_at' > ?}, "2014-01-01 00:00:00")
+      .where(%Q{"tickets".'updated_at' >= ?}, "2014-01-01 00:00:00")
+      .where(%Q{"tickets".'created_at' < ?}, "2014-01-01 01:00:00")
+      .where(%Q{"tickets".'updated_at' <= ?}, "2014-01-01 01:00:00")
       .where(
          %Q{"tickets"."name" LIKE ? OR "tickets"."message" LIKE ?},
          "%ruby on rails%", "%ruby on rails%"

data/spec/lib/criteria/where_spec.rb

@@ -61,7 +61,7 @@ describe Parelation::Criteria::Where do
     it "should add #{symbol} criteria to the chain" do
       criteria = klass.new(Ticket.all, operator, created_at: "2014-08-26T19:20:44Z").call
       ar_query = Ticket.where(
-        %Q{"tickets".'created_at' #{symbol} ?}, "2014-08-26 19:20:44.000000"
+        %Q{"tickets".'created_at' #{symbol} ?}, "2014-08-26 19:20:44"
       )
 
       expect(criteria.to_sql).to eq(ar_query.to_sql)
@@ -69,7 +69,7 @@ describe Parelation::Criteria::Where do
 
     it "should add multiple #{symbol} criteria to the chain" do
       criteria = klass.new(Ticket.all, operator, created_at: "2014-08-26T19:20:44Z", position: "5").call
-      ar_query = Ticket.where(%Q{"tickets".'created_at' #{symbol} ?}, "2014-08-26 19:20:44.000000")
+      ar_query = Ticket.where(%Q{"tickets".'created_at' #{symbol} ?}, "2014-08-26 19:20:44")
                        .where(%Q{"tickets".'position' #{symbol} ?}, 5)
 
       expect(criteria.to_sql).to eq(ar_query.to_sql)
@@ -149,7 +149,7 @@ describe Parelation::Criteria::Where do
 
     it "should cast a string to time" do
       criteria = klass.new(Ticket.all, "where", created_at: "2014-01-01T00:00:00Z").call
-      ar_query = Ticket.where(created_at: '2014-01-01 00:00:00.000000')
+      ar_query = Ticket.where(created_at: "2014-01-01 00:00:00")
 
       expect(criteria.to_sql).to eq(ar_query.to_sql)
     end

data/spec/support/db.rb

@@ -1,8 +1,9 @@
 ActiveRecord::Base.establish_connection(
-  adapter: "sqlite3", database: ":memory:"
+  :adapter  => "sqlite3",
+  :database => ":memory:",
 )
 
-class Schema < ActiveRecord::Migration
+class Schema < ActiveRecord::Migration[5.0]
 
   def change
     create_table :projects do |t|
@@ -23,9 +24,7 @@ class Schema < ActiveRecord::Migration
   end
 end
 
-silence_stream(STDOUT) do
-  Schema.new.change
-end
+Schema.new.change
 
 class Project < ActiveRecord::Base
   has_many :tickets

data/spec/support/env.rb

@@ -1,5 +1,4 @@
 require "pry"
-require "sqlite3"
 require "active_record"
 
 ROOT_PATH = File.expand_path("../../..", __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parelation
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,98 +50,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.6
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.6
+        version: 0.9.0
 description: 
 email:
 - michael@vanrooijen.io
@@ -143,11 +135,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemfiles/4.1.gemfile"
-- ".gemfiles/4.2.gemfile"
+- ".gemfiles/5.0.gemfile"
+- ".gemfiles/5.1.gemfile"
+- ".gemfiles/5.2.gemfile"
+- ".gemfiles/6.0.gemfile"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -180,7 +174,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/db.rb
 - spec/support/env.rb
-homepage: http://meskyanichi.github.io/store_schema/
+homepage: http://mrrooijen.github.io/store_schema/
 licenses:
 - MIT
 metadata: {}
@@ -199,8 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Translates HTTP parameters to ActiveRecord queries.
@@ -216,4 +209,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/db.rb
 - spec/support/env.rb
-has_rdoc: 

data/.gemfiles/4.1.gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-gem "activerecord", "~> 4.1.0"
-gemspec path: "../"

data/.gemfiles/4.2.gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-gem "activerecord", "~> 4.2.0"
-gemspec path: "../"

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-gemfile:
-  - .gemfiles/4.1.gemfile
-  - .gemfiles/4.2.gemfile