simply_messages 0.0.2 → 0.1.0

data/.gitignore

@@ -2,4 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+log/*
 *.swp

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.rdoc

@@ -1,6 +1,6 @@
 = simply_messages
 
-simply_messages is a Rails plugin providing a unified notice/alert messages handling (like those: flash.now[:notice] = 'Yeah').
+simply_messages is a Rails plugin providing a unified notice/alert messages handling (like those: flash.now[:notice] = 'Yeah') and model validation errors.
 Based on the message_block by Ben Hughes (http://github.com/railsgarden/message_block).
 
 
@@ -37,7 +37,7 @@ In `app/views/layouts/application.html.erb`:
   <%= messages_block %>
 
 
-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.
+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). It will also display appropriate messages for :success and :error flash keys.
 
 We can also explicitly set the model we would like to display errors for, like this:
 
@@ -72,11 +72,11 @@ Given a User model instance with one validation error:
   user.errors
   => #<OrderedHash {:name=>["can't be blank"]}>
 
-and this in view in the users controller:
+and this in the view in the users controller:
 
   <%= messages_block %>
 
-will render:
+it will render:
 
   <div class="alert">
   <p>1 error prohibited this User from being saved:</p>

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   require 'simply_messages/version'
   rdoc.rdoc_dir = 'rdoc'

data/lib/simply_messages/version.rb

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

data/simply_messages.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.summary = 'Unified flash notices and model error messages display solution'
   s.description = 'simply_messages is a unified flash and error messages display solution'
 
-  s.rubyforge_project = 'simply_messages'
+  s.rubyforge_project = 'simply-messages'
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/app.rb

@@ -0,0 +1,59 @@
+require 'active_record'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+
+# database
+ActiveRecord::Base.configurations = { 'test' => { :adapter => 'sqlite3', :database => ':memory:' } }
+ActiveRecord::Base.establish_connection 'test'
+
+# config
+app = Class.new(Rails::Application)
+app.config.secret_token = "2jv9wver8j3haskhf23b4j51ho8f8vh1"
+app.config.session_store :cookie_store, :key => "_simply_messages_session"
+app.config.active_support.deprecation = :log
+app.initialize!
+
+# route
+app.routes.draw do
+  resources :users, :only => [:index, :create]
+end
+
+# model
+class User < ActiveRecord::Base
+  validates_presence_of :name, :age
+end
+
+# controllers
+class ApplicationController < ActionController::Base
+end
+
+class UsersController < ApplicationController
+  def index
+    flash.now[:notice] = 'Good'
+    flash.now[:success] = 'Good'
+    flash.now[:alert] = 'Not too good'
+    render :inline => "<%= messages_block %>"
+  end
+
+  def create
+    @user = User.create(params[:user])
+    render :inline => "<%= messages_block %>"
+  end
+end
+
+# helpers
+Object.const_set(:ApplicationHelper, Module.new)
+
+# migration
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table(:users) do |t|
+      t.string :name, :null => false
+      t.integer :age, :null => false
+    end
+  end
+end
+
+# I18n
+I18n.backend.store_translations :en, :activerecord => { :errors => { :template => { :header => { :one => 'There is one error' } } } }
+I18n.backend.store_translations :en, :activerecord => { :errors => { :template => { :header => { :other => 'There are %{count} errors' } } } }

data/spec/controllers/users_controller_spec.rb

@@ -0,0 +1,44 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe UsersController do
+
+  render_views
+
+  describe "#index" do
+    before do
+      get :index
+    end
+
+    specify { response.should be_success }
+
+    specify { response.should have_selector('div.notice p', :content => 'Good') }
+    specify { response.should have_selector('div.success p', :content => 'Good') }
+    specify { response.should have_selector('div.alert p', :content => 'Not too good') }
+  end
+
+  describe "#create" do
+    context "without name" do
+      before do
+        post :create, :user => { :age => 21 }
+      end
+
+      specify { response.should be_success }
+
+      specify { response.should have_selector('div.alert p', :content => "error") }
+      specify { response.should have_selector('div.alert li', :content => "Name can't be blank") }
+    end
+
+    context "without name and age" do
+      before do
+        post :create
+      end
+
+      specify { response.should be_success }
+
+      specify { response.should have_selector('div.alert p', :content => "error") }
+      specify { response.should have_selector('div.alert li', :content => "Name can't be blank") }
+      specify { response.should have_selector('div.alert li', :content => "Age can't be blank") }
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,28 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$:.unshift(File.dirname(__FILE__))
+
+require 'rails'
+require 'simply_messages'
+
+require File.join(File.dirname(__FILE__), 'app')
+
+require 'rspec/rails'
+
+# Requires supporting ruby files with custom matchers and macros, etc.
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+require "webrat"
+
+Webrat.configure do |config|
+  config.mode = :rails
+end
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+
+  # run migrations
+  config.before :all do
+    CreateUsers.up unless ActiveRecord::Base.connection.table_exists? 'users'
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Go\xC5\x9Bcicki"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 +02:00
+date: 2011-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +117,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -126,8 +127,9 @@ files:
 - lib/simply_messages/railtie.rb
 - lib/simply_messages/version.rb
 - simply_messages.gemspec
-- test/functional/helpers_test.rb
-- test/test_helper.rb
+- spec/app.rb
+- spec/controllers/users_controller_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: https://github.com/pjg/simply_messages
 licenses: 
@@ -157,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: simply_messages
+rubyforge_project: simply-messages
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3

data/test/functional/helpers_test.rb

@@ -1,81 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'action_controller'
-require 'action_controller/test_process'
-
-class Mock
-  attr_accessor :errors
-
-  def initialize(opts = {})
-    # create Errors object so I could add errors to this mock model
-    @errors = ActiveRecord::Errors.new(self)
-  end
-end
-
-class MocksController < ApplicationController
-  def success
-    flash.now[:success] = 'We have a success'
-    render :inline => '<%= messages_block %>'
-  end
-
-  def notice
-    flash.now[:notice] = 'We have a notice'
-    render :inline => '<%= messages_block %>'
-  end
-
-  def error
-    flash.now[:error] = 'Error: no luck this time'
-    render :inline => '<%= messages_block %>'
-  end
-
-  def alert
-    flash.now[:alert] = 'Alert: no luck this time'
-    render :inline => '<%= messages_block %>'
-  end
-
-  def model_error
-    flash.now[:error] = 'Model error'
-    @mock = Mock.new
-    @mock.errors.add('name', 'just having some troubles')
-    render :inline => '<%= messages_block %>'
-  end
-end
-
-class MocksControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = MocksController.new
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
-
-    ActionController::Routing::Routes.draw do |map|
-      map.connect ':controller/:action/:id'
-    end
-  end
-
-  def test_success
-    get :success
-    assert_select 'div.success p', :text => /We have a success./
-  end
-
-  def test_notice
-    get :notice
-    assert_select 'div.notice p', :text => /We have a notice./
-  end
-
-  def test_error
-    get :error
-    assert_select 'div.error p', :text => /Error: no luck this time./
-  end
-
-  def test_alert
-    get :alert
-    assert_select 'div.alert p', :text => /Alert: no luck this time./
-  end
-
-  def test_model_error
-    get :model_error
-    assert_select 'div.error p', :text => /Model error:/
-    assert_select 'div.error ul li', :text => /just having some troubles/
-  end
-
-end

data/test/test_helper.rb

@@ -1,11 +0,0 @@
-ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/../../../..'
-
-# Optional gems
-begin
-  require 'redgreen'
-rescue LoadError
-end
-
-# Load Rails
-require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))