flatter-extensions 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3ccff2224155cdb168ccd7de33cadeacb42d34b
-  data.tar.gz: 16f61b126dc24a8b68dc04fa8dff925bc2fd6a7b
+  metadata.gz: d1610548722ed156df3b6ec87c309f3932bb4cf5
+  data.tar.gz: 3babab0a77a55252c362bb0f1652cb77131264b4
 SHA512:
-  metadata.gz: a0405d1ce282f152a014365af8c51d26d9f7e18c3f2f8ca5ffac5971e55551e289359a74408f78051e6fbc5f0226092558171c4b8060ad58ca82c95ac11647b7
-  data.tar.gz: a72f133129b400d4c281a0694278d73c5dabd3c7fbe0bdd924787158c717bf68917131457280de05a880aab24f57e62d1068be6b3d3a0246216c70cd00b6832f
+  metadata.gz: b247e946523b399435929d1e8da0a198a249cc1ca8877ddfa60ee10c269c4ee73890f20e4b78f8a9af5eb7a0145c6b6b822187fef1fe285fe91b1293ced345c4
+  data.tar.gz: bd68d670ccb3c43c2a6222e353028e5f9047b197128efd193145f5c304cd486af2c2c068620d3fc56ece75a6e875b8e15965c48851c3486a28f0603b0281d4d0

data/README.md

@@ -153,19 +153,6 @@ single mapper object with plain hash of attributes that can be used to render a
 used as a form object itself to distribute form params among records, or used in
 your API, encapsulating processing logic with reusable traits.
 
-`:active_record` extension depends on `:skipping` extension to be able to utilize
-it properly. This means that if you use `:active_record` extension, `:skipping`
-will be used automatically. Although there will be no harm using it explicitly
-like:
-
-```ruby
-Flatten.configure do |f|
-  f.use :order
-  f.use :skipping
-  f.use :active_record
-end
-```
-
 When using `:active_record` extension, you should keep in mind following things:
 
 #### Mounted target from association
@@ -177,26 +164,38 @@ will be tried to be derived from relevant association. For example:
 class Person < ActiveRecord::Base
   belongs_to :user
   has_one :location
+  has_many :notes
   has_many :phones
 end
 
 class PersonMapper < Flatter::Mapper
   mount :user
   mount :location
