rails_errors2html 1.0.2 → 1.3.0

data/lib/rails_errors2html.rb

@@ -1,5 +1,5 @@
 module Errors2Html
-  VERSION = '1.0.2'
+  VERSION = '1.3.0'
 
   def Errors2Html.version
     Errors2Html::VERSION
@@ -7,8 +7,9 @@ module Errors2Html
 
   def Errors2Html.dependencies
     {
-      'map' => [ 'map'           , ' >= 6.2.0' ],
-      'rails_view' => [ 'rails_view'           , ' >= 1.0.1' ]
+      'fattr'      => [ 'fattr'         , ' >= 2.2.1' ],
+      'map'        => [ 'map'           , ' >= 6.2.0' ],
+      'rails_view' => [ 'rails_view'    , ' >= 1.0.1' ]
     }
   end
     
@@ -23,10 +24,6 @@ module Errors2Html
     require(lib)
   end
 
-  class << Errors2Html
-    attr_accessor :template
-  end
-
   def Errors2Html.to_html(*args)
     args.flatten!
     args.compact!
@@ -35,23 +32,18 @@ module Errors2Html
 
     errors = Map.new
     errors[:global] = []
-    errors[:fields] = {}
+    errors[:fields] = {} 
 
     args.each do |e|
-      e.each do |key, messages|
-        key = key.to_s
-
+      flatten(e).each do |key, messages|
         Array(messages).each do |message|
           at_least_one_error = true
 
-          list =
-            if key =~ /\A(?:[*]|base)\Z/iomx
-              errors[:global] ||= []
-            else
-              errors[:fields][key] ||= []
-            end
-
-          list.push(message.to_s).uniq!
+          if Array(key).join =~ /\A(?:[*]|base)\Z/iomx
+            errors.global.push(message.to_s).uniq!
+          else
+            (errors.fields[key] ||= []).push(message.to_s).uniq!
+          end
         end
       end
     end
@@ -67,54 +59,84 @@ module Errors2Html
     if template
       View.render(:template => template, :locals => locals)
     else
-      View.render(:inline => Template, :locals => locals)
+      View.render(:inline => inline, :locals => locals)
     end
   end
 
-  def to_html
-    Errors2Html.to_html(self)
+  def Errors2Html.flatten(hashlike)
+    case hashlike
+      when Map
+        hash = Hash.new
+        hashlike.depth_first_each do |key, value|
+          index = key.pop if key.last.is_a?(Integer)
+          (hash[key] ||= []).push(value)
+        end
+        hash
+      else
+        hashlike.respond_to?(:to_hash) ? hashlike.to_hash : hashlike
+    end
   end
 
-  def to_s
-    to_html
-  end
+  Fattr(:inline) do
+    <<-erb
+      <div class="errors2html errors-summary">
+        <h4 class="errors-caption">Sorry, we encountered some errors:</h4>
+
+        <% unless errors.global.empty?  %>
 
-  Template = <<-erb
-    <div class="errors2html errors-summary">
-      <h4 class="errors-caption">Sorry, we encountered some errors:</h4>
-
-      <% unless errors.global.empty?  %>
-        <ul class="errors-global-list">
-          <% errors.global.each do |message| %>
-            <li class="errors-message">
-              <%= message %>
-            </li>
-          <% end %>
-        </ul>
-      <% end %>
-
-      <% unless errors.fields.empty?  %>
-        <dl class="errors-fields-list">
-          <% 
-            errors.fields.each do |key, messages|
-              title = Array(key).join(" ").titleize
-          %>
-            <dt class="errors-title">
-              <%= title %>
-            </dt>
-
-            <% Array(messages).each do |message| %>
-              <dd class="errors-message">
+          <ul class="errors-global-list">
+            <% errors.global.each do |message| %>
+              <li class="errors-message">
                 <%= message %>
-              </dd>
+              </li>
             <% end %>
-          <% end %>
-        </dl>
-      <% end %>
-    </div>
-  erb
+          </ul>
+        <% end %>
+
+        <% unless errors.fields.empty?  %>
+
+          <dl class="errors-fields-list">
+            <% 
+              errors.fields.each do |key, messages|
+                title = Array(key).join(" ").titleize
+            %>
+              <dt class="errors-title">
+                <%= title %>
+              </dt>
+              <% Array(messages).each do |message| %>
+                <dd class="errors-message">
+                  <%= message %>
+                </dd>
+
+              <% end %>
+            <% end %>
+          </dl>
+        <% end %>
+      </div>
+    erb
+  end
+
+  Fattr(:template){ nil }
+
+  module Mixin
+    def to_html
+      ::Errors2Html.to_html(self)
+    end
+
+    def to_s
+      to_html
+    end
+  end
 end
 
-require 'active_model' unless defined?(ActiveModel)
-ActiveModel::Errors.send(:include, Errors2Html)
+##
+#
+  require 'active_model' unless defined?(ActiveModel)
+
+  ActiveModel::Errors.send(:include, Errors2Html::Mixin)
 
+  ActiveModel::Errors.class_eval do
+    def inspect(*args, &block)
+      to_hash.inspect(*args, &block)
+    end
+  end

data/rails_errors2html.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "rails_errors2html"
-  spec.version = "1.0.2"
+  spec.version = "1.3.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "rails_errors2html"
   spec.description = "<%= form_for @post do %>  <%= @post.errors.to_html %>"
@@ -25,6 +25,8 @@ Gem::Specification::new do |spec|
   spec.test_files = nil
 
   
+    spec.add_dependency(*["fattr", " >= 2.2.1"])
+  
     spec.add_dependency(*["map", " >= 6.2.0"])
   
     spec.add_dependency(*["rails_view", " >= 1.0.1"])

data/test/rails_errors2html_test.rb

@@ -3,6 +3,8 @@ require_relative '../test/testing.rb'
 
 Testing Errors2Html do
 
+##
+#
   testing 'simple rendering' do
     errors = ActiveModel::Errors.new(base = Map.new)
     errors.add :base, 'error on base'
@@ -22,7 +24,6 @@ Testing Errors2Html do
               <dt class="errors-title">
                 Field
               </dt>
-
                 <dd class="errors-message">
                   error on field
                 </dd>
@@ -30,8 +31,58 @@ Testing Errors2Html do
       </div>
     __
 
-    compress = proc do |string|
-end
+    assert{ compress(errors.to_html) == compress(expected) } 
+    assert{ compress(errors) == compress(expected) } 
+  end
+
+
+##
+#
+  testing 'map-y errors' do
+    errors = Map.new
+    errors.set '*', 'error on base'
+    errors.set 'field', 'error on field'
+    errors.set 'a', 'b', 'c', %w'one two three'
+    errors.extend(Errors2Html::Mixin)
+
+    expected = <<-__
+      <div class="errors2html errors-summary">
+        <h4 class="errors-caption">Sorry, we encountered some errors:</h4>
+
+
+          <ul class="errors-global-list">
+              <li class="errors-message">
+                error on base
+              </li>
+          </ul>
+
+
+          <dl class="errors-fields-list">
+              <dt class="errors-title">
+                Field
+              </dt>
+                <dd class="errors-message">
+                  error on field
+                </dd>
+
+              <dt class="errors-title">
+                A B C
+              </dt>
+                <dd class="errors-message">
+                  one
+                </dd>
+
+                <dd class="errors-message">
+                  two
+                </dd>
+
+                <dd class="errors-message">
+                  three
+                </dd>
+
+          </dl>
+      </div>
+    __
 
     assert{ compress(errors.to_html) == compress(expected) } 
     assert{ compress(errors) == compress(expected) } 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_errors2html
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fattr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement