responders 0.6.2 → 0.6.3

data/CHANGELOG.rdoc

@@ -1,5 +1,6 @@
 == 0.6
 
+* HTTP Cache is no longer triggered for collections
 * :js now sets the flash.now by default, instead of flash
 * Renamed responders_install generator to responders:install
 * Added CollectionResponder which allows you to always redirect to the collection path (index action) after POST/PUT/DELETE

data/Gemfile

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

data/Gemfile.lock

@@ -1,52 +1,35 @@
-PATH
-  remote: /Users/jose/Work/github/rails
+GEM
+  remote: http://rubygems.org/
   specs:
-    actionmailer (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
+    abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
       mail (~> 2.2.5)
-    actionpack (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.9)
+      rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.22)
-    activemodel (3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      arel (~> 0.4.0)
-      tzinfo (~> 0.3.22)
-    activeresource (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-    activesupport (3.0.0.beta4)
-    rails (3.0.0.beta4)
-      actionmailer (= 3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activerecord (= 3.0.0.beta4)
-      activeresource (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      bundler (>= 1.0.0.beta.10)
-      railties (= 3.0.0.beta4)
-    railties (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      rake (>= 0.8.3)
-      thor (~> 0.14.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    arel (0.4.0)
-      activesupport (>= 3.0.0.beta)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      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)
     builder (2.1.2)
     columnize (0.3.1)
     erubis (2.6.6)
@@ -62,10 +45,23 @@ GEM
       rake
     polyglot (0.3.1)
     rack (1.2.1)
-    rack-mount (0.6.9)
+    rack-mount (0.6.13)
       rack (>= 1.0.0)
     rack-test (0.5.4)
       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)
     rake (0.8.7)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
@@ -75,12 +71,12 @@ GEM
     thor (0.14.0)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.22)
+    tzinfo (0.3.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   mocha
-  rails!
+  rails (= 3.0.0)
   ruby-debug

data/Rakefile

@@ -23,21 +23,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "responders"
-    s.version = Responders::VERSION.dup
-    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.files =  FileList["[A-Z]*", "lib/**/*", "init.rb"]
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
-end

data/lib/responders.rb

@@ -9,7 +9,11 @@ module Responders
 
   class Railtie < ::Rails::Railtie
     config.responders = ActiveSupport::OrderedOptions.new
-    config.generators.scaffold_controller = :responders_controller
+    if config.respond_to?(:app_generators)
+      config.app_generators.scaffold_controller = :responders_controller
+    else
+      config.generators.scaffold_controller = :responders_controller
+    end
 
     # Add load paths straight to I18n, so engines and application can overwrite it.
     require 'active_support/i18n'
@@ -21,4 +25,4 @@ module Responders
       end
     end
   end
-end
+end

data/lib/responders/http_cache_responder.rb

@@ -22,9 +22,7 @@ module Responders
   protected
 
     def do_http_cache!
-      timestamp = resources.flatten.map do |resource|
-        resource.updated_at.try(:utc) if resource.respond_to?(:updated_at)
-      end.compact.max
+      timestamp = resource.updated_at.try(:utc) if resource.respond_to?(:updated_at)
 
       controller.response.last_modified ||= timestamp if timestamp
 

data/lib/responders/version.rb

@@ -1,3 +1,3 @@
 module Responders
-  VERSION = "0.6.2".freeze
+  VERSION = "0.6.3".freeze
 end

data/responders.gemspec

@@ -0,0 +1,21 @@
+# -*- 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.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/test/http_cache_responder_test.rb

@@ -17,6 +17,10 @@ class HttpCacheController < ApplicationController
     respond_with [Address.new(Time.utc(2009)), Address.new(Time.utc(2008))]
   end
 
+  def changing_collection
+    respond_with Address.all
+  end
+
   def not_persisted
     model = Address.new(Time.utc(2009))
     model.persisted = false
@@ -82,13 +86,27 @@ class HttpCacheResponderTest < ActionController::TestCase
     assert_equal 200, @response.status
   end
 
-  def test_collection_chooses_the_latest_timestamp
+  def test_does_not_set_cache_for_collection
     get :collection
-    assert_equal Time.utc(2009).httpdate, @response.headers["Last-Modified"]
-    assert_match /xml/, @response.body
+
+    assert_nil @response.headers["Last-Modified"]
+    assert_not_nil @response.headers["ETag"]
     assert_equal 200, @response.status
   end
 
+  def test_does_not_return_not_modified_if_collection_has_changed
+    #First request. Returns 2 items
+    Address.stubs(:all).returns [Address.new(Time.utc(2009)), Address.new(Time.utc(2008))]
+    get :changing_collection
+
+    #Second request. Returns 1 item, simulating scenario where a address was deleted
+    Address.stubs(:all).returns [Address.new(Time.utc(2009))]
+    @request.env["HTTP_IF_MODIFIED_SINCE"] = @response.headers["Last-Modified"]
+    get :changing_collection
+
+    assert_not_equal 304, @response.status
+  end
+
   def test_work_with_an_empty_array
     get :empty
     assert_nil @response.headers["Last-Modified"]
@@ -96,8 +114,8 @@ class HttpCacheResponderTest < ActionController::TestCase
     assert_equal 200, @response.status
   end
 
-  def test_it_does_not_set_body_etag
-    get :collection
+  def test_it_does_not_set_body_etag_for_single_resource
+    get :single
     assert_nil @response.headers["ETag"]
   end
 

data/test/locales/en.yml

@@ -0,0 +1,23 @@
+en:
+  flash:
+    actions:
+      create:
+        success: "Resource created with success"
+        failure: "Resource could not be created"
+      with_block:
+        success: "Resource with block created with success"        
+    addresses:
+      update:
+        success: "Nice! %{resource_name} was updated with success!"
+        failure: "Oh no! We could not update your address!"
+      destroy:
+        success: "Successfully deleted the address at %{reference}"
+        notice: "Successfully deleted the chosen address at %{reference}"
+    admin:
+      actions:
+        create:
+          notice: "Admin created address with success"
+      addresses:
+        update:
+          notice: "Admin updated address with success"
+

data/test/test_helper.rb

@@ -13,25 +13,24 @@ require 'action_controller'
 require 'active_model'
 require 'rails/railtie'
 
-class ApplicationController < ActionController::Base
-  respond_to :html, :xml
-end
-
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'responders'
 
-I18n.load_path << File.join(File.dirname(__FILE__), 'locales', 'en.yml')
+I18n.load_path << File.expand_path('../locales/en.yml', __FILE__)
 I18n.reload!
 
-ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
-
 Responders::Routes = ActionDispatch::Routing::RouteSet.new
 Responders::Routes.draw do
   match '/admin/:action', :controller => "admin/addresses"
   match '/:controller(/:action(/:id))'
 end
 
-ActionController::Base.send :include, Responders::Routes.url_helpers
+class ApplicationController < ActionController::Base
+  include Responders::Routes.url_helpers
+
+  self.view_paths = File.join(File.dirname(__FILE__), 'views')
+  respond_to :html, :xml
+end
 
 class ActiveSupport::TestCase
   setup do
@@ -64,4 +63,4 @@ class Address < Model
 end
 
 class User < Model
-end
+end

data/test/views/addresses/create.js.erb

@@ -0,0 +1 @@
+create.js.erb

data/test/views/addresses/edit.html.erb

@@ -0,0 +1 @@
+edit.html.erb

data/test/views/addresses/new.html.erb

@@ -0,0 +1 @@
+new.html.erb

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: responders
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 +02:00
+date: 2011-05-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -25,8 +25,8 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - CHANGELOG.rdoc
 - Gemfile
@@ -45,18 +45,23 @@ files:
 - lib/responders/http_cache_responder.rb
 - lib/responders/locales/en.yml
 - lib/responders/version.rb
+- responders.gemspec
 - test/collection_responder_test.rb
 - test/controller_method_test.rb
 - test/flash_responder_test.rb
 - test/http_cache_responder_test.rb
+- test/locales/en.yml
 - test/test_helper.rb
+- test/views/addresses/create.js.erb
+- test/views/addresses/edit.html.erb
+- test/views/addresses/new.html.erb
 has_rdoc: true
 homepage: http://github.com/plataformatec/responders
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -79,8 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: responders
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A set of Rails 3 responders to dry up your application
@@ -89,4 +94,8 @@ test_files:
 - test/controller_method_test.rb
 - test/flash_responder_test.rb
 - test/http_cache_responder_test.rb
+- test/locales/en.yml
 - test/test_helper.rb
+- test/views/addresses/create.js.erb
+- test/views/addresses/edit.html.erb
+- test/views/addresses/new.html.erb