simply_messages 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,7 +1,7 @@
 = simply_messages
 
 simply_messages is a Rails plugin providing a unified notice/alert messages handling (like those: flash.now[:notice] = 'Yeah').
-Based on the message_block plugin by Ben Hughes (http://github.com/railsgarden/message_block).
+Based on the message_block by Ben Hughes (http://github.com/railsgarden/message_block).
 
 
 == Requirements
@@ -20,17 +20,26 @@ Then bundle:
   bundle
 
 
-In `app/views/layouts/application.html.erb`:
+simply_messages uses standard I18n translations to display errors and as such requires at least the following keys to be present:
 
-  <%= messages_block %>
+  activerecord:
+    errors:
+      template:
+        header:
+          one: "1 error prohibited this %{model} from being saved"
+          other: "%{count} errors prohibited this %{model} from being saved"
+
+
+== Usage
 
+In `app/views/layouts/application.html.erb`:
 
-By default the messages_block function will display all flash[:notice] and flash[:alert] messages and all errors for model object associated by name with the current controller (so it will display all model errors for @user model when 'users' is the current controller).
+  <%= messages_block %>
 
-Will also display appropriate messages for :success and :error flash keys.
 
+By default the messages_block function will display all flash[:notice] and flash[:alert] messages and all errors for model object associated by name with the current controller (so it will display all model errors for @user model when 'users' is the current controller). Will also display appropriate messages for :success and :error flash keys.
 
-We can also specify the model we would like to display errors for, like this:
+We can also explicitly set the model we would like to display errors for, like this:
 
   <%= messages_block :for => :comment %>
 
@@ -52,27 +61,27 @@ view:
 will result in:
 
   <div class="notice">
-  <p>Post saved.</p>
+  <p>Post saved</p>
   </div>
 
 
 === EXAMPLE 2
 
-users_controller:
+Given a User model instance with one validation error:
 
-  @user.errors.add('name', 'name should not be empty')
-  flash.now[:alert] = 'Unable to add user'
+  user.errors
+  => #<OrderedHash {:name=>["can't be blank"]}>
 
-view:
+and this in view in the users controller:
 
   <%= messages_block %>
 
-will result in:
+will render:
 
   <div class="alert">
-  <p>Unable to add user:</p>
+  <p>1 error prohibited this User from being saved:</p>
   <ul>
-  <li>name should not be empty</li>
+  <li>Name can't be blank</li>
   </ul>
   </div>
 

data/Rakefile

@@ -3,10 +3,17 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+task :default => :spec
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   require 'simply_messages/version'
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "simply_messages #{SimplyMessages::VERSION}"
   rdoc.rdoc_files.include('README*')

data/lib/simply_messages/action_view_extension.rb

@@ -5,8 +5,8 @@ module SimplyMessages
     extend ::ActiveSupport::Concern
 
     module InstanceMethods
-      def messages_block(options = {})
 
+      def messages_block(options = {})
         # make options[:for] an array
         options[:for] ||= []
         options[:for] = [options[:for]] unless options[:for].is_a?(Array)
@@ -21,48 +21,51 @@ module SimplyMessages
           else
             model_object
           end
-        end.select {|m| !m.nil? }.uniq
-
-        # all models errors
-        models_errors = []
-        model_objects.each do |m|
-          errors = m.errors.entries.collect {|field, message| message}.select {|m| m.present?}
-          models_errors.concat(errors) if errors.any?
-        end
+        end.select { |m| m.present? }.uniq
 
         # messages_block
         messages_block = ''
 
-        # flash[:success] or flash[:notice]
-        if flash[:success].present? or flash[:notice].present?
-
-          key = flash[:success].present? ? :success : :notice
-
-          msg = content_tag(:p, flash[key] + '.')
-          messages_block += content_tag(:div, msg, :class => key.to_s)
+        # notice/success
+        flash_msg = ''
+        [:notice, :success].each do |key|
+          if flash[key].present?
+            flash_msg += content_tag(:p, flash[key])
+            messages_block += content_tag(:div, flash_msg.html_safe, :class => key.to_s)
+          end
         end
 
-        # flash[:error] or flash[:alert] or models errors
-        if flash[:error].present? or flash[:alert] or models_errors.any?
-          key = flash[:error].present? ? :error : :alert
-          msg = ''
-
+        # alert/error
+        flash_msg = ''
+        html_class = ''
+        [:alert, :error].each do |key|
           if flash[key].present?
-            msg += content_tag(:p, flash[key] + (models_errors.any? ? ':' : '.'))
+            flash_msg += content_tag(:p, flash[key])
+            html_class += key.to_s
           end
+        end
 
-          if models_errors.any?
-            errors = []
-            models_errors.each do |e|
-              errors << content_tag(:li, e)
+        # all models errors
+        errors = ''
+        model_objects.each do |model|
+          if model.errors.any?
+            errors += content_tag(:p, I18n.translate(
+              model.errors.count > 1 ? :other : :one,
+              :count => model.errors.count,
+              :model => model.class.model_name.human,
+              :scope => [:activerecord, :errors, :template, :header]) + ':')
+
+            msg = ''
+            model.errors.full_messages.each do |e|
+              msg += content_tag(:li, e)
             end
-            msg += content_tag(:ul, errors.join)
+            errors += content_tag(:ul, msg.html_safe)
           end
-
-          messages_block += content_tag(:div, msg, :class => key.to_s)
         end
 
-        messages_block
+        messages_block += content_tag(:div, flash_msg.html_safe + errors.html_safe, :class => (html_class.presence || 'alert'))
+
+        messages_block.html_safe
       end
 
     end

data/lib/simply_messages/railtie.rb

@@ -11,4 +11,3 @@ module SimplyMessages
     end
   end
 end
-

data/lib/simply_messages/version.rb

@@ -1,3 +1,3 @@
 module SimplyMessages
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/simply_messages.gemspec

@@ -25,4 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', ['>= 3.0.0']
   s.add_development_dependency 'bundler', ['>= 1.0.0']
   s.add_development_dependency 'sqlite3', ['>= 0']
+  s.add_development_dependency 'rspec', ['>= 0']
+  s.add_development_dependency 'rspec-rails', ['>= 0']
+  s.add_development_dependency 'webrat', ['>= 0']
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simply_messages
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Go\xC5\x9Bcicki"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 +02:00
+date: 2011-05-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,48 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: webrat
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: simply_messages is a unified flash and error messages display solution
 email: 
 - pawel.goscicki@gmail.com