store_attribute 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd2643cf4b1909497a0de3f0d15ed6ca51ba599e
-  data.tar.gz: 607171026ea9b9638e20a920b732bd7258db246a
+  metadata.gz: 191063cf9091064962abf3548153b75656a55665
+  data.tar.gz: cbc5f2bfc1b33f186296fd9b6c0cc1b8d08fb1df
 SHA512:
-  metadata.gz: 79e570bd455ecf0f2f7c500725e4a243f4e0d5133c5bdfd45100e10963bbe16623c37396d4a87b7018c74472813efbcfd212cc9d7ebe83c697ca00ad053d338c
-  data.tar.gz: 0c4458f32f0a658d276218894912e3c1c53833dd0cb4e506885bcff00a824beeadda620c89a4d6c09376edd1a262b9396ad317eb275c981d4d08194eb48968da
+  metadata.gz: ae7b28363deb33a59141481eba79eecebd530c7810e9b29a79e9b2a618ca4e5dd8fa6e0211d5ae3d167fe29bff286a175aac0094a8b353e8ae59f484e1caadeb
+  data.tar.gz: bd3858caaa4d37e67bc586a18e1607a2d5c88f2385d9760fc59c9b15ad8fb403694f7a354248299928644acd4cec19bfbc4771f091fbdfd8c75348c6930b9ac0

data/.travis.yml

@@ -10,5 +10,10 @@ before_script:
 
 matrix:
   include:
-    - rvm: 2.3.1
+    - rvm: 2.4.1
       gemfile: gemfiles/rails5.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/railsmaster.gemfile
+  allow_failures:
+    - rvm: ruby-head
+      gemfile: gemfiles/railsmaster.gemfile

data/Gemfile

@@ -7,5 +7,5 @@ local_gemfile = 'Gemfile.local'
 if File.exist?(local_gemfile)
   eval(File.read(local_gemfile)) # rubocop:disable Lint/Eval
 else
-  gem 'activerecord', '5.0.0'
+  gem 'activerecord', '5.1.0'
 end

data/gemfiles/rails5.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~>5.0.0'
+gem 'rails', '~> 5.1.0'
 
 gemspec path: '..'

data/gemfiles/railsmaster.rb

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'arel', github: 'rails/arel'
+gem 'rails', github: 'rails/rails'
+
+gemspec path: '..'

data/lib/store_attribute/active_record/store.rb

@@ -4,6 +4,7 @@ require 'store_attribute/active_record/type/typed_store'
 module ActiveRecord
   module Store
     module ClassMethods # :nodoc:
+      alias _orig_store store
       # Defines store on this model.
       #
       # +store_name+ The name of the store.
@@ -21,8 +22,9 @@ module ActiveRecord
       #     store :settings, accessors: [:color, :homepage, login_at: :datetime], coder: JSON
       #   end
       def store(store_name, options = {})
-        serialize store_name, IndifferentCoder.new(options[:coder])
-        store_accessor(store_name, *options[:accessors]) if options.key?(:accessors)
+        accessors = options.delete(:accessors)
+        _orig_store(store_name, options)
+        store_accessor(store_name, *accessors) if accessors
       end
       # Adds additional accessors to an existing store on this model.
       #

data/lib/store_attribute/version.rb

@@ -1,3 +1,3 @@
 module StoreAttribute # :nodoc:
-  VERSION = "0.5.1".freeze
+  VERSION = "0.5.2".freeze
 end

data/spec/spec_helper.rb

@@ -13,6 +13,8 @@ require 'active_record'
 require 'pg'
 require 'store_attribute'
 
+RAILS_5_1 = ActiveRecord.version.release >= Gem::Version.new("5.1.0")
+
 ActiveRecord::Base.establish_connection(
   adapter: 'postgresql',
   database: 'store_attribute_test'

data/spec/store_attribute/typed_store_spec.rb

@@ -2,14 +2,6 @@ require 'spec_helper'
 
 describe ActiveRecord::Type::TypedStore do
   let(:json_type) { ActiveRecord::Type::Serialized.new(ActiveRecord::Type::Text.new, ActiveRecord::Coders::JSON) }
-  let(:yaml_type) do
-    ActiveRecord::Type::Serialized.new(
-      ActiveRecord::Type::Text.new,
-      ActiveRecord::Store::IndifferentCoder.new(
-        ActiveRecord::Coders::YAMLColumn.new(Hash)
-      )
-    )
-  end
 
   context "with json store" do
     subject { described_class.new(json_type) }
@@ -76,6 +68,27 @@ describe ActiveRecord::Type::TypedStore do
   end
 
   context "with yaml coder" do
+    if RAILS_5_1
+      let(:yaml_type) do
+        ActiveRecord::Type::Serialized.new(
+          ActiveRecord::Type::Text.new,
+          ActiveRecord::Store::IndifferentCoder.new(
+            'test',
+            ActiveRecord::Coders::YAMLColumn.new('test', Hash)
+          )
+        )
+      end
+    else
+      let(:yaml_type) do
+        ActiveRecord::Type::Serialized.new(
+          ActiveRecord::Type::Text.new,
+          ActiveRecord::Store::IndifferentCoder.new(
+            ActiveRecord::Coders::YAMLColumn.new(Hash)
+          )
+        )
+      end
+    end
+
     let(:subject) { described_class.new(yaml_type) }
 
     it "works", :aggregate_failures do

data/store_attribute.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($/)
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "activerecord", "~>5.0.0"
+  s.add_runtime_dependency "activerecord", "~>5.0"
 
   s.add_development_dependency "pg", "~>0.18"
   s.add_development_dependency "rake", "~> 10.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_attribute
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2017-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/rails5.gemfile
+- gemfiles/railsmaster.rb
 - lib/store_attribute.rb
 - lib/store_attribute/active_record.rb
 - lib/store_attribute/active_record/store.rb
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension which adds typecasting to store accessors