active_tools 0.0.50 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fed305b8948e972bfa8d49c0d9bcbb10719c249
-  data.tar.gz: 2af83ee21be57d34ec36368ce65a00ec331d4ca6
+  metadata.gz: 3690b827d1bbd74263c304724e70dcee2edeb90d
+  data.tar.gz: a971e63143d76aeb518becfec2d20be3a4999f5e
 SHA512:
-  metadata.gz: ae3f3d27967889287e0b28102b6d1154d3480c7deff13d426151923416abc56ca3bb4e9a06347ee1a6e679747aaae809a310000d3aeb39312a291333c1ee6f45
-  data.tar.gz: 2dc855f78c179f89914d581997f92f65708279b373eab60e77cff7cf126a72d72e7f2dfaa71f048f00ac221ddc8d97086962a9da36daa8e6aa59b4e38ad0f9ab
+  metadata.gz: cdc442425869c45f6d5a580e60cf4145f1bad3e99c5c411e0e4934870644cffa63638369f2b3548b3f55902e123261a229c52e78254142457c623756bb1247b6
+  data.tar.gz: be4c77d4de9e5e21cd737b9ff1282881c46a1072c4aa63f438e03d061d844d48cd1f41b319b9fbd49812550958f08c868786ce9435b61193ff7dc3c1707d6b6d

data/lib/active_tools/action_pack/action_view/field_name.rb

@@ -0,0 +1,22 @@
+module ActiveTools
+  module ActionPack
+    module ActionView
+      module FieldName
+        
+      end
+    end
+  end
+  
+  module OnLoadActionView
+    
+    def field_name(builder, *args)
+      [object_name_to_field_id(builder.object_name), *args].join("_")
+    end
+  
+    def object_name_to_field_id(val)
+      val.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+    end
+    
+  end
+  
+end

data/lib/active_tools/active_record/adaptive_belongs_to/adapter.rb

@@ -18,13 +18,14 @@ module ActiveTools
           @update_if = @options[:update_if]
           @destroy_if = @options[:destroy_if]
           @uniq_by = Array(@options[:uniq_by]).map(&:to_s)
+          @target_process = @options[:target_process]
           association.load_target
         end
-        
+
         def klass
           association.klass||reflection.class_name.constantize
         end
-        
+
         def association
           owner.association(assoc_name)
         end
@@ -48,9 +49,9 @@ module ActiveTools
             end
           end
         end
-        
+
         def try_nullify
-          if nullify_target?    
+          if nullify_target?
             store_backup!
             self.target = nil
             true
@@ -58,10 +59,10 @@ module ActiveTools
         end
 
         def try_commit
-          try_commit_existed || try_update
+          try_commit_existed || try_restore_refreshed_backup
         end
 
-        def try_destroy          
+        def try_destroy
           try_destroy_backup
           try_destroy_target
         end
@@ -69,29 +70,25 @@ module ActiveTools
         def template_attributes
           attributes(@template, *@remote_attributes)
         end
-        
+
         def target_attributes
           attributes(target, *@remote_attributes)
         end
 
-        def try_update
+        def try_restore_refreshed_backup
           if updateable_backup?
-            warn "Adaptive updating: <#{@backup.class.name}: #{@backup.class.primary_key}: #{@backup.send(@backup.class.primary_key)}>"
-            begin
-              @backup.update(template_attributes)
-            rescue ::ActiveRecord::StaleObjectError
-              @backup.reload
-              try_update
-            rescue ::ActiveRecord::StatementInvalid
-              @backup.reload
-              try_update
+            warn "Adaptive going to update: <#{@backup.class.name}: #{@backup.class.primary_key}: #{@backup.send(@backup.class.primary_key)}>"
+            @backup.attributes = template_attributes
+            if @backup.valid?
+              restore_backup!
+              true
+            else
+              false
             end
-            restore_backup!
-            true
           end
         end
 
-        def try_commit_existed          
+        def try_commit_existed
           if @template.present? && @uniq_by.any? && (existed = detect_existed) && !(@backup.present? && same_records?(@backup, existed, :attributes => @uniq_by))
             warn "Adaptive fetching existed <#{existed.class.name}: #{existed.class.primary_key}: #{existed.send(existed.class.primary_key)}>"
             self.target = existed
@@ -99,10 +96,10 @@ module ActiveTools
               @backup.mark_for_destruction
             end
             true
-          end 
+          end
         end
 
-        def try_destroy_backup          
+        def try_destroy_backup
           if destroyable_backup?
             warn "Adaptive destroying backed up: <#{@backup.class.name}: #{@backup.class.primary_key}: #{@backup.send(@backup.class.primary_key)}>"
             begin
@@ -117,9 +114,9 @@ module ActiveTools
           end
         end
 
-        def try_destroy_target          
+        def try_destroy_target
           if destroyable_target?
-            warn "Adaptive destroying target: <#{target.class.name}: #{target.class.primary_key}: #{target.send(target.class.primary_key)}>"            
+            warn "Adaptive destroying target: <#{target.class.name}: #{target.class.primary_key}: #{target.send(target.class.primary_key)}>"
             begin
               target.destroy
             rescue ::ActiveRecord::StaleObjectError
@@ -131,6 +128,25 @@ module ActiveTools
             end
           end
         end
+        
+        def target_process_do
+          @target_process.try(:call, target, owner)
+        end
+
+        def update_target_if_changed!
+          if target.changes.any?
+            warn "Adaptive updating: <#{target.class.name}: #{target.class.primary_key}: #{target.send(target.class.primary_key)}>"
+            begin
+              target.save
+            rescue ::ActiveRecord::StaleObjectError
+              target.reload
+              update_target_if_changed!
+            rescue ::ActiveRecord::StatementInvalid
+              target.reload
+              update_target_if_changed!
+            end
+          end
+        end
 
         def clear!
           @template = nil
@@ -138,7 +154,7 @@ module ActiveTools
         end
 
         private
-        
+
         def target_id
           association.send(:target_id)
         end
@@ -174,7 +190,7 @@ module ActiveTools
         def destroyable_target?
           target.try(:persisted?) && (!target.destroyed?||target.marked_for_destruction?) && @destroy_if.try(:call, target.reload, owner)
         end
-        
+
         def attributes(object, *attrs)
           array = attrs.map do |a|
             begin
@@ -187,7 +203,7 @@ module ActiveTools
         end
 
         def create_template!
-          if target.nil? || @template.nil? 
+          if target.nil? || @template.nil?
             self.target = template
           end
         end
@@ -201,13 +217,13 @@ module ActiveTools
             @backup = nil
           end
         end
-        
+
         def store_backup!
           if target.try(:persisted?)
             @backup ||= target
           end
         end
-        
+
         def same_records?(*args)
           options = args.extract_options!
           attributes = options[:attributes]
@@ -255,10 +271,10 @@ module ActiveTools
           @template.tap do |t|
             @init_proc.try(:call, t, owner)
           end
-        end 
+        end
       end
 
     end
   end
-  
-end
+
+end

data/lib/active_tools/active_record/adaptive_belongs_to.rb

@@ -4,12 +4,12 @@ module ActiveTools
   module ActiveRecord
     module AdaptiveBelongsTo
       extend ::ActiveSupport::Concern
-      
+
       included do
       end
 
       module ClassMethods
-  
+
         def relation_options_under(*args)
           path = args.extract_options!
           local_attribute = args.first
@@ -36,15 +36,15 @@ module ActiveTools
             end
             {:outer_values => outer_values, :where_values => where_values}
           end
-          
+
           class_eval do
             define_method local_method do
               self.class.send(local_method, self)
             end
           end
-          
+
         end
-        
+
         def adaptive_belongs_to(*args)
           options = args.extract_options!
           assoc_name = args.first
@@ -52,19 +52,24 @@ module ActiveTools
             raise(ArgumentError, ":#{assoc_name} method doesn't look like an association accessor!")
           end
           adapter_name = "#{assoc_name}_adaptive"
-          
+
           raise(TypeError, "Option :attributes must be a Hash. #{options[:attributes].class} passed!") unless options[:attributes].is_a?(Hash)
           attr_map = HashWithIndifferentAccess.new(options.delete(:attributes))
           valid_options = Hash(options.delete(:valid_with)).symbolize_keys
           valid_with assoc_name, valid_options.merge(:attributes => attr_map) #, :fit => true
-        
+
           class_attribute :adaptive_options unless defined?(adaptive_options)
           self.adaptive_options ||= {}
           self.adaptive_options[assoc_name.to_sym] = options.merge(:attr_map => attr_map)
-          
+
           class_eval <<-EOV
             before_validation do
               #{adapter_name}.try_nullify||#{adapter_name}.try_commit
+              #{adapter_name}.target_process_do
+            end
+
+            before_save do
+              #{adapter_name}.update_target_if_changed!
             end
 
             after_save do
@@ -75,7 +80,7 @@ module ActiveTools
             after_destroy do
               #{adapter_name}.try_destroy
             end
-          
+
             def #{adapter_name}
               @#{adapter_name} ||= ActiveTools::ActiveRecord::AdaptiveBelongsTo::Adapter.new(self, :#{assoc_name}, adaptive_options[:#{assoc_name}])
             end
@@ -92,10 +97,10 @@ module ActiveTools
               end
             end
           end
-          
+
         end
       end
-      
+
       # def reload(*args)
       #   super.tap do |record|
       #     adaptive_options.keys.each do |assoc_name|
@@ -105,12 +110,12 @@ module ActiveTools
       #     end
       #   end
       # end
-      
+
     end
   end
-  
+
   module OnLoadActiveRecord
     include ActiveRecord::AdaptiveBelongsTo
   end
-  
-end
+
+end

data/lib/active_tools/active_record/custom_counter_cache.rb

@@ -11,6 +11,11 @@ module ActiveTools
       module ClassMethods
         def custom_counter_cache_for(*args)
           mapping = args.extract_options!
+          
+          class_attribute :custom_counter_cache_options unless defined?(custom_counter_cache_options)
+          self.custom_counter_cache_options ||= {}
+          self.custom_counter_cache_options[:mapping] = mapping.with_indifferent_access
+          
           mapping.each do |assoc_name, value|
             assoc_name = assoc_name.to_s
             if assoc_name.last == "*"

data/lib/active_tools/version.rb

@@ -1,3 +1,3 @@
 module ActiveTools
-  VERSION = "0.0.50"
+  VERSION = "0.0.51"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.51
 platform: ruby
 authors:
 - Valery Kvon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -63,6 +63,7 @@ files:
 - lib/active_tools/action_pack/action_dispatch.rb
 - lib/active_tools/action_pack/action_dispatch/flash_stack.rb
 - lib/active_tools/action_pack/action_view.rb
+- lib/active_tools/action_pack/action_view/field_name.rb
 - lib/active_tools/action_pack/action_view/perform_as_tree.rb
 - lib/active_tools/action_pack/action_view/tag_attributes.rb
 - lib/active_tools/action_pack/action_view/uniq_content_for.rb