datamappify 0.51.1 → 0.52.0

data/lib/datamappify/entity/composable/attributes.rb

@@ -0,0 +1,54 @@
+module Datamappify
+  module Entity
+    module Composable
+      class Attributes
+        class << self
+          def build(entity, entity_class, options)
+            @entity       = entity
+            @entity_class = entity_class
+            @options      = options
+
+            build_attributes
+          end
+
+          private
+
+          # @return (see #attributes_from)
+          def build_attributes
+            @entity_class.attribute_set.each do |attribute|
+              unless excluded_attributes.include?(attribute.name)
+                @entity.attribute_set << build_attribute(attribute.name, attribute.writer)
+              end
+            end
+          end
+
+          # @return [Array]
+          def excluded_attributes
+            @excluded_attributes ||= @entity_class.reference_keys << :id
+          end
+
+          # @param attribute_name [Symbol]
+          #
+          # @param attribute_writer [Virtus::Attribute::Writer]
+          #
+          # @return [Virtus::Attribute]
+          def build_attribute(attribute_name, attribute_writer)
+            name = if @options[:prefix_with]
+              Attribute.prefix(attribute_name, @options[:prefix_with])
+            else
+              attribute_name
+            end
+
+            Virtus::Attribute.build(
+              name,
+              attribute_writer.primitive,
+              :default    => attribute_writer.default_value,
+              :visibility => attribute_writer.visibility,
+              :coercer    => attribute_writer.coercer
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datamappify/entity/composable/validators.rb

@@ -0,0 +1,63 @@
+module Datamappify
+  module Entity
+    module Composable
+      class Validators
+        class << self
+          def build(entity, entity_class, options)
+            @entity       = entity
+            @entity_class = entity_class
+            @options      = options
+
+            build_validators
+            run_validators
+          end
+
+          private
+
+          # @return (see #attributes_from)
+          def build_validators
+            if @options[:prefix_with]
+              rename_validators(@options[:prefix_with])
+            else
+              @entity_class._validators.each { |k, v| @entity._validators[k] = v.dup }
+            end
+          end
+
+          # @param prefix [Symbol]
+          #
+          # @return [void]
+          def rename_validators(prefix)
+            @entity_class._validators.each do |attribute_name, validators|
+              @entity._validators[Attribute.prefix(attribute_name, prefix)] = validators.map do |validator|
+                rename_validator_attributes(validator.dup, prefix)
+              end
+            end
+          end
+
+          # @param validator [Validator]
+          #
+          # @param prefix (see #rename_validators)
+          #
+          # @return [void]
+          def rename_validator_attributes(validator, prefix)
+            validator.instance_variable_set(
+              :@attributes,
+              validator.attributes.map { |name| Attribute.prefix(name, prefix) }
+            )
+
+            validator
+          end
+
+          # @return [void]
+          def run_validators
+            @entity._validators.each do |_, validators|
+              validators.each do |validator|
+                @entity.validate(validator, validator.options)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datamappify/entity/composable.rb

@@ -1,3 +1,7 @@
+require 'datamappify/entity/composable/attribute'
+require 'datamappify/entity/composable/attributes'
+require 'datamappify/entity/composable/validators'
+
 module Datamappify
   module Entity
     module Composable
@@ -12,93 +16,8 @@ module Datamappify
         #
         # @return [void]
         def attributes_from(entity_class, options = {})
-          setup_attributes(entity_class, options)
-          setup_validators(entity_class, options)
-          run_validators
-        end
-
-        private
-
-        # @param (see #attributes_from)
-        #
-        # @return (see #attributes_from)
-        def setup_attributes(entity_class, options)
-          entity_class.attribute_set.each do |attribute|
-            unless excluded_attributes(entity_class).include?(attribute.name)
-              self.attribute_set << tweak_attribute(attribute.dup, options)
-            end
-          end
-        end
-
-        # @param (see #attributes_from)
-        #
-        # @return (see #attributes_from)
-        def setup_validators(entity_class, options)
-          if options[:prefix_with]
-            rename_validators(entity_class, options[:prefix_with])
-          else
-            entity_class._validators.each { |k, v| self._validators[k] = v.dup }
-          end
-        end
-
-        # @return [void]
-        def run_validators
-          self._validators.each do |_, validators|
-            validators.each do |validator|
-              validate(validator, validator.options)
-            end
-          end
-        end
-
-        # @param entity_class [Entity]
-        #
-        # @param prefix [Symbol]
-        #
-        # @return [void]
-        def rename_validators(entity_class, prefix)
-          entity_class._validators.each do |attribute_name, validators|
-            self._validators[:"#{prefix}_#{attribute_name}"] = validators.map do |validator|
-              rename_validator_attributes(validator.dup, prefix)
-            end
-          end
-        end
-
-        # @param validator [Validator]
-        #
-        # @param prefix (see #rename_validators)
-        #
-        # @return [void]
-        def rename_validator_attributes(validator, prefix)
-          validator.instance_variable_set :@attributes, validator.attributes.map { |name| :"#{prefix}_#{name}" }
-          validator
-        end
-
-        # @param entity_class [Entity]
-        #
-        # @return [Array]
-        def excluded_attributes(entity_class)
-          @excluded_attributes ||= entity_class.reference_keys << :id
-        end
-
-        # @param attribute [Virtus::Attribute]
-        #
-        # @param options [Hash]
-        #
-        # @return [Virtus::Attribute]
-        def tweak_attribute(attribute, options)
-          prefix_attribute_name(attribute, options[:prefix_with]) if options[:prefix_with]
-
-          attribute
-        end
-
-        # @param attribute [Virtus::Attribute]
-        #
-        # @param prefix [Symbol]
-        #
-        # @return [void]
-        def prefix_attribute_name(attribute, prefix)
-          name = attribute.instance_variable_set :@name, :"#{prefix}_#{attribute.name}"
-          attribute.instance_variable_set :@instance_variable_name, "@#{name}".to_sym
+          Attributes.build(self, entity_class, options)
+          Validators.build(self, entity_class, options)
         end
       end
     end

data/lib/datamappify/entity.rb

@@ -10,10 +10,10 @@ module Datamappify
     def self.included(klass)
       klass.class_eval do
         include Observable
-        include Virtus
-        include Virtus::Equalizer.new(inspect)
         include ::ActiveModel::Model
         include ActiveModel::Compatibility
+        include Virtus
+        include Virtus::Equalizer.new(inspect)
         include LazyChecking
         include Composable
         include Relation

data/lib/datamappify/repository/mapping_dsl.rb

@@ -26,8 +26,8 @@ module Datamappify
       # @param (see Data::Mapper::Attribute#initialize)
       #
       # @return [void]
-      def map_attribute(name, source)
-        data_mapper.custom_mapping[name] = source
+      def map_attribute(name, source, options = {})
+        data_mapper.custom_mapping[name] = [source, options]
       end
     end
   end

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

@@ -73,11 +73,22 @@ module Datamappify
         # @param entity [Entity]
         #
         # @return [void]
-        def dispatch_criteria_to_providers(criteria_name, entity, *args)
+        def dispatch_criteria_to_providers(criteria_name, entity)
+          _primary_record = nil
+
           attributes_walker(entity) do |provider_name, source_class, attributes|
-            data_mapper.provider(provider_name).build_criteria(
-              criteria_name, source_class, entity, attributes, *args
-            )
+            attributes.classify { |attr| attr.options[:via] }.each do |via, attrs|
+              record = data_mapper.provider(provider_name).build_criteria(
+                criteria_name,
+                source_class,
+                entity,
+                attrs,
+                :via            => via,
+                :primary_record => _primary_record
+              )
+
+              _primary_record ||= record
+            end
           end
         end
 

data/lib/datamappify/version.rb

@@ -1,3 +1,3 @@
 module Datamappify
-  VERSION = '0.51.1'
+  VERSION = '0.52.0'
 end

data/spec/entity/composable_spec.rb

@@ -5,8 +5,7 @@ describe Datamappify::Entity do
     Computer.new({
       :brand               => 'Fruit',
       :cpu                 => '286',
-      :ram                 => 8192,
-      :hdd                 => 65536,
+      :ram                 => 4242,
       :gfx                 => 'Voodoo',
       :vendor              => 'Compaq',
       :software_os         => 'OS X',
@@ -22,8 +21,9 @@ describe Datamappify::Entity do
     })
   end
 
+  its(:brand)               { should == 'Fruit' }
   its(:cpu)                 { should == '286' }
-  its(:ram)                 { should == 8192 }
+  its(:ram)                 { should == 4242 }
   its(:hdd)                 { should == 65536 }
   its(:gfx)                 { should == 'Voodoo' }
   its(:vendor)              { should == 'Compaq' }

data/spec/repository/reverse_mapped_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+shared_examples_for "reverse mapped" do |data_provider|
+  let!(:author_repository) { "AuthorRepository#{data_provider}".constantize }
+  let!(:post_repository)   { "PostRepository#{data_provider}".constantize }
+  let(:new_author)         { Author.new(:name => 'George R. R. Martin', :bio => 'GoT') }
+  let(:new_post)           { Post.new(:title => 'Hello world', :author_name => 'Fred Wu', :author_bio => 'x')}
+  let(:new_post_2)         { Post.new(:title => 'Hello earth', :author_name => 'Sheldon Cooper', :author_bio => 'y')}
+
+  context "#{data_provider}" do
+    before do
+      author_repository.save!(new_author)
+    end
+
+    describe "persistence" do
+      before do
+        post_repository.save!(new_post_2)
+      end
+
+      describe "referenced entity" do
+        subject { post_repository.save!(new_post) }
+
+        its(:title)       { should == 'Hello world' }
+        its(:author_name) { should == 'Fred Wu' }
+        its(:author_bio)  { should == 'x' }
+      end
+
+      describe "new found entity" do
+        let!(:saved_post)   { post_repository.save!(new_post) }
+        let!(:saved_post_2) { post_repository.save!(new_post_2) }
+
+        context "record 1" do
+          subject { post_repository.find(saved_post.id) }
+
+          its(:title)       { should == 'Hello world' }
+          its(:author_name) { should == 'Fred Wu' }
+          its(:author_bio)  { should == 'x' }
+        end
+
+        context "record 2" do
+          subject { post_repository.find(saved_post_2.id) }
+
+          its(:title)       { should == 'Hello earth' }
+          its(:author_name) { should == 'Sheldon Cooper' }
+          its(:author_bio)  { should == 'y' }
+        end
+      end
+    end
+  end
+end
+
+describe Datamappify::Repository do
+  DATA_PROVIDERS.each do |data_provider|
+    it_behaves_like "reverse mapped", data_provider
+  end
+end

data/spec/support/entities/author.rb

@@ -0,0 +1,6 @@
+class Author
+  include Datamappify::Entity
+
+  attribute :name, String
+  attribute :bio,  String
+end

data/spec/support/entities/computer_hardware.rb

@@ -2,8 +2,8 @@ class ComputerHardware
   include Datamappify::Entity
 
   attribute :cpu, String
-  attribute :ram, Integer
-  attribute :hdd, Integer
+  attribute :ram, Integer, :default => 8192
+  attribute :hdd, Integer, :default => 65536
   attribute :gfx, String
   attribute :vendor, String
 

data/spec/support/entities/post.rb

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

data/spec/support/repositories/active_record/author_repository.rb

@@ -0,0 +1,6 @@
+class AuthorRepositoryActiveRecord
+  include Datamappify::Repository
+
+  for_entity Author
+  default_provider :ActiveRecord
+end

data/spec/support/repositories/active_record/post_repository.rb

@@ -0,0 +1,9 @@
+class PostRepositoryActiveRecord
+  include Datamappify::Repository
+
+  for_entity Post
+  default_provider :ActiveRecord
+
+  map_attribute :author_name, 'ActiveRecord::Author#name', :via => :author_id
+  map_attribute :author_bio,  'ActiveRecord::Author#bio'
+end

data/spec/support/repositories/sequel/author_repository.rb

@@ -0,0 +1,6 @@
+class AuthorRepositorySequel
+  include Datamappify::Repository
+
+  for_entity Author
+  default_provider :Sequel
+end

data/spec/support/repositories/sequel/post_repository.rb

@@ -0,0 +1,9 @@
+class PostRepositorySequel
+  include Datamappify::Repository
+
+  for_entity Post
+  default_provider :Sequel
+
+  map_attribute :author_name, 'Sequel::Author#name', :via => :author_id
+  map_attribute :author_bio,  'Sequel::Author#bio'
+end

data/spec/support/tables/active_record.rb

@@ -63,5 +63,18 @@ ActiveRecord::Migration.suppress_messages do
       t.belongs_to :user
       t.timestamps
     end
+
+    create_table :posts do |t|
+      t.string :title
+      t.references :author
+      t.timestamps
+    end
+
+    create_table :authors do |t|
+      t.string :name
+      t.string :bio
+      t.references :post
+      t.timestamps
+    end
   end
 end

data/spec/support/tables/sequel.rb

@@ -76,3 +76,20 @@ DB.create_table :user_health_cares do
   DateTime :created_at
   DateTime :updated_at
 end
+
+DB.create_table :posts do |t|
+  primary_key :id
+  String :title
+  foreign_key :author_id
+  DateTime :created_at
+  DateTime :updated_at
+end
+
+DB.create_table :authors do |t|
+  primary_key :id
+  String :name
+  String :bio
+  String :post_id
+  DateTime :created_at
+  DateTime :updated_at
+end

data/spec/unit/entity/composable_spec.rb

@@ -5,7 +5,7 @@ module Datamappify::Entity
     class FarDistantEntity
       include Datamappify::Entity
 
-      attribute :far_distant_attribute_one
+      attribute :far_distant_attribute_one, String
     end
 
     class DistantEntity
@@ -47,6 +47,8 @@ module Datamappify::Entity
       its(:attributes) { should have_key(:other_distant_attribute_one) }
       its(:attributes) { should have_key(:other_distant_attribute_two) }
       its(:attributes) { should have_key(:other_far_far_distant_attribute_one) }
+      its(:attributes) { should have_key(:other_distant_entity_id) }
+      its(:attributes) { should have_key(:other_far_distant_entity_id) }
 
       its(:attributes) { should_not have_key(:attribute_one) }
       its(:attributes) { should_not have_key(:attribute_two) }
@@ -54,9 +56,7 @@ module Datamappify::Entity
       its(:attributes) { should_not have_key(:distant_attribute_two) }
 
       its(:attributes) { should_not have_key(:distant_entity_id) }
-      its(:attributes) { should_not have_key(:other_distant_entity_id) }
       its(:attributes) { should_not have_key(:far_distant_entity_id) }
-      its(:attributes) { should_not have_key(:other_far_distant_entity_id) }
       its(:attributes) { should_not have_key(:far_far_distant_entity_id) }
 
       its(:other_attribute_one)   { should == 'Hello' }

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: datamappify
 version: !ruby/object:Gem::Version
-  version: 0.51.1
+  version: 0.52.0
 platform: ruby
 authors:
 - Fred Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta0
+    - - <=
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta0
+    - - <=
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +252,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
-description: Compose and manage domain logic and data persistence separately and intelligently.
+description: Compose, decouple and manage domain logic and data persistence separately.
+  Works great with forms!
 email:
 - ifredwu@gmail.com
 executables: []
@@ -275,6 +282,8 @@ files:
 - lib/datamappify/data/criteria/active_record/save_by_key.rb
 - lib/datamappify/data/criteria/active_record/transaction.rb
 - lib/datamappify/data/criteria/common.rb
+- lib/datamappify/data/criteria/concerns/update_primary_record.rb
+- lib/datamappify/data/criteria/relational/concerns/set_criteria.rb
 - lib/datamappify/data/criteria/relational/count.rb
 - lib/datamappify/data/criteria/relational/find.rb
 - lib/datamappify/data/criteria/relational/find_by_key.rb
@@ -301,6 +310,9 @@ files:
 - lib/datamappify/entity.rb
 - lib/datamappify/entity/active_model/compatibility.rb
 - lib/datamappify/entity/composable.rb
+- lib/datamappify/entity/composable/attribute.rb
+- lib/datamappify/entity/composable/attributes.rb
+- lib/datamappify/entity/composable/validators.rb
 - lib/datamappify/entity/lazy_checking.rb
 - lib/datamappify/entity/relation.rb
 - lib/datamappify/lazy.rb
@@ -338,30 +350,37 @@ files:
 - spec/repository/dirty_tracking_spec.rb
 - spec/repository/finders_spec.rb
 - spec/repository/persistence_spec.rb
+- spec/repository/reverse_mapped_spec.rb
 - spec/repository/transactions_spec.rb
 - spec/repository/validation_spec.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
 - spec/support/entities/admin_user.rb
+- spec/support/entities/author.rb
 - spec/support/entities/comment.rb
 - spec/support/entities/computer.rb
 - spec/support/entities/computer_hardware.rb
 - spec/support/entities/computer_software.rb
 - spec/support/entities/group.rb
 - spec/support/entities/hero_user.rb
+- spec/support/entities/post.rb
 - spec/support/entities/role.rb
 - spec/support/entities/user.rb
 - spec/support/monkey_patches/database_cleaner.rb
 - spec/support/repositories/active_record/admin_user_repository.rb
+- spec/support/repositories/active_record/author_repository.rb
 - spec/support/repositories/active_record/comment_repository.rb
 - spec/support/repositories/active_record/group_repository.rb
+- spec/support/repositories/active_record/post_repository.rb
 - spec/support/repositories/active_record/role_repository.rb
 - spec/support/repositories/active_record/user_repository.rb
 - spec/support/repositories/callbacks_chaining_repository.rb
 - spec/support/repositories/hero_user_repository.rb
 - spec/support/repositories/sequel/admin_user_repository.rb
+- spec/support/repositories/sequel/author_repository.rb
 - spec/support/repositories/sequel/comment_repository.rb
 - spec/support/repositories/sequel/group_repository.rb
+- spec/support/repositories/sequel/post_repository.rb
 - spec/support/repositories/sequel/role_repository.rb
 - spec/support/repositories/sequel/user_repository.rb
 - spec/support/shared/contexts.rb
@@ -393,7 +412,8 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Compose and manage domain logic and data persistence separately and intelligently.
+summary: Compose, decouple and manage domain logic and data persistence separately.
+  Works great with forms!
 test_files:
 - spec/entity/composable_spec.rb
 - spec/entity/inheritance_spec.rb
@@ -405,30 +425,37 @@ test_files:
 - spec/repository/dirty_tracking_spec.rb
 - spec/repository/finders_spec.rb
 - spec/repository/persistence_spec.rb
+- spec/repository/reverse_mapped_spec.rb
 - spec/repository/transactions_spec.rb
 - spec/repository/validation_spec.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
 - spec/support/entities/admin_user.rb
+- spec/support/entities/author.rb
 - spec/support/entities/comment.rb
 - spec/support/entities/computer.rb
 - spec/support/entities/computer_hardware.rb
 - spec/support/entities/computer_software.rb
 - spec/support/entities/group.rb
 - spec/support/entities/hero_user.rb
+- spec/support/entities/post.rb
 - spec/support/entities/role.rb
 - spec/support/entities/user.rb
 - spec/support/monkey_patches/database_cleaner.rb
 - spec/support/repositories/active_record/admin_user_repository.rb
+- spec/support/repositories/active_record/author_repository.rb
 - spec/support/repositories/active_record/comment_repository.rb
 - spec/support/repositories/active_record/group_repository.rb
+- spec/support/repositories/active_record/post_repository.rb
 - spec/support/repositories/active_record/role_repository.rb
 - spec/support/repositories/active_record/user_repository.rb
 - spec/support/repositories/callbacks_chaining_repository.rb
 - spec/support/repositories/hero_user_repository.rb
 - spec/support/repositories/sequel/admin_user_repository.rb
+- spec/support/repositories/sequel/author_repository.rb
 - spec/support/repositories/sequel/comment_repository.rb
 - spec/support/repositories/sequel/group_repository.rb
+- spec/support/repositories/sequel/post_repository.rb
 - spec/support/repositories/sequel/role_repository.rb
 - spec/support/repositories/sequel/user_repository.rb
 - spec/support/shared/contexts.rb