active_tools 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51b06ad3dec14fa1f094a6024d64ca9ed4b50ed5
-  data.tar.gz: 7a599525d1dbefef2de63aca1be53497c0ee8407
+  metadata.gz: 2c3a808736336301eb85cdfd4dcda22dca43306b
+  data.tar.gz: 46ff38509cbc5f40dc83d8afc70a8a04303fcc6b
 SHA512:
-  metadata.gz: 5d609f04f1b350636e47bf4107f438f1a34a654ca5a1e57e8276d322870d7df28df98acd35d3d6409af68871e63b7a63813c0a78b7c9d8e5ad19a01507581a04
-  data.tar.gz: c392bec6ca96f1b3ea97b27623c16ec88ed837557de8443b7faff5fdccb7914689457df20825a54569f133f03a6dda6555493c116aa010f0d7764f6a5c460cfc
+  metadata.gz: ea8c069240fff2daebd6fe87b96fe116e2cb4da2d89083dea00c6a34795136c4ae7fbfcf821a4be0c2775575790721a4f47466603b7ae25f24e790c2324d9319
+  data.tar.gz: adf4bff7c29823e5678a021632403438da55969cc4fbf30bc213123ce6278b58571351ef1cea6ae38fce890af9477a974a779ab0f2bd485d113e6470d7733cd6

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

@@ -0,0 +1,32 @@
+module ActiveTools
+  module ActionPack
+    module ActionController
+      module PathHelper
+        module ComplexHelpers
+          def path?(controller, action = nil)
+            controller?(controller) && action?(action)
+          end
+
+          def action?(action)
+            actions = case action
+            when Array then action.map {|c| c.to_s}
+            when String, Symbol then Array.wrap(action.to_s)
+            else nil
+            end
+            actions.blank? ? true : current_action.in?(actions)
+          end
+
+          def controller?(controller)
+            controllers = case controller
+            when Array then controller.map {|c| c.to_s}
+            when String, Symbol then Array.wrap(controller.to_s)
+            else nil
+            end
+            controllers.blank? ? true : current_controller.in?(controllers)
+          end
+        end
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,39 @@
+require 'active_tools/action_pack/action_controller/path_helper/complex_helpers'
+
+module ActiveTools
+  module ActionPack
+    module ActionController
+      module PathHelper
+        class HttpReferer
+          attr_reader :url, :recognized
+          include ComplexHelpers
+          
+          delegate :[], :to => :recognized
+          
+          def initialize(request, environment = {})
+            @url = request.env['HTTP_REFERER']
+            @recognized = begin
+              @url.present? ? Rails.application.routes.recognize_path(@url, environment) : {}
+            rescue ::ActionController::RoutingError
+              {}
+            end
+            @recognized.freeze
+          end
+
+          def current_controller
+            recognized[:controller]
+          end
+
+          def current_action
+            recognized[:action]
+          end
+          
+          def to_s
+            @url
+          end
+        end
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,29 @@
+require 'active_tools/misc/uniq_content'
+
+module ActiveTools
+  module ActionPack
+    module ActionView
+      module UniqContentFor
+        
+      end
+    end
+  end
+  
+  module OnLoadActionView
+    
+    def uniq_content_for(name, content = nil, options = {}, &block)
+      if content || block_given?
+        if block_given?
+          options = content if content
+          content = capture(&block)
+        end
+        if content && !uniq_content_storage.remembered?(content, name)
+          content_for(name, uniq_content_storage.remember(content, name), options)
+          nil
+        end
+      end
+    end
+    
+  end
+  
+end

data/lib/active_tools/active_model/valid_with.rb

@@ -8,9 +8,8 @@ module ActiveTools
         def valid_with(*args)
           options = args.extract_options!
           object_name = args.first
-          passed_attr_map = options.delete(:attributes)
+          passed_attr_map = options.delete(:attributes)||{}
           prefix = options.delete(:prefix)
-          raise(TypeError, "Option :attributes must be a Hash. #{passed_attr_map.class} passed!") unless passed_attr_map.is_a?(Hash)
           attr_map_name = :"_valid_with_#{object_name}"
           unless respond_to?(attr_map_name)
             class_attribute attr_map_name 
