pgrel 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a4870c7384f1433c46da0d1515243c3753e928d
-  data.tar.gz: 446c7ccfd60abe33f7422cd2252dfa8d9bb47281
+SHA256:
+  metadata.gz: 291e1ba18186a87e551768d2a8fcee684e7a3e10ad146e27fdb7ffc060c072dc
+  data.tar.gz: 16bdf8ac60f413c6cde49868b7741d91b76cad8e6c38bd02e94127f9b4b580a3
 SHA512:
-  metadata.gz: 39575efbbe02500b4a3534e4a188b845305911e96fbd33f01a68a7eaad0fa4185261727da4a7e9bf498f506af5ee63de9a147024f5b16b283a91776ee568346c
-  data.tar.gz: 63c370d875d0442c14a680d846cf34c7ccdb2f03ca25d061fbe6eae2772cf5bc5b2b9dcf16febb0543ffee61ec3c00c8cfd076c0e7dcea861925d2217790a05c
+  metadata.gz: f69f2ec3caa4f59553c728bc1ad27728ecc10c497a83136772ed194b545a273ea85dd9fd4af54dd8d69bba4ec0bd44e6c04b4874118d68d29c131590c543c78b
+  data.tar.gz: 0fa1716133ca109594d50598575083bdf651846ea80db5da902256542f121d46b5391823bac35cca503481533db54b0d3844fc39f82121732cf9295f7fd4159f

data/.travis.yml

@@ -5,17 +5,14 @@ addons:
   postgresql: "9.4"
 
 before_script:
-  - createuser pgrel -d
-  - createdb -U pgrel pgrel
+  - createdb pgrel
   - psql -U postgres -d pgrel -c 'CREATE EXTENSION IF NOT EXISTS hstore;'
 
 matrix:
   include:
-    - rvm: 2.2.3
+    - rvm: 2.5.0
       gemfile: gemfiles/rails5.gemfile
-    - rvm: 2.2.1
+    - rvm: 2.4.3
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: 2.3.2
       gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails40.gemfile

data/Gemfile

@@ -7,5 +7,5 @@ local_gemfile = 'Gemfile.local'
 if File.exist?(local_gemfile)
   eval(File.read(local_gemfile)) # rubocop:disable Lint/Eval
 else
-  gem 'activerecord', '~>4.0'
+  gem 'activerecord', '~> 5.1'
 end

data/README.md

@@ -4,7 +4,7 @@
 
 ActiveRecord extension for querying hstore, array and jsonb.
 
-Compatible with **Rails** >= 4.0 (and even with upcoming **Rails 5**!).
+Compatible with **Rails** >= 4.2.
 
 ### General
 

data/gemfiles/rails5.gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rack', github: "rack/rack"
-gem 'arel', github: 'rails/arel'
-gem 'rails', github: 'rails/rails'
+gem 'activerecord', '~> 5.1'
 
 gemspec path: '..'

data/lib/pgrel/active_record.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'pgrel/active_record/query_methods'

data/lib/pgrel/active_record/query_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/relation'
 require 'pgrel/active_record/store_chain'
 require 'pgrel/active_record/store_chain/array_chain'

data/lib/pgrel/active_record/store_chain.rb

@@ -1,5 +1,4 @@
-# Check rails version
-RAILS_5 = ActiveRecord.version.release >= Gem::Version.new("5")
+# frozen_string_literal: true
 
 module ActiveRecord
   module QueryMethods
@@ -83,7 +82,7 @@ module ActiveRecord
         @scope
       end
 
-      if RAILS_5
+      if ActiveRecord.version.release >= Gem::Version.new("5")
         protected
 
         def update_scope(*opts)
@@ -94,7 +93,7 @@ module ActiveRecord
 
         def type_cast(value)
           ActiveRecord::Base.connection.quote(
-            @scope.table.type_cast_for_database(@store_name, value)
+            @scope.klass.type_caster.type_cast_for_database(@store_name, value)
           )
         end
       else
@@ -190,9 +189,9 @@ module ActiveRecord
         )
       end
 
-      if RAILS_5
+      if ActiveRecord.version.release >= Gem::Version.new("5")
         def where_with_prefix(prefix, opts)
-          where_clause = @scope.send(:where_clause_factory).build(opts, {})
+          where_clause = @scope.send(:where_clause_factory).build(opts, [])
           predicates = where_clause.ast.children.map do |rel|
             rel.left = to_sql_literal(prefix, rel.left)
             rel

data/lib/pgrel/active_record/store_chain/array_chain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module QueryMethods
     # Store chain for array columns.

data/lib/pgrel/active_record/store_chain/hstore_chain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module QueryMethods
     # Store chain for hstore columns.

data/lib/pgrel/active_record/store_chain/jsonb_chain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module QueryMethods
     # Store chain for jsonb columns.

data/lib/pgrel/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pgrel # :nodoc:
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/pgrel.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($/)
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "activerecord", ">=4.0.0"
+  s.add_runtime_dependency "activerecord", ">= 4.0"
 
   s.add_development_dependency "pg", "~>0.18"
-  s.add_development_dependency('rake', '~> 10.1')
+  s.add_development_dependency 'rake', '~> 10.1'
   s.add_development_dependency "simplecov", ">= 0.3.8"
   s.add_development_dependency 'pry-byebug'
-  s.add_development_dependency "rspec", "~> 3.1.0"
+  s.add_development_dependency "rspec", ">= 3.1"
 end

data/spec/spec_helper.rb

@@ -16,7 +16,6 @@ require 'pgrel'
 ActiveRecord::Base.establish_connection(
   adapter: 'postgresql',
   host: 'localhost',
-  username: 'pgrel',
   database: 'pgrel'
 )
 connection = ActiveRecord::Base.connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgrel
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 description: ActiveRecord extension for querying hstore and jsonb.
 email:
 - dementiev.vm@gmail.com
@@ -108,8 +108,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails5.gemfile
 - lib/pgrel.rb
@@ -148,9 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension for querying hstore and jsonb.
 test_files: []
-has_rdoc: 

data/gemfiles/rails40.gemfile

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

data/gemfiles/rails41.gemfile

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