datamappify 0.70.0.beta1 → 0.70.0.beta2

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

@@ -8,7 +8,10 @@ module Datamappify
           klass.class_eval do
             include Hooks
 
-            define_hooks :before_create,  :after_create,
+            define_hooks :before_init,    :after_init,
+                         :before_load,    :after_load,
+                         :before_find,    :after_find,
+                         :before_create,  :after_create,
                          :before_update,  :after_update,
                          :before_save,    :after_save,
                          :before_destroy, :after_destroy,
@@ -18,21 +21,45 @@ module Datamappify
 
         # @param entity [Entity]
         #
+        # @param types (see #_run_callbacks)
+        #
+        # @yield (see #_run_callbacks)
+        #
+        # @return [void]
+        def run_callbacks(entity, *types, &block)
+          _run_callbacks(false, entity, *types, &block)
+        end
+
+        # @param criteria [any]
+        #
+        # @param types (see #_run_callbacks)
+        #
+        # @yield (see #_run_callbacks)
+        #
+        # @return [void]
+        def run_callbacks_and_return_entity(criteria, *types, &block)
+          _run_callbacks(true, criteria, *types, &block)
+        end
+
+        private
+
+        # @param return_yield_value [Boolean]
+        #
+        # @param input [any]
+        #
         # @param types [Symbol]
         #   e.g. :create, :update, :save or :destroy
         #
         # @yield callback
         #
         # @return [void]
-        def run_callbacks(entity, *types, &block)
-          run_hooks(types, :before, entity) &&
+        def _run_callbacks(return_yield_value, input, *types, &block)
+          run_hooks(types, :before, input) &&
             (yield_value = block.call) &&
-            run_hooks(types.reverse, :after, entity) &&
+            run_hooks(types.reverse, :after, (return_yield_value ? yield_value : input)) &&
             yield_value
         end
 
-        private
-
         # @param types [Array<Symbol]
         #   an array of types (e.g. :create, :update, :save or :destroy)
         #

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

@@ -4,7 +4,9 @@ module Datamappify
       class Count < Method
         # @return [Integer]
         def perform
-          dispatch_criteria_to_default_source(:Count)
+          dispatch_criteria_to_default_source(
+            :Count, data_mapper.entity_class, criteria, data_mapper.attributes
+          )
         end
 
         # @see Method#reader?

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

@@ -29,6 +29,8 @@ module Datamappify
           @lazy_load   = options[:lazy_load?]
 
           @entity = @criteria = entity_or_criteria
+
+          @criteria.symbolize_keys! if @criteria.is_a?(Hash)
         end
 
         # Should the method be aware of the dirty state?
@@ -93,11 +95,11 @@ module Datamappify
         def walk_attributes(criteria_name, entity)
           _primary_record = nil
 
-          attributes_walker(entity) do |provider_name, source_class, attributes|
+          attributes_walker(entity) do |provider_name, source_class, options|
             walk_path = if reader?
-              { nil => attributes }
+              { nil => options[:attributes] }
             else
-              attributes.classify { |attr| attr.options[:via] }
+              options[:attributes].classify { |attr| attr.options[:via] }
             end
 
             walk_path.each do |via, attrs|
@@ -106,8 +108,9 @@ module Datamappify
                 source_class,
                 entity,
                 attrs,
-                :via            => via,
-                :primary_record => _primary_record
+                :via              => via,
+                :primary_record   => _primary_record,
+                :dirty_attributes => options[:dirty_attributes]
               )
 
               _primary_record ||= record

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

@@ -21,7 +21,12 @@ module Datamappify
 
           # @return [void]
           def perform_read
-            @entity.send("#{@reference_name}=", fetch_referenced_entities)
+            case reference_type
+            when :one
+              @entity.send("#{@reference_name}=", fetch_referenced_entity)
+            when :many
+              @entity.send("#{@reference_name}=", fetch_referenced_entities)
+            end
           end
 
           # @return [void]
@@ -39,14 +44,32 @@ module Datamappify
             end
           end
 
-          # @return [Array]
+          # @return [Symbol]
+          #   :one or :many
+          def reference_type
+            reference = @entity.send(:attribute_set).detect do |attr|
+              attr.name == @reference_name
+            end
+
+            case reference
+            when Virtus::Attribute::EmbeddedValue then :one
+            when Virtus::Attribute::Collection    then :many
+            end
+          end
+
+          # @return [Entity]
+          def fetch_referenced_entity
+            @repository.where(reference_key => @entity.id).first
+          end
+
+          # @return [Array<Entity>]
           def fetch_referenced_entities
             @repository.where(reference_key => @entity.id)
           end
 
-          # @return [Array]
+          # @return [Array<Entity>]
           def referenced_entities
-            @entity.send(@reference_name)
+            Array.wrap(@entity.send(@reference_name))
           end
 
           # @return (see Data::Mapper::Attribute#reference_key)

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

@@ -12,6 +12,8 @@ module Datamappify
             @dirty_aware      = options[:dirty_aware?]
             @dirty_attributes = options[:dirty_attributes]
             @query_method     = options[:query_method]
+
+            @options = options
           end
 
           # @yield [provider_name, source_class, attributes]
@@ -47,7 +49,7 @@ module Datamappify
           # @return [void]
           def perform_walk(source_class, attributes, &block)
             if do_walk?(source_class, attributes)
-              block.call(@provider_name, source_class, attributes)
+              block.call(@provider_name, source_class, @options.merge(:attributes => attributes))
               walk_performed(attributes)
             end
           end

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

@@ -13,11 +13,6 @@ module Datamappify
           false
         end
 
-        # @see Method#dirty_aware?
-        def dirty_aware?
-          true
-        end
-
         # @see Method#writer?
         def writer?
           true
@@ -39,7 +34,7 @@ module Datamappify
         end
 
         def context
-          self.class.name.demodulize.underscore.to_sym
+          self.class.name.demodulize.downcase.to_sym
         end
       end
     end

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

@@ -4,6 +4,10 @@ module Datamappify
   module Repository
     module QueryMethod
       class Update < Save
+        # @see Method#dirty_aware?
+        def dirty_aware?
+          true
+        end
       end
     end
   end

data/lib/datamappify/repository/query_methods.rb

@@ -8,6 +8,22 @@ module Datamappify
       def self.included(klass)
         klass.class_eval do
           include QueryMethod::Callbacks
+
+          if defined?(Kaminari)
+            require 'datamappify/extensions/kaminari/criteria_processor'
+            include Extensions::Kaminari::CriteriaProcessor
+          end
+        end
+      end
+
+      # Initialises the entity so hooks can be attached
+      #
+      # @param entity_class [Class]
+      #
+      # @return [Entity]
+      def init(entity_class)
+        run_callbacks_and_return_entity entity_class, :init do
+          entity_class.new
         end
       end
 
@@ -17,7 +33,9 @@ module Datamappify
       #
       # @return [Boolean]
       def exists?(entity)
-        QueryMethod::Exists.new(query_options, entity).perform
+        run_callbacks entity, :load, :find do
+          QueryMethod::Exists.new(query_options, entity).perform
+        end
       end
 
       # @param criteria [Integer, String]
@@ -25,7 +43,9 @@ module Datamappify
       #
       # @return [Entity, nil]
       def find(criteria)
-        QueryMethod::Find.new(query_options, criteria).perform
+        run_callbacks_and_return_entity criteria, :load, :find do
+          QueryMethod::Find.new(query_options, criteria).perform
+        end
       end
 
       # @param criteria [Hash]
@@ -33,7 +53,9 @@ module Datamappify
       #
       # @return [Entity]
       def where(criteria)
-        QueryMethod::Where.new(query_options, criteria).perform
+        QueryMethod::Where.new(query_options, criteria).perform.map do |entity|
+          run_callbacks(entity, :load, :find) { entity }
+        end
       end
 
       # @param criteria [Hash]
@@ -41,14 +63,18 @@ module Datamappify
       #
       # @return [Entity]
       def match(criteria)
-        QueryMethod::Match.new(query_options, criteria).perform
+        QueryMethod::Match.new(query_options, criteria).perform.map do |entity|
+          run_callbacks(entity, :load, :find) { entity }
+        end
       end
 
       # Returns a collection of all the entities in the repository
       #
       # @return [Array<Entity>]
       def all
-        QueryMethod::Where.new(query_options, {}).perform
+        QueryMethod::Where.new(query_options, {}).perform.map do |entity|
+          run_callbacks(entity, :load, :find) { entity }
+        end
       end
 
       # @param criteria [Hash]
@@ -56,7 +82,9 @@ module Datamappify
       #
       # @return [Array<Entity>]
       def criteria(criteria)
-        QueryMethod::Criteria.new(query_options, criteria).perform
+        QueryMethod::Criteria.new(query_options, criteria).perform.map do |entity|
+          run_callbacks(entity, :load, :find) { entity }
+        end
       end
 
       # @param entity [Entity]
@@ -64,7 +92,7 @@ module Datamappify
       #
       # @return [Entity, false]
       def create(entity)
-        run_callbacks entity, :save, :create do
+        run_callbacks entity, :load, :save, :create do
           QueryMethod::Create.new(query_options, entity).perform
         end
       end
@@ -83,7 +111,7 @@ module Datamappify
       #
       # @return [Entity, false]
       def update(entity)
-        run_callbacks entity, :save, :update do
+        run_callbacks entity, :load, :save, :update do
           QueryMethod::Update.new(query_options, entity).perform
         end
       end
@@ -118,7 +146,7 @@ module Datamappify
       #
       # @return [void, false]
       def destroy(entity)
-        run_callbacks entity, :destroy do
+        run_callbacks entity, :load, :destroy do
           QueryMethod::Destroy.new(query_options, entity).perform
         end
       end
@@ -132,9 +160,12 @@ module Datamappify
         destroy(entity) || raise(Data::EntityNotDestroyed.new(entity.errors))
       end
 
+      # @param criteria [Hash]
+      #   a hash containing criteria
+      #
       # @return [Integer]
-      def count
-        QueryMethod::Count.new(query_options).perform
+      def count(criteria = {})
+        QueryMethod::Count.new(query_options, criteria).perform
       end
 
       private

data/lib/datamappify/repository/unit_of_work/persistent_states/object.rb

@@ -51,7 +51,7 @@ module Datamappify
           #
           # @return [Boolean]
           def new?
-            @entity.id.nil?
+            !@entity.persisted?
           end
 
           private
@@ -85,7 +85,7 @@ module Datamappify
           # @return [void]
           def construct_setter(name)
             define_singleton_method "#{name}=" do |value|
-              send(:attribute_will_change!, name) unless send(name) == value
+              mark_as_dirty(name) unless send(name) == value
               set_value(name, value)
             end
           end

data/lib/datamappify/version.rb

@@ -1,3 +1,3 @@
 module Datamappify
-  VERSION = '0.70.0.beta1'
+  VERSION = '0.70.0.beta2'
 end

data/spec/extensions/kaminari_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+shared_examples_for "extensions - Kaminari" do |data_provider|
+  include_context "user repository for finders", data_provider
+
+  context "#{data_provider}" do
+    describe "pagination" do
+      let(:records) { user_repository.criteria(page: 2, per: 1) }
+      subject       { records }
+
+      it { should have(1).user }
+
+      its(:current_page) { should == 2 }
+      its(:limit_value)  { should == 1 }
+      its(:offset_value) { should == 1 }
+      its(:total_count)  { should == 3 }
+
+      its(:first) { should == existing_user_1 }
+    end
+  end
+end
+
+describe Datamappify::Repository do
+  DATA_PROVIDERS.each do |data_provider|
+    it_behaves_like "extensions - Kaminari", data_provider
+  end
+end

