flatter-extensions 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1610548722ed156df3b6ec87c309f3932bb4cf5
-  data.tar.gz: 3babab0a77a55252c362bb0f1652cb77131264b4
+  metadata.gz: 4542fbf33538d98c2fadc27ef9b858fed8555dca
+  data.tar.gz: 08923753f3dab118027e8d9e4012e61bbf80780d
 SHA512:
-  metadata.gz: b247e946523b399435929d1e8da0a198a249cc1ca8877ddfa60ee10c269c4ee73890f20e4b78f8a9af5eb7a0145c6b6b822187fef1fe285fe91b1293ced345c4
-  data.tar.gz: bd68d670ccb3c43c2a6222e353028e5f9047b197128efd193145f5c304cd486af2c2c068620d3fc56ece75a6e875b8e15965c48851c3486a28f0603b0281d4d0
+  metadata.gz: 324a581971e9b55af3fceaa4df3d7975028491a4269876ebc64da21cd3135ae69fdf27727ac16f8149b507571c2e425afb25a76301b4af7fecc4f9f23c7cd496
+  data.tar.gz: 959e2f9da6ba4bf3b7bf2c76e5db7c698a539e4bcc7a2ff2b43a7322f1660ecb256c8d27ce6179f83d7d2dc329be33f4dc73fe38723ea61b4e6a5ffc7565672b

data/README.md

@@ -92,6 +92,20 @@ class PersonMapper < Flatter::Mapper
 end
 ```
 
+Starting from version `0.2.1`, there are `:skip_if` and `:reject_if` options
+for mounted mappers. First one is used for skipping mounting if passed condition
+is evaluated to non-falsy value. Second one is used to reject specific sets of
+params before they are passed for collection processing.
+
+```ruby
+class EmployeeMapper < Flatter::Mapper
+  map :first_name, :last_name
+
+  mount :department, skip_if: -> { department_name.blank? }
+  mount :projects, reject_if: ->(params){ params[:project_name].blank? }
+end
+```
+
 ### Order
 
 ```ruby
@@ -202,11 +216,13 @@ not supported for now.
 Keep in mind that you can always pass `:target` option to control targets of
 mounted mappers.
 
-#### Saving is performed without callbacks and validation
+#### Saving is performed without validation and callbacks by default
 
