responders 0.6.0 → 0.6.1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.6
+
+* :js now sets the flash.now by default, instead of flash
+* Renamed responders_install generator to responders:install
+* Added a fix for Rails 3.0.0.beta3
+
 == 0.5
 
 * Added Railtie and better Rails 3 support

data/Gemfile

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+gem "rails", "3.0.0.beta3"
+gem "mocha"
+
+if RUBY_VERSION < "1.9"
+	gem "ruby-debug"
+else
+  gem "test-unit"
+end

data/README.rdoc

@@ -58,7 +58,7 @@ responder. This can be done in an initializer for example:
 
 Or, for your convenience, just do:
 
-  rails generate responders_install
+  rails generate responders:install
 
 == Controller method
 

data/Rakefile

@@ -10,7 +10,6 @@ task :default => :test
 
 desc 'Test Responders'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true

data/lib/generators/responders/install_generator.rb

@@ -0,0 +1,33 @@
+module Responders
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      def self.source_root
+        @_source_root ||= File.expand_path("..", __FILE__)
+      end
+
+      desc "Creates an initializer with default responder configuration and copy locale file"
+
+      def create_responder_file
+        create_file "lib/application_responder.rb", <<-RUBY
+class ApplicationResponder < ActionController::Responder
+  include Responders::FlashResponder
+  include Responders::HttpCacheResponder
+end
+        RUBY
+      end
+
+      def update_application_controller
+        prepend_file "app/controllers/application_controller.rb", %{require "application_responder"\n\n}
+        inject_into_class "app/controllers/application_controller.rb", "ApplicationController", <<-RUBY
+  self.responder = ApplicationResponder
+  respond_to :html
+
+        RUBY
+      end
+
+      def copy_locale
+        copy_file "../../responders/locales/en.yml", "config/locales/responders.en.yml"
+      end
+    end
+  end
+end

data/lib/responders.rb

@@ -5,7 +5,6 @@ module Responders
   autoload :HttpCacheResponder, 'responders/http_cache_responder'
 
   require 'responders/controller_method'
-  ActionController::Base.extend Responders::ControllerMethod
 
   class Railtie < ::Rails::Railtie
     config.responders = ActiveSupport::OrderedOptions.new

data/lib/responders/controller_method.rb

@@ -32,4 +32,15 @@ module Responders
       end
     end
   end
-end
+end
+
+# Fix for Rails <= 3.0.0.beta3
+require "action_controller/metal/responder"
+
+class ActionController::Responder
+  def default_action
+    @action ||= ACTIONS_FOR_VERBS[request.request_method_symbol]
+  end
+end
+
+ActionController::Base.extend Responders::ControllerMethod

data/lib/responders/flash_responder.rb

@@ -95,7 +95,7 @@ module Responders
 
     def to_js
       set_flash_message! if set_flash_message?
-      to_format
+      defined?(super) ? super : to_format
     end
 
   protected

data/lib/responders/http_cache_responder.rb

@@ -23,22 +23,22 @@ module Responders
 
     def do_http_cache!
       timestamp = resources.flatten.map do |resource|
-        (resource.updated_at || Time.now).utc if resource.respond_to?(:updated_at)
+        next unless resource.respond_to?(:updated_at)
+        resource.updated_at.utc
       end.compact.max
 
-      controller.response.last_modified = timestamp if timestamp
+      controller.response.last_modified ||= timestamp if timestamp
 
       head :not_modified if fresh = request.fresh?(controller.response)
       fresh
     end
 
     def do_http_cache?
-      get? && @http_cache != false && ActionController::Base.perform_caching &&
-        !new_record? && controller.response.last_modified.nil?
+      get? && @http_cache != false && ActionController::Base.perform_caching && persisted? && resourceful?
     end
 
-    def new_record?
-      resource.respond_to?(:new_record?) && resource.new_record?
+    def persisted?
+      resource.respond_to?(:persisted?) ? resource.persisted? : true
     end
   end
 end

data/lib/responders/locales/en.yml

@@ -2,9 +2,9 @@ en:
   flash:
     actions:
       create:
-        notice: '{{resource_name}} was successfully created.'
+        notice: '%{resource_name} was successfully created.'
       update:
-        notice: '{{resource_name}} was successfully updated.'
+        notice: '%{resource_name} was successfully updated.'
       destroy:
-        notice: '{{resource_name}} was successfully destroyed.'
-        alert: '{{resource_name}} could not be destroyed.'
+        notice: '%{resource_name} was successfully destroyed.'
+        alert: '%{resource_name} could not be destroyed.'

data/lib/responders/version.rb

@@ -1,3 +1,3 @@
 module Responders
-  VERSION = "0.6.0".freeze
+  VERSION = "0.6.1".freeze
 end

data/test/controller_method_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 ActionController::Base.extend Responders::ControllerMethod
 

data/test/flash_responder_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class Address
   attr_accessor :errors

data/test/http_cache_responder_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class HttpCacheResponder < ActionController::Responder
   include Responders::HttpCacheResponder
@@ -17,9 +17,9 @@ class HttpCacheController < ApplicationController
     respond_with [Model.new(Time.utc(2009)), Model.new(Time.utc(2008))]
   end
 
-  def new_record
+  def not_persisted
     model = Model.new(Time.utc(2009))
-    model.new_record = true
+    model.persisted = false
     respond_with(model)
   end
 
@@ -82,18 +82,6 @@ class HttpCacheResponderTest < ActionController::TestCase
     assert_equal 200, @response.status
   end
 
-  def test_does_not_set_cache_if_last_modified_already_set_in_response
-    get :single, :last_modified => true
-    assert_equal Time.utc(2008).httpdate, @response.headers["Last-Modified"]
-    assert_equal 200, @response.status
-  end
-
-  def test_does_not_use_cache_if_last_modified_already_set_in_response
-    @request.env["HTTP_IF_MODIFIED_SINCE"] = Time.utc(2009, 6).httpdate
-    get :single, :last_modified => true
-    assert_equal 200, @response.status
-  end
-
   def test_collection_chooses_the_latest_timestamp
     get :collection
     assert_equal Time.utc(2009).httpdate, @response.headers["Last-Modified"]
@@ -114,7 +102,7 @@ class HttpCacheResponderTest < ActionController::TestCase
   end
 
   def test_does_not_set_cache_for_new_records
-    get :new_record
+    get :not_persisted
     assert_nil @response.headers["Last-Modified"]
     assert_equal "<xml />", @response.body
     assert_equal 200, @response.status

data/test/test_helper.rb

@@ -1,20 +1,7 @@
 require 'rubygems'
+require 'bundler'
 
-gem 'activesupport', '3.0.0.beta2'
-gem 'activemodel', '3.0.0.beta2'
-gem 'actionpack', '3.0.0.beta2'
-gem 'railties', '3.0.0.beta2'
-
-begin
-  gem "test-unit"
-rescue LoadError
-end
-
-begin
-  gem "ruby-debug"
-  require 'ruby-debug'
-rescue LoadError
-end
+Bundler.setup
 
 require 'test/unit'
 require 'mocha'
@@ -52,10 +39,10 @@ class ActiveSupport::TestCase
 end
 
 class Model < Struct.new(:updated_at)
-  attr_writer :new_record
+  attr_writer :persisted
 
-  def new_record?
-    @new_record || false
+  def persisted?
+    defined?(@persisted) ? @persisted : true
   end
 
   def to_xml(*args)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 +02:00
+date: 2010-05-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,13 +28,14 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - CHANGELOG.rdoc
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
 - lib/generators/rails/USAGE
 - lib/generators/rails/responders_controller_generator.rb
 - lib/generators/rails/templates/controller.rb
-- lib/generators/responders_install_generator.rb
+- lib/generators/responders/install_generator.rb
 - lib/responders.rb
 - lib/responders/controller_method.rb
 - lib/responders/flash_responder.rb

data/lib/generators/responders_install_generator.rb

@@ -1,23 +0,0 @@
-class RespondersInstallGenerator < Rails::Generators::Base
-  def self.source_root
-    @_source_root ||= File.expand_path("..", __FILE__)
-  end
-
-  desc "Creates an initializer with default responder configuration and copy locale file"
-
-  def create_responder_initializer
-    create_file "config/initializers/responders.rb", <<-FILE
-class ApplicationResponder < ActionController::Responder
-  include Responders::FlashResponder
-  include Responders::HttpCacheResponder
-end
-
-ApplicationController.respond_to :html
-ApplicationController.responder = ApplicationResponder
-    FILE
-  end
-
-  def copy_locale
-    copy_file "../responders/locales/en.yml", "config/locales/responders.en.yml"
-  end
-end