datamappify 0.53.1 → 0.53.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4ec85b5050a819d22845e27d8dd637007b94910c
+  data.tar.gz: 8c42b671c22e957161aaf8c7791a978037559424
+SHA512:
+  metadata.gz: 125891396e0b79a7336abb47f9fc1dbc9f1fd492a0acaeb439f5c111d1ddbdbb6fba6c7acb5ef4479c7b6db6153e214b1e7f5b87342182c0f533cf63e96777eb
+  data.tar.gz: d5d7ab84a3650dac56ad2678e732bb737e1d90873121f237a2489e72fa5709c7eab8d0ebfb86a4347c9721ccad6a8376d84b3b4db8650abeec68fa37440e1b9c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## master
 
+## 0.53.2 [2013-07-18]
+
+- Better attributes inspect. Thanks @jamesmoriarty!
+- Added support of `:create` and `:update` contexts for validations.
+- Fixed the persistence when `:via` is specified in the repository.
+
 ## 0.53.1 [2013-06-27]
 
 - Fixed ruby 1.9 compatibility.

data/README.md

@@ -374,6 +374,10 @@ end
 
 Note: Returning either `nil` or `false` from the callback will cancel all subsequent callbacks (and the action itself, if it's a `before_` callback).
 
+## More Reading
+
+You may check out this [article](http://fredwu.me/post/54009567748/) for more examples.
+
 ## Changelog
 
 Refer to [CHANGELOG](CHANGELOG.md).

data/lib/datamappify/data/criteria/relational/concerns/set_criteria.rb

@@ -20,11 +20,6 @@ module Datamappify
               end
             end
 
-            def criteria_for_reverse_mapping
-              reverse_id = options[:primary_record].send(options[:via])
-              reverse_id ? { :id => reverse_id } : {}
-            end
-
             def criteria_for_normal_mapping
               { key_name => entity.id }
             end

data/lib/datamappify/data/criteria/relational/find_by_key.rb

@@ -11,6 +11,13 @@ module Datamappify
           def initialize(source_class, entity, attributes, options = {}, &block)
             super(source_class, entity, nil, attributes, options, &block)
           end
+
+          private
+
+          def criteria_for_reverse_mapping
+            reverse_id = options[:primary_record].send(options[:via])
+            reverse_id ? { :id => reverse_id } : {}
+          end
         end
       end
     end

data/lib/datamappify/data/criteria/relational/save_by_key.rb

@@ -10,6 +10,12 @@ module Datamappify
           def initialize(source_class, entity, attributes, options = {}, &block)
             super(source_class, entity, {}, attributes, options, &block)
           end
+
+          private
+
+          def criteria_for_reverse_mapping
+            {}
+          end
         end
       end
     end

data/lib/datamappify/data/errors.rb

@@ -7,8 +7,11 @@ module Datamappify
     end
 
     class EntityInvalid < Error
+      attr_reader :entity
+
       # @param entity [Entity]
       def initialize(entity)
+        @entity = entity
         super entity.errors.full_messages.join(', ')
       end
     end

data/lib/datamappify/entity/inspectable.rb

@@ -0,0 +1,28 @@
+module Datamappify
+  module Entity
+    module Inspectable
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      def inspect
+        inspectable = self.attributes.map do |name, value|
+          "#{name}: #{value.inspect}"
+        end.join(", ")
+
+        "#<#{self.class} #{inspectable}>"
+      end
+
+      module ClassMethods
+        def inspect
+          inspectable = self.attribute_set.map do |attribute|
+            "#{attribute.name}: #{attribute.class.primitive}"
+          end.join(", ")
+
+          "#<#{name} #{inspectable}>"
+        end
+      end
+    end
+  end
+end
+

data/lib/datamappify/entity.rb

@@ -4,6 +4,7 @@ require 'datamappify/entity/active_model/compatibility'
 require 'datamappify/entity/lazy_checking'
 require 'datamappify/entity/composable'
 require 'datamappify/entity/relation'
+require 'datamappify/entity/inspectable'
 
 module Datamappify
   module Entity
@@ -17,6 +18,7 @@ module Datamappify
         include LazyChecking
         include Composable
         include Relation
+        include Inspectable
 
         attribute :id, Integer
       end

data/lib/datamappify/repository/query_method/save.rb

@@ -31,12 +31,16 @@ module Datamappify
         #
         # @return [Entity]
         def create_or_update(entity)
-          raise Data::EntityInvalid.new(entity) if entity.invalid?
+          raise Data::EntityInvalid.new(entity) if entity.invalid?(context)
 
           dispatch_criteria_to_providers(:SaveByKey, entity)
 
           entity
         end
+
+        def context
+          self.class.name.demodulize.underscore.to_sym
+        end
       end
     end
   end

data/lib/datamappify/version.rb

@@ -1,3 +1,3 @@
 module Datamappify
-  VERSION = '0.53.1'
+  VERSION = '0.53.2'
 end

data/spec/repository/reverse_mapped_spec.rb

@@ -44,6 +44,32 @@ shared_examples_for "reverse mapped" do |data_provider|
           its(:author_name) { should == 'Sheldon Cooper' }
           its(:author_bio)  { should == 'y' }
         end
+
+        describe "update record" do
+          context "example 1" do
+            let(:record) { post_repository.find(saved_post.id) }
+            subject      { post_repository.save!(record) }
+
+            its(:title)       { should == 'Hello world' }
+            its(:author_name) { should == 'Fred Wu' }
+            its(:author_bio)  { should == 'x' }
+          end
+
+          context "example 2" do
+            let(:record) { post_repository.find(saved_post.id) }
+            subject      { post_repository.find(record.id) }
+
+            before do
+              record.title = 'Hello mars'
+              record.author_name = 'JK Rowling'
+              post_repository.save!(record)
+            end
+
+            its(:title)       { should == 'Hello mars' }
+            its(:author_name) { should == 'JK Rowling' }
+            its(:author_bio)  { should == 'x' }
+          end
+        end
       end
     end
   end

data/spec/repository/validation_spec.rb

@@ -32,6 +32,18 @@ shared_examples_for "repository (in)validation" do |data_provider|
         valid_user.id.should be_kind_of(Integer)
       end
     end
+
+    describe "within context" do
+      let(:invalid_user) { User.new(:first_name => 'Fr', :driver_license => 'MOSDEVOPS') }
+
+      it "is valid within :create" do
+        invalid_user.valid?(:create).should == true
+      end
+
+      it "is invalid within :update" do
+        invalid_user.valid?(:update).should == false
+      end
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+$:.unshift File.dirname(__FILE__)
+
 require 'coveralls'
 require 'simplecov'
 require 'pry'

data/spec/support/entities/post.rb

@@ -3,7 +3,7 @@ require_relative 'author'
 class Post
   include Datamappify::Entity
 
-  attribute :title,       String
+  attribute :title, String
 
   attributes_from Author, :prefix_with => :author
 end

data/spec/support/entities/user.rb

@@ -10,6 +10,8 @@ class User
 
   validates :first_name,     :presence => true,
                              :length   => { :minimum => 2 }
+  validates :first_name,     :length   => { :minimum => 3 },
+                             :on       => :update
   validates :driver_license, :presence => true,
                              :length   => { :minimum => 8 }
 

metadata

@@ -1,22 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: datamappify
 version: !ruby/object:Gem::Version
-  version: 0.53.1
-  prerelease: 
+  version: 0.53.2
 platform: ruby
 authors:
 - Fred Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0.beta0
     - - <=
@@ -25,9 +23,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0.beta0
     - - <=
@@ -36,9 +33,8 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0.rc1
     - - <
@@ -47,9 +43,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0.rc1
     - - <
@@ -58,7 +53,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -66,7 +60,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -74,7 +67,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -82,7 +74,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,169 +81,148 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0.rc1
     - - <
@@ -261,9 +231,8 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0.rc1
     - - <
@@ -272,7 +241,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -280,7 +248,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -346,6 +313,7 @@ files:
 - lib/datamappify/entity/composable/attribute.rb
 - lib/datamappify/entity/composable/attributes.rb
 - lib/datamappify/entity/composable/validators.rb
+- lib/datamappify/entity/inspectable.rb
 - lib/datamappify/entity/lazy_checking.rb
 - lib/datamappify/entity/relation.rb
 - lib/datamappify/lazy.rb
@@ -428,33 +396,26 @@ files:
 homepage: https://github.com/fredwu/datamappify
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4173751016346712187
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4173751016346712187
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Compose, decouple and manage domain logic and data persistence separately.
   Works particularly great for composing form objects!
 test_files: