datamappify 0.60.0 → 0.70.0.beta1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datamappify
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.70.0.beta1
 platform: ruby
 authors:
 - Fred Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -16,8 +16,8 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta0
-    - - <=
+        version: 1.0.0.beta6
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
@@ -26,30 +26,24 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta0
-    - - <=
+        version: 1.0.0.beta6
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
@@ -222,22 +216,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -274,32 +262,47 @@ files:
 - lib/datamappify/data.rb
 - lib/datamappify/data/criteria.rb
 - lib/datamappify/data/criteria/active_record/count.rb
+- lib/datamappify/data/criteria/active_record/criteria.rb
+- lib/datamappify/data/criteria/active_record/criteria_method.rb
 - lib/datamappify/data/criteria/active_record/destroy.rb
 - lib/datamappify/data/criteria/active_record/exists.rb
 - lib/datamappify/data/criteria/active_record/find.rb
 - lib/datamappify/data/criteria/active_record/find_by_key.rb
-- lib/datamappify/data/criteria/active_record/find_multiple.rb
+- lib/datamappify/data/criteria/active_record/limit.rb
+- lib/datamappify/data/criteria/active_record/match.rb
+- lib/datamappify/data/criteria/active_record/order.rb
+- lib/datamappify/data/criteria/active_record/rollback.rb
 - lib/datamappify/data/criteria/active_record/save.rb
 - lib/datamappify/data/criteria/active_record/save_by_key.rb
 - lib/datamappify/data/criteria/active_record/transaction.rb
+- lib/datamappify/data/criteria/active_record/where.rb
 - lib/datamappify/data/criteria/common.rb
 - lib/datamappify/data/criteria/concerns/update_primary_record.rb
+- lib/datamappify/data/criteria/relational/concerns/find.rb
+- lib/datamappify/data/criteria/relational/concerns/find_by_key.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
-- lib/datamappify/data/criteria/relational/find_multiple.rb
+- lib/datamappify/data/criteria/relational/criteria.rb
+- lib/datamappify/data/criteria/relational/criteria_base_method.rb
+- lib/datamappify/data/criteria/relational/criteria_method.rb
+- lib/datamappify/data/criteria/relational/limit.rb
 - lib/datamappify/data/criteria/relational/save.rb
 - lib/datamappify/data/criteria/relational/save_by_key.rb
 - lib/datamappify/data/criteria/sequel/count.rb
+- lib/datamappify/data/criteria/sequel/criteria.rb
+- lib/datamappify/data/criteria/sequel/criteria_method.rb
 - lib/datamappify/data/criteria/sequel/destroy.rb
 - lib/datamappify/data/criteria/sequel/exists.rb
 - lib/datamappify/data/criteria/sequel/find.rb
 - lib/datamappify/data/criteria/sequel/find_by_key.rb
-- lib/datamappify/data/criteria/sequel/find_multiple.rb
+- lib/datamappify/data/criteria/sequel/limit.rb
+- lib/datamappify/data/criteria/sequel/match.rb
+- lib/datamappify/data/criteria/sequel/order.rb
+- lib/datamappify/data/criteria/sequel/rollback.rb
 - lib/datamappify/data/criteria/sequel/save.rb
 - lib/datamappify/data/criteria/sequel/save_by_key.rb
 - lib/datamappify/data/criteria/sequel/transaction.rb
+- lib/datamappify/data/criteria/sequel/where.rb
 - lib/datamappify/data/errors.rb
 - lib/datamappify/data/mapper.rb
 - lib/datamappify/data/mapper/attribute.rb
@@ -309,14 +312,18 @@ files:
 - lib/datamappify/data/provider/sequel.rb
 - lib/datamappify/data/record.rb
 - lib/datamappify/entity.rb
-- lib/datamappify/entity/active_model/compatibility.rb
+- lib/datamappify/entity/association.rb
+- lib/datamappify/entity/association/reference.rb
+- lib/datamappify/entity/association/validation.rb
+- lib/datamappify/entity/compatibility/active_model.rb
+- lib/datamappify/entity/compatibility/active_record.rb
+- lib/datamappify/entity/compatibility/association/active_record.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/inspectable.rb
 - lib/datamappify/entity/lazy_checking.rb