data/spec/repository/associations/has_many_spec.rb

@@ -108,18 +108,6 @@ shared_examples_for "has_many records from nested form attributes with invalid d
     )
   end
 
-  context "before saving" do
-    subject { new_group }
-
-    its(:name)   { should == 'New People' }
-    its(:users)  { should have(3).items }
-    its(:valid?) { should be_false }
-
-    it "does not save" do
-      -> { group_repository.save!(new_group) }.should raise_error(Datamappify::Data::EntityNotSaved)
-    end
-  end
-
   context "non-saved dirty new group" do
     before do
       group_repository.save(new_group)
@@ -130,6 +118,10 @@ shared_examples_for "has_many records from nested form attributes with invalid d
     its(:name)   { should == 'New People' }
     its(:users)  { should have(3).items }
     its(:valid?) { should be_false }
+
+    it "does not save" do
+      -> { group_repository.save!(new_group) }.should raise_error(Datamappify::Data::EntityNotSaved)
+    end
   end
 
   context "fresh copy of the non-saved new group" do
@@ -163,35 +155,6 @@ shared_examples_for "has_many records destroy from nested form attributes" do
   its(:users) { should have(1).item }
 end
 
-shared_examples_for "has_many data records" do |data_provider|
-  let(:data_groups)               { "Datamappify::Data::Record::#{data_provider}::Group".constantize }
-  let(:data_super_users)          { "Datamappify::Data::Record::#{data_provider}::SuperUser".constantize }
-  let(:data_users)                { "Datamappify::Data::Record::#{data_provider}::User".constantize }
-  let(:data_user_driver_licenses) { "Datamappify::Data::Record::#{data_provider}::UserDriverLicense".constantize }
-
-  before do
-    saved_group
-  end
-
-  describe "data records" do
-    it "does not create extra primary data records" do
-      expect { saved_group }.to change { data_groups.count }.by(0)
-    end
-
-    it "does not create extra associated primary data records" do
-      expect { saved_group }.to change { data_super_users.count }.by(0)
-    end
-
-    it "does not create extra associated secondary data records" do
-      expect { saved_group }.to change { data_users.count }.by(0)
-    end
-
-    it "does not create extra secondary data records" do
-      expect { saved_group }.to change { data_user_driver_licenses.count }.by(0)
-    end
-  end
-end
-
 shared_examples_for "has_many" do |data_provider|
   let(:user_repository)  { "SuperUserRepository#{data_provider}".constantize }
   let(:group_repository) { "GroupRepository#{data_provider}".constantize }
@@ -223,25 +186,29 @@ shared_examples_for "has_many" do |data_provider|
       it_behaves_like "has_many new records created from nested form attributes"
       it_behaves_like "has_many records created from nested form attributes"
       it_behaves_like "has_many records from nested form attributes with invalid data"
-      it_behaves_like "has_many data records", data_provider
+      it_behaves_like "association data records", data_provider
     end
 
     context "reloaded return" do
       let(:saved_group) { group_repository.save!(group); group_repository.find(group.id) }
 
       it_behaves_like "has_many records"
+      it_behaves_like "has_many new records created from nested form attributes"
       it_behaves_like "has_many records created from nested form attributes"
       it_behaves_like "has_many records from nested form attributes with invalid data"
       it_behaves_like "has_many records destroy from nested form attributes"
+      it_behaves_like "association data records", data_provider
     end
 
     context "collection return" do
       let(:saved_group) { group_repository.save!(group); group_repository.all.detect { |g| g.id == group.id } }
 
       it_behaves_like "has_many records"
+      it_behaves_like "has_many new records created from nested form attributes"
       it_behaves_like "has_many records created from nested form attributes"
       it_behaves_like "has_many records from nested form attributes with invalid data"
       it_behaves_like "has_many records destroy from nested form attributes"
+      it_behaves_like "association data records", data_provider
     end
 
     context "criteria return" do