activerecord-typedstore 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48c928ae468d6b194e9e449f10a7cb7dc2e8462c
-  data.tar.gz: 2bda0a0de2a3969e8d1b05129209bd4f79200381
+  metadata.gz: d9f474258f3d2248355c75bfaaed2439a6f17d01
+  data.tar.gz: a7f227175a6583d765931a9feda03e8ede33b4b0
 SHA512:
-  metadata.gz: 6e66a694855109d5938364e16699d23139c0a0bcc5f463a88ee415a411a77dbc75c946801d69e044a1f7220c95ab40c7eceac8dcba7c0c0a13c83b3ff492f7a4
-  data.tar.gz: 1decb6986f91b5f5628387316b11701e0f8ba742add1679fc556cd2e4d53f72dab3b068104d071d4b42533529732c413923d113502fae1a2418a68e5fb662b60
+  metadata.gz: f2f2191bb5cec0d4e138b3adeafdd6a779bd032f31c2d93f8862484676afd5683f6fdb7bf230ebe3f6f9a0e9843f6d0b58f1278917c5db5488f684ff6664a978
+  data.tar.gz: 4f74a8624f48916154ffa549d5e0320c3679db8534280c4593669bc4a2f000d32bdd3947dd2e673b75fae4d8708102b8c3c5492a9c76cece3ea6a9026c177cb6

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.1'
+  spec.add_dependency 'activerecord', '>= 4.2', '< 5.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10'

data/gemfiles/Gemfile.ar-5.1

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

data/lib/active_record/typed_store/dsl.rb

@@ -4,16 +4,22 @@ module ActiveRecord::TypedStore
   class DSL
     attr_reader :fields, :coder
 
-    def initialize(options)
-      @coder = options.fetch(:coder) { default_coder }
+    def initialize(attribute_name, options)
+      @coder = options.fetch(:coder) { default_coder(attribute_name) }
       @accessors = options[:accessors]
       @accessors = [] if options[:accessors] == false
       @fields = {}
       yield self
     end
 
-    def default_coder
-      ActiveRecord::Coders::YAMLColumn.new
+    if ActiveRecord.gem_version < Gem::Version.new('5.1.0')
+      def default_coder(attribute_name)
+        ActiveRecord::Coders::YAMLColumn.new
+      end
+    else
+      def default_coder(attribute_name)
+        ActiveRecord::Coders::YAMLColumn.new(attribute_name)
+      end
     end
 
     def accessors

data/lib/active_record/typed_store/extension.rb

@@ -17,7 +17,7 @@ module ActiveRecord::TypedStore
       end
 
       def typed_store(store_attribute, options={}, &block)
-        dsl = DSL.new(options, &block)
+        dsl = DSL.new(store_attribute, options, &block)
         self.typed_stores ||= {}
         self.typed_stores[store_attribute] = dsl
 
@@ -61,6 +61,13 @@ module ActiveRecord::TypedStore
       super
     end
 
+    def read_attribute(attr_name)
+      if self.class.store_accessors.include?(attr_name.to_sym)
+        return public_send(attr_name)
+      end
+      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)

data/lib/active_record/typed_store/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module TypedStore
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

data/spec/active_record/typed_store_spec.rb

@@ -140,6 +140,11 @@ shared_examples 'any model' do
     it 'is initialized at nil if :default is not defined' do
       expect(model.no_default).to be_nil
     end
+
+    it 'is accessible throught #read_attribute' do
+      model.name = 'foo'
+      expect(model.read_attribute(:name)).to be == 'foo'
+    end
   end
 
   describe 'string attribute' do

data/spec/support/models.rb

@@ -6,12 +6,13 @@ AR_VERSION = Gem::Version.new(ActiveRecord::VERSION::STRING)
 AR_4_0 = Gem::Version.new('4.0')
 AR_4_1 = Gem::Version.new('4.1.0.beta')
 AR_4_2 = Gem::Version.new('4.2.0-rc1')
+AR_5_0 = Gem::Version.new('5.0.0')
 
 ActiveRecord::Base.time_zone_aware_attributes = ENV['TIMEZONE_AWARE'] != '0'
 ActiveRecord::Base.configurations = {
-  'test_sqlite3' => {adapter: 'sqlite3', database: "/tmp/typed_store.db"},
-  'test_postgresql' => {adapter: 'postgresql', database: 'typed_store_test', username: 'postgres'},
-  'test_mysql' => {adapter: 'mysql2', database: 'typed_store_test', username: 'travis'},
+  'test_sqlite3' => { 'adapter' => 'sqlite3', 'database' => '/tmp/typed_store.db' },
+  'test_postgresql' => { 'adapter' => 'postgresql', 'database' => 'typed_store_test', 'username' => 'postgres' },
+  'test_mysql' => { 'adapter' => 'mysql2', 'database' => 'typed_store_test', 'username' => 'travis' },
 }
 
 def define_columns(t)
@@ -76,7 +77,8 @@ def define_store_with_attributes(**options)
   end
 end
 
-class CreateAllTables < ActiveRecord::Migration
+MigrationClass = AR_VERSION >= AR_5_0 ? ActiveRecord::Migration["5.0"] : ActiveRecord::Migration
+class CreateAllTables < MigrationClass
 
   def self.recreate_table(name, *args, &block)
     execute "drop table if exists #{name}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-05-18 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.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - gemfiles/Gemfile.ar-4.1
 - gemfiles/Gemfile.ar-4.2
 - gemfiles/Gemfile.ar-5.0
+- gemfiles/Gemfile.ar-5.1
 - lib/active_record/typed_store.rb
 - lib/active_record/typed_store/dsl.rb
 - lib/active_record/typed_store/extension.rb