active_tools 0.0.6 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6884fd00e3b38429d219a9d533116fa46c824de0
-  data.tar.gz: 5fa48a6d56370b0e68729b71ac24977f6c327bfd
+  metadata.gz: 51b06ad3dec14fa1f094a6024d64ca9ed4b50ed5
+  data.tar.gz: 7a599525d1dbefef2de63aca1be53497c0ee8407
 SHA512:
-  metadata.gz: 478603a760745f50193cbe24358e39fefef37792a766b0d31bad36f686b127812deb76f80e9d8d11cdc963a20d3d773287350855d1af7a8db1cb93c44fddf342
-  data.tar.gz: c8f2fbae68a570892e9f212a0bc9c1c611867d064e0212eb8668fe4ed3515aa096482dae36dd95ea30ef872a59a5a8dccb10a6bb4767676c0fabfdbc6d7281ce
+  metadata.gz: 5d609f04f1b350636e47bf4107f438f1a34a654ca5a1e57e8276d322870d7df28df98acd35d3d6409af68871e63b7a63813c0a78b7c9d8e5ad19a01507581a04
+  data.tar.gz: c392bec6ca96f1b3ea97b27623c16ec88ed837557de8443b7faff5fdccb7914689457df20825a54569f133f03a6dda6555493c116aa010f0d7764f6a5c460cfc

data/active_tools.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
 
   gem.rubyforge_project = "active_tools"
 
-  gem.add_dependency "rails"
-  gem.add_development_dependency "rspec"
+  gem.add_runtime_dependency "rails", "~> 4"
+  gem.add_development_dependency "rspec", "~> 0"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

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

@@ -1,3 +1,6 @@
+require 'active_tools/action_pack/action_controller/path_helper/complex_helpers'
+require 'active_tools/action_pack/action_controller/path_helper/http_referer'
+
 module ActiveTools
   module ActionPack
     module ActionController
@@ -5,31 +8,10 @@ module ActiveTools
         extend ::ActiveSupport::Concern
         
         included do
-          helper_method :path?, :action?, :controller?, :current_action, :current_controller
+          include ComplexHelpers
+          helper_method :path?, :action?, :controller?, :current_action, :current_controller, :http_referer
         end
         
-        def path?(controller, action = nil)
-          controller?(controller) && action?(action)
-        end
-
-        def action?(action)
-          actions = case action
-          when Array then action.collect {|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.collect {|c| c.to_s}
-          when String, Symbol then Array.wrap(controller.to_s)
-          else nil
-          end
-          controllers.blank? ? true : current_controller.in?(controllers)
-        end
-
         def current_action
           request.path_parameters[:action]
         end
@@ -37,6 +19,11 @@ module ActiveTools
         def current_controller
           request.path_parameters[:controller]
         end
+        
+        def http_referer(environment = {})
+          @http_referer ||= HttpReferer.new(request, environment)
+        end
+        
       end
     end
   end

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

@@ -3,7 +3,6 @@ module ActiveTools
     module ActionView
       module TagAttributes
         class Collect
-          attr_reader :hash
           def initialize(hash = nil)
             @hash = HashWithIndifferentAccess.new {|h,k| h[k] = Array.new}
             merge(hash) if hash
@@ -30,6 +29,10 @@ module ActiveTools
             Hash[@hash.map {|k,v| [k, v.join(" ")]}]
           end
 
+          def hash
+            @hash.symbolize_keys
+          end
+
           private
 
           def type_valid(object = nil)

data/lib/active_tools/action_pack/action_view.rb

@@ -1,5 +1,6 @@
 require 'active_tools/action_pack/action_view/tag_attributes'
 require 'active_tools/action_pack/action_view/perform_as_tree'
+require 'active_tools/action_pack/action_view/uniq_content_for'
 
 module ActiveTools
   module ActionPack

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

@@ -12,6 +12,7 @@ module ActiveTools
           @foreign_key = reflection.foreign_key
           @remote_attributes = @options[:remote_attributes]
           @init_proc = @options[:init_proc]
+          @nullify_if = @options[:nullify_if]
           @update_if = @options[:update_if]
           @destroy_if = @options[:destroy_if]
           @uniq_by = Array(@options[:uniq_by]).map(&:to_s)
@@ -34,12 +35,19 @@ module ActiveTools
             end
           end
         end
+        
+        def try_nullify
+          if nullify?    
+            store_backup!
+            self.target = nil
+          end
+        end
 
-        def try_commit
+        def try_commit          
           try_commit_existed || try_update
         end
 
-        def try_destroy
+        def try_destroy          
           try_destroy_backup
           try_destroy_target
         end
@@ -47,7 +55,7 @@ module ActiveTools
         def try_update
           if updateable_backup?
             begin
-              @backup.update(attributes(@template, *@remote_attributes))
+              @backup.update(attributes(@template, *@remote_attributes))   
             rescue ::ActiveRecord::StaleObjectError
               @backup.reload
               try_update
@@ -57,9 +65,11 @@ module ActiveTools
         end
 
         def try_commit_existed
-          if @template.present? && @uniq_by.any? && existed = detect_existed
+          if @template.present? && @uniq_by.any? && (existed = detect_existed)
             self.target = existed
-            try_destroy_updateable_backup
+            if updateable_backup?
+              @backup.mark_for_destruction
+            end
             true
           end 
         end
@@ -75,18 +85,7 @@ module ActiveTools
           end
         end
 
-        def try_destroy_updateable_backup
-          if updateable_backup?
-            begin
-              @backup.destroy
-            rescue ::ActiveRecord::StaleObjectError
-              @backup.reload
-              try_destroy_updateable_backup
-            end
-          end
-        end
-
-        def try_destroy_target(force = false)
+        def try_destroy_target
           if destroyable_target?
             begin
               target.destroy
@@ -111,8 +110,8 @@ module ActiveTools
             relation_options_call = "#{attribute}_relation_options"
             if klass.respond_to?(relation_options_call)
               values = @template.send(relation_options_call)
-              outer_values.merge!(values[:outer_values])
-              where_values.merge!(values[:where_values])
+              outer_values.deep_merge!(values[:outer_values])
+              where_values.deep_merge!(values[:where_values])
             else
               where_values[attribute] = @template.send(attribute)
             end
@@ -120,16 +119,20 @@ module ActiveTools
           klass.includes(outer_values).where(where_values).limit(1).first
         end
 
+        def nullify?
+          target.present? && @nullify_if.try(:call, (target.persisted? ? target.reload : target), owner)
+        end
+
         def updateable_backup?
-          @backup.present? && @update_if.try(:call, @backup)
+          @backup.try(:persisted?) && @update_if.try(:call, @backup.reload, owner)
         end
 
         def destroyable_backup?
-          @backup.present? && !@backup.destroyed? && @destroy_if.try(:call, @backup)
+          @backup.try(:persisted?) && (!@backup.destroyed?||@backup.marked_for_destruction?) && @destroy_if.try(:call, @backup.reload, owner)
         end
 
         def destroyable_target?
-          target.try(:persisted?) && !target.destroyed? && @destroy_if.try(:call, target)
+          target.try(:persisted?) && (!target.destroyed?||target.marked_for_destruction?) && @destroy_if.try(:call, target.reload, owner)
         end
         
         def attributes(object, *attrs)
@@ -144,6 +147,9 @@ module ActiveTools
 
         def restore_backup!
           if @backup
+            if @backup.marked_for_destruction?
+              @backup.instance_variable_set(:@marked_for_destruction, false)
+            end
             self.target = @backup
             @backup = nil
           end
@@ -165,7 +171,15 @@ module ActiveTools
 
         def target=(record)
           if owner.persisted?
-            association.send(:replace_keys, record)
+            if Rails.version >= "4.1.0"
+              if record
+                association.send(:replace_keys, record)
+              else
+                association.send(:remove_keys)
+              end
+            else
+              association.send(:replace_keys, record)
+            end
             association.set_inverse_instance(record)
             association.instance_variable_set(:@updated, true) if record != @backup
             association.target = record
@@ -184,7 +198,7 @@ module ActiveTools
             target.dup
           end
           @template.tap do |t|
-            @init_proc.try(:call, t)
+            @init_proc.try(:call, t, owner)
           end
         end 
       end

data/lib/active_tools/active_record/adaptive_belongs_to.rb

@@ -1,3 +1,4 @@
+require 'active_tools/core_extension/deep_merge'
 require 'active_tools/active_record/adaptive_belongs_to/adapter'
 module ActiveTools
   module ActiveRecord
@@ -50,8 +51,8 @@ module ActiveTools
           unless reflection = reflections[assoc_name]
             raise(ArgumentError, ":#{assoc_name} method doesn't look like an association accessor!")
           end
-          adapter_name = "#{assoc_name}_"
-          config_name = "#{assoc_name}_adapter_options"
+          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
@@ -62,11 +63,15 @@ module ActiveTools
           self.send("#{config_name}=", options.merge(:remote_attributes => attr_map.keys))
           
           class_eval <<-EOV
-            after_validation do
+            before_validation do
+              #{adapter_name}.try_nullify
+            end
+          
+            #{Rails.version >= "4.1.0" ? "after_validation" : "before_save"} do
               #{adapter_name}.try_commit
             end
 
-            after_commit do
+            after_save do
               #{adapter_name}.try_destroy_backup
               #{adapter_name}.clear!
             end
@@ -86,28 +91,13 @@ 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
-
-          # attr_map.each do |remote_attribute, local_attribute|        
-          #   class_eval <<-EOV
-          #     def #{local_attribute}_adaptive
-          #       [{:#{assoc_name} => {}}, {:#{reflections[assoc_name].table_name} => {:#{remote_attribute} => #{local_attribute}}}]
-          #     end
-          # 
-          #     def #{local_attribute}
-          #       #{adapter_name}.read(:#{remote_attribute})
-          #     end
-          # 
-          #     def #{local_attribute}=(value)
-          #       #{adapter_name}.write(:#{remote_attribute}, value)
-          #     end           
-          #   EOV
-          # end
+          
         end    
       end
     end

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

@@ -27,7 +27,7 @@ module ActiveTools
           foreign_key  = reflection.foreign_key
           if (@_after_create_custom_counter_called ||= false)
             @_after_create_custom_counter_called = false
-          elsif send(:attribute_changed?, foreign_key) && !new_record? && (Rails.version >= "4.1.0" ? association(assoc_name).constructable? : defined?(reflection.klass.to_s.camelize))
+          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

data/lib/active_tools/activerecord.rb

@@ -1,6 +1,7 @@
 require 'active_tools/active_record/record_id'
 require 'active_tools/active_record/adaptive_belongs_to'
 require 'active_tools/active_record/custom_counter_cache'
+require 'active_tools/active_record/with_permalink'
 
 module ActiveTools
   module ActiveRecord

data/lib/active_tools/misc/script_flow.rb

@@ -1,55 +1,14 @@
+require 'active_tools/misc/uniq_content'
+
 module ActiveTools
   module Misc
-    module ScriptFlow
-      class Map
-        attr_reader :content
-
-        delegate :any?, :empty?, :to => :content
-
-        def initialize
-          @content = ::ActiveSupport::OrderedHash.new { |h,k| h[k] = ::ActiveSupport::SafeBuffer.new }
-        end
-
-        # Called by _layout_for to read stored values.
-        def get(key)
-          @content[key]
-        end
-
-        # Called by each renderer object to set the layout contents.
-        def set(key, value)
-          @content[key] = value
-        end
-
-        # Called by content_for
-        def append(key, value)
-          @content[key] << value
-        end
-        alias_method :append!, :append
-
-        def add_script(script)
-          set(script.hash, script)
-        end
-
-        def render
-          @content.values.join("\n").html_safe
-        end
-
-      end
-    end
+    DEFAULT_JS_FLOW_KEY = :_script_flow
   end
   
   module OnLoadActionController
-    included do
-      helper_method :script_flow
-    end
-
-    def script_flow
-      @script_flow ||= Misc::ScriptFlow::Map.new
-    end
-
     def _render_template(options)
       if lookup_context.rendered_format == :js
-         super + script_flow.render
+         super + uniq_content_storage.render_content(Misc::DEFAULT_JS_FLOW_KEY)
       else
         super
       end
@@ -57,25 +16,33 @@ module ActiveTools
   end
   
   module OnLoadActionView
-    def script(content = nil, &block)
+    def script(*args, &block)
+      options = args.extract_options!
+      content = args.first
       if content || block_given?
         if block_given?
           content = capture(&block)
         end
         if content
-           case request.format
-           when Mime::JS then
-             script_flow.add_script(content)
-             nil
-           when Mime::HTML then
-             javascript_tag(content)
-           end
+          case request.format
+          when Mime::JS then
+            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])
+              options[:javascript_tag] == false ? flow : javascript_tag(flow, options)
+            end
+          end
         end
       end
     end
 
-    def script_for(identifier, content = nil, &block)
-      content_for(identifier, script(content, &block))
+    def script_for(identifier, *args, &block)
+      options = args.extract_options!
+      content_for(identifier) do
+        script(args, options.merge(:volume => identifier), &block)
+      end
     end
   end
   

data/lib/active_tools/misc.rb

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

data/lib/active_tools/version.rb

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

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: active_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.10
 platform: ruby
 authors:
 - Valery Kvon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !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'
 description: Missing tools for Rails developers
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -102,17 +102,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: active_tools
-rubygems_version: 2.0.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActionDispatch, ActionController, ActiveModel, ActiveRecord, ActiveSupport,