-- lib/datamappify/entity/relation.rb
 - lib/datamappify/lazy.rb
 - lib/datamappify/lazy/attributes_handler.rb
 - lib/datamappify/lazy/source_attributes_walker.rb
@@ -328,14 +335,17 @@ files:
 - lib/datamappify/repository/query_method/callbacks.rb
 - lib/datamappify/repository/query_method/count.rb
 - lib/datamappify/repository/query_method/create.rb
+- lib/datamappify/repository/query_method/criteria.rb
 - lib/datamappify/repository/query_method/destroy.rb
 - lib/datamappify/repository/query_method/exists.rb
 - lib/datamappify/repository/query_method/find.rb
-- lib/datamappify/repository/query_method/find_multiple.rb
 - lib/datamappify/repository/query_method/method.rb
+- lib/datamappify/repository/query_method/method/multi_result_blender.rb
+- lib/datamappify/repository/query_method/method/reference_handler.rb
 - lib/datamappify/repository/query_method/method/source_attributes_walker.rb
 - lib/datamappify/repository/query_method/save.rb
 - lib/datamappify/repository/query_method/update.rb
+- lib/datamappify/repository/query_method/where_or_match.rb
 - lib/datamappify/repository/query_methods.rb
 - lib/datamappify/repository/unit_of_work.rb
 - lib/datamappify/repository/unit_of_work/persistent_states.rb
@@ -343,15 +353,21 @@ files:
 - lib/datamappify/repository/unit_of_work/transaction.rb
 - lib/datamappify/version.rb
 - spec/config_spec.rb
+- spec/entity/association/reference_spec.rb
 - spec/entity/composable_spec.rb
 - spec/entity/inheritance_spec.rb
-- spec/entity/relation_spec.rb
 - spec/entity_spec.rb
 - spec/lazy_spec.rb
+- spec/repository/associations/has_many_spec.rb
 - spec/repository/callbacks_spec.rb
 - spec/repository/dirty_persistence_spec.rb
 - spec/repository/dirty_tracking_spec.rb
-- spec/repository/finders_spec.rb
+- spec/repository/finders/all_spec.rb
+- spec/repository/finders/criteria_spec.rb
+- spec/repository/finders/different_providers_spec.rb
+- spec/repository/finders/find_spec.rb
+- spec/repository/finders/match_spec.rb
+- spec/repository/finders/where_spec.rb
 - spec/repository/namespaced_mapping_spec.rb
 - spec/repository/persistence_spec.rb
 - spec/repository/reverse_mapped_spec.rb
@@ -369,7 +385,9 @@ files:
 - spec/support/entities/reversed/author.rb
 - spec/support/entities/reversed/post.rb
 - spec/support/entities/role.rb
+- spec/support/entities/super_user.rb
 - spec/support/entities/user.rb
+- spec/support/entities/user_info.rb
 - spec/support/monkey_patches/database_cleaner.rb
 - spec/support/repositories/active_record/admin_user_repository.rb
 - spec/support/repositories/active_record/comment_repository.rb
@@ -378,6 +396,7 @@ files:
 - spec/support/repositories/active_record/reversed/author_repository.rb
 - spec/support/repositories/active_record/reversed/post_repository.rb
 - spec/support/repositories/active_record/role_repository.rb
+- spec/support/repositories/active_record/super_user_repository.rb
 - spec/support/repositories/active_record/user_repository.rb
 - spec/support/repositories/callbacks_chaining_repository.rb
 - spec/support/repositories/hero_user_repository.rb
@@ -388,12 +407,14 @@ files:
 - spec/support/repositories/sequel/reversed/author_repository.rb
 - spec/support/repositories/sequel/reversed/post_repository.rb
 - spec/support/repositories/sequel/role_repository.rb
+- spec/support/repositories/sequel/super_user_repository.rb
 - spec/support/repositories/sequel/user_repository.rb
 - spec/support/shared/contexts.rb
+- spec/support/shared/examples/repository/finders/where_or_match.rb
 - spec/support/tables/active_record.rb
 - spec/support/tables/sequel.rb
