message_block 1.0.3 → 1.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    message_block (1.0.1)
+    message_block (1.0.3)
       rails (>= 3.0.0)
 
 GEM

data/README.rdoc

@@ -33,7 +33,7 @@ the helper <tt><%= message_block %></tt>:
 
 The first argument specifies a hash options:
 
-* <tt>:on</tt> - specifies one or many model names for which to check error messages.
+* <tt>:on</tt> - specifies one or many model names for which to check error messages. You can specify the special value of :all which will grab all view assignments that contain an ActiveModel "errors" method.
 * <tt>:model_error_type</tt> - specifies the message type to use for validation errors; defaults to 'error'
 * <tt>:flash_types</tt> - specifies the keys to check in the flash hash.  Messages will be grouped in ul 
   lists according to this type.  Defaults to: %w(back confirm error info warn)
@@ -43,6 +43,7 @@ The first argument specifies a hash options:
 * <tt>:container</tt> - specifies which block-level element to contain the errors (defaults to :div).
 
 === Example
+
 Imagine you have a form for entering a user and a comment:
 
   <%= message_block :on => [:user, :comment] %>
@@ -74,6 +75,8 @@ given that both user and comment fail ActiveRecord validation:
     </ul>
   </div>
 
+Note that instead of manually specifying models you wish to report errors on, you can instead use the special <tt>:all</tt> value which will automatically use all view assign values that contain an ActiveModel::Errors "errors" method.
+
 === Ajax & JavaScript Integration
 
 Sometimes you'll want to use the message block pattern within JavaScript.  Wouldn't it be nice to just populate 
@@ -128,4 +131,4 @@ This could be useful if you're interacting with stuff via Ajax, for example:
       
       // Do something...
     }
-  });
+  });

data/assets/stylesheets/message_block.css

@@ -1,11 +1,11 @@
 .message_block {
   clear: both;
-  margin-top: 0.2em;
-  margin-bottom: 0.3em;
+  margin: 12px 0;
 }
 
 .message_block ul {
-  margin-bottom: 0;
+  border-bottom: 1px solid #ecd757;
+  border-top: 1px solid #ecd757;
   list-style: none;
   padding: 10px;
 }
@@ -14,31 +14,21 @@
 }
 
 .message_block ul.error {
-  border-top: 1px solid #ecd757;
-  border-bottom: 1px solid #ecd757;
-  background: #fcf6d0 url(../../images/message_block/error_m.gif) 1em 50% no-repeat;
+  background: #fcf6d0 url(../../images/message_block/error.gif) 16px 50% no-repeat;
 }
 
 .message_block ul.info {
-  border-top: 1px solid #ecd757;
-  border-bottom: 1px solid #ecd757;
-  background: #fcf6d0 url(../../images/message_block/info_m.gif) 1em 50% no-repeat;
+  background: #fcf6d0 url(../../images/message_block/info.gif) 16px 50% no-repeat;
 }
 
 .message_block ul.notice {
-  border-top: 1px solid #ecd757;
-  border-bottom: 1px solid #ecd757;
-  background: #fcf6d0 url(../../images/message_block/notice_m.gif) 1em 50% no-repeat;
+  background: #fcf6d0 url(../../images/message_block/notice.gif) 16px 50% no-repeat;
 }
 
 .message_block ul.confirm {
-  border-top: 1px solid #ecd757;
-  border-bottom: 1px solid #ecd757;
-  background: #fcf6d0 url(../../images/message_block/confirmation_m.gif) 1em 50% no-repeat;
+  background: #fcf6d0 url(../../images/message_block/confirmation.gif) 16px 50% no-repeat;
 }
 
 .message_block ul.warn {
-  border-top: 1px solid #ecd757;
-  border-bottom: 1px solid #ecd757;
-  background: #fcf6d0 url(../../images/message_block/warn_m.gif) 1em 50% no-repeat;
-}
+  background: #fcf6d0 url(../../images/message_block/warn.gif) 1em 50% no-repeat;
+}

data/lib/message_block/helpers.rb

@@ -2,8 +2,6 @@ module MessageBlock
   module Helpers
     
     def message_block(options = {})
-      options.assert_valid_keys(:on, :model_error_type, :flash_types, :html, :id, :class, :container)
-      
       options[:model_error_type] ||= :error
       options[:flash_types] ||= [:notice, :back, :confirm, :error, :info, :warn].sort_by(&:to_s)
       options[:on] ||= controller.controller_name.split('/').last.gsub(/\_controller$/, '').singularize.to_sym
@@ -27,12 +25,14 @@ module MessageBlock
       
       options[:on] = [options[:on]] unless options[:on].is_a?(Array)
       model_objects = options[:on].map do |model_object|
-        if model_object.instance_of?(String) or model_object.instance_of?(Symbol)
+        if model_object == :all
+          assigns.values.select {|o| o.respond_to?(:errors) && o.errors.is_a?(ActiveModel::Errors) }
+        elsif model_object.instance_of?(String) or model_object.instance_of?(Symbol)
           instance_variable_get("@#{model_object}")
         else
           model_object
         end
-      end.select {|m| !m.nil? }
+      end.flatten.select {|m| !m.nil? }
       
       model_errors = model_objects.inject([]) {|b, m| b += m.errors.full_messages }
       

data/lib/message_block/version.rb

@@ -1,3 +1,3 @@
 module MessageBlock
-  VERSION = "1.0.3"
-end
+  VERSION = "1.0.4"
+end

data/spec/message_block/helpers_spec.rb

@@ -5,12 +5,9 @@ describe MessageBlock::Helpers do
   include MessageBlock::Helpers
   
   before do
-    setup_post
-    setup_user
-  end
-  
-  it "should not accept invalid options" do
-    lambda { message_block :invalid => "option" }.should raise_error(ArgumentError)
+    @post = Post.new
+    @user = User.new
+    stub!(:assigns).and_return(:user => @user, :post => @post)
   end
   
   it "should accept valid options" do
@@ -28,40 +25,45 @@ describe MessageBlock::Helpers do
     message_block.should == %(<div class="message_block" id="message_block"></div>)
   end
   
-  it "should automatically find post errorts with posts controller" do
+  it "should automatically find post errors with posts controller" do
     @controller = posts_controller
     output = message_block
-    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>Author name can't be empty</li></ul></div>)
+    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>name can't be blank</li></ul></div>)
   end
   
   it "should give no error for post" do
     output = message_block(:on => :post)
-    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>Author name can't be empty</li></ul></div>)
+    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>name can't be blank</li></ul></div>)
   end
   
   it "should give error for user" do
     output = message_block(:on => :user)
-    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>User email can't be empty</li></ul></div>)
+    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>name can't be blank</li></ul></div>)
+  end
+
+  it "should give error for both user and post when using :all" do
+    output = message_block(:on => :all)
+    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>name can't be blank</li><li>name can't be blank</li></ul></div>)
   end
   
   it "should give errors for both post and user" do
     output = message_block(:on => [:post, :user])
-    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>Author name can't be empty</li><li>User email can't be empty</li></ul></div>)
+    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>name can't be blank</li><li>name can't be blank</li></ul></div>)
   end
   
   it "should give errors for both post and user in the correct order" do
     output = message_block(:on => [:user, :post])
-    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>)
+    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>name can't be blank</li><li>name can't be blank</li></ul></div>)
   end
   
   it "should give error for user given direct instance variable" do
     output = message_block(:on => @user)
-    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>User email can't be empty</li></ul></div>)
+    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>name can't be blank</li></ul></div>)
   end
   
   it "should respect model error type" do
     output = message_block(:on => :user, :model_error_type => "fail")
-    output.should == %(<div class="message_block" id="message_block"><ul class="fail"><li>User email can't be empty</li></ul></div>)
+    output.should == %(<div class="message_block" id="message_block"><ul class="fail"><li>name can't be blank</li></ul></div>)
   end
   
   it "should be able to specify id for containing div" do
@@ -81,12 +83,12 @@ describe MessageBlock::Helpers do
   
   it "should be able to specify container option as false" do
     output = message_block(:on => :post, :container => false)
-    output.should == %(<ul class="error"><li>Author name can't be empty</li></ul>)
+    output.should == %(<ul class="error"><li>name can't be blank</li></ul>)
   end
   
   it "should be able to specify container option" do
     output = message_block(:on => :post, :container => :fieldset)
-    output.should == %(<fieldset class="message_block" id="message_block"><ul class="error"><li>Author name can't be empty</li></ul></fieldset>)
+    output.should == %(<fieldset class="message_block" id="message_block"><ul class="error"><li>name can't be blank</li></ul></fieldset>)
   end
   
   it "should be able to see flash error string" do
@@ -118,7 +120,7 @@ describe MessageBlock::Helpers do
   it "should be able to see flash error alongside model error" do
     flash[:error] = "Error A"
     output = message_block(:on => :post)
-    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>Error A</li><li>Author name can't be empty</li></ul></div>)
+    output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>Error A</li><li>name can't be blank</li></ul></div>)
   end
   
   it "should be safe for html inside flash messages" do
@@ -127,4 +129,4 @@ describe MessageBlock::Helpers do
     output.should == %(<div class="message_block" id="message_block"><ul class="error"><li>Error <strong>A</strong></li><li>Error <strong>B</strong></li></ul></div>)
   end
   
-end
+end

data/spec/spec_helper.rb

@@ -1,54 +1,61 @@
 require "rubygems"
 require "message_block"
 require "active_support"
+require "active_model"
 require "action_pack"
 require "action_view"
 
 require File.dirname(__FILE__) + '/../init'
 
-# Borrowed model stubs from Rails active_record_helper_test.rb
-# TODO: Re-implement using mocha
-Post = Struct.new("Post", :title, :author_name)
-User = Struct.new("User", :email)
+class Post
+  extend ActiveModel::Naming
 
-def setup_post
-  @post = Post.new
-  def @post.errors
-    Class.new do
-      def on(field)
-        case field.to_s
-        when "author_name"
-          "can't be empty"
-        when "body"
-          true
-        else
-          false
-        end
-      end
-      def empty?() false end
-      def count() 1 end
-      def full_messages() [ "Author name can't be empty" ] end
-    end.new
+  attr_accessor :name
+  attr_reader :errors
+
+  def initialize
+    @errors = ActiveModel::Errors.new(self)
+    @errors.add(:name, "can't be blank")
+  end
+  
+  def read_attribute_for_validation(attr)
+    send(attr)
+  end
+  
+  def self.human_attribute_name(attr, options = {})
+    attr
   end
   
-  @post.title       = "Hello World"
-  @post.author_name = ""
+  def self.lookup_ancestors
+    [self]
+  end
 end
 
-def setup_user
-  @user = User.new
-  def @user.errors
-    Class.new {
-      def on(field) field == "email" end
-      def empty?() false end
-      def count() 1 end
-      def full_messages() [ "User email can't be empty" ] end
-    }.new
+class User
+  extend ActiveModel::Naming
+
+  attr_accessor :name
+  attr_reader :errors
+
+  def initialize
+    @errors = ActiveModel::Errors.new(self)
+    @errors.add(:name, "can't be blank")
   end
   
-  @user.email = ""
+  def read_attribute_for_validation(attr)
+    send(attr)
+  end
+  
+  def self.human_attribute_name(attr, options = {})
+    attr
+  end
+  
+  def self.lookup_ancestors
+    [self]
+  end
 end
 
+
 def controller
   @controller ||= Class.new {
     def controller_name
@@ -67,4 +74,4 @@ end
 
 def flash
   @flash ||= {}
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: message_block
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Ben Hughes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +03:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,21 +114,14 @@ files:
 - spec/message_block/helpers_spec.rb
 - spec/spec_helper.rb
 - assets/images/back.gif
-- assets/images/back_m.gif
 - assets/images/confirmation.gif
-- assets/images/confirmation_m.gif
 - assets/images/error.gif
-- assets/images/error_m.gif
 - assets/images/info.gif
-- assets/images/info_m.gif
 - assets/images/notice.gif
-- assets/images/notice_m.gif
 - assets/images/warn.gif
-- assets/images/warn_m.gif
 - assets/javascripts/message_block.js
 - assets/stylesheets/message_block.css
 - rails/init.rb
-- CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
 - LICENSE

data/CHANGELOG.rdoc

@@ -1,15 +0,0 @@
-== [2010-10-13] 1.0.1 Removed Rails 2.3 Compatibility, Cucumber Overhaul
-
-* Issues with loading rake tasks in Rails 2.3; removing compatibility
-* Revamped Cucumber invocation to use Rails 3 with 'gem "message_block", :path => "..."'
-* Upgraded RSpec to 2.0
-
-== [2010-10-13] 1.0.0 Major Updates
-
-* Finally updated to be a Gem
-* Internal refactoring
-* Converted tests to RSpec
-* New cucumber features
-* Added support for Rails 3.0
-
-== 0.1.0 Initial Beta Version