surus 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3979b782fd1e13d2e96ba994192cacf5433c53d7
-  data.tar.gz: 8f030cf17f9d8fb30dace66d08edb1b224a192bf
+  metadata.gz: afd6203a513dcb6136faec8044f8dbbb14ed2f35
+  data.tar.gz: fdec01e83da15fde64daaf59ed496fe65a613ee8
 SHA512:
-  metadata.gz: aab88cce49c5e6582b04c14b43e38da23e7463fec01e5772650537d241fa23cf6e1fdf06a40a57e6e3d5e2a4663dc8700d9b7e95a01914b9196b494c91a55b58
-  data.tar.gz: c3da04f7796d29af7a73d1ffff121ef2f206613921f8f1b6456e52257ee4e31bfc74bd32e0c9d3f123c1eb49c588b40e588d2c3517d2212a0baa74e57058fb44
+  metadata.gz: 4286d4e69d627d9ea2cf774870bf7dfd1e7006313a9921e54bfdc7156bb7d16e4ae460f142851e15d1ba8b6ed0707be0e3626c20a54e490d756f788e7d0d2b45
+  data.tar.gz: fb9e31a45421de9f476440d6d225d2cd34f8984afd5443f5489613acb79d0242a1ea243ee400a6f1ae03c43296f3840f3b7ec3c0038fd9effe8fa0478ebb7dc8

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
   - 2.3.1
   - 2.2.5
-  - 2.1.9
+  - 2.1.10
   - rbx
 gemfile:
-  - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.6.4 (November 5, 2016)
+
+* Fix has_and_belongs_to_many scope with non-standard primary key (Nick Inhofe)
+
 # 0.6.3 (May 14, 2016)
 
 * Gemspec allows Rails 5

data/lib/surus/json/has_and_belongs_to_many_scope_builder.rb

@@ -5,7 +5,7 @@ module Surus
         s = association
           .klass
           .joins("JOIN #{join_table} ON #{join_table}.#{association_foreign_key}=#{association_table}.#{association_primary_key}")
-          .where("#{outside_class.quoted_table_name}.#{association_primary_key}=#{join_table}.#{foreign_key}")
+          .where("#{outside_class.quoted_table_name}.#{primary_key}=#{join_table}.#{foreign_key}")
         s = s.instance_eval(&association.scope) if association.scope
         s
       end
@@ -14,6 +14,10 @@ module Surus
         connection.quote_table_name association.join_table
       end
 
+      def primary_key
+        connection.quote_table_name association.active_record_primary_key
+      end
+
       def association_foreign_key
         connection.quote_column_name association.association_foreign_key
       end

data/lib/surus/version.rb

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

data/surus.gemspec

@@ -24,11 +24,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_dependency 'activerecord', "> 4.0"
+  s.add_dependency 'activerecord', "> 4.1"
 
   s.add_development_dependency 'rspec', "~> 3.1.0"
-  s.add_development_dependency 'guard', ">= 0.10.0"
-  s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
   s.add_development_dependency 'oj', '~> 2.0.2'
   s.add_development_dependency 'pg'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surus
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-11-05 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'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +178,6 @@ files:
 - bench/hstore_find.rb
 - bench/json_generation.rb
 - bench/synchronous_commit.rb
-- gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile

data/gemfiles/4.0.gemfile

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