@@ -19,23 +18,20 @@ module ActiveTools
             self.send(attr_map_name).merge!(passed_attr_map)
           end
 
-          if passed_attr_map.any?
-            class_eval <<-EOV
-              validate do
-                if object = #{object_name}
-                  #{"object.instance_variable_set(:@errors, ActiveTools::ActiveModel::ValidWith::FakeErrors.new(object))" if options[:fit] == true}
-                  if !object.valid?
-                    object.errors.messages.each do |attribute, suberrors|
-                      if local_attribute = self.#{attr_map_name}[attribute]
-                        suberrors.each do |suberror|
-                          errors.add(["#{prefix}", local_attribute].select(&:present?).join("_"), suberror)
-                        end
-                      end
-                    end
+          validate(*[options]) do
+            if object = send(object_name)
+              if options[:fit] == true
+                object.instance_variable_set(:@errors, ActiveTools::ActiveModel::ValidWith::FakeErrors.new(object))
+              end
+              if !object.valid?
+                object.errors.messages.each do |attribute, suberrors|
+                  local_attribute = send(attr_map_name)[attribute]||attribute
+                  suberrors.each do |suberror|
+                    errors.add([prefix.to_s, local_attribute].select(&:present?).join("_"), suberror)
                   end
                 end
               end
-            EOV
+            end
           end
         end
       end

data/lib/active_tools/active_record/adaptive_belongs_to.rb

@@ -52,22 +52,22 @@ module ActiveTools
             raise(ArgumentError, ":#{assoc_name} method doesn't look like an association accessor!")
           end
           adapter_name = "#{assoc_name}_adaptive"
-          config_name = "#{assoc_name}_adaptive_options"
           
           raise(TypeError, "Option :attributes must be a Hash. #{options[:attributes].class} passed!") unless options[:attributes].is_a?(Hash)
           attr_map = options.delete(:attributes).with_indifferent_access
        
-          valid_with assoc_name, :attributes => attr_map
+          valid_with assoc_name, :attributes => attr_map#, :fit => true
         
-          class_attribute config_name
-          self.send("#{config_name}=", options.merge(:remote_attributes => attr_map.keys))
+          class_attribute :adaptive_options unless defined?(adaptive_options)
+          self.adaptive_options ||= {}
+          self.adaptive_options[assoc_name.to_sym] = options.merge(:remote_attributes => attr_map.keys)
           
           class_eval <<-EOV
             before_validation do
               #{adapter_name}.try_nullify
             end
           
-            #{Rails.version >= "4.1.0" ? "after_validation" : "before_save"} do
+            #{Rails.version >= "4.1.0" ? "before_validation" : "before_save"} do
               #{adapter_name}.try_commit
             end
 
@@ -81,7 +81,7 @@ module ActiveTools
             end
           
             def #{adapter_name}
-              @#{adapter_name} ||= ActiveTools::ActiveRecord::AdaptiveBelongsTo::Adapter.new(association(:#{assoc_name}), #{config_name})
+              @#{adapter_name} ||= ActiveTools::ActiveRecord::AdaptiveBelongsTo::Adapter.new(self, :#{assoc_name}, adaptive_options[:#{assoc_name}])
             end
           EOV
 
@@ -91,15 +91,25 @@ module ActiveTools
               define_method local_attribute do
                 send(adapter_name).read(remote_attribute)
               end
-          
               define_method "#{local_attribute}=" do |value|
                 send(adapter_name).write(remote_attribute, value)
               end
             end
           end
           
-        end    
+        end
       end
+      
+      # def reload(*args)
+      #   super.tap do |record|
+      #     adaptive_options.keys.each do |assoc_name|
+      #       puts assoc_name
+      #       adapter_name = "#{assoc_name}_adaptive"
+      #       eval("@#{adapter_name}.try(:replace_association, association(:#{assoc_name}))")
+      #     end
+      #   end
+      # end
+      
     end
   end
   

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

@@ -2,12 +2,13 @@ module ActiveTools
   module ActiveRecord
     module AdaptiveBelongsTo
       class Adapter
-        attr_reader :association, :options
+        attr_reader :owner, :assoc_name, :options
 
-        delegate :target, :target_id, :klass, :owner, :reflection, :to => :association
+        delegate :target, :target_id, :reflection, :to => :association
 
-        def initialize(association, options = {})
-          @association = association
+        def initialize(owner, assoc_name, options = {})
+          @owner = owner
+          @assoc_name = assoc_name
           @options = options.with_indifferent_access
           @foreign_key = reflection.foreign_key
           @remote_attributes = @options[:remote_attributes]
@@ -16,7 +17,15 @@ module ActiveTools
           @update_if = @options[:update_if]
           @destroy_if = @options[:destroy_if]
           @uniq_by = Array(@options[:uniq_by]).map(&:to_s)
-          @association.load_target
+          association.load_target
+        end
+        
+        def klass
+          association.klass||reflection.class_name.constantize
+        end
+        
+        def association
+          owner.association(assoc_name)
         end
 
         def read(name)
@@ -43,7 +52,7 @@ module ActiveTools
           end
         end
 
-        def try_commit          
+        def try_commit
           try_commit_existed || try_update
         end
 
@@ -52,13 +61,24 @@ module ActiveTools
           try_destroy_target
         end
 
+        def template_attributes
+          attributes(@template, *@remote_attributes)
+        end
+        
+        def target_attributes
+          attributes(target, *@remote_attributes)
+        end
+
         def try_update
           if updateable_backup?
             begin
-              @backup.update(attributes(@template, *@remote_attributes))   
+              @backup.update(template_attributes)
             rescue ::ActiveRecord::StaleObjectError
               @backup.reload
               try_update
+            rescue ::ActiveRecord::StatementInvalid
+              @backup.reload
+              try_update
             end
             self.target = @backup
           end
@@ -81,6 +101,9 @@ module ActiveTools
             rescue ::ActiveRecord::StaleObjectError
               @backup.reload
               try_destroy_backup
+            rescue ::ActiveRecord::StatementInvalid
+              @backup.reload
+              try_destroy_backup
             end
           end
         end
@@ -92,6 +115,9 @@ module ActiveTools
             rescue ::ActiveRecord::StaleObjectError
               target.reload
               try_destroy_target
+            rescue ::ActiveRecord::StatementInvalid
+              target.reload
+              try_destroy_target
             end
           end
         end
@@ -136,7 +162,14 @@ module ActiveTools
         end
         
         def attributes(object, *attrs)
-          Hash[attrs.map {|a| [a, object.send(a)]}]
+          array = attrs.map do |a|
+            begin
+              [a, object.send(a)]
+            rescue NoMethodError
+              nil
+            end
+          end.compact
+          Hash[array]
         end
 
         def create_template!
@@ -191,7 +224,7 @@ module ActiveTools
         def template
           @template ||=
           if target.try(:persisted?)
-            klass.new(attributes(target, *@remote_attributes))
+            klass.new(target_attributes)
           elsif target.nil?
             klass.new
           elsif target.try(:new_record?)

data/lib/active_tools/active_record/custom_counter_cache/instance_methods.rb

@@ -12,10 +12,8 @@ module ActiveTools
         end
 
         def custom_counter_cache_before_destroy(assoc_name, reflection, assoc_mapping)
-          foreign_key = reflection.foreign_key.to_sym
-          unless destroyed_by_association && destroyed_by_association.foreign_key.to_sym == foreign_key
-            record = send(assoc_name)
-            if record && !self.destroyed?
+          unless destroyed_by_association && (destroyed_by_association.foreign_key.to_sym == reflection.foreign_key.to_sym)
+            if (record = send(assoc_name)) && !self.destroyed?
               ActiveRecord::CustomCounterCache.digger(self, record, assoc_mapping) do |parent, cache_column, value|
                 parent.class.update_counters(parent.id, cache_column => -value)
               end
@@ -24,20 +22,27 @@ module ActiveTools
         end
 
         def custom_counter_cache_after_update(assoc_name, reflection, assoc_mapping)
