dao-entity 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b6d9d9132f8b835b675e81e2b0db4f7671fb72
-  data.tar.gz: 4d2d416595294a9f8f9e7877d0bb333d20e1463c
+  metadata.gz: f2f9be8e3117453df3c5f6c5c4000c6c71d285af
+  data.tar.gz: 50f072ed9d80684e60cb3be67b8798796ed5267e
 SHA512:
-  metadata.gz: f3affef47f0c8dffd5bcd95a43d809cad170047fe962712541a599df12b59bea72c2ea6eea9ee52bfb783873d7f880a53047450b16d6e423d2dd4ef5bd26e85e
-  data.tar.gz: 8e61d2ea6136e356df1989a612584ece23d08ff5a0ee0707bd94d69cb697409b86b884b991210711b657f57678da9a9df602af58237e0efa968b43f49ff70e0c
+  metadata.gz: 19d41169d0bf90bde1e211be3171fcd6b65092a1d0210f2df3a7ac39960aafec3aaf3ded27220879c1b8fe4e6322b4af34332c2cf1a4f9a1d50ff4963a1d5c37
+  data.tar.gz: ef9d5b8f2bf28d74fbc6d039d663236616aeb157463dc3aa65f3c2ff06eeddfac57dfce422521774de5cb0929dab0ff264a2ce8c6b43f6b236a4414f54d443ce

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 2.3.0
 before_install: gem install bundler -v 1.11.2
+
+script:
+  - CODECLIMATE_REPO_TOKEN=8577d79977549811ba29d131a3b4573282267712fd72168c5c06d38fc99649cd bundle exec rspec

data/README.md

@@ -1,8 +1,9 @@
 # Dao::Entity
 
+[![Gem Version](https://badge.fury.io/rb/dao-entity.svg)](https://badge.fury.io/rb/dao-entity)
 [![Build Status](https://travis-ci.org/dao-rb/dao-entity.svg?branch=master)](https://travis-ci.org/dao-rb/dao-entity)
 [![Code Climate](https://codeclimate.com/github/dao-rb/dao-entity/badges/gpa.svg)](https://codeclimate.com/github/dao-rb/dao-entity)
-[![Test Coverage](https://codeclimate.com/github/dao-rb/dao-entity/badges/coverage.svg)](https://codeclimate.com/github/dao-rb/dao-entity/coverage)
+[![Test Coverage](https://codeclimate.com/repos/5772c7700d9c6e0067002c74/badges/2376d7e0731cb6672a41/coverage.svg)](https://codeclimate.com/repos/5772c7700d9c6e0067002c74/coverage)
 
 ## Installation
 
@@ -61,4 +62,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/dao-rb
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/dao-entity.gemspec

@@ -28,4 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'pry-byebug'
 end

data/lib/dao/entity.rb

@@ -3,6 +3,7 @@ require 'virtus'
 require 'active_support/all'
 require 'active_model/attribute_methods'
 require 'active_model/dirty'
+require 'dao/entity/dirty'
 require 'dao/entity/state'
 require 'dao/entity/base'
 

data/lib/dao/entity/base.rb

@@ -7,8 +7,11 @@ module Dao
 
       def initialize(attrs = {})
         super
+        after_initialize
+      end
+
+      def after_initialize
         @initialized_with = []
-        @entity_state = self.class.state_class.new(attributes)
       end
 
       def initialized_with=(attrs)
@@ -19,10 +22,6 @@ module Dao
         id.present? if respond_to?(:id)
       end
 
-      def entity_state
-        @entity_state.tap { |s| s.assign_attributes(attributes) }
-      end
-
       def to_key
         key = respond_to?(:id) && id
         key ? [key] : nil
@@ -43,11 +42,7 @@ module Dao
       alias eql? ==
       alias equal? eql?
 
-      private
-
-      def self.state_class
-        @state_class ||= State.build_with_attrs(attribute_set.collect(&:name))
-      end
+      protected
 
       def identity
         if respond_to?(:id)

data/lib/dao/entity/dirty.rb

@@ -0,0 +1,60 @@
+module Dao
+  module Entity
+    module Dirty
+      extend ActiveSupport::Concern
+
+      def after_initialize
+        super
+        initialize_entity_state
+      end
+
+      def initialize_entity_state
+        @in_dump_mode = false
+        @entity_state = self.class.state_class.new(attributes)
+      end
+
+      def entity_state
+        @entity_state.tap { |s| s.assign_attributes(attributes) }
+      end
+
+      def _dump(_level)
+        prepare_for_dump do
+          Marshal.dump(self)
+        end
+      end
+
+      class_methods do
+        def _load(marshal_string)
+          Marshal.load(marshal_string).tap(&:initialize_entity_state)
+        end
+
+        def state_class
+          @_state_class ||= State.build_with_attrs(attribute_set.collect(&:name))
+        end
+      end
+
+      def respond_to?(*args)
+        if args.first == :_dump
+          not @in_dump_mode
+        else
+          super
+        end
+      end
+
+      protected
+
+      def prepare_for_dump
+        current_entity_state = @entity_state
+        @entity_state = nil
+        @in_dump_mode = true
+
+        result = yield
+
+        @entity_state = current_entity_state
+        @in_dump_mode = false
+
+        result
+      end
+    end
+  end
+end

data/lib/dao/entity/state.rb

@@ -6,7 +6,7 @@ module Dao
       def self.build_with_attrs(attrs)
         state = Class.new(self)
 
-        state.define_attribute_methods *attrs
+        state.define_attribute_methods(*attrs)
 
         state.send(:attr_accessor, *attrs)
         attrs.each do |attr|

data/lib/dao/entity/version.rb

@@ -1,5 +1,5 @@
 module Dao
   module Entity
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dao-entity
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - llxff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -109,6 +109,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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: pry
+  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: byebug
+  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: pry-byebug
+  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: Base entity
 email:
 - ll.wg.bin@gmail.com
@@ -128,6 +184,7 @@ files:
 - dao-entity.gemspec
 - lib/dao/entity.rb
 - lib/dao/entity/base.rb
+- lib/dao/entity/dirty.rb
 - lib/dao/entity/state.rb
 - lib/dao/entity/version.rb
 homepage: https://github.com/dao-rb/dao-entity