reststop 0.5.1 → 0.5.2

data/History.txt

@@ -1,52 +1,56 @@
-=== 0.5.1 :: 2010-06-09 
-  * Update to align with the post 2.0 enhancements in Camping related to Tilt support.
-	Since Tilt support is now checking for the existing of view methods and Tilt views
-	RESTstop needs to ensure that view methods can be looked up in Views:HTML as opposed to Views.
-
-=== 0.5.0 :: 2010-04-07
-
-  * Major refactoring for compatibility with Camping 2.0. Thanks to Philippe Monnet
-    for completing the work.
-
-=== 0.4.1 :: 2009-05-08
-
-  * Custom actions should now work again (needed to make some more changes for
-    Camping 2.0 compatibility).
-
-=== 0.4.0 :: 2009-05-01
-
-  * Now compatible with Camping 2.0, but no longer works with Camping 1.x :(
-
-=== 0.3.0 :: 2008-06-19
-
-  * Restr has been moved out to its own gem, and should now work properly with 
-    Rails 2.x (fixes bug #17421).
-  * `R` helper method should now work properly when a Restful controlelr class 
-    is fed as input along with a custom action. The final argument can be a Hash 
-    and will be translated into URL parameters. For example: 
-      R(Kittens, 'list', 'colour' => 'black') 
-
-=== 0.2.0 :: 2007-12-10
-
-  * It is now possible to specify the format for rendering a page by appending
-    it as a filename extension to the URL. For example: '/items.xml' to use the XML
-    view module, or '/items/5.rss' to use the RSS module.
-  * Custom actions are now possible. Custom methods defined in your controller will 
-    respond to the standard custom-action URLs. For example, if you have a method
-    'foo' in your 'kittens' controller, you can get to it by requesting the URL
-    '/kittens/foo' or '/kittens/1/foo'. Note that the action will respond to any
-    HTTP method (post, get, put, delete). It is up to you to handle different
-    request methods inside your action's definition.
-  * XML input (from an ActiveResource client, for example) is now parsed into a
-    nested Hash, and is made available as the standard @input Camping variable.
-  * HTML forms created using Markaby (i.e. by just using `form`) that
-    have a :method parameter now automatically insert a hidden '_method' input to
-    facilitate 'put' and 'delete' HTTP methods for HTML browsers.
-  * Pages now correctly return HTTP status code 501 when an unimplemented controller 
-    method is called. ActiveRecord::NotFound exceptions are caught and return 404 
-    status.
-  * R helper now works for routing RESTful controllers.
-
-=== 0.1.0 :: 2007-07-30
-
-  * First public release.
+=== 0.5.2 :: 2010-06-21 
+  * Made the content-type in reststop_render to be text/html only if the format is :HTML, and application/#{format} otherwise
+  * Fixed issue in the new basic_render method where the layout was not being applied.
+
+=== 0.5.1 :: 2010-06-09 
+  * Update to align with the post 2.0 enhancements in Camping related to Tilt support.
+	Since Tilt support is now checking for the existing of view methods and Tilt views
+	RESTstop needs to ensure that view methods can be looked up in Views:HTML as opposed to Views.
+
+=== 0.5.0 :: 2010-04-07
+
+  * Major refactoring for compatibility with Camping 2.0. Thanks to Philippe Monnet
+    for completing the work.
+
+=== 0.4.1 :: 2009-05-08
+
+  * Custom actions should now work again (needed to make some more changes for
+    Camping 2.0 compatibility).
+
+=== 0.4.0 :: 2009-05-01
+
+  * Now compatible with Camping 2.0, but no longer works with Camping 1.x :(
+
+=== 0.3.0 :: 2008-06-19
+
+  * Restr has been moved out to its own gem, and should now work properly with 
+    Rails 2.x (fixes bug #17421).
+  * `R` helper method should now work properly when a Restful controlelr class 
+    is fed as input along with a custom action. The final argument can be a Hash 
+    and will be translated into URL parameters. For example: 
+      R(Kittens, 'list', 'colour' => 'black') 
+
+=== 0.2.0 :: 2007-12-10
+
+  * It is now possible to specify the format for rendering a page by appending
+    it as a filename extension to the URL. For example: '/items.xml' to use the XML
+    view module, or '/items/5.rss' to use the RSS module.
+  * Custom actions are now possible. Custom methods defined in your controller will 
+    respond to the standard custom-action URLs. For example, if you have a method
+    'foo' in your 'kittens' controller, you can get to it by requesting the URL
+    '/kittens/foo' or '/kittens/1/foo'. Note that the action will respond to any
+    HTTP method (post, get, put, delete). It is up to you to handle different
+    request methods inside your action's definition.
+  * XML input (from an ActiveResource client, for example) is now parsed into a
+    nested Hash, and is made available as the standard @input Camping variable.
+  * HTML forms created using Markaby (i.e. by just using `form`) that
+    have a :method parameter now automatically insert a hidden '_method' input to
+    facilitate 'put' and 'delete' HTTP methods for HTML browsers.
+  * Pages now correctly return HTTP status code 501 when an unimplemented controller 
+    method is called. ActiveRecord::NotFound exceptions are caught and return 404 
+    status.
+  * R helper now works for routing RESTful controllers.
+
+=== 0.1.0 :: 2007-07-30
+
+  * First public release.

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2010 the Contributors (see http://github.com/zuk/reststop/commits/master)
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+Copyright (c) 2010 the Contributors (see http://github.com/zuk/reststop/commits/master)
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -1,12 +1,14 @@
-.loadpath
-.project
-CHANGELOG.txt
-History.txt
-LICENSE.txt
-Manifest.txt
-README.txt
-Rakefile
-examples/blog.rb
-lib/reststop.rb
-lib/reststop/version.rb
-setup.rb
+.loadpath
+.project
+CHANGELOG.txt
+History.txt
+LICENSE.txt
+Manifest.txt
+README.txt
+Rakefile
+examples/blog.rb
+lib/reststop.rb
+lib/reststop/version.rb
+setup.rb
+test/reststop_test.rb
+test/test_helper.rb

data/{README.txt → README.rdoc}

@@ -1,126 +1,126 @@
-= Reststop
-
-<b>Reststop makes it easy to write RESTful[http://en.wikipedia.org/wiki/Representational_State_Transfer] 
-applications in Camping[http://github.com/camping/camping].</b>
-
-For info and downloads please see http://github.com/camping/reststop
-
-
-*Authors*::    Matt Zukowski and Philippe Monnet (see http://github.com/camping/reststop/commits/master)
-*Copyright*:: Copyright (c) 2010 Urbacon Ltd.
-*License*::   MIT License[http://en.wikipedia.org/wiki/MIT_License]
-
-
-For an example of a complete Reststop-based Camping app, have a look at 
-http://github.com/zuk/reststop/blob/master/examples/blog.rb
-
-Reststop essentially gives you three things:
-
-<b>1. Camping controllers that respond to the standard REST verbs:</b>
-
-* create (POST)
-* read (GET)
-* update (PUT)
-* destroy (DELETE)
-* list (GET)
-
-Custom actions are also possible. See the Reststop::Controllers#REST method documentation for usage info.
-
-<b>2. Camping views grouped by output format:</b>
-
-Your views module:
-
-  module Foobar::Views
-    module HTML
-      def foo
-        html do
-          p "Hello World"
-        end
-      end
-    end
-    module XML
-      def foo
-        tag!('foo')
-          "Hello World"
-        end
-      end
-    end
-  end
-
-Your render call:
-
-  render(:foo, :XML)
-  
-See the Camping#render method documentation for usage info.
-
-<b>3. Nice URLs to bring it all together:</b>
-
-For example a list of kittens in the default format (HTML) is available at:
-
-  /kittens
-
-The list, in RSS format:
-
-  /kittens.rss
-  
-Kitten with id 1, in XML format:
-  
-  /kittens/1.xml
-  
-Using custom action 'meow' on kitten with id 1:
-
-  /kittens/1/meow
-
-In other words, say you have a "kittens" resource; you can make a GET
-request to http://yourapp.com/kittens.xml and get a list of kittens
-through your Kittens controller's <tt>list</tt>, formatted using your
-<tt>XML</tt> view module. 
-
-
-<b>Looking for Restr, the very simple REST client?</b>
-
-Due to its popularity, <b>Restr</b>, the "very simple rest client",
-has been moved out to its own gem. Restr now lives under
-http://rubyforge.org/projects/restr/ and can be installed using:
-
-  gem install restr
- 
-Restr is basically a wrapper around Ruby's Net::HTTP, offering
-a more RESTfully meaningful interface.
-
-See the "Restr documentation"[http://restr.rubyforge.org/] for more info, 
-but here's a simple example of RESTful interaction with Restr:
-
-  require 'restr'
-  kitten = Restr.get('http://example.com/kittens/1.xml')
-  puts kitten['name']
-  puts kitten['colour']
-  
-  kitten['colour'] = 'black'
-  kitten = Restr.put('http://example.com/kittens/1.xml', kitten)
-
-
-== License
-
-Copyright (c) 2010 the Contributors (see http://github.com/camping/reststop/commits/master)
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+= Reststop
+
+<b>Reststop makes it easy to write RESTful[http://en.wikipedia.org/wiki/Representational_State_Transfer] 
+applications in Camping[http://github.com/camping/camping].</b>
+
+For info and downloads please see http://github.com/camping/reststop
+
+
+*Authors*::    Matt Zukowski and Philippe Monnet (see http://github.com/camping/reststop/commits/master)
+*Copyright*:: Copyright (c) 2010 Urbacon Ltd.
+*License*::   MIT License[http://en.wikipedia.org/wiki/MIT_License]
+
+
+For an example of a complete Reststop-based Camping app, have a look at 
+http://github.com/zuk/reststop/blob/master/examples/blog.rb
+
+Reststop essentially gives you three things:
+
+<b>1. Camping controllers that respond to the standard REST verbs:</b>
+
+* create (POST)
+* read (GET)
+* update (PUT)
+* destroy (DELETE)
+* list (GET)
+
+Custom actions are also possible. See the Reststop::Controllers#REST method documentation for usage info.
+
+<b>2. Camping views grouped by output format:</b>
+
+Your views module:
+
+  module Foobar::Views
+    module HTML
+      def foo
+        html do
+          p "Hello World"
+        end
+      end
+    end
+    module XML
+      def foo
+        tag!('foo')
+          "Hello World"
+        end
+      end
+    end
+  end
+
+Your render call:
+
+  render(:foo, :XML)
+  
+See the Camping#render method documentation for usage info.
+
+<b>3. Nice URLs to bring it all together:</b>
+
+For example a list of kittens in the default format (HTML) is available at:
+
+  /kittens
+
+The list, in RSS format:
+
+  /kittens.rss
+  
+Kitten with id 1, in XML format:
+  
+  /kittens/1.xml
+  
+Using custom action 'meow' on kitten with id 1:
+
+  /kittens/1/meow
+
+In other words, say you have a "kittens" resource; you can make a GET
+request to http://yourapp.com/kittens.xml and get a list of kittens
+through your Kittens controller's <tt>list</tt>, formatted using your
+<tt>XML</tt> view module. 
+
+
+<b>Looking for Restr, the very simple REST client?</b>
+
+Due to its popularity, <b>Restr</b>, the "very simple rest client",
+has been moved out to its own gem. Restr now lives under
+http://rubyforge.org/projects/restr/ and can be installed using:
+
+  gem install restr
+ 
+Restr is basically a wrapper around Ruby's Net::HTTP, offering
+a more RESTfully meaningful interface.
+
+See the "Restr documentation"[http://restr.rubyforge.org/] for more info, 
+but here's a simple example of RESTful interaction with Restr:
+
+  require 'restr'
+  kitten = Restr.get('http://example.com/kittens/1.xml')
+  puts kitten['name']
+  puts kitten['colour']
+  
+  kitten['colour'] = 'black'
+  kitten = Restr.put('http://example.com/kittens/1.xml', kitten)
+
+
+== License
+
+Copyright (c) 2010 the Contributors (see http://github.com/camping/reststop/commits/master)
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,54 +1,56 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'fileutils'
-require 'hoe'
-include FileUtils
-require File.join(File.dirname(__FILE__), 'lib', 'reststop', 'version')
-
-AUTHOR = "Matt Zukowski"  # can also be an array of Authors
-EMAIL = "matt@roughest.net"
-DESCRIPTION = "Convenient RESTfulness for all your Camping needs (i.e. makes it easy to implement RESTful controllers in Camping)."
-GEM_NAME = "reststop"
-RUBYFORGE_PROJECT = "reststop" # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-
-ENV['NODOT'] = '1'
-
-NAME = "reststop"
-REV = nil
-#REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
-VERS = ENV['VERSION'] || (Reststop::VERSION::STRING + (REV ? ".#{REV}" : ""))
-                          CLEAN.include ['**/.*.sw?', '*.gem', '.config']
-RDOC_OPTS = ['--quiet', '--title', "#{NAME} #{VERS} documentation",
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject { |x| Array(x).first == 'hoe' } 
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  #p.changes        - A description of the release's latest changes.
-  p.extra_deps = ['restr']
-  #p.spec_extras    - A hash of extra values to set in the gemspec.
-end
+require 'rubygems'
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
+require 'rake/rdoctask'
+require 'rake/contrib/rubyforgepublisher'
+require 'fileutils'
+require 'hoe'
+include FileUtils
+require File.join(File.dirname(__FILE__), 'lib', 'reststop', 'version')
+
+AUTHOR = "Matt Zukowski"  # can also be an array of Authors
+EMAIL = "matt@roughest.net"
+DESCRIPTION = "Convenient RESTfulness for all your Camping needs (i.e. makes it easy to implement RESTful controllers in Camping)."
+GEM_NAME = "reststop"
+RUBYFORGE_PROJECT = "reststop" # The unix name for your project
+HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
+
+ENV['NODOT'] = '1'
+
+NAME = "reststop"
+REV = nil
+#REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
+VERS = ENV['VERSION'] || (Reststop::VERSION::STRING + (REV ? ".#{REV}" : ""))
+                          CLEAN.include ['**/.*.sw?', '*.gem', '.config']
+RDOC_OPTS = ['--quiet', '--title', "#{NAME} #{VERS} documentation",
+    "--opname", "index.html",
+    "--line-numbers", 
+    "--main", "README",
+    "--inline-source"]
+
+class Hoe
+  def extra_deps 
+    @extra_deps.reject { |x| Array(x).first == 'hoe' } 
+  end 
+end
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+hoe = Hoe.new(GEM_NAME, VERS) do |p|
+  p.author = AUTHOR 
+  p.description = DESCRIPTION
+  p.email = EMAIL
+  p.summary = DESCRIPTION
+  p.url = HOMEPATH
+  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
+  p.test_globs = ["test/**/*_test.rb"]
+  p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
+  
+  # == Optional
+  #p.changes        - A description of the release's latest changes.
+  p.extra_deps = ['restr']
+  #p.spec_extras    - A hash of extra values to set in the gemspec.
+end