-          foreign_key  = reflection.foreign_key
+          record_changed =
+          if reflection.polymorphic?
+            send(:attribute_changed?, reflection.foreign_type)||send(:attribute_changed?, reflection.foreign_key)
+          else
+            send(:attribute_changed?, reflection.foreign_key) && defined?(reflection.klass.to_s.camelize)
+          end
+          
           if (@_after_create_custom_counter_called ||= false)
             @_after_create_custom_counter_called = false
-          elsif send(:attribute_changed?, foreign_key) && !new_record? && defined?(reflection.klass.to_s.camelize)
-            model           = reflection.klass
-            foreign_key_was = attribute_was foreign_key
-            foreign_key     = attribute foreign_key
+          elsif !new_record? && record_changed
+            model           = reflection.polymorphic? ? attribute(reflection.foreign_type).try(:constantize) : reflection.klass
+            model_was       = reflection.polymorphic? ? attribute_was(reflection.foreign_type).try(:constantize) : reflection.klass
+            foreign_key     = attribute(reflection.foreign_key)
+            foreign_key_was = attribute_was(reflection.foreign_key)
 
             if foreign_key && model.respond_to?(:increment_counter) && to_increment = model.find_by_id(foreign_key)
               ActiveRecord::CustomCounterCache.digger(self, to_increment, assoc_mapping) do |parent, cache_column, value|
                 parent.class.update_counters(parent.id, cache_column => value)
               end
             end
-            if foreign_key_was && model.respond_to?(:decrement_counter) && to_decrement = model.find_by_id(foreign_key_was)
+            if foreign_key_was && model_was.respond_to?(:decrement_counter) && to_decrement = model_was.find_by_id(foreign_key_was)
               ActiveRecord::CustomCounterCache.digger(self, to_decrement, assoc_mapping) do |parent, cache_column, value|
                 parent.class.update_counters(parent.id, cache_column => -value)
               end

data/lib/active_tools/active_record/with_permalink.rb

@@ -0,0 +1,92 @@
+module ActiveTools
+  module ActiveRecord
+    module WithPermalink
+      extend ::ActiveSupport::Concern
+
+      module ClassMethods
+        def with_permalink(*args)
+          options = args.extract_options!
+          unless (column_name = args.first.to_sym) || options[:from].present?
+            raise "WithPermalink: column_name and/or options[:from] expected!"
+          end
+
+          options[:uniq] ||= true
+
+          cattr_accessor :with_permalink_options unless defined?(with_permalink_options)
+          self.with_permalink_options ||= {}
+          self.with_permalink_options[column_name] = options
+
+          validates_presence_of column_name
+          validates_uniqueness_of column_name, options[:scope] ? {:scope => Array(options[:scope])} : {}
+
+          before_validation do
+            self.with_permalink_options.each do |column_name, options|
+              eval <<-EOV
+                source = @_#{column_name}_demanded
+              EOV
+              source ||= case options[:from]
+              when String, Symbol then send(options[:from])
+              when Proc then options[:from].call(self)
+              end
+              if options[:uniq]
+                self.send("#{column_name}=", generate_permalink(column_name, source, options))
+              else
+                self.send("#{column_name}=", source)
+              end
+            end
+          end
+
+          after_save do
+            instance_variable_set(:"@_#{column_name}_demanded", nil)
+          end
+
+          class_eval <<-EOV
+            def #{column_name}=(value)
+              @_#{column_name}_demanded = value if value.present?
+              super(value)
+            end
+
+            def to_param
+              changes["#{column_name}"].try(:first)||#{column_name}
+            end        
+          EOV
+
+        end
+      end
+
+      def generate_permalink(column_name, permalink, options = {})
+        tester, correction = permalink, 0
+        while exists_permalink?(column_name, tester, options)
+          correction += 1
+          tester = [permalink, correction].select(&:present?).join("-")
+        end
+        tester
+      end
+
+      def exists_permalink?(column_name, permalink, options = {})
+        sql_clause, values = [], []
+        sql_clause << "#{column_name} = ?"
+        values << permalink
+        if options[:scope]
+          Array(options[:scope]).each do |field|
+            if value = send(field)
+              sql_clause << "#{field} = ?"
+              values << value
+            end
+          end
+        end
+        if persisted?
+          sql_clause  << "id != ?"
+          values << self.id
+        end
+        self.class.exists?([sql_clause.join(" AND "), *values])
+      end
+      
+    end
+  end
+  
+  module OnLoadActiveRecord
+    include ActiveRecord::WithPermalink
+  end
+  
+end

