responders 0.9.3 → 1.0.0.rc

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: de01024464852eb08914a193b19d0f915877c0ac
+  data.tar.gz: 6df0e03ed0128f02e604e86b41b633fbc374ddfc
+SHA512:
+  metadata.gz: a7eeff649c82736af6c3873899d731395014acca97a914db15069d9d94d64fb84912a7fa8646535118e3816190174a6bf378bdd252abe7d6ee966ec8d1253ca8
+  data.tar.gz: 3b78f0a5d481abf8b667613355e064f586b1918890c8a04c216ef99283433b74f362bbe5ff724480b40a5b9027031c73f66b9dfb759c557bb31c9916f12fa469

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.0.rc
+
+* Drop support for Rails 3.1 and Ruby 1.8, keep support for Rails 3.2
+* Support for Rails 4.0 onward
+* Fix flash message on destroy failure. Fixes #61
+
 ## 0.9.3
 
 * Fix url generation for namespaced models

data/README.md

@@ -1,5 +1,9 @@
 # Responders
 
+[![Gem Version](https://fury-badge.herokuapp.com/rb/responders.png)](http://badge.fury.io/rb/responders)
+[![Build Status](https://api.travis-ci.org/plataformatec/responders.png?branch=master)](http://travis-ci.org/plataformatec/responders)
+[![Code Climate](https://codeclimate.com/github/plataformatec/responders.png)](https://codeclimate.com/github/plataformatec/responders)
+
 A set of responders modules to dry up your Rails 3+ app.
 
 ## Responders Types
@@ -24,7 +28,8 @@ does not contain errors, it will automatically set the flash message to
 ```
 
 In case the resource contains errors, you should use the failure key on I18n. This is
-useful to dry up flash messages from your controllers. If you need a specific message
+useful to dry up flash messages from your controllers. Note: by default alerts for `update`
+and `destroy` actions are commented in generated I18n file. If you need a specific message
 for a controller, let's say, for `PostsController`, you can also do:
 
 ```yaml
@@ -119,6 +124,29 @@ class InvitationsController < ApplicationController
 end
 ```
 
+## Interpolation Options
+
+You can pass in extra interpolation options for the translation by adding an `interpolation_options` method to your controller:
+
+```ruby
+class InvitationsController < ApplicationController
+  responders :flash, :http_cache
+  
+  def create
+    @invitation = Invitation.create(params[:invitation])
+    respond_with @invitation
+  end  
+  
+  private
+  
+  def interpolation_options
+    { resource_name: @invitation.email }
+  end
+end
+```
+
+Now you would see the message "bob@bob.com was successfully created" instead of the default "Invitation was successfully created."
+
 ## Generator
 
 This gem also includes a responders controller generator, so your scaffold can be customized

data/lib/responders/flash_responder.rb

@@ -135,7 +135,8 @@ module Responders
     end
 
     def set_flash_now?
-      (@flash_now == true) || (has_errors? ? @flash_now == :on_failure : @flash_now == :on_success) || (format == :js)
+      @flash_now == true || format == :js ||
+        (default_action && (has_errors? ? @flash_now == :on_failure : @flash_now == :on_success))
     end
 
     def set_flash_message? #:nodoc:

data/lib/responders/locales/en.yml

@@ -3,8 +3,10 @@ en:
     actions:
       create:
         notice: '%{resource_name} was successfully created.'
+        # alert: '%{resource_name} could not be created.'
       update:
         notice: '%{resource_name} was successfully updated.'
+        # alert: '%{resource_name} could not be updated.'
       destroy:
         notice: '%{resource_name} was successfully destroyed.'
-        alert: '%{resource_name} could not be destroyed.'
+        alert: '%{resource_name} could not be destroyed.'

data/lib/responders/version.rb

@@ -1,3 +1,3 @@
 module Responders
-  VERSION = "0.9.3".freeze
+  VERSION = "1.0.0.rc".freeze
 end

data/test/collection_responder_test.rb

@@ -28,7 +28,7 @@ class CollectionController < ApplicationController
   end
 
   def isolated_namespace
-    respond_with MyEngine::Business.new
+    respond_with MyEngine::Business
   end
 
   def uncountable

data/test/flash_responder_test.rb

@@ -174,6 +174,12 @@ class FlashResponderTest < ActionController::TestCase
     assert_flash_now :failure
   end
 
+  def test_does_not_set_flash_message_to_now_with_errors_and_redirect
+    delete :with_html, :fail => true
+    assert_not_flash_now :failure
+    assert_equal "<strong>OH NOES!</strong> You did it wrong!", flash[:failure]
+  end
+
   def test_never_set_flash_now
     post :flexible, :fail => true, :responder_options => { :flash_now => false, :alert => "Warning" }
     assert_not_flash_now :failure
@@ -181,13 +187,13 @@ class FlashResponderTest < ActionController::TestCase
 
   # If we have flash.now, it's always marked as used.
   def assert_flash_now(k)
-    assert flash.instance_variable_get(:@used).to_a.include?(k.to_sym),
+    assert flash.used_keys.include?(k.to_sym),
      "Expected #{k} to be in flash.now, but it's not."
   end
 
   def assert_not_flash_now(k)
     assert flash[k], "Expected #{k} to be set"
-    assert !flash.instance_variable_get(:@used).include?(k.to_sym),
+    assert !flash.used_keys.include?(k.to_sym),
      "Expected #{k} to not be in flash.now, but it is."
   end
 end

data/test/http_cache_responder_test.rb

@@ -51,7 +51,7 @@ class HttpCacheResponderTest < ActionController::TestCase
     @request.env["HTTP_IF_MODIFIED_SINCE"] = Time.utc(2009, 6).httpdate
     get :single
     assert_equal 304, @response.status
-    assert_equal " ", @response.body
+    assert_includes [" ", ""], @response.body
   end
 
   def test_refreshes_last_modified_if_cache_is_expired

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require 'bundler'
 
 Bundler.setup
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 
 # Configure Rails
 ENV["RAILS_ENV"] = "test"
@@ -11,6 +11,7 @@ ENV["RAILS_ENV"] = "test"
 require 'active_support'
 require 'action_controller'
 require 'active_model'
+require 'rails/engine'
 require 'rails/railtie'
 
 $:.unshift File.expand_path('../../lib', __FILE__)
@@ -22,8 +23,8 @@ I18n.reload!
 Responders::Routes = ActionDispatch::Routing::RouteSet.new
 Responders::Routes.draw do
   resources :news
-  match '/admin/:action', :controller => "admin/addresses"
-  match '/:controller(/:action(/:id))'
+  get '/admin/:action', :controller => "admin/addresses"
+  get '/:controller(/:action(/:id))'
 end
 
 class ApplicationController < ActionController::Base
@@ -39,6 +40,17 @@ class ActiveSupport::TestCase
   end
 end
 
+module ActionDispatch
+  class Flash
+    class FlashHash
+      def used_keys
+        # Rails 3 || Rails 4
+        @used || @discard
+      end
+    end
+  end
+end
+
 class Model
   include ActiveModel::Conversion
   include ActiveModel::Validations
@@ -70,10 +82,8 @@ class News < Model
 end
 
 module MyEngine
-  def self.use_relative_model_naming?
-    true
-  end
-
-  class Business < Model
+  class Business < Rails::Engine
+    isolate_namespace MyEngine
+    extend ActiveModel::Naming
   end
 end

metadata

@@ -1,58 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: responders
 version: !ruby/object:Gem::Version
-  version: 0.9.3
-  prerelease: 
+  version: 1.0.0.rc
 platform: ruby
 authors:
 - José Valim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.1'
-description: A set of Rails 3 responders to dry up your application
+        version: '5'
+description: A set of Rails responders to dry up your application
 email: contact@plataformatec.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
-- Rakefile
-- gemfiles/Gemfile-rails.3.1.x
-- lib/generators/rails/USAGE
 - lib/generators/rails/responders_controller_generator.rb
 - lib/generators/rails/templates/controller.rb
+- lib/generators/rails/USAGE
 - lib/generators/responders/install_generator.rb
-- lib/responders.rb
 - lib/responders/collection_responder.rb
 - lib/responders/controller_method.rb
 - lib/responders/flash_responder.rb
 - lib/responders/http_cache_responder.rb
 - lib/responders/locales/en.yml
 - lib/responders/version.rb
-- responders.gemspec
+- lib/responders.rb
 - test/collection_responder_test.rb
 - test/controller_method_test.rb
 - test/flash_responder_test.rb
@@ -63,29 +60,29 @@ files:
 - test/views/addresses/edit.html.erb
 - test/views/addresses/new.html.erb
 homepage: http://github.com/plataformatec/responders
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: responders
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: A set of Rails 3 responders to dry up your application
+specification_version: 4
+summary: A set of Rails responders to dry up your application
 test_files:
 - test/collection_responder_test.rb
 - test/controller_method_test.rb

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - ree
-  - jruby-18mode
-gemfile:
-  - gemfiles/Gemfile-rails.3.1.x
-  - Gemfile
-notifications:
-  recipients:
-    - jose.valim@plataformatec.com.br
-    - carlos@plataformatec.com.br
-    - rafael.franca@plataformatec.com.br

data/Gemfile

@@ -1,10 +0,0 @@
-source :rubygems
-
-gemspec
-
-# Fixed 3.2.1 because 3.2.2 is broken
-gem 'railties', '~> 3.2.3'
-
-gem 'mocha'
-
-gem 'ruby-debug', :platform => :mri_18

data/Gemfile.lock

@@ -1,76 +0,0 @@
-PATH
-  remote: .
-  specs:
-    responders (0.9.3)
-      railties (~> 3.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    builder (3.0.3)
-    columnize (0.3.6)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.5)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    metaclass (0.0.1)
-    mocha (0.10.4)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.9)
-    rdoc (3.12)
-      json (~> 1.4)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mocha
-  railties (~> 3.2.3)
-  responders!
-  ruby-debug

data/Rakefile

@@ -1,26 +0,0 @@
-# encoding: UTF-8
-
-require 'bundler/gem_tasks'
-
-require 'rake/testtask'
-require 'rdoc/task'
-require File.join(File.dirname(__FILE__), 'lib', 'responders', 'version')
-
-desc 'Default: run unit tests'
-task :default => :test
-
-desc 'Test Responders'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for Responders'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Responders'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/gemfiles/Gemfile-rails.3.1.x

@@ -1,6 +0,0 @@
-source :rubygems
-
-gem 'responders', :path => '..'
-
-gem 'railties', '~> 3.1.0'
-gem 'mocha'

data/responders.gemspec

@@ -1,22 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "responders/version"
-
-Gem::Specification.new do |s|
-  s.name        = "responders"
-  s.version     = Responders::VERSION.dup
-  s.platform    = Gem::Platform::RUBY
-  s.summary     = "A set of Rails 3 responders to dry up your application"
-  s.email       = "contact@plataformatec.com.br"
-  s.homepage    = "http://github.com/plataformatec/responders"
-  s.description = "A set of Rails 3 responders to dry up your application"
-  s.authors     = ['José Valim']
-
-  s.rubyforge_project = "responders"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths = ["lib"]
-
-  s.add_dependency "railties", "~> 3.1"
-end