+- spec/unit/entity/association/reference_spec.rb
 - spec/unit/entity/composable_spec.rb
-- spec/unit/entity/relation_spec.rb
 - spec/unit/repository/query_method_spec.rb
 homepage: https://github.com/fredwu/datamappify
 licenses:
@@ -410,9 +431,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -422,15 +443,21 @@ summary: Compose, decouple and manage domain logic and data persistence separate
   Works particularly great for composing form objects!
 test_files:
 - spec/config_spec.rb
+- spec/entity/association/reference_spec.rb
 - spec/entity/composable_spec.rb
 - spec/entity/inheritance_spec.rb
-- spec/entity/relation_spec.rb
 - spec/entity_spec.rb
 - spec/lazy_spec.rb
+- spec/repository/associations/has_many_spec.rb
 - spec/repository/callbacks_spec.rb
 - spec/repository/dirty_persistence_spec.rb
 - spec/repository/dirty_tracking_spec.rb
-- spec/repository/finders_spec.rb
+- spec/repository/finders/all_spec.rb
+- spec/repository/finders/criteria_spec.rb
+- spec/repository/finders/different_providers_spec.rb
+- spec/repository/finders/find_spec.rb
+- spec/repository/finders/match_spec.rb
+- spec/repository/finders/where_spec.rb
 - spec/repository/namespaced_mapping_spec.rb
 - spec/repository/persistence_spec.rb
 - spec/repository/reverse_mapped_spec.rb
@@ -448,7 +475,9 @@ test_files:
 - spec/support/entities/reversed/author.rb
 - spec/support/entities/reversed/post.rb
 - spec/support/entities/role.rb
+- spec/support/entities/super_user.rb
 - spec/support/entities/user.rb
+- spec/support/entities/user_info.rb
 - spec/support/monkey_patches/database_cleaner.rb
 - spec/support/repositories/active_record/admin_user_repository.rb
 - spec/support/repositories/active_record/comment_repository.rb
@@ -457,6 +486,7 @@ test_files:
 - spec/support/repositories/active_record/reversed/author_repository.rb
 - spec/support/repositories/active_record/reversed/post_repository.rb
 - spec/support/repositories/active_record/role_repository.rb
+- spec/support/repositories/active_record/super_user_repository.rb
 - spec/support/repositories/active_record/user_repository.rb
 - spec/support/repositories/callbacks_chaining_repository.rb
 - spec/support/repositories/hero_user_repository.rb
@@ -467,11 +497,13 @@ test_files:
 - spec/support/repositories/sequel/reversed/author_repository.rb
 - spec/support/repositories/sequel/reversed/post_repository.rb
 - spec/support/repositories/sequel/role_repository.rb
+- spec/support/repositories/sequel/super_user_repository.rb
 - spec/support/repositories/sequel/user_repository.rb
 - spec/support/shared/contexts.rb
+- spec/support/shared/examples/repository/finders/where_or_match.rb
 - spec/support/tables/active_record.rb
 - spec/support/tables/sequel.rb
+- spec/unit/entity/association/reference_spec.rb
 - spec/unit/entity/composable_spec.rb
-- spec/unit/entity/relation_spec.rb
 - spec/unit/repository/query_method_spec.rb
 has_rdoc: 

data/lib/datamappify/data/criteria/active_record/find_multiple.rb

@@ -1,40 +0,0 @@
-require 'datamappify/data/criteria/relational/find_multiple'
-
-module Datamappify
-  module Data
-    module Criteria
-      module ActiveRecord
-        class FindMultiple < Relational::FindMultiple
-          private
-
-          # @return [Array]
-          def records
-            source_class.joins(@secondaries.map(&:source_key)).where(
-              structured_criteria(primaries, secondaries)
-            )
-          end
-
-          # @param primaries [Array<Attribute>]
-          #
-          # @param secondaries [Array<Attribute>]
-          #
-          # @return [Hash]
-          def structured_criteria(primaries, secondaries)
-            _criteria = {}
-
-            primaries.each do |primary|
-              _criteria[primary.source_attribute_key] = primary.value
-            end
-
-            secondaries.each do |secondary|
-              _criteria[secondary.source_table] ||= {}
-              _criteria[secondary.source_table][secondary.source_attribute_key] = secondary.value
-            end
-
-            _criteria
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,25 +0,0 @@
-module Datamappify
-  module Data
-    module Criteria
-      module Relational
-        class Find < Common
-          def perform
-            record = source_class.where(criteria).first
-
-            update_entity_with(record) if record
-
-            record
-          end
-
-          private
-
-          def update_entity_with(record)
-            attributes.each do |attribute|
-              entity.send("#{attribute.name}=", record.send(attribute.source_attribute_name))
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-require 'datamappify/data/criteria/relational/find'
-require 'datamappify/data/criteria/relational/concerns/set_criteria'
-
-module Datamappify
-  module Data
-    module Criteria
-      module Relational
-        class FindByKey < Find
-          include Concerns::SetCriteria
-
-          def initialize(source_class, entity, attributes, options = {}, &block)
-            super(source_class, entity, nil, attributes, options, &block)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datamappify/data/criteria/sequel/find_multiple.rb

@@ -1,43 +0,0 @@
-require 'datamappify/data/criteria/relational/find_multiple'
-
-module Datamappify
-  module Data
-    module Criteria
-      module Sequel
-        class FindMultiple < Relational::FindMultiple
-          private
-
-          # @return [Array]
-          def records
-            query_builder = source_class
-
-            secondaries.each do |secondary|
-              query_builder = query_builder.join(secondary.source_table, secondary.primary_reference_key => :id)
-            end
-
-            query_builder.where(structured_criteria(primaries, secondaries))
-          end
-
-          # @param primaries [Array<Attribute>]
-          #
-          # @param secondaries [Array<Attribute>]
-          #
-          # @return [Hash]
-          def structured_criteria(primaries, secondaries)
-            _criteria = {}
-
-            primaries.each do |primary|
-              _criteria[primary.source_attribute_key] = primary.value
-            end
-
-            secondaries.each do |secondary|
-              _criteria[:"#{secondary.source_table}__#{secondary.source_attribute_name}"] = secondary.value
-            end
-
-            _criteria
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datamappify/entity/relation.rb

@@ -1,61 +0,0 @@
-module Datamappify
-  module Entity
-    module Relation
-      def self.included(klass)
-        klass.class_eval do
-          cattr_accessor :reference_keys
-          extend DSL
-
-          self.reference_keys = []
-        end
-      end
-
-      module DSL
-        # @param entity_name [Symbol, String]
-        #
-        # @return [void]
-        def references(entity_name)
-          attribute_name = :"#{entity_name}_id"
-
-          create_attribute attribute_name, Integer
-          create_accessor entity_name
-          record_attribute attribute_name
-        end
-
-        private
-
-        # @param entity_name (see #references)
-        #
-        # @return [void]
-        def create_accessor(entity_name)
-          class_eval <<-CODE, __FILE__, __LINE__ + 1
-            attr_reader :#{entity_name}
-
-            def #{entity_name}=(entity)
-              @#{entity_name}        = entity
-              self.#{entity_name}_id = entity.nil? ? nil : entity.id
-            end
-          CODE
-        end
-
-        # @param name [Symbol]
-        #
-        # @param type [Class]
-        #
-        # @param options [any]
-        #
-        # @return [void]
-        def create_attribute(name, type, *args)
-          attribute name, type, *args
-        end
-
-        # @param attribute_name [Symbol]
-        #
-        # @return [Array]
-        def record_attribute(attribute_name)
-          self.reference_keys << attribute_name
-        end
-      end
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-module Datamappify
-  module Repository
-    module QueryMethod
-      class FindMultiple < Method
-        # @param options (see Method#initialize)
-        #
-        # @param where [Hash]
-        #   a hash containing all the find criterias
-        def initialize(options, criteria)
-          super
-          @criteria = criteria
-        end
-
-        # @return [Array<Entity>]
-        def perform
-          dispatch_criteria_to_default_source(
-            :FindMultiple, data_mapper.entity_class, @criteria, data_mapper.attributes
-          )
-        end
-
-        # @see Method#reader?
-        def reader?
-          true
-        end
-      end
-    end
-  end
-end