embedded_model 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e78534a14ac279770ebed2d92db40cf8a3fa1595
-  data.tar.gz: 8c4a86a6594ef13a49ac0323ec3f838a6980e37f
+  metadata.gz: 28d126fa8bb8769bfe363bfca015e254962d1268
+  data.tar.gz: 191eb772fd2bf3ce4999939a9c50f411b9c69ee6
 SHA512:
-  metadata.gz: b14e521b92ca30246b228d8121f33273a44f6ac45fc219ad3b7c8abda994699cba47836e85dfa1211303a46103b6429e012724973588c3785bdad373563a3796
-  data.tar.gz: 84050aecada229e6b42fe8795d82a8d8811b9cb6efbc6dae96ec7a01ea29fc4f7ad5a5b1114e57296c0ed66870cf8018180983edba7b7383b98b8b74da224e53
+  metadata.gz: 850d537ceca626d68f5282eb7b4ab4dea785ffb2d7c8469b9ee3f773eebc51b2860c05c1f0996cf63c2b299d84e8a7b77f85fc351a1b392509cb163fc16f6f4b
+  data.tar.gz: ec09a60aef56b9d0ed9248aa86dc683d431810eabdea01b1e80b8c108f3c0fd65999db4d54656318fa01d1bd8aeca98ca0b7e80b93034cd71ef7bfbaf1d38a37

data/README.md

@@ -2,8 +2,6 @@
 
 A simple extension for ActiveRecord allowing to embed plain-models and store them as JSON. It's well-suited in case the use of full-featured models with underlying tables is redundant.
 
-Works with ActiveRecord ~> 4.2. Support of the 5th version has not been implemented yet.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -20,6 +18,13 @@ Or install it yourself as:
 
     $ gem install embedded_model
 
+
+Current version of the gem works with ActiveRecord 5.0.0.rc1 only, but previous one fits well for 4.2.
+
+```ruby
+gem 'embedded_model', '~> 0.1.0'
+```
+
 ## Usage
 
 ### Embeddable models

data/embedded_model.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '~> 4.2'
+  spec.add_dependency 'activerecord', '5.0.0.rc1'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/embedded_model/embedder.rb

@@ -29,7 +29,14 @@ module EmbeddedModel
     end
 
     def object_builder
-      ->(attrs) { attrs.is_a?(model) ? attrs : model.new(attrs.try(:to_hash)) }
+      ->(object_or_attributes) do
+        if object_or_attributes.is_a?(model)
+          object_or_attributes
+        else
+          attributes = object_or_attributes.try(:to_hash)
+          model.new(attributes) if attributes
+        end
+      end
     end
 
     def collection_builder

data/lib/embedded_model/type.rb

@@ -1,27 +1,19 @@
-require 'active_record/connection_adapters/postgresql/oid/json'
-
 module EmbeddedModel
-  class Type < ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Json
+  class Type < ActiveRecord::Type::Internal::AbstractJson
     def initialize(&builder)
       @builder = builder
     end
 
-    def type_cast_from_database(value)
-      type_cast(super)
-    end
-
-    def type_cast_from_user(value)
-      type_cast(value)
+    def cast(attrs)
+      @builder.call(attrs)
     end
 
-    def type_cast_for_database(value)
-      super(value.as_json)
+    def serialize(obj)
+      super(obj.as_json)
     end
 
-    private
-
-    def cast_value(value)
-      @builder.call(value)
+    def deserialize(json)
+      cast(super)
     end
   end
 end

data/lib/embedded_model/version.rb

@@ -1,3 +1,3 @@
 module EmbeddedModel
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: embedded_model
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Nikolai Vasilenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement