activerecord-typedstore 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 805a07504ab5ed0b6a41983d945f5a0bdd649726
-  data.tar.gz: c09ffc9348aa4256c439645b7d36edb0b3951705
+  metadata.gz: 840c3646ef834da4bfeb760ae59a440136a09b84
+  data.tar.gz: 25cf44e8833ff79e3870b66361ccdfc2f7913cf5
 SHA512:
-  metadata.gz: 2c033c463261169f42b5ab7e1a4c0dade01d101c1f084695124b5e018131bbce84a389b34bfc9aedeec224383def213cd6cf4c78b609d820cffbf8fd1cdaf695
-  data.tar.gz: 6ed412a72266d529d32401c6ef99a7bfc85fd5d38cf7716f8e44035cc1b1250099b67e3aa9e153a5eab1e97e4a2669fa1f7596fa2fb271aa1404274fabf94020
+  metadata.gz: a9af2dc153df0bf781a9afbe9053a0246b76a2b0a60d2ab333d1113ce5b3ad68e127c2ab2c9e706d0a9d4c0446fc051d3c82f32a5d22506066425f8627e1e225
+  data.tar.gz: a439fda466092a2a33750859e7387017b5db9a253eb17ec64d373899425b48c0b3d444c7c21656852c31f4d44bd241b31ca80bbf5d5e59a13d03f9c1978988c2

data/.travis.yml

@@ -1,21 +1,34 @@
+language: ruby
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
+  - 1.9
+  - 2.0
+  - 2.1
 gemfile:
   - gemfiles/Gemfile.ar-3.2
   - gemfiles/Gemfile.ar-4.0
   - gemfiles/Gemfile.ar-4.1
+  - gemfiles/Gemfile.ar-4.2
   - gemfiles/Gemfile.ar-edge
 
+env:
+  - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1
+  - TIMEZONE_AWARE=0 POSTGRES=1 MYSQL=1
+
+addons:
+  postgresql: 9.3
+
+sudo: false
+
 before_script:
   - mysql -e 'create database typed_store_test;'
-
-env:
-  - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1 POSTGRES_URL=$(curl http://api.postgression.com)
-  - TIMEZONE_AWARE=0 POSTGRES=1 MYSQL=1 POSTGRES_URL=$(curl http://api.postgression.com)
+  - psql -c 'create database typed_store_test;' -U postgres
 
 matrix:
   allow_failures:
     - gemfile: gemfiles/Gemfile.ar-edge
+  exclude:
+   - gemfile: gemfiles/Gemfile.ar-edge
+     rvm: 1.9
+   - gemfile: gemfiles/Gemfile.ar-edge
+     rvm: 2.0

data/activerecord-typedstore.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Jean Boussier']
   spec.email         = ['jean.boussier@gmail.com']
   spec.description   = %q{ActiveRecord::Store but with type definition}
-  spec.summary       = %q{ActiveRecord::Store but with type definition}
+  spec.summary       = %q{Add type casting and full method attributes support to RctiveRecord store}
   spec.homepage      = 'https://github.com/byroot/activerecord-typedstore'
   spec.license       = 'MIT'
 
@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 3.2'
+  spec.add_dependency 'activerecord', '>= 3.2', '< 5'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'pg'
-  spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'rake', '~> 0'
+  spec.add_development_dependency 'rspec', '~> 0'
+  spec.add_development_dependency 'coveralls', '~> 0'
+  spec.add_development_dependency 'sqlite3', '~> 0'
+  spec.add_development_dependency 'pg', '~> 0'
+  spec.add_development_dependency 'mysql2', '~> 0'
+  spec.add_development_dependency 'database_cleaner', '~> 0'
 end

data/gemfiles/Gemfile.ar-4.1

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 4.1.0.beta1'
+gem 'activerecord', '~> 4.1.0'
 gem 'bundler', '~> 1.3'
 gem 'rake'
 gem 'rspec'

data/gemfiles/Gemfile.ar-4.2

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

data/lib/active_record/typed_store/column.rb

@@ -29,7 +29,8 @@ module ActiveRecord::TypedStore
 
     def extract_default(value)
       return value if (type == :string || type == :text) && value.nil?
-      super
+
+      type_cast(value)
     end
 
     def type_cast(value, map=true)
@@ -46,9 +47,37 @@ module ActiveRecord::TypedStore
         return super(value.iso8601)
       end
 
-      super(value)
+      defined?(super) ? super(value) : type_cast_from_database(value)
     end
 
   end
 
+  if defined? ::ActiveRecord::Type
+    BaseColumn = remove_const(:Column)
+
+    class DecimalType < ::ActiveRecord::Type::Decimal
+      def type_cast_from_database(value)
+        value = value.to_s if value.is_a?(Float)
+        super(value)
+      end
+    end
+
+    class Column < BaseColumn
+      CAST_TYPES = {
+        boolean: ::ActiveRecord::Type::Boolean,
+        integer: ::ActiveRecord::Type::Integer,
+        string: ::ActiveRecord::Type::String,
+        float: ::ActiveRecord::Type::Float,
+        date: ::ActiveRecord::Type::Date,
+        datetime: ::ActiveRecord::Type::DateTime,
+        decimal: DecimalType,
+        any: ::ActiveRecord::Type::Value,
+      }
+
+      def initialize(_, type, *)
+        @cast_type = CAST_TYPES.fetch(type).new
+        super
+      end
+    end
+  end
 end

data/lib/active_record/typed_store/extension.rb

@@ -5,7 +5,8 @@ require 'active_record/typed_store/typed_hash'
 module ActiveRecord::TypedStore
   AR_VERSION = Gem::Version.new(ActiveRecord::VERSION::STRING)
   IS_AR_3_2 = AR_VERSION < Gem::Version.new('4.0')
-  IS_AR_4_1 = AR_VERSION >= Gem::Version.new('4.1.0.beta')
+  IS_AR_4_1 = AR_VERSION >= Gem::Version.new('4.1') && AR_VERSION < Gem::Version.new('4.2.0-rc1')
+  IS_AR_4_2 = AR_VERSION >= Gem::Version.new('4.2.0-rc1')
 
   module Extension
     extend ActiveSupport::Concern
@@ -92,6 +93,18 @@ module ActiveRecord::TypedStore
 
     protected
 
+    if IS_AR_4_2
+      def attribute_method?(attr_name)
+        super || store_attribute_method?(attr_name)
+      end
+    end
+
+    def store_attribute_method?(attr_name)
+      return unless self.class.typed_store_attributes
+      store_attribute = self.class.typed_store_attributes[attr_name]
+      store_attribute && store_attribute.accessor?
+    end
+
     def write_store_attribute(store_attribute, key, value)
       column = store_column(store_attribute, key)
       if column.try(:type) == :datetime && self.class.time_zone_aware_attributes && value.respond_to?(:in_time_zone)
@@ -106,8 +119,27 @@ module ActiveRecord::TypedStore
 
     private
 
+    if IS_AR_4_2
+      def match_attribute_method?(method_name)
+        match = super
+        return unless match
+        return if match.target == 'attribute_before_type_cast'.freeze && store_attribute_method?(match.attr_name)
+        match
+      end
+
+      def coder_for(attr_name)
+        column = self.class.columns_hash[attr_name]
+        return unless column.cast_type.is_a?(::ActiveRecord::Type::Serialized)
+        column.cast_type.coder
+      end
+    else
+      def coder_for(attr_name)
+        self.class.serialized_attributes[attr_name]
+      end
+    end
+
     def write_attribute(attr_name, value)
-      if coder = self.class.serialized_attributes[attr_name]
+      if coder = coder_for(attr_name)
         if coder.is_a?(ActiveRecord::TypedStore::Coder)
           return super(attr_name, coder.as_indifferent_hash(value))
         end
@@ -116,6 +148,10 @@ module ActiveRecord::TypedStore
       super
     end
 
+    def keys_for_partial_write
+      super & self.class.column_names
+    end
+
     def store_column(store_attribute, key)
       store = store_columns(store_attribute)
       store && store[key]

data/lib/active_record/typed_store/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module TypedStore
-    VERSION = '0.4.4'
+    VERSION = '0.5.0'
   end
 end

data/spec/active_record/typed_store_spec.rb

@@ -58,11 +58,20 @@ shared_examples 'any model' do
       }.to change { model.age_changed? }.from(true).to(false)
     end
 
-    it 'can be reset individually' do
-      model.age = 24
-      expect {
-        model.reset_age!
-      }.to change { model.age }.from(24).to(12)
+    if AR_VERSION >= AR_4_2
+      it 'can be restored individually' do
+        model.age = 24
+        expect {
+          model.restore_age!
+        }.to change { model.age }.from(24).to(12)
+      end
+    else
+      it 'can be reset individually' do
+        model.age = 24
+        expect {
+          model.reset_age!
+        }.to change { model.age }.from(24).to(12)
+      end
     end
 
     it 'does not dirty track assigning the same boolean' do
@@ -606,7 +615,7 @@ shared_examples 'a model supporting arrays' do |pg_native=false|
   end
 
   it 'cast values inside the array (integer)' do
-    pending('ActiveRecord bug: https://github.com/rails/rails/pull/11245') if pg_native
+    pending('ActiveRecord bug: https://github.com/rails/rails/pull/11245') if pg_native && AR_VERSION < AR_4_2
     model.update_attributes(grades: ['1', 2, 3.4])
     expect(model.reload.grades).to be == [1, 2, 3]
   end
@@ -621,12 +630,14 @@ shared_examples 'a model supporting arrays' do |pg_native=false|
     expect(model.reload.tags).to be == ['1', nil]
   end
 
-  it 'convert non array value as empty array' do
-    model.update_attributes(grades: 'foo')
-    expect(model.reload.grades).to be == []
+  if !pg_native || AR_VERSION < AR_4_2
+    it 'convert non array value as empty array' do
+      model.update_attributes(grades: 'foo')
+      expect(model.reload.grades).to be == []
+    end
   end
 
-  if !pg_native || AR_VERSION == AR_4_1
+  if !pg_native || AR_VERSION >= AR_4_1
     it 'accept multidimensianl arrays' do
       model.update_attributes(grades: [[1, 2], [3, 4]])
       expect(model.reload.grades).to be == [[1, 2], [3, 4]]

data/spec/support/models.rb

@@ -5,6 +5,7 @@ require 'yaml'
 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')
 
 ActiveRecord::Base.time_zone_aware_attributes = ENV['TIMEZONE_AWARE'] != '0'
 ActiveRecord::Base.configurations = {
@@ -60,31 +61,33 @@ class CreateAllTables < ActiveRecord::Migration
 
   def self.up
     if ENV['MYSQL']
-      ActiveRecord::Base.establish_connection('test_mysql')
+      ActiveRecord::Base.establish_connection(:test_mysql)
       recreate_table(:mysql_regular_ar_models) { |t| define_columns(t); t.text :untyped_settings }
     end
 
     if ENV['POSTGRES']
-      ActiveRecord::Base.establish_connection(ENV['POSTGRES_URL'] || 'test_postgresql')
+      ActiveRecord::Base.establish_connection(ENV['POSTGRES_URL'] || :test_postgresql)
       recreate_table(:postgresql_regular_ar_models) { |t| define_columns(t); t.text :untyped_settings }
 
       if AR_VERSION >= AR_4_0
         execute "create extension if not exists hstore"
         recreate_table(:postgres_hstore_typed_store_models) { |t| t.hstore :settings; t.text :untyped_settings }
 
-        #execute "create extension if not exists json"
-        recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :untyped_settings }
+        if ENV['POSTGRES_JSON']
+          execute "create extension if not exists json"
+          recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :untyped_settings }
+        end
       end
     end
 
-    ActiveRecord::Base.establish_connection('test_sqlite3')
+    ActiveRecord::Base.establish_connection(:test_sqlite3)
     recreate_table(:sqlite3_regular_ar_models) { |t| define_columns(t); t.text :untyped_settings }
     recreate_table(:yaml_typed_store_models) { |t| t.text :settings; t.text :untyped_settings }
     recreate_table(:json_typed_store_models) { |t| t.text :settings; t.text :untyped_settings }
     recreate_table(:marshal_typed_store_models) { |t| t.text :settings; t.text :untyped_settings }
   end
 end
-ActiveRecord::Migration.verbose = false
+ActiveRecord::Migration.verbose = true
 CreateAllTables.up
 
 class ColumnCoder
@@ -119,32 +122,34 @@ end
 
 if ENV['MYSQL']
   class MysqlRegularARModel < ActiveRecord::Base
-    establish_connection 'test_mysql'
+    establish_connection :test_mysql
     store :untyped_settings, accessors: [:title]
   end
 end
 
 if ENV['POSTGRES']
   class PostgresqlRegularARModel < ActiveRecord::Base
-    establish_connection ENV['POSTGRES_URL'] || 'test_postgresql'
+    establish_connection ENV['POSTGRES_URL'] || :test_postgresql
     store :untyped_settings, accessors: [:title]
   end
 
   if AR_VERSION >= AR_4_0
 
     class PostgresHstoreTypedStoreModel < ActiveRecord::Base
