err_supply 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35673a76dbd68c64bdc2f49222403480c6bb2dcb
-  data.tar.gz: 45ef7b26dc7d7857138e4aac2da0509614b690d9
+  metadata.gz: e26b294d388b3d14d24bc7f245d01c5c1318eafb
+  data.tar.gz: 81f3b1a2556498463ba3e77aa5e495f25d29c441
 SHA512:
-  metadata.gz: 45ad911a10d3dd8e6620a444cd0b1a09974c9f5beb89bec8de7a083702c832f7848b8d28df8279c4c9a070a99b95dca2360db7c52c7b2924a9988dfadc309409
-  data.tar.gz: cdc3f2d847d3c1973ea1c3b0bba7212a5697de6004bc1f2e555a0d0687ebd4b4cdd51f1c656c3c3cd273e03a463b46e1f0635c91656a771b60813df5aeb7768f
+  metadata.gz: 1160167253407821bd833fc9b50f59ec1f5774c9f8996fc804b11472f6bd25534ce0cecc511ac1c9488e5e11fa266f87b35b44d116ba99abc27c66fdb7b0edc2
+  data.tar.gz: 8169d4e862ba8e0f5880e78d02e085bdccb1d89b24a1a1704f84948dcef464ba1bb9833d4c3d04a123cdeeb4c6c415c62de1becd43676183a0dddb47bad9ac9d

data/lib/err_supply/controller_helpers.rb

@@ -0,0 +1,90 @@
+module ErrSupply
+  module ControllerHelpers
+    
+    # Declare our method as a helper method so it is accessible to views.
+    ActionController::Base.helper_method :err_supply_hash
+    
+    # This method can be called recursively to unpack a rails object's error hash 
+    # into something more manageable for the view. Basically, it uses the keys in the
+    # object's error hash to traverse the object graph and expand the errors into a
+    # flattened hash, keyed using the dom ids rails will generate for the 
+    # associated objects.
+    #
+    # Because the method is called recursively, it only pays attention to errors for 
+    # the given object and its immediate child collections.  More remote descendents
+    # will be processed in subsequent passes.
+    #
+    def err_supply_hash(obj, options={})
+
+      #---------------------------------------------
+      # set up main variables
+      #---------------------------------------------
+
+      prefix  = options[:prefix]
+      errors  = obj.errors
+      h       = {}
+
+
+      #---------------------------------------------
+      # apply options to local attrs
+      #---------------------------------------------
+
+      # get keys
+      attrs   = errors.keys.select { |k| k.to_s.split(".").size == 1 }
+
+      # whitelist/blacklist keys
+      if options.has_key?(:only)
+        attrs = attrs.select { |k| Array(options[:only]).flatten.include?(k) }
+      end
+      if options.has_key?(:except)
+        attrs = attrs.reject { |k| Array(options[:except]).flatten.include?(k) }
+      end
+
+      # apply errors that match our list (slightly inefficient, but a touch easier to read)
+      attrs.each do |attr|
+        o  = options[attr.to_sym] || {}
+        id = "#{prefix}_#{(o[:key] || attr).to_s}"
+
+        unless h.has_key?(id)
+          h[id] = {
+            "label"    => obj.class.human_attribute_name(attr),
+            "messages" => []
+          }
+        end
+
+        h[id]["label"]    = o[:label].to_s.underscore.humanize unless o[:label].nil?
+        h[id]["messages"] = (h[id]["messages"] + errors[attr].map { |msg| "#{msg}.".gsub("..", ".") }).flatten
+      end
+
+
+      #---------------------------------------------
+      # apply options to children
+      #---------------------------------------------
+  
+      # get keys
+      assoc_names = errors.keys.map { |k| k.to_s.split(".") }.select { |a| a.many? }.map { |a| a[0] }.compact.uniq
+
+      # if child has errors or is invalid (i.e., we prefer explicitly declared errrors),
+      # call function recursively and merge results
+      assoc_names.each do |assoc_name|
+        c_options = options[assoc_name.to_sym] || {}
+        obj.send("#{assoc_name}").each_with_index do |child, index|
+          if !child.errors.empty? or child.invalid?
+            c_prefix = "#{prefix}_#{assoc_name}_attributes_#{index}"
+            c_hash   = err_supply_hash(child, c_options.merge({ :prefix => c_prefix }))
+
+            h.merge!(c_hash)
+          end
+        end
+      end
+
+
+      #---------------------------------------------
+      # return the hash
+      #---------------------------------------------
+      h    
+
+    end
+    
+  end
+end

