message_block 1.0.4 → 1.1.0

data/Gemfile.lock

@@ -1,94 +1,70 @@
 PATH
   remote: .
   specs:
-    message_block (1.0.3)
+    message_block (1.0.4)
       rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.10)
     builder (2.1.2)
-    capybara (0.3.9)
-      culerity (>= 0.2.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.3)
-    childprocess (0.0.7)
-      ffi (~> 0.6.3)
-    cucumber (0.9.2)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.5)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    culerity (0.2.12)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    gherkin (2.2.8)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    i18n (0.4.1)
-    json (1.4.6)
-    json_pure (1.4.6)
-    mail (2.2.7)
+    i18n (0.6.0)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.3.1)
-    polyglot (0.3.1)
+    polyglot (0.3.3)
     rack (1.2.1)
-    rack-mount (0.6.13)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rspec (2.0.0)
       rspec-core (= 2.0.0)
@@ -100,26 +76,17 @@ GEM
     rspec-mocks (2.0.0)
       rspec-core (= 2.0.0)
       rspec-expectations (= 2.0.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (0.0.29)
-      childprocess (>= 0.0.7)
-      ffi (~> 0.6.3)
-      json_pure
-      rubyzip
     sqlite3-ruby (1.3.1)
-    term-ansicolor (1.0.5)
-    thor (0.14.3)
-    treetop (1.4.8)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (~> 0.3.9)
-  cucumber (~> 0.9.2)
   message_block!
-  rails (>= 3.0.0)
   rspec (~> 2.0)
   sqlite3-ruby (~> 1.3.1)

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/rubiety/message_block.png?branch=master" alt="Build Status" />}[http://travis-ci.org/rubiety/message_block]
+
 == Message Block
 
 Implements the common view pattern by which a list of messages are shown at the top, 
@@ -76,59 +78,3 @@ given that both user and comment fail ActiveRecord validation:
   </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 
-the message_block DOM tree based on a JavaScript object not unlike Rails flash?
-
-Included in the plugin is a Prototype JS implementation to make this easier.  Note that this file is *not* automatically 
-copied when the plugin is installed.  Currently this only works with prototype, but will be converted to jQuery before long:
-  
-  assets/javascripts/message_block.js
-
-Example Usage:
-  
-  <div id="something">
-    <%= message_block :on => :job %>
-  </div>
-  
-  <script type="text/javascript">
-    document.observe('dom:loaded', function() {
-      message_block = new MessageBlock('message_block');  // Default ID is message_block, being explicit
-      
-      // Updates with two errors and one confirmation
-      message_block.update({
-        error: ['Error One', 'Error Two'],
-        confirm: ['Confirmation Message']
-      });
-      
-      // Clears the message block
-      message_block.clear();
-      
-      // Same as above...
-      message_block.update({});
-    });
-  </script>
-
-This could be useful if you're interacting with stuff via Ajax, for example:
-
-  # In Controller
-  wants.json do
-    render :status => :unprocessable_entity, :json => { 'error' => @job.errors.full_messages }
-  end
-  
-  # JavaScript Ajax
-  new Ajax.Request("/jobs", {
-    method: 'get',
-    
-    onFailure: function(transport) {
-      this.message_block.update(transport.responseJSON);
-    },
-    
-    onSuccess: function(transport) {
-      this.message_block.clear();
-      
-      // Do something...
-    }
-  });

data/Rakefile

@@ -2,6 +2,29 @@ require 'rubygems'
 require 'rake'
 require 'rake/rdoctask'
 
+require 'rubygems'
+require 'bundler/setup'
+
+require 'rake'
+require 'rspec/core/rake_task'
+
+Bundler::GemHelper.install_tasks
+
+desc 'Default: run unit tests.'
+task :default => [:clean, :test]
+
+desc "Run Specs"
+RSpec::Core::RakeTask.new(:spec) do |t|
+end
+
+task :test => :spec
+
+desc "Clean up files."
+task :clean do |t|
+  FileUtils.rm_rf "tmp"
+  Dir.glob("message_block-*.gem").each {|f| FileUtils.rm f }
+end
+
 desc "Generate documentation for the plugin."
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = "rdoc"
@@ -12,3 +35,5 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"].sort.each { |ext| load ext }
+
+

data/lib/message_block/helpers.rb

@@ -43,10 +43,12 @@ module MessageBlock
         "<ul class=\"#{type}\">" + flash_messages[type.to_sym].map {|message| "<li>#{message}</li>" }.join + "</ul>"
       end.join
       
-      if options[:container]
-        content_tag(options[:container], contents, options[:html], false)
-      else
-        contents
+      unless contents.blank?
+        if options[:container]
+          content_tag(options[:container], contents, options[:html], false)
+        else
+          contents
+        end
       end
     end
     

data/lib/message_block/version.rb

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

data/lib/tasks/message_block.rake

@@ -5,11 +5,9 @@ namespace :message_block do
     
     images_source = File.join(File.dirname(__FILE__), "..", "..", "assets", "images")
     stylesheets_source = File.join(File.dirname(__FILE__), "..", "..", "assets", "stylesheets", "message_block.css")
-    javascripts_source = File.join(File.dirname(__FILE__), "..", "..", "assets", "javascripts", "message_block.js")
     
     images_target = Rails.root.join("public", "images", "message_block")
     stylesheets_target = Rails.root.join("public", "stylesheets", "message_block.css")
-    javascripts_target = Rails.root.join("public", "javascripts", "message_block.js")
     
     unless File.exists?(images_target)
       FileUtils.cp_r(images_source, images_target)
@@ -25,12 +23,5 @@ namespace :message_block do
       puts "  Stylesheet appears to already be installed, not copying"
     end
     
-    unless File.exists?(javascripts_target)
-      FileUtils.cp(javascripts_source, javascripts_target)
-      puts "  Copied Javascript"
-    else
-      puts "  Javascript appears to already be installed, not copying"
-    end
-    
   end
-end
+end

data/spec/message_block/helpers_spec.rb

@@ -22,7 +22,7 @@ describe MessageBlock::Helpers do
   end
   
   it "should show nothing with no errors" do
-    message_block.should == %(<div class="message_block" id="message_block"></div>)
+    message_block.should be_nil
   end
   
   it "should automatically find post errors with posts controller" do
@@ -67,18 +67,21 @@ describe MessageBlock::Helpers do
   end
   
   it "should be able to specify id for containing div" do
+    @controller = posts_controller
     output = message_block(:id => "messages")
-    output.should == %(<div class="message_block" id="messages"></div>)
+    output.should == %(<div class="message_block" id="messages"><ul class="error"><li>name can't be blank</li></ul></div>)
   end
   
   it "should be able to specify class for containing div" do
+    @controller = posts_controller
     output = message_block(:class => "messages")
-    output.should == %(<div class="messages" id="message_block"></div>)
+    output.should == %(<div class="messages" id="message_block"><ul class="error"><li>name can't be blank</li></ul></div>)
   end
   
   it "should be able to specify html options for containing div" do
+    @controller = posts_controller
     output = message_block(:html => {:id => "block", :class => "messages"})
-    output.should == %(<div class="messages" id="block"></div>)
+    output.should == %(<div class="messages" id="block"><ul class="error"><li>name can't be blank</li></ul></div>)
   end
   
   it "should be able to specify container option as false" do

metadata

@@ -1,111 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: message_block
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-15 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: capybara
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 3
-        - 9
-        version: 0.3.9
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.3.1
-  type: :development
-  version_requirements: *id005
-description: Implements the common view pattern by which a list of messages are shown at the top, often a combination of flash messages and ActiveRecord validation issues on one or more models.
+description: Implements the common view pattern by which a list of messages are shown
+  at the top, often a combination of flash messages and ActiveRecord validation issues
+  on one or more models.
 email: ben@railsgarden.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/message_block/helpers.rb
 - lib/message_block/railtie.rb
 - lib/message_block/version.rb
@@ -119,7 +80,6 @@ files:
 - assets/images/info.gif
 - assets/images/notice.gif
 - assets/images/warn.gif
-- assets/javascripts/message_block.js
 - assets/stylesheets/message_block.css
 - rails/init.rb
 - Gemfile
@@ -128,41 +88,28 @@ files:
 - Rakefile
 - README.rdoc
 - init.rb
-has_rdoc: true
 homepage: http://github.com/rubiety/message_block
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 19
-      segments: 
-      - 1
-      - 3
-      - 4
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: message_block
-rubygems_version: 1.3.7
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Flash message and error_messages_for handling with a common interface.
 test_files: []
-

data/assets/javascripts/message_block.js

@@ -1,37 +0,0 @@
-/**
- * Message Block JavaScript Interface
- * 
- * Allows for updating a message block with JSON errors
- **/
-
-var MessageBlock = Class.create({
-  initialize: function(message_block) {
-    this.message_block = $(message_block ? message_block : "message_block");
-  },
-  
-  clear: function() {
-    this.message_block.update("");
-    new Effect.Fade(this.message_block);
-  },
-  
-  update: function(errors) {
-    if (!errors || Object.keys(errors).size() == 0) {
-      new Effect.Fade(this.message_block);
-      return;
-    }
-    
-    this.message_block.update("");
-    
-    for (error_type in errors) {
-      $(this.message_block).appendChild(
-        Builder.node('ul', { 'class': error_type },
-          $A(errors[error_type]).map(function(error) {
-            return Builder.node('li', error);
-          })
-        )
-      );
-    }
-    
-    new Effect.Appear(this.message_block);
-  }
-});