-  mount :phone
+  mount :note
+  mount :phones
 end
 ```
 
 Here we have:
 - `:user` is a `:belongs_to` association. Target for mounted `UserMapper` will
   be by default fetched as `person.user || person.build_user`.
+
 - `:location` is a `:has_one` association. Just like `:user`, target for mounted
   `LocationMapper` will be fetched as `person.location || person.build_location`.
-- `:phones` is a `:has_many` association, and we map **singular** phone. In this
-  case target for `PhoneMapper` is fetched as `person.phones.build`. Thus, you may
+
+- `:notes` is a `:has_many` association, and we map **singular** note. In this
+  case target for `PhoneMapper` is fetched as `person.notes.build`. Thus, you may
   want to `skip!` this mounting before save or validation to prevent creating
   freshly-built record, if it was not populated with any values.
 
+- `:phones` is a `:has_many` association, mounted as a collection mountings `:phones`.
+  In this case whole association would handled by mapper as a collection (this
+  feature is available starting from `0.2.0` version of `flatter`). Thus, reading
+  instance of `PersonMapper` will give you array of `phones`, each of which will
+  have it's own `key` value dependent on it's definition. See
+  [flatter Collections](https://github.com/akuzko/flatter#collections) for more
+  details on how mapped collections are handled.
+
 Mounting collection associations and working with them as with collections is
 not supported for now.
 

data/flatter-extensions.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "flatter"
+  spec.add_dependency "flatter", "~> 0.2"
 
   spec.add_development_dependency "activerecord", ">= 4.0"
   spec.add_development_dependency "sqlite3"

data/lib/flatter/extensions/active_record.rb

@@ -1,143 +1,130 @@
-if defined? ActiveRecord
-  module Flatter
-    module Extensions
-      module ActiveRecord
-        extend ::Flatter::Extension
-
-        module SkipCallbacks
-          def save_without_callbacks
-            @_saving_without_callbacks = true
-            create_or_update
-          ensure
-            remove_instance_variable('@_saving_without_callbacks')
-          end
+module Flatter
+  module Extensions
+    module ActiveRecord
+      extend ::Flatter::Extension
+
+      module SkipCallbacks
+        def save_without_callbacks
+          @_saving_without_callbacks = true
+          create_or_update
+        ensure
+          remove_instance_variable('@_saving_without_callbacks')
+        end
 
-          private
+        private
 
-          def _run_save_callbacks
-            @_saving_without_callbacks ? yield : super
-          end
-
-          def _run_create_callbacks
-            @_saving_without_callbacks ? yield : super
-          end
+        def _run_save_callbacks
+          @_saving_without_callbacks ? yield : super
+        end
 
-          def _run_update_callbacks
-            @_saving_without_callbacks ? yield : super
-          end
+        def _run_create_callbacks
+          @_saving_without_callbacks ? yield : super
         end
 
-        register_as :active_record
+        def _run_update_callbacks
+          @_saving_without_callbacks ? yield : super
+        end
+      end
 
-        depends_on :skipping
+      register_as :active_record
 
-        hooked do
-          ::ActiveRecord::Base.send(:prepend, SkipCallbacks)
-        end
+      hooked do
+        ::ActiveRecord::Base.send(:prepend, SkipCallbacks)
+      end
 
-        factory.extend do
-          def default_target_from(mapper)
-            return super unless mapper.ar?
+      factory.extend do
+        def default_target_from(mapper)
+          return super unless mapper.ar?
 
-            target_from_association(mapper.target) || super
-          end
-          private :default_target_from
+          target_from_association(mapper.target) || super
+        end
+        private :default_target_from
 
-          def target_from_association(target)
-            reflection = reflection_from_target(target)
+        def target_from_association(target)
+          reflection = reflection_from_target(target)
 
-            return unless reflection.present?
+          return unless reflection.present?
 
-            case reflection.macro
-            when :has_one, :belongs_to
-              target.public_send(name) || target.public_send("build_#{name}")
-            when :has_many
-              target.association(reflection.name).build
-            end
+          case reflection.macro
+          when :has_one, :belongs_to
+            target.public_send(name) || target.public_send("build_#{name}")
+          when :has_many
+            association = target.association(reflection.name)
+            collection? ? association.load_target : association.build
           end
-          private :target_from_association
+        end
+        private :target_from_association
 
-          def reflection_from_target(target)
-            target_class = target.class
-            reflection   = target_class.reflect_on_association(name.to_sym)
-            reflection || target_class.reflect_on_association(name.pluralize.to_sym)
-          end
-          private :reflection_from_target
+        def reflection_from_target(target)
+          target_class = target.class
+          reflection   = target_class.reflect_on_association(name.to_sym)
+          reflection || target_class.reflect_on_association(name.pluralize.to_sym)
         end
+        private :reflection_from_target
+      end
 
-        mapper.add_options :foreign_key, :mounter_foreign_key do
-          def apply(*)
-            return super unless ar?
+      mapper.add_options :foreign_key, :mounter_foreign_key do
+        def apply(*)
+          return super unless ar?
 
-            !!::ActiveRecord::Base.transaction do
-              super or raise ::ActiveRecord::Rollback
-            end
+          !!::ActiveRecord::Base.transaction do
+            super or raise ::ActiveRecord::Rollback
           end
+        end
 
-          def save
-            !!::ActiveRecord::Base.transaction do
-              begin
-                super
-              rescue ::ActiveRecord::StatementInvalid
-                raise ::ActiveRecord::Rollback
-              end
+        def save
+          !!::ActiveRecord::Base.transaction do
+            begin
+              super
+            rescue ::ActiveRecord::StatementInvalid
+              raise ::ActiveRecord::Rollback
             end
           end
+        end
 
-          def save_target
-            return super unless ar?
+        def delete_target_item(item)
+          item.destroy! && super
+        end
 
-            assign_foreign_keys_from_mountings
+        def save_target
+          return super unless ar?
 
-            was_new = target.new_record?
-            result = target.save_without_callbacks
+          assign_foreign_keys_from_mountings
 
-            if result && was_new
-              assign_foreign_keys_for_mountings
-            end
+          result = target.save_without_callbacks
 
-            result != false
-          end
-          protected :save_target
+          assign_foreign_keys_for_mountings if result
 
-          def assign_foreign_keys_from_mountings
-            associated_mountings(:mounter_foreign_key).each do |mounting|
-              target[mounting.mounter_foreign_key] = mounting.target.id
-            end
-          end
-          private :assign_foreign_keys_from_mountings
+          result != false
+        end
+        protected :save_target
 
-          def assign_foreign_keys_for_mountings
-            associated_mountings(:foreign_key).each do |mounting|
-              mounting.target[mounting.foreign_key] = target.id
-            end
+        def assign_foreign_keys_from_mountings
+          associated_mountings(:mounter_foreign_key).each do |mounting|
+            target[mounting.mounter_foreign_key] = mounting.target.id
           end
-          private :assign_foreign_keys_for_mountings
+        end
+        private :assign_foreign_keys_from_mountings
 
-          def associated_mountings(key)
-            root_mountings.select do |mounting|
-              mounter = mounting.mounter
-              mounter = mounter.mounter if mounter.trait?
-              mounting.options.key?(key) && mounter == self
-            end
-          end
-          private :associated_mountings
-
-          def skip!
-            if ar?
-              if target.new_record?
-                target.instance_variable_set('@destroyed', true)
-              else
-                target.restore_attributes
-              end
-            end
-            super
+        def assign_foreign_keys_for_mountings
+          associated_mountings(:foreign_key).each do |mounting|
+            mounting.target[mounting.foreign_key] = target.id
           end
+        end
+        private :assign_foreign_keys_for_mountings
 
-          def ar?
-            target.class < ::ActiveRecord::Base
+        def associated_mountings(key)
+          root_mountings.select do |mounting|
+            mounter = mounting.mounter
+            mounter = mounter.mounter if mounter.trait?
+            mounting.options.key?(key) && mounter == self
           end
         end
+        private :associated_mountings
+
+        def ar?
+          target.class < ::ActiveRecord::Base
+        end
       end
     end
   end

data/lib/flatter/extensions/multiparam.rb

@@ -21,11 +21,13 @@ module Flatter
         end
 
         def extract_multiparams!(params)
-          mappings.each do |name, mapping|
+          return super if collection?
+
+          local_mappings.each do |mapping|
             next unless mapping.multiparam?
 
             param_keys = params.keys.
-              select{ |key| key.to_s =~ /#{name}\(\d+[if]\)/ }.
+              select{ |key| key.to_s =~ /#{mapping.name}\(\d+[if]\)/ }.
               sort_by{ |key| key.to_s[/\((\d+).*\)/, 1].to_i }
 
             next if param_keys.empty?
@@ -41,7 +43,7 @@ module Flatter
               values.push value
             end
 
-            params[name] = args
+            params[mapping.name] = args
           end
         end
         private :extract_multiparams!

data/lib/flatter/extensions/skipping.rb

@@ -20,6 +20,7 @@ module Flatter
         end
 
         def skip!
+          collection.each(&:skip!) if collection?
           @skipped = true
         end
 

data/lib/flatter/extensions/version.rb

@@ -1,5 +1,5 @@
 module Flatter
   module Extensions
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: flatter-extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Artem Kuzko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement