active_tools 0.0.52 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfe18a76260474bb133da839b557c81cc8e6aec4
-  data.tar.gz: 4065dc7f15810a7d8b19068e6d99e09d643b1bda
+  metadata.gz: 7cf669472ca4f394eed4f88c701b210297b3cf86
+  data.tar.gz: 2b8b57bd4db879100eba570471c62a9ed087bd1d
 SHA512:
-  metadata.gz: 4e8f2873d1a32a51440b408200a025ca0c85bb510a04192cd916297869e4f2318903562ebf884f7f7ac5797eae3563e4eb83c8fa188704e86f74c3115ebc5f5d
-  data.tar.gz: bcff8bd17960012ffb93268c4a56f2606d8c0ab0e652fc397a7152ecdb5fefda16050e42ca95b65e1de698350fd45bd019122fb993379ff4a59f7efeeb42b9f2
+  metadata.gz: 21cef49c611aa55c42934206f5fb6c93c9c209a7be14463c7f96376a2a4ecfa8161b6397ef43df8242cbb48d78bb6e1ce90ebc5e148390ba1dc595d233492c3f
+  data.tar.gz: e353c911a674cd4a78e6765e8a8b36feb66b9bf9625fa795089a79f52417da31e16b3a3805277564f5a5c15b3096e9fe0017afc5fdde05425e017a284d7e5e56

data/active_tools.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.rubyforge_project = "active_tools"
 
-  gem.add_runtime_dependency "rails", ">= 4"
+  gem.add_runtime_dependency "rails", ">= 5"
   gem.add_development_dependency "rspec", ">= 0"
 
   gem.files         = `git ls-files`.split($/)

data/lib/active_tools/action_pack/action_controller/path_helper.rb

@@ -8,8 +8,10 @@ module ActiveTools
         extend ::ActiveSupport::Concern
         
         included do
-          include ComplexHelpers
-          helper_method :path?, :action?, :controller?, :current_action, :current_controller, :http_referer
+          if respond_to?(:helper_method)
+            include ComplexHelpers
+            helper_method :path?, :action?, :controller?, :current_action, :current_controller, :http_referer
+          end
         end
         
         def current_action

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

@@ -43,11 +43,12 @@ module ActiveTools
             store_backup!
             create_template!
             target.send("#{name}=", value)
-            owner.send(:clear_attribute_changes, local_attribute) if owner.changes[local_attribute].try(:last) == owner.changes[local_attribute].try(:first)
+            owner.send(:attributes_changed_by_setter).except!(local_attribute) if owner.changes[local_attribute].try(:last) == owner.changes[local_attribute].try(:first)
             if @backup.present? && same_records?(@backup, target, :attributes => @remote_attributes)
               restore_backup!
             end
           end
+          value
         end
 
         def try_nullify
@@ -77,20 +78,16 @@ module ActiveTools
 
         def try_restore_refreshed_backup
           if updateable_backup?
-            warn "Adaptive going to update: <#{@backup.class.name}: #{@backup.class.primary_key}: #{@backup.send(@backup.class.primary_key)}>"
+            warn "Adaptive is 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
           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)}>"
+            warn "Adaptive is fetching existed <#{existed.class.name}: #{existed.class.primary_key}: #{existed.send(existed.class.primary_key)}>"
             self.target = existed
             if updateable_backup?
               @backup.mark_for_destruction
@@ -101,7 +98,7 @@ module ActiveTools
 
         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)}>"
+            warn "Adaptive is destroying backed up: <#{@backup.class.name}: #{@backup.class.primary_key}: #{@backup.send(@backup.class.primary_key)}>"
             begin
               @backup.destroy
             rescue ::ActiveRecord::StaleObjectError
@@ -116,7 +113,7 @@ module ActiveTools
 
         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 is destroying target: <#{target.class.name}: #{target.class.primary_key}: #{target.send(target.class.primary_key)}>"
             begin
               target.destroy
             rescue ::ActiveRecord::StaleObjectError
@@ -134,15 +131,13 @@ module ActiveTools
         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)}>"
+          if target && target.changes.any?
+            warn "Adaptive is 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
@@ -169,26 +164,26 @@ module ActiveTools
               outer_values.deep_merge!(values[:outer_values])
               where_values.deep_merge!(values[:where_values])
             else
-              where_values[attribute] = @template[attribute] #@template.send(attribute)
+              where_values[attribute] = @template[attribute]
             end
           end
           klass.includes(outer_values).where(where_values).limit(1).first
         end
 
         def nullify_target?
-          target.present? && @nullify_if.try(:call, (target.persisted? ? target.reload : target), owner)
+          target.present? && @nullify_if.try(:call, target, owner) # .reload is NOT acceptable (flushes changes)
         end
 
         def updateable_backup?
-          @backup.try(:persisted?) && @update_if.try(:call, @backup.reload, owner)
+          @backup.try(:persisted?) && @update_if.try(:call, @backup.reload, owner) # .reload is acceptable
         end
 
         def destroyable_backup?
-          @backup.try(:persisted?) && (!@backup.destroyed?||@backup.marked_for_destruction?) && @destroy_if.try(:call, @backup.reload, owner)
+          @backup.try(:persisted?) && (!@backup.destroyed?||@backup.marked_for_destruction?) && @destroy_if.try(:call, @backup.reload, owner) # .reload is acceptable
         end
 
         def destroyable_target?
-          target.try(:persisted?) && (!target.destroyed?||target.marked_for_destruction?) && @destroy_if.try(:call, target.reload, owner)
+          target.try(:persisted?) && (!target.destroyed?||target.marked_for_destruction?) && @destroy_if.try(:call, target.reload, owner) # .reload is acceptable
         end
 
         def attributes(object, *attrs)
@@ -215,6 +210,7 @@ module ActiveTools
             end
             self.target = @backup
             @backup = nil
+            true
           end
         end
 

data/lib/active_tools/misc/script_flow.rb

@@ -30,10 +30,10 @@ module ActiveTools
         end
         if content
           case request.format
-          when Mime::JS then
+          when Mime[:js] then
             uniq_content_storage.append_content(content, Misc::DEFAULT_JS_FLOW_KEY)
             nil
-          when Mime::HTML then
+          when Mime[:html] then
             volume = options.delete(:volume)
             unless uniq_content_storage.remembered?(content, volume)
               flow = uniq_content_storage.remember(content, volume)

data/lib/active_tools/misc/uniq_content.rb

@@ -48,7 +48,9 @@ module ActiveTools
   
   module OnLoadActionController
     included do
-      helper_method :uniq_content_storage
+      if respond_to?(:helper_method)
+        helper_method :uniq_content_storage
+      end
     end
 
     def uniq_content_storage

data/lib/active_tools/misc.rb

@@ -1,6 +1,5 @@
 require 'active_tools/misc/uniq_content'
 require 'active_tools/misc/script_flow'
-require 'active_tools/misc/input_source'
 
 module ActiveTools
   module Misc

data/lib/active_tools/version.rb

@@ -1,3 +1,3 @@
 module ActiveTools
-  VERSION = "0.0.52"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.52
+  version: 0.1.0
 platform: ruby
 authors:
 - Valery Kvon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,6 @@ files:
 - lib/active_tools/core_extension/string_round_with.rb
 - lib/active_tools/engine.rb
 - lib/active_tools/misc.rb
-- lib/active_tools/misc/input_source.rb
 - lib/active_tools/misc/script_flow.rb
 - lib/active_tools/misc/uniq_content.rb
 - lib/active_tools/railtie.rb

data/lib/active_tools/misc/input_source.rb

@@ -1,105 +0,0 @@
-module ActiveTools
-  module Misc
-    module InputSource
-      module ErrorsExtension
-        extend ::ActiveSupport::Concern
-
-        included do
-          delegate :field_of, :to => :@base
-        end
-
-        def fields
-          keys.map {|attribute| field_of(attribute)}.compact.tap do |names|
-            names.instance_eval do
-              def ids
-                self.map(&:to_id)
-              end
-            end
-          end
-        end
-      end
-      
-      module ConverseParameters
-        def converse_parameters(value, prefix = nil, parent = nil)
-          case value
-          when Hash
-            value.each do |k, v|
-              new_prefix = prefix ? "#{prefix}[#{k}]" : k
-              converse_parameters(v, new_prefix, value)
-            end
-          when Array
-            value.each do |e|
-              new_prefix = "#{prefix}[]"
-              converse_parameters(e, new_prefix, value)
-            end
-          else
-            value
-          end
-          value.tap do |v|
-            v.singleton_class.send(:undef_method, :belongs_to) if v.respond_to?(:belongs_to)
-            v.define_singleton_method :belongs_to do
-              parent
-            end
-            v.singleton_class.send(:undef_method, :input_source) if v.respond_to?(:input_source)
-            v.define_singleton_method :input_source do
-              prefix.to_s
-            end
-          end
-        end
-      end
-      
-      module RequestExtension
-        include ConverseParameters
-
-        private
-        def normalize_parameters(value)
-          converse_parameters(super)
-        end
-      end
-      
-      module AttributesAssignment
-        def assign_attributes(*args)
-          new_attributes = args.first
-          if new_attributes.respond_to?(:input_source)
-            @input_source = new_attributes.input_source
-          end
-          super(*args)
-        end
-
-        def field_of(attribute)
-          if @input_source && has_attribute?(attribute)
-            "#{@input_source}[#{attribute}]".tap do |input_source|
-              input_source.instance_eval do
-                def to_id
-                  self.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-                end
-              end
-            end
-          end
-        end
-      end
-    
-    end
-  end
-  
-  module OnLoadActionController
-    ::ActionDispatch::Request.send(:include, Misc::InputSource::RequestExtension)
-    
-    def converse(hash, key)
-      converse_parameters(hash[key], key)
-    end
-
-    private
-    include Misc::InputSource::ConverseParameters
-  end
-  
-  module OnLoadActiveRecord
-    ::ActiveModel::Errors.send(:include, Misc::InputSource::ErrorsExtension)
-    
-    if Rails.version >= "3.2.9"
-      ::ActiveRecord::AttributeAssignment.send(:include, Misc::InputSource::AttributesAssignment)
-    else
-      include Misc::InputSource::AttributesAssignment
-    end
-  end
-end