activerecord-typedstore 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 32186c23b2155944fe8760d18cbfd9fa1091ba10
-  data.tar.gz: 811f0a0dfd47754e463afe3c6d540443456e8397
+SHA256:
+  metadata.gz: ab5f09b64721a41a7eae679a4ae848813504913d1d87815c035352da6b3134eb
+  data.tar.gz: bc9d48e95b48f9ad9d5b7e02f1edd9a1ce1004e8c93bfb6d18fc4d944d63c161
 SHA512:
-  metadata.gz: abbf5d186254ff6052dcd07d11e8f4743eaa406086845511bd0ef2a5451e2b3e56ae3f5ba3e190bd6582d409985ce08fd33db61a52eee8d0cf415c7c0cad0c37
-  data.tar.gz: ce93bc861633c8b1e1aecd0c23e398caa0688fd23577cb8da5398459927711905a9c72a07337ab34c42952e3e8e81fec0d827775e8eeddedbc6c3ff700bcff04
+  metadata.gz: bbd034206f96e1063bdb078417b685148346edeeb36968068bd54a2a8e95321ec56d5aa69b50851238607a862a01cba1a1770ac541e283eba12735c11dd84f5a
+  data.tar.gz: f04cdc9a39338b8b0fcc164da82f4b472acbf7e59543e6f8ebf5b51300e5bf55f4cb01d602a7dfc083833fef38069ed468049a49be3b6ff45b84dac7e0f86952

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 
 rvm:
-  - 2.1
-  - 2.2.3
-  - 2.3.0
+  - 2.3.5
+  - 2.4.2
 gemfile:
   - gemfiles/Gemfile.ar-4.2
   - gemfiles/Gemfile.ar-5.0
+  - gemfiles/Gemfile.ar-5.1
 
 env:
   - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1
@@ -21,8 +21,3 @@ cache: bundler
 before_script:
   - mysql -e 'create database typed_store_test;'
   - psql -c 'create database typed_store_test;' -U postgres
-
-matrix:
-  exclude:
-    - rvm: 2.1
-      gemfile: gemfiles/Gemfile.ar-5.0

data/Rakefile

@@ -21,7 +21,7 @@ end
 
 namespace :spec do
   task :all do
-    %w(3.2 4.0 edge).each do |ar_version|
+    %w(4.2 5.0 5.1).each do |ar_version|
       [1, 0].each do |timezone_aware|
         command = %W{
           BUNDLE_GEMFILE=gemfiles/Gemfile.ar-#{ar_version}

data/activerecord-typedstore.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 4.2', '< 5.2'
+  spec.add_dependency 'activerecord', '>= 4.2', '< 5.3'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10'

data/gemfiles/{Gemfile.ar-3.2 → Gemfile.ar-5.2}

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 3.2.15'
+gem 'activerecord', ['>= 5.2.0.beta1', '< 5.3']
 gem 'bundler', '~> 1.3'
 gem 'rake'
 gem 'rspec'
 gem 'sqlite3'
 gem 'pg', '~> 0.11'
-gem 'mysql2', '~> 0.3.10'
+gem 'mysql2', ['>= 0.3.13', '< 0.5']
 gem 'database_cleaner'
 gem 'coveralls', require: false

data/lib/active_record/typed_store/extension.rb

@@ -8,19 +8,17 @@ module ActiveRecord::TypedStore
 
     included do
       class_attribute :typed_stores
+      self.typed_stores = {}
     end
 
     module ClassMethods
       def store_accessors
-        return [] unless typed_stores
-        typed_stores.values.map(&:accessors).flatten
+        typed_stores.each_value.flat_map(&:accessors)
       end
 
       def typed_store(store_attribute, options={}, &block)
         dsl = DSL.new(store_attribute, options, &block)
-        self.typed_stores ||= {}
-        self.typed_stores = typed_stores.deep_dup
-        self.typed_stores[store_attribute] = dsl
+        self.typed_stores = self.typed_stores.merge(store_attribute => dsl)
 
         typed_klass = TypedHash.create(dsl.fields.values)
         const_set("#{store_attribute}_hash".camelize, typed_klass)
@@ -29,11 +27,26 @@ module ActiveRecord::TypedStore
           Type.new(typed_klass, dsl.coder, subtype)
         end
         store_accessor(store_attribute, dsl.accessors)
+
+        dsl.accessors.each do |accessor_name|
+          define_method("#{accessor_name}_changed?") do
+            send("#{store_attribute}_changed?") &&
+              send(store_attribute)[accessor_name] != send("#{store_attribute}_was")[accessor_name]
+          end
+
+          define_method("#{accessor_name}_was") do
+            send("#{store_attribute}_was")[accessor_name]
+          end
+
+          define_method("restore_#{accessor_name}!") do
+            send("#{accessor_name}=", send("#{accessor_name}_was"))
+          end
+        end
       end
 
       def define_attribute_methods
         super
-        define_typed_store_attribute_methods if typed_stores
+        define_typed_store_attribute_methods
       end
 
       def undefine_attribute_methods # :nodoc:
@@ -57,6 +70,16 @@ module ActiveRecord::TypedStore
       end
     end
 
+    def changes
+      changes = super
+      self.class.store_accessors.each do |attr|
+        if send("#{attr}_changed?")
+          changes[attr] = [send("#{attr}_was"), send(attr)]
+        end
+      end
+      changes
+    end
+
     def clear_attribute_change(attr_name)
       return if self.class.store_accessors.include?(normalize_attribute(attr_name))
       super
@@ -69,16 +92,6 @@ module ActiveRecord::TypedStore
       super
     end
 
-    def write_store_attribute(store_attribute, key, value)
-      if typed_stores && typed_stores[store_attribute]
-        prev_value = read_store_attribute(store_attribute, key)
-        new_value = typed_stores[store_attribute].fields[key].cast(value)
-        attribute_will_change!(key.to_s) if new_value != prev_value
-      end
-
-      super
-    end
-
     def query_attribute(attr_name)
       if self.class.store_accessors.include?(attr_name.to_sym)
         value = public_send(attr_name)

data/lib/active_record/typed_store/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module TypedStore
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -157,12 +157,10 @@ files:
 - README.md
 - Rakefile
 - activerecord-typedstore.gemspec
-- gemfiles/Gemfile.ar-3.2
-- gemfiles/Gemfile.ar-4.0
-- gemfiles/Gemfile.ar-4.1
 - gemfiles/Gemfile.ar-4.2
 - gemfiles/Gemfile.ar-5.0
 - gemfiles/Gemfile.ar-5.1
+- gemfiles/Gemfile.ar-5.2
 - lib/active_record/typed_store.rb
 - lib/active_record/typed_store/dsl.rb
 - lib/active_record/typed_store/extension.rb
@@ -196,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Add type casting and full method attributes support to АctiveRecord store

data/gemfiles/Gemfile.ar-4.0

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.0.0'
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', '~> 0.3.10'
-gem 'database_cleaner'
-gem 'coveralls', require: false

data/gemfiles/Gemfile.ar-4.1

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.1.0'
-gem 'bundler', '~> 1.3'
-gem 'rake'
-gem 'rspec'
-gem 'sqlite3'
-gem 'pg', '~> 0.11'
-gem 'mysql2', '~> 0.3.13'
-gem 'database_cleaner'
-gem 'coveralls', require: false