data/lib/active_tools/misc/script_flow.rb

@@ -29,8 +29,9 @@ module ActiveTools
             uniq_content_storage.append_content(content, Misc::DEFAULT_JS_FLOW_KEY)
             nil
           when Mime::HTML then
-            unless uniq_content_storage.remembered?(content, options[:volume])
-              flow = uniq_content_storage.remember(content, options[:volume])
+            volume = options.delete(:volume)
+            unless uniq_content_storage.remembered?(content, volume)
+              flow = uniq_content_storage.remember(content, volume)
               options[:javascript_tag] == false ? flow : javascript_tag(flow, options)
             end
           end

data/lib/active_tools/misc/uniq_content.rb

@@ -0,0 +1,76 @@
+module ActiveTools
+  module Misc
+    module UniqContent
+      class Storage    
+        attr_reader :content
+
+        delegate :any?, :empty?, :to => :content
+
+        def initialize
+          @content = ::ActiveSupport::OrderedHash.new {|h,k| h[k] = []}
+          @hashes = ::ActiveSupport::OrderedHash.new {|h,k| h[k] = []}
+        end
+
+        # Called by _layout_for to read stored values.
+        def get_content(key = nil)
+          @content[key]
+        end
+
+        # Called by each renderer object to set the layout contents.
+        def set_content(value, key = nil)
+          @content[key] = Array(value)
+        end
+
+        # Called by content_for
+        def append_content(value, key = nil)
+          @content[key] |= Array(value)
+        end
+        alias_method :append_content!, :append_content
+
+        def render_content(key = nil)
+          @content[key].join("\n").html_safe
+        end
+        
+        def remember(value, key = nil)
+          unless remembered?(value, key)
+            @hashes[key] << value.hash
+            value
+          end
+        end
+        
+        def remembered?(value, key = nil)
+          @hashes[key].include?(value.hash)
+        end
+
+      end
+    end
+  end
+  
+  module OnLoadActionController
+    included do
+      helper_method :uniq_content_storage
+    end
+
+    def uniq_content_storage
+      @_uniq_content_storage ||= Misc::UniqContent::Storage.new
+    end
+  end
+  
+  module OnLoadActionView
+    def uniq_content(*args, &block)
+      options = args.extract_options!
+      content = args.first
+      if content || block_given?
+        if block_given?
+          content = capture(&block)
+        end
+        if content && !uniq_content_storage.remembered?(content, options[:volume])
+          uniq_content_storage.remember(content, options[:volume])
+        else
+          nil
+        end
+      end
+    end
+  end
+  
+end

data/lib/active_tools/version.rb

@@ -1,3 +1,3 @@
 module ActiveTools
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Valery Kvon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,23 +45,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - active_tools.gemspec
 - copy
+- lib/.DS_Store
 - lib/active_tools.rb
+- lib/active_tools/.DS_Store
 - lib/active_tools/action_pack/action_controller.rb
 - lib/active_tools/action_pack/action_controller/path_helper.rb
+- lib/active_tools/action_pack/action_controller/path_helper/complex_helpers.rb
+- lib/active_tools/action_pack/action_controller/path_helper/http_referer.rb
 - 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/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
 - lib/active_tools/actionpack.rb
 - lib/active_tools/active_model/delegate_attributes.rb
 - lib/active_tools/active_model/valid_with.rb
@@ -71,6 +75,7 @@ files:
 - lib/active_tools/active_record/custom_counter_cache.rb
 - lib/active_tools/active_record/custom_counter_cache/instance_methods.rb
 - lib/active_tools/active_record/record_id.rb
+- lib/active_tools/active_record/with_permalink.rb
 - lib/active_tools/activemodel.rb
 - lib/active_tools/activerecord.rb
 - lib/active_tools/activesupport.rb
@@ -89,6 +94,7 @@ files:
 - 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
 - lib/active_tools/version.rb
 - spec/active_tools/active_model/delegate_attributes_spec.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-delegate_attributes

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.0.0-p247