-That's right. On save your models will not be validated and their `:save` callbacks
-will not be executed. All such form-related business logic should be handled by mappers,
-keeping models clean for taking care about inner application business logic only.
+On save your models will not be validated (and their validation callbacks will
+not be called), and their `:save` callbacks will not be executed. However,
+starting from version `0.2.1`, you can use `Flatter::Mapper` class-level methods
+`enable_callback` (and it's alias `enable_callbacks`) to enable specific
+callbacks, such as `enable_callbacks :create, :update`.
 
 For example, if you have multi-step form and want to put all your validations in
 model, there will be dozens of boolean checks to use specific validations only

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", "~> 0.2"
+  spec.add_dependency "flatter", ">= 0.2.1"
 
   spec.add_development_dependency "activerecord", ">= 4.0"
   spec.add_development_dependency "sqlite3"

data/lib/flatter/extensions/active_record.rb

@@ -3,33 +3,46 @@ module Flatter
     module ActiveRecord
       extend ::Flatter::Extension
 
-      module SkipCallbacks
-        def save_without_callbacks
-          @_saving_without_callbacks = true
+      module CallbacksControl
+        def save_with_callbacks(callbacks)
+          @_saving_callbacks = callbacks
           create_or_update
         ensure
-          remove_instance_variable('@_saving_without_callbacks')
+          remove_instance_variable('@_saving_callbacks')
         end
 
         private
 
         def _run_save_callbacks
-          @_saving_without_callbacks ? yield : super
+          return super unless defined? @_saving_callbacks
+          @_saving_callbacks.include?(:save) ? super : yield
         end
 
         def _run_create_callbacks
-          @_saving_without_callbacks ? yield : super
+          return super unless defined? @_saving_callbacks
+          @_saving_callbacks.include?(:create) ? super : yield
         end
 
         def _run_update_callbacks
-          @_saving_without_callbacks ? yield : super
+          return super unless defined? @_saving_callbacks
+          @_saving_callbacks.include?(:update) ? super : yield
         end
       end
 
       register_as :active_record
 
       hooked do
-        ::ActiveRecord::Base.send(:prepend, SkipCallbacks)
+        ::ActiveRecord::Base.send(:prepend, CallbacksControl)
+        Flatter::Mapper::Collection::Concern.module_eval do
+          alias build_collection_item_without_ar build_collection_item
+
+          def build_collection_item
+            return build_collection_item_without_ar unless mounter!.try(:ar?)
+
+            mounter!.target.association(name.to_sym).try(:build) ||
+              build_collection_item_without_ar
+          end
+        end
       end
 
       factory.extend do
@@ -64,6 +77,28 @@ module Flatter
       end
 
       mapper.add_options :foreign_key, :mounter_foreign_key do
+        extend ActiveSupport::Concern
+        attr_reader :ar_error
+
+        included do
+          class_attribute :enabled_ar_callbacks
+          self.enabled_ar_callbacks = []
+        end
+
+        class_methods do
+          def enable_ar_callbacks(*callbacks)
+            self.enabled_ar_callbacks += callbacks
+            enabled_ar_callbacks.uniq!
+          end
+
+          def disable_ar_callbacks(*callbacks)
+            self.enabled_ar_callbacks -= callbacks
+          end
+
+          alias enable_ar_callback enable_ar_callbacks
+          alias disable_ar_callback disable_ar_callbacks
+        end
+
         def apply(*)
           return super unless ar?
 
@@ -75,15 +110,18 @@ module Flatter
         def save
           !!::ActiveRecord::Base.transaction do
             begin
+              @ar_error = nil
               super
-            rescue ::ActiveRecord::StatementInvalid
+            rescue ::ActiveRecord::StatementInvalid => e
+              @ar_error = e
               raise ::ActiveRecord::Rollback
             end
           end
         end
 
         def delete_target_item(item)
-          item.destroy! && super
+          item.destroy! if ar?(item)
+          super
         end
 
         def save_target
@@ -91,7 +129,7 @@ module Flatter
 
           assign_foreign_keys_from_mountings
 
-          result = target.save_without_callbacks
+          result = target.save_with_callbacks(enabled_ar_callbacks)
 
           assign_foreign_keys_for_mountings if result
 
@@ -122,8 +160,8 @@ module Flatter
         end
         private :associated_mountings
 
-        def ar?
-          target.class < ::ActiveRecord::Base
+        def ar?(object = target)
+          object.class < ::ActiveRecord::Base
         end
       end
     end

data/lib/flatter/extensions/order.rb

@@ -5,11 +5,22 @@ module Flatter
 
       register_as :order
 
+      mapping.add_option :index do
+        def index
+          options[:index] || 0
+        end
+      end
+
       mapper.add_option :index do
         def index
           options[:index] || 0
         end
 
+        def local_mappings
+          @_local_mappings ||= super.sort_by(&:index)
+        end
+        protected :local_mappings
+
         def mappers_chain(context)
           super.sort_by do |mapper|
             index = mapper.index

data/lib/flatter/extensions/skipping.rb

@@ -5,7 +5,25 @@ module Flatter
 
       register_as :skipping
 
-      mapper.extend do
+      hooked do
+        ::Flatter::Mapper::Collection.module_eval do
+          alias extract_data_without_reject extract_data
+
+          def extract_data(params)
+            extract_data_without_reject(params).tap do |data|
+              data.reject!{ |params| reject_if[params] } if reject_if?
+            end
+          end
+        end
+      end
+
+      mapper.add_options :skip_if, :reject_if do
+        extend ActiveSupport::Concern
+
+        included do
+          set_callback :validate, :before, :ignore_skipped_mountings
+        end
+
         def run_validations!
           if skipped?
             errors.clear
@@ -27,6 +45,13 @@ module Flatter
         def skipped?
           !!@skipped
         end
+
+        def ignore_skipped_mountings
+          local_mountings.each do |mapper|
+            mapper.skip! if mapper.skip_if? && instance_exec(&mapper.skip_if)
+          end
+        end
+        private :ignore_skipped_mountings
       end
     end
   end

data/lib/flatter/extensions/version.rb

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

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: flatter-extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Artem Kuzko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -135,9 +135,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -161,17 +161,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Set of extensions for Flatter gem.