active_store_accessor 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06ba4627f521236634c1de9d03b20e672c5477aa
-  data.tar.gz: 139b01fbfc855b5959ef426844cd634fd1342f1a
+  metadata.gz: 3d80e0a2c9f3bf1d6fde04802b05c5d01f89f179
+  data.tar.gz: 92665c56d16926a3b909c0d45650f0a6032ffe26
 SHA512:
-  metadata.gz: 061f082b0c32e47db4489b6d07045b3d6557a57df737cb7373afa6046ff1693aa894ac8e52ad311810434508f26a76a9c6b8be24826b75255e076ad091889e67
-  data.tar.gz: 8e9952ba446c200649fea03e94a5ee4a6b96039de92f1e69b1843e92192a8667a443d709b65558822b48690c77a6bf7b0a0c738e0fde15642c36da592215931c
+  metadata.gz: b91de091930c91921061b8dd70713b3c568bb6e4c8c29009fa191f49ceac194782e27e2c3132cbff2ac542b97b6e563da4d54e73a5bd7e6d94772a567f29ed87
+  data.tar.gz: 82ea8763e58340fe731de04f2db72a2f6ed6bab7e1b1bfbba98199e89b9fee93a7e58639943bf8279f29734b2aeb2368951947b242690ecbd644583b9ac4f17d

data/.travis.yml

@@ -1,6 +1,7 @@
 env:
   - "AR_VERSION=4.0"
   - "AR_VERSION=4.1"
+  - "AR_VERSION=4.2"
 rvm:
   - 1.9.3
   - 2.0.0
@@ -8,4 +9,4 @@ rvm:
 addons:
   postgresql: "9.3"
 before_script:
-  - psql -c 'create database asa_test;' -U rails
+  - psql -c 'create database asa_test;' -U rails -d postgres

data/Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 ar_version = ENV["AR_VERSION"]
 ar_version = case ar_version
   when "4.0" then "~> 4.0.0"
+  when "4.2" then "~> 4.2.0.beta4"
   else
     "~> 4.1.0"
   end

data/active_store_accessor.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "active_store_accessor"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["Sergey Pchelincev"]
   spec.email         = ["mail@sergeyp.me"]
   spec.summary       = %q{Get more from ActiveRecord::Store}

data/lib/active_store_accessor.rb

@@ -6,7 +6,10 @@ module ActiveStoreAccessor
   end
 
   def active_store_accessor(column_name, attrs)
-    if columns.detect { |column| column.name == column_name.to_s }.text?
+    column = columns.detect { |column| column.name == column_name.to_s }
+    if !column
+      raise "[active_store_accessor] The column '#{column_name}' does not exist in the model #{name}."
+    elsif column.type == :text
       serialize(column_name) unless serialized_attributes.include?(column_name.to_s)
     end
 
@@ -16,22 +19,31 @@ module ActiveStoreAccessor
       options = { type: options.to_s } unless options.is_a?(Hash)
       type = options.fetch(:type) { raise ArgumentError, "please specify type of `#{ attr_name }` attribute" }.to_s
 
-      # time for activerecord is only a hours and minutes without date part
-      # but for most rubist and rails developer it should contains a date too
-      type = :datetime if type == :time
-
-      args = [attr_name.to_s, options[:default], type]
-      active_store_attributes[attr_name] = ActiveRecord::ConnectionAdapters::Column.new(*args)
+      config = if connection.respond_to?(:lookup_cast_type)
+        column = connection.lookup_cast_type(type)
+        [column.method(:type_cast_from_database), column.method(:type_cast_for_database)]
+      else
+        # time for activerecord is only a hours and minutes without date part
+        # but for most rubist and rails developer it should contains a date too
+        type = 'datetime' if type == 'time'
+        args = [attr_name.to_s, options[:default], type]
+        column = ActiveRecord::ConnectionAdapters::Column.new(*args)
+        [column.method(:type_cast), column.method(:type_cast_for_write)]
+      end
+
+      config << options[:default]
+      active_store_attributes[attr_name] = config
 
       _active_store_accessor_module.module_eval <<-RUBY
         def #{ attr_name }
-          column = self.class.active_store_attributes[:#{ attr_name }]
-          value = column.type_cast(super)
-          value.nil? ? column.default : value
+          getter, _, default = self.class.active_store_attributes[:#{ attr_name }]
+          value = getter.call(super)
+          value.nil? ? default : value
         end
 
         def #{ attr_name }=(value)
-          super self.class.active_store_attributes[:#{ attr_name }].type_cast_for_write(value)
+          _, setter, _ = self.class.active_store_attributes[:#{ attr_name }]
+          super setter.call(value)
         end
       RUBY
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_store_accessor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sergey Pchelincev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord