composite_primary_keys 9.0.9 → 9.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff862b93eb239969238798e2bc089b2312861d32a269d3c2cabc8a0873efb9d
-  data.tar.gz: 6778a792c0849abc74826beb68c61b296199630974c24f855df1434a7c7b4aca
+  metadata.gz: 133a4025b9fe7ee82617de7c3c34373d8f52d38d5e88c03ab742ebd954bf6064
+  data.tar.gz: 579e4d9e564e4c9e40f976d0d56b76533296c8f7e5b5ba925d7244141604fb08
 SHA512:
-  metadata.gz: 7402eb2befdbaaf5a57b95d84921ca56049d0606fcb058b2ad65332b6523bdc8decf8ee92e0a474f718f6664f49758ce97798456c15f216c5c7b9bccf081647c
-  data.tar.gz: 36796097d0f1b1104561605179cecf0c8476ec2e4f69be288d04cb6b474804de0c9c1f79f85b72dd43d2fc40b6f9a13ef4823ce0b3256aa32f52504db2d37a48
+  metadata.gz: 334933952b9a84db67746c48c074c38d197215fa607640e134bf7aedd564e122a0c809318fab4529e0ad5bd181081baa792395419b25a4b19149066122cdfdfc
+  data.tar.gz: 2820381f390429bbdf61b0a04434c0432faa88d2cffdb04c5cd74f9dfc26682893809531b2d4dc14b03620614bec0ce1a69e128624b6a511b5718b19e24c9970

data/History.rdoc

@@ -1,3 +1,7 @@
+== 9.0.10 (2018-06-24)
+
+* Fix AR 5.0.7 (Jordan Owens)
+
 == 9.0.9 (2018-03-06)
 
 * Fix update statements that incorrectly pass NULL values for the primary key components (Sean Linsley)

data/lib/composite_primary_keys.rb

@@ -38,6 +38,7 @@ require 'active_record/persistence'
 require 'active_record/relation'
 require 'active_record/sanitization'
 require 'active_record/attribute_methods'
+require 'active_record/autosave_association'
 
 require 'active_record/associations/association'
 require 'active_record/associations/association_scope'
@@ -50,7 +51,6 @@ require 'active_record/associations/preloader/belongs_to'
 require 'active_record/associations/singular_association'
 require 'active_record/associations/collection_association'
 
-require 'active_record/attribute_set/builder'
 require 'active_record/attribute_methods/primary_key'
 require 'active_record/attribute_methods/read'
 require 'active_record/attribute_methods/write'
@@ -76,8 +76,8 @@ require 'composite_primary_keys/composite_predicates'
 require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/relation'
 require 'composite_primary_keys/sanitization'
-require 'composite_primary_keys/attribute_set/builder'
 require 'composite_primary_keys/attribute_methods'
+require 'composite_primary_keys/autosave_association'
 require 'composite_primary_keys/version'
 
 require 'composite_primary_keys/associations/association'
@@ -110,4 +110,4 @@ require 'composite_primary_keys/composite_relation'
 
 require 'composite_primary_keys/arel/in'
 require 'composite_primary_keys/arel/to_sql'
-require 'composite_primary_keys/arel/sqlserver'
+require 'composite_primary_keys/arel/sqlserver'

data/lib/composite_primary_keys/autosave_association.rb

@@ -0,0 +1,32 @@
+module ActiveRecord
+  module AutosaveAssociation
+    private
+
+    def save_belongs_to_association(reflection)
+      association = association_instance_get(reflection.name)
+      return unless association && association.loaded? && !association.stale_target?
+
+      record = association.load_target
+      if record && !record.destroyed?
+        autosave = reflection.options[:autosave]
+
+        if autosave && record.marked_for_destruction?
+          self[reflection.foreign_key] = nil
+          record.destroy
+        elsif autosave != false
+          saved = record.save(validate: !autosave) if record.new_record? || (autosave && record.changed_for_autosave?)
+
+          if association.updated?
+            # CPK
+            # association_id = record.send(reflection.options[:primary_key] || :id)
+            association_id = reflection.options[:primary_key] ? record[reflection.options[:primary_key]] : record.id
+            self[reflection.foreign_key] = association_id
+            association.loaded!
+          end
+
+          saved if autosave
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/connection_adapters/abstract_adapter.rb

@@ -1,11 +1,11 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractAdapter
-      def quote_column_names(name)
-        Array(name).map do |col|
-          quote_column_name(col.to_s)
-        end.join(CompositePrimaryKeys::ID_SEP)
-      end
-    end
-  end
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractAdapter
+      def quote_column_names(name)
+        Array(name).map do |col|
+          quote_column_name(col.to_s)
+        end.join(CompositePrimaryKeys::ID_SEP)
+      end
+    end
+  end
 end

data/lib/composite_primary_keys/locking/optimistic.rb

@@ -5,7 +5,7 @@ module ActiveRecord
       private
 
       silence_warnings do
-        def _update_record(attribute_names = @attributes.keys) #:nodoc:
+        def _update_record(attribute_names = self.attribute_names) #:nodoc:
           return super unless locking_enabled?
           return 0 if attribute_names.empty?
 
