activerecord-attribute_converter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a1107bf795acf0d0ddd42afc3cd1512760445c4
-  data.tar.gz: f38eae4f2d62f732acddde5b5e096caf6228cda8
+  metadata.gz: f5ac88613a83588985a6f7b7729ba74958bd5a53
+  data.tar.gz: c9d1fb6f43d5c45aeec99088a0c6d6f6252fc057
 SHA512:
-  metadata.gz: 44ae86c61702a4c4ca8204b56ccb07417943d1a645d1a3b263d7a3bc2cc48872a9b9e17d982d15a72785a7320d08e0dfadd591310df4abf5f6b58c822fd690a0
-  data.tar.gz: 413bc326e4a9eca90aa7dbd66be9d447deb6f967be959d2db40d5151ba77e5f0078bb585cbc62b18fc36de366587009e33233eaf1e87a5d8a1534cd9af50b076
+  metadata.gz: 0302cc8783014305e5de3597c455ce5d72b44fe81cc760eff5ab649c18cd135ae8594f1780bfaef8bf46ac3a5c37bc2063c3f6ba1d174578e815d6e228d37e2c
+  data.tar.gz: 7aec1c0d8d9b5067dc709180360d9d9ef5dfbe5fc043f73c13c3a6743da3e7a23e52ea8b186f70c9d24e268e75f9707a17ecf70a52d7262dae82e57a011733d9

data/lib/activerecord/attribute_converter.rb

@@ -1,8 +1,22 @@
 require 'active_support/lazy_load_hooks'
+require 'activerecord/attribute_converter/base'
+require 'activerecord/attribute_converter/predicate_builder'
+require 'activerecord/attribute_converter/relation'
 require 'activerecord/attribute_converter/version'
 
 ActiveSupport.on_load(:active_record) do
-  require 'activerecord/attribute_converter/base'
-  require 'activerecord/attribute_converter/relation'
-  require 'activerecord/attribute_converter/predicate_builder'
+  ActiveRecord::Base.send(:include, ActiveRecord::AttributeConverter::Base)
+
+  ActiveRecord::PredicateBuilder.singleton_class.class_eval do
+    include ActiveRecord::AttributeConverter::PredicateBuilder
+    alias_method_chain :build_from_hash, :attribute_converter
+  end
+
+  ActiveRecord::Relation.class_eval do
+    # Use alias_method_chain instead of Module#prepend here.
+    # In Rails 4, activerecord-deprecated_finders monkey-patches update_all and
+    # the combination of alias_method_chain and prepend causes some trouble.
+    include ActiveRecord::AttributeConverter::Relation
+    alias_method_chain :update_all, :attribute_converter
+  end
 end

data/lib/activerecord/attribute_converter/base.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module ActiveRecord
   module AttributeConverter
     module Base
@@ -44,5 +46,3 @@ module ActiveRecord
     end
   end
 end
-
-ActiveRecord::Base.send(:include, ActiveRecord::AttributeConverter::Base)

data/lib/activerecord/attribute_converter/predicate_builder.rb

@@ -1,6 +1,9 @@
 module ActiveRecord
   module AttributeConverter
     module PredicateBuilder
+      # Rails 3.2:  build_from_hash(engine, attributes, default_table, allow_table_name = true)
+      # Rails 4.0:  build_from_hash(klass, attributes, default_table)
+      # Rails 4.1:  build_from_hash(klass, attributes, default_table)
       def build_from_hash_with_attribute_converter(*args)
         klass = args[0]
         unless klass.attribute_converters.empty?
@@ -19,8 +22,3 @@ module ActiveRecord
     end
   end
 end
-
-ActiveRecord::PredicateBuilder.singleton_class.class_eval do
-  include ActiveRecord::AttributeConverter::PredicateBuilder
-  alias_method_chain :build_from_hash, :attribute_converter
-end

data/lib/activerecord/attribute_converter/relation.rb

@@ -1,12 +1,18 @@
 module ActiveRecord
   module AttributeConverter
     module Relation
+      # Rails 3.2:  update_all(updates, conditions = nil, options = {})
+      # Rails 4.0:  update_all(updates)
+      # Rails 4.1:  update_all(updates)
       def update_all_with_attribute_converter(*args)
         updates = args[0]
         conditions = args[1]
         options = args[2] || {}
 
         if !conditions && !options.present? && !@klass.attribute_converters.empty? && updates.is_a?(Hash)
+          # Only `update_all(attr: value)` form is supported.
+          # `update_all(['attr = ?', value])` and `update_all("attr = #{value}")`
+          # form is NOT supported because we cannot convert values safely.
           updates = updates.stringify_keys
           @klass.attribute_converters.each do |attr, converter|
             if updates.has_key?(attr)
@@ -21,8 +27,3 @@ module ActiveRecord
     end
   end
 end
-
-ActiveRecord::Relation.class_eval do
-  include ActiveRecord::AttributeConverter::Relation
-  alias_method_chain :update_all, :attribute_converter
-end

data/lib/activerecord/attribute_converter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module AttributeConverter
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ ActiveRecord::Base.configurations['test'] = {
   adapter: 'sqlite3',
   database: ':memory:',
 }
-ActiveRecord::Base.establish_connection('test')
+ActiveRecord::Base.establish_connection(:test)
 require File.expand_path('../schema', __FILE__)
 require File.expand_path('../models', __FILE__)
 

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-attribute_converter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 description: Transparent conversion for ActiveRecord
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -133,17 +133,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Transparent conversion for ActiveRecord