surus 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afd6203a513dcb6136faec8044f8dbbb14ed2f35
-  data.tar.gz: fdec01e83da15fde64daaf59ed496fe65a613ee8
+  metadata.gz: ca553e879baa56ea3b059072ecb5cdfbdfc148f4
+  data.tar.gz: 9284d9fc51b2d3b50c013e19e77b13a8ce1f8cbe
 SHA512:
-  metadata.gz: 4286d4e69d627d9ea2cf774870bf7dfd1e7006313a9921e54bfdc7156bb7d16e4ae460f142851e15d1ba8b6ed0707be0e3626c20a54e490d756f788e7d0d2b45
-  data.tar.gz: fb9e31a45421de9f476440d6d225d2cd34f8984afd5443f5489613acb79d0242a1ea243ee400a6f1ae03c43296f3840f3b7ec3c0038fd9effe8fa0478ebb7dc8
+  metadata.gz: 818f420d11fd94a7e90d67855cdb5e79db3aac8c5d73c08608012e46ee8c73f1067a1555730c369c3817d2ba6dcc36d34a4b79121334cc78fc2c97dcedf82b0e
+  data.tar.gz: 4131b91df11f7186e7260b0aed8d87079ed124f7f03fe253bcd80dd35d1068e96f188fd0914251df8c1a8443132cfd1d5a99bfdde3e30f9e59e9d20450aa7cf4

data/.travis.yml

@@ -2,14 +2,14 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.3.1
+  - 2.4.1
+  - 2.3.4
   - 2.2.5
-  - 2.1.10
   - rbx
 gemfile:
-  - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
 
 matrix:
   allow_failures:
@@ -25,4 +25,3 @@ before_script:
 
 script:
   - bundle exec rake spec
-  - bundle exec rubocop

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.5 (May 5, 2017)
+
+* Qualify column references with table names (Zach Schneider)
+* Tested against Rails 5.1 and Ruby 2.4
+* Dropped Rails 4.1 and Ruby 2.1 support
+
 # 0.6.4 (November 5, 2016)
 
 * Fix has_and_belongs_to_many scope with non-standard primary key (Nick Inhofe)

data/README.md

@@ -16,7 +16,7 @@ substantially faster than converting ActiveRecord objects to JSON.
 
     gem install surus
 
-Or add to your Gemfile. This version of Surus only works on Rails 4.
+Or add to your Gemfile. This version of Surus only works on Rails 4.2+.
 
     gem 'surus'
 

data/gemfiles/5.0.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0.rc1"
+gem "activerecord", "~> 5.0.0"
 
 gemspec :path=>"../"

data/gemfiles/{4.1.gemfile → 5.1.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.1.14"
+gem "activerecord", "~> 5.1.0"
 
 gemspec :path=>"../"

data/lib/surus/json/belongs_to_scope_builder.rb

@@ -4,10 +4,18 @@ module Surus
       def scope
         s = association
           .klass
-          .where("#{quote_column_name association.active_record_primary_key}=#{quote_column_name association.foreign_key}")
+          .where("#{association_primary_key}=#{association_foreign_key}")
         s = s.instance_eval(&association.scope) if association.scope
         s
       end
+
+      def association_primary_key
+        "#{association.quoted_table_name}.#{quote_column_name association.active_record_primary_key}"
+      end
+
+      def association_foreign_key
+        "#{outside_class.quoted_table_name}.#{quote_column_name association.foreign_key}"
+      end
     end
   end
 end

data/lib/surus/json/has_many_scope_builder.rb

@@ -14,7 +14,7 @@ module Surus
       end
 
       def association_foreign_key
-        "#{connection.quote_column_name association.foreign_key}"
+        "#{association.quoted_table_name}.#{connection.quote_column_name association.foreign_key}"
       end
     end
   end

data/lib/surus/version.rb

@@ -1,3 +1,3 @@
 module Surus
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/surus.gemspec

@@ -24,13 +24,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_dependency 'activerecord', "> 4.1"
+  s.add_dependency 'activerecord', "> 4.2"
 
-  s.add_development_dependency 'rspec', "~> 3.1.0"
-  s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
-  s.add_development_dependency 'oj', '~> 2.0.2'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rb-fsevent'
+  s.add_development_dependency 'oj'
   s.add_development_dependency 'pg'
-  s.add_development_dependency 'pry', '~> 0.9.11'
+  s.add_development_dependency 'pry'
   s.add_development_dependency 'factory_girl', '~> 4.2.0'
   s.add_development_dependency 'faker', '~> 1.4.3'
   s.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surus
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -178,9 +178,9 @@ files:
 - bench/hstore_find.rb
 - bench/json_generation.rb
 - bench/synchronous_commit.rb
-- gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/5.1.gemfile
 - lib/generators/surus/hstore/install_generator.rb
 - lib/generators/surus/hstore/templates/install_hstore.rb
 - lib/surus.rb
@@ -232,8 +232,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: PostgreSQL Acceleration for ActiveRecord
-test_files: []
+test_files:
+- spec/array/scope_spec.rb
+- spec/database.yml
+- spec/database.yml.travis
+- spec/database_structure.sql
+- spec/factories.rb
+- spec/hstore/scope_spec.rb
+- spec/hstore/serializer_spec.rb
+- spec/json/json_spec.rb
+- spec/spec_helper.rb
+- spec/synchronous_commit/connection_spec.rb
+- spec/synchronous_commit/model_spec.rb