@@ -25,18 +25,18 @@ module ActiveRecord
               ).where(
                   lock_col => previous_lock_value
               ).update_all(
-                  Hash[attributes_for_update(attribute_names).map do |name|
-                         [name, _read_attribute(name)]
-                       end]
+                  attributes_for_update(attribute_names).map do |name|
+                      [name, _read_attribute(name)]
+                  end.to_h
               )
             else
               affected_rows = relation.where(
                   self.class.primary_key => id,
                   lock_col => previous_lock_value,
               ).update_all(
-                  Hash[attributes_for_update(attribute_names).map do |name|
-                       [name, _read_attribute(name)]
-                     end]
+                  attributes_for_update(attribute_names).map do |name|
+                      [name, _read_attribute(name)]
+                  end.to_h
               )
             end
 

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 9
     MINOR = 0
-    TINY  = 9
+    TINY  = 10
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/scripts/console.rb

@@ -1,48 +1,48 @@
-#!/usr/bin/env ruby
-
-#
-# if run as script, load the file as library while starting irb 
-#
-if __FILE__ == $0
-  irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-  ENV['ADAPTER'] = ARGV[0]
-  exec "#{irb} -f -r #{$0} --simple-prompt"
-end
-
-#
-# check if the given adapter is supported (default: mysql)
-#
-adapters = %w[mysql sqlite oracle oracle_enhanced postgresql ibm_db]
-adapter = ENV['ADAPTER'] || 'mysql'
-unless adapters.include? adapter
-  puts "Usage: #{__FILE__} <adapter>"
-  puts ''
-  puts 'Adapters: '
-  puts adapters.map{ |adapter| "    #{adapter}" }.join("\n")
-  exit 1
-end
-
-#
-# load all necessary libraries
-#
-require 'rubygems'
-require 'local/database_connections'
-
-$LOAD_PATH.unshift 'lib'
-
-begin
-  require 'local/paths'
-  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/active_record/lib"  if ENV['EDGE_RAILS_DIR']
-  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
-rescue
-end
-
-require 'active_support'
-require 'active_record'
-
-require "test/connections/native_#{adapter}/connection"
-require 'composite_primary_keys'
-
-PROJECT_ROOT = File.join(File.dirname(__FILE__), '..')
-Dir[File.join(PROJECT_ROOT,'test/fixtures/*.rb')].each { |model| require model }
-
+#!/usr/bin/env ruby
+
+#
+# if run as script, load the file as library while starting irb 
+#
+if __FILE__ == $0
+  irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+  ENV['ADAPTER'] = ARGV[0]
+  exec "#{irb} -f -r #{$0} --simple-prompt"
+end
+
+#
+# check if the given adapter is supported (default: mysql)
+#
+adapters = %w[mysql sqlite oracle oracle_enhanced postgresql ibm_db]
+adapter = ENV['ADAPTER'] || 'mysql'
+unless adapters.include? adapter
+  puts "Usage: #{__FILE__} <adapter>"
+  puts ''
+  puts 'Adapters: '
+  puts adapters.map{ |adapter| "    #{adapter}" }.join("\n")
+  exit 1
+end
+
+#
+# load all necessary libraries
+#
+require 'rubygems'
+require 'local/database_connections'
+
+$LOAD_PATH.unshift 'lib'
+
+begin
+  require 'local/paths'
+  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/active_record/lib"  if ENV['EDGE_RAILS_DIR']
+  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
+rescue
+end
+
+require 'active_support'
+require 'active_record'
+
+require "test/connections/native_#{adapter}/connection"
+require 'composite_primary_keys'
+
+PROJECT_ROOT = File.join(File.dirname(__FILE__), '..')
+Dir[File.join(PROJECT_ROOT,'test/fixtures/*.rb')].each { |model| require model }
+

data/scripts/txt2html

@@ -1,76 +1,76 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-gem 'RedCloth'
-gem 'syntax'
-
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-
-version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
-require File.expand_path(version_path)
-
-version  = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubygems.org/gems/composite_primary_keys'
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1
-       return 'st'
-    when 2
-      return 'nd'
-    when 3
-      return 'rd'
-    else
-      return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
-  
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text = fsrc.read
-  syntax_items = []
-  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
-    ident = syntax_items.length
-    element, syntax, source = $1, $2, $3
-    syntax_items << "<#{element} class=\"syntax\">#{convert_syntax(syntax, source)}</#{element}>"
-    "syntax-temp-#{ident}"
-  }
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text).to_html
-  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)
+#!/usr/bin/env ruby
+
+require 'rubygems'
+gem 'RedCloth'
+gem 'syntax'
+
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+
+version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
+require File.expand_path(version_path)
+
+version  = CompositePrimaryKeys::VERSION::STRING
+download = 'http://rubygems.org/gems/composite_primary_keys'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1
+       return 'st'
+    when 2
+      return 'nd'
+    when 3
+      return 'rd'
+    else
+      return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
+  
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class=\"syntax\">#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text).to_html
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/scripts/txt2js

@@ -1,65 +1,65 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-require 'active_support'
-
-version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
-require File.expand_path(version_path)
-
-version  = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubygems.org/gems/composite_primary_keys'
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1
-      return 'st'
-    when 2
-      return 'nd'
-    when 3
-      return 'rd'
-    else
-      return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.dirname(__FILE__) + '/../website/template.js'
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.js] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text = fsrc.read
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text)
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+require 'active_support'
+
+version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
+require File.expand_path(version_path)
+
+version  = CompositePrimaryKeys::VERSION::STRING
+download = 'http://rubygems.org/gems/composite_primary_keys'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1
+      return 'st'
+    when 2
+      return 'nd'
+    when 3
+      return 'rd'
+    else
+      return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.dirname(__FILE__) + '/../website/template.js'
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.js] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text)
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)