-      establish_connection ENV['POSTGRES_URL'] || 'test_postgresql'
+      establish_connection ENV['POSTGRES_URL'] || :test_postgresql
       store :untyped_settings, accessors: [:title]
       typed_store :settings, coder: ColumnCoder.new(AsJson) do |s|
         define_store_columns(s)
       end
     end
 
-    class PostgresJsonTypedStoreModel < ActiveRecord::Base
-      establish_connection ENV['POSTGRES_URL'] || 'test_postgresql'
-      store :untyped_settings, accessors: [:title]
-      typed_store :settings, coder: ColumnCoder.new(AsJson) do |s|
-        define_store_columns(s)
+    if ENV['POSTGRES_JSON']
+      class PostgresJsonTypedStoreModel < ActiveRecord::Base
+        establish_connection ENV['POSTGRES_URL'] || :test_postgresql
+        store :untyped_settings, accessors: [:title]
+        typed_store :settings, coder: ColumnCoder.new(AsJson) do |s|
+          define_store_columns(s)
+        end
       end
     end
 
@@ -152,12 +157,12 @@ if ENV['POSTGRES']
 end
 
 class Sqlite3RegularARModel < ActiveRecord::Base
-  establish_connection 'test_sqlite3'
+  establish_connection :test_sqlite3
   store :untyped_settings, accessors: [:title]
 end
 
 class YamlTypedStoreModel < ActiveRecord::Base
-  establish_connection 'test_sqlite3'
+  establish_connection :test_sqlite3
   store :untyped_settings, accessors: [:title]
   typed_store :settings do |s|
     define_store_columns(s)
@@ -165,7 +170,7 @@ class YamlTypedStoreModel < ActiveRecord::Base
 end
 
 class JsonTypedStoreModel < ActiveRecord::Base
-  establish_connection 'test_sqlite3'
+  establish_connection :test_sqlite3
   store :untyped_settings, accessors: [:title]
   typed_store :settings, coder: ColumnCoder.new(JSON) do |s|
     define_store_columns(s)
@@ -187,7 +192,7 @@ module MarshalCoder
 end
 
 class MarshalTypedStoreModel < ActiveRecord::Base
-  establish_connection 'test_sqlite3'
+  establish_connection :test_sqlite3
   store :untyped_settings, accessors: [:title]
   typed_store :settings, coder: ColumnCoder.new(MarshalCoder) do |s|
     define_store_columns(s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,98 +48,98 @@ dependencies:
   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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   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: 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'
 - !ruby/object:Gem::Dependency
   name: pg
   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: mysql2
   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: database_cleaner
   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: ActiveRecord::Store but with type definition
@@ -154,6 +160,7 @@ files:
 - gemfiles/Gemfile.ar-3.2
 - gemfiles/Gemfile.ar-4.0
 - gemfiles/Gemfile.ar-4.1
+- gemfiles/Gemfile.ar-4.2
 - gemfiles/Gemfile.ar-edge
 - lib/active_record/typed_store.rb
 - lib/active_record/typed_store/ar_32_fallbacks.rb
@@ -192,7 +199,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: ActiveRecord::Store but with type definition
+summary: Add type casting and full method attributes support to RctiveRecord store
 test_files:
 - spec/active_record/typed_store/typed_hash_spec.rb
 - spec/active_record/typed_store_spec.rb