data/lib/err_supply/version.rb

@@ -1,3 +1,3 @@
 module ErrSupply
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/err_supply/view_helpers.rb

@@ -10,92 +10,6 @@ module ErrSupply
 
       "$('##{id}').trigger('err_supply:loaded', #{h.to_json});".html_safe
     end
-
-
-
-    protected
-    
-    # This method can be called recursively to unpack a rails object's error hash 
-    # into something more manageable for the view. Basically, it uses the keys in the
-    # object's error hash to traverse the object graph and expand the errors into a
-    # flattened hash, keyed using the dom ids rails will generate for the 
-    # associated objects.
-    #
-    # Because the method is called recursively, it only pays attention to errors for 
-    # the given object and its immediate child collections.  More remote descendents
-    # will be processed in subsequent passes.
-    #
-    def err_supply_hash(obj, options={})
-
-      #---------------------------------------------
-      # set up main variables
-      #---------------------------------------------
-
-      prefix  = options[:prefix]
-      errors  = obj.errors
-      h       = {}
-
-
-      #---------------------------------------------
-      # apply options to local attrs
-      #---------------------------------------------
-
-      # get keys
-      attrs   = errors.keys.select { |k| k.to_s.split(".").size == 1 }
-
-      # whitelist/blacklist keys
-      if options.has_key?(:only)
-        attrs = attrs.select { |k| Array(options[:only]).flatten.include?(k) }
-      end
-      if options.has_key?(:except)
-        attrs = attrs.reject { |k| Array(options[:except]).flatten.include?(k) }
-      end
-
-      # apply errors that match our list (slightly inefficient, but a touch easier to read)
-      attrs.each do |attr|
-        o  = options[attr.to_sym] || {}
-        id = "#{prefix}_#{(o[:key] || attr).to_s}"
-
-        unless h.has_key?(id)
-          h[id] = {
-            "label"    => obj.class.human_attribute_name(attr),
-            "messages" => []
-          }
-        end
-
-        h[id]["label"]    = o[:label].to_s.underscore.humanize unless o[:label].nil?
-        h[id]["messages"] = (h[id]["messages"] + errors[attr].map { |msg| "#{msg}.".gsub("..", ".") }).flatten
-      end
-
-
-      #---------------------------------------------
-      # apply options to children
-      #---------------------------------------------
-      
-      # get keys
-      assoc_names = errors.keys.map { |k| k.to_s.split(".") }.select { |a| a.many? }.map { |a| a[0] }.compact.uniq
-
-      # if child has errors or is invalid (i.e., we prefer explicitly declared errrors),
-      # call function recursively and merge results
-      assoc_names.each do |assoc_name|
-        c_options = options[assoc_name.to_sym] || {}
-        obj.send("#{assoc_name}").each_with_index do |child, index|
-          if !child.errors.empty? or child.invalid?
-            c_prefix = "#{prefix}_#{assoc_name}_attributes_#{index}"
-            c_hash   = err_supply_hash(child, c_options.merge({ :prefix => c_prefix }))
-
-            h.merge!(c_hash)
-          end
-        end
-      end
-
-
-      #---------------------------------------------
-      # return the hash
-      #---------------------------------------------
-      h    
-
-    end
     
   end
 end

data/lib/err_supply.rb

@@ -1,4 +1,5 @@
 require 'err_supply/version'
+require 'err_supply/controller_helpers'
 require 'err_supply/view_helpers'
 
 module ErrSupply
@@ -9,8 +10,15 @@ module ErrSupply
     #-------------------------------------------------------
     initializer "err_supply.start" do |app|
       
-      # add method to views
-      ActionView::Base.module_eval { include ErrSupply::ViewHelpers }  if defined? ActionView
+      # extend views
+      ActiveSupport.on_load :action_view do 
+        include ErrSupply::ViewHelpers
+      end
+      
+      # extend controllers
+      ActiveSupport.on_load :action_controller do
+        include ErrSupply::ControllerHelpers
+      end
       
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: err_supply
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Coroutine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,6 +58,7 @@ files:
 - err_supply.gemspec
 - lib/assets/javascripts/err_supply.js
 - lib/err_supply.rb
+- lib/err_supply/controller_helpers.rb
 - lib/err_supply/version.rb
 - lib/err_supply/view_helpers.rb
 - vendor/assets/javascripts/jquery.qtip.js