reststop 0.2.0.50 → 0.3.0

data/.loadpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<loadpath>
+	<pathentry path="" type="src"/>
+	<pathentry path="org.rubypeople.rdt.launching.RUBY_CONTAINER" type="con"/>
+	<pathentry path="GEM_LIB/reststop-0.2.0.50/lib" type="var"/>
+	<pathentry path="GEM_LIB/reststop-0.2.0.50/lib" type="var"/>
+</loadpath>

data/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>reststop</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.rubypeople.rdt.core.rubybuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.rubypeople.rdt.core.rubynature</nature>
+	</natures>
+</projectDescription>

data/CHANGELOG.txt

@@ -1,30 +1 @@
-=== 0.2.1 :: In Progress...
-
-  * Restr should now work properly with Rails 2.x (fixes bug #17421).
-  * R helper method should now work properly when a Restful object is fed as
-    input along with a custom action.
-
-=== 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.
+See History.txt

data/History.txt

@@ -1 +1,33 @@
-See CHANGELOG.txt
+=== 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/Manifest.txt

@@ -1,3 +1,5 @@
+.loadpath
+.project
 CHANGELOG.txt
 History.txt
 LICENSE.txt
@@ -5,7 +7,6 @@ Manifest.txt
 README.txt
 Rakefile
 examples/blog.rb
-lib/restr.rb
 lib/reststop.rb
 lib/reststop/version.rb
 setup.rb

data/README.txt

@@ -77,14 +77,19 @@ through your Kittens controller's <tt>list</tt>, formatted using your
 <tt>XML</tt> view module. 
 
 
-<b>BONUS: A simple REST client</b>
+<b>Looking for Restr, the very simple REST client?</b>
 
-Reststop also comes with a very simple REST client called Restr.
+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 for more info, but here's a simple
-example of RESTful interaction with Restr:
+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')

data/Rakefile

@@ -21,8 +21,8 @@ HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 ENV['NODOT'] = '1'
 
 NAME = "reststop"
-#REV = nil
-REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
+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",
@@ -51,6 +51,6 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   #p.changes        - A description of the release's latest changes.
-  #p.extra_deps     - An array of rubygem dependencies.
+  p.extra_deps = ['restr']
   #p.spec_extras    - A hash of extra values to set in the gemspec.
 end

data/lib/reststop/version.rb

@@ -1,7 +1,7 @@
 module Reststop
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/reststop.rb

@@ -403,6 +403,7 @@ module Camping
     #   R(Kittens, 1, 'meow') # /kittens/1/meow
     #   R(@kitten)            # /kittens/1
     #   R(@kitten, 'meow')    # /kittens/1/meow
+    #   R(Kittens, 'list', :colour => 'black')  # /kittens/list?colour=black
     #
     # The current output format is retained, so if the current <tt>@format</tt> is <tt>:XML</tt>, 
     # the URL will be /kittens/1.xml rather than /kittens/1.
@@ -415,17 +416,21 @@ module Camping
         path = "/#{cl.underscore}/#{c.id}"
         path << ".#{@format.to_s.downcase}" if @format
         path << "/#{g.shift}" unless g.empty? 
-        # FIXME: undefined behaviour if there are multiple arguments left... maybe we should allow for arbitrary params as a Hash?
         self / path
       elsif c.respond_to?(:restful?) && c.restful?
         base = c.name.split("::").last.underscore
-        id = g.shift
-        action = g.shift
+        id_or_action = g.shift
+        if id_or_action =~ /\d+/
+          id = id_or_action
+          action = g.shift
+        else
+          action = id_or_action
+        end
         path = "/#{base}"
         path << "/#{id}" if id
         path << "/#{action}" if action
         path << ".#{@format.to_s.downcase}" if @format 
-        path << "?#{g}" unless g.empty? # FIXME: undefined behaviour if there are multiple arguments left
+        path << "?#{g.collect{|a|a.collect{|k,v| C.escape(k)+"="+C.escape(v)}.join("&")}.join("&")}" unless g.empty? # FIXME: undefined behaviour if there are multiple arguments left
         self / path
       else
         _R(c, *g)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reststop
 version: !ruby/object:Gem::Version 
-  version: 0.2.0.50
+  version: 0.3.0
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -9,10 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-10 00:00:00 -04:00
+date: 2008-06-19 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: restr
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Convenient RESTfulness for all your Camping needs (i.e. makes it easy to implement RESTful controllers in Camping).
 email: matt@roughest.net
 executables: []
@@ -26,6 +34,8 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
+- .loadpath
+- .project
 - CHANGELOG.txt
 - History.txt
 - LICENSE.txt
@@ -33,7 +43,6 @@ files:
 - README.txt
 - Rakefile
 - examples/blog.rb
-- lib/restr.rb
 - lib/reststop.rb
 - lib/reststop/version.rb
 - setup.rb

data/lib/restr.rb

@@ -1,126 +0,0 @@
-require 'net/http'
-require 'net/https'
-require 'uri'
-require 'cgi'
-
-begin
-  require 'xml_simple'
-rescue LoadError
-  require 'rubygems'
-  require 'active_support'
-  begin
-  require 'xml_simple'
-  rescue LoadError
-    require 'xmlsimple'
-  end
-end
-
-
-# A very simple REST client, best explained by example:
-#
-#   # Retrieve a Kitten and print its name and colour
-#   kitten = Restr.get('http://example.com/kittens/1.xml')
-#   puts kitten['name']
-#   puts kitten['colour']
-#
-#   # Create a Kitten
-#   kitten = Restr.post('http://example.com/kittens.xml', 
-#     :name => 'batman', :colour => 'black')
-#
-#   # Update a Kitten
-#   kitten = Restr.put('http://example.com/kittens/1.xml', 
-#     :age => '6 months')
-#
-#   # Delete a Kitten :(
-#   kitten = Restr.delete('http://example.com/kittens/1.xml')
-#
-#   # Retrieve a list of Kittens
-#   kittens = Restr.get('http://example.com/kittens.xml')
-#
-# When the response to a Restr request has content type 'text/xml', the
-# response body will be parsed from XML into a nested Hash (using XmlSimple 
-# -- see http://xml-simple.rubyforge.org/). Otherwise the response is  
-# returned untouched, as a String.
-#
-# If the remote REST resource requires authentication (Restr only supports
-# HTTP Basic authentication, for now):
-#
-#   Restr.get('http://example.com/kittens/1.xml, {}, 
-#     {:username => 'foo', :password => 'bar'})
-#
-class Restr
-  @@log = nil
-  
-  def self.logger=(logger)
-    @@log = logger.dup
-    @@log.progname = self.name
-  end
-  
-  def self.method_missing(method, *args)
-    self.do(method, args[0], args[1] || {}, args[2])
-  end
-  
-  def self.do(method, url, params = {}, auth = nil)
-    uri = URI.parse(url)
-    params = {} unless params
-      
-    method_mod = method.to_s.downcase.capitalize
-    unless Net::HTTP.const_defined?(method_mod)
-      raise InvalidRequestMethod, 
-        "Callback method #{method.inspect} is not a valid HTTP request method."
-    end
-    
-    if method_mod == 'Get'
-      q = params.collect{|k,v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"}.join("&")
-      if uri.query
-        uri.query += "&#{q}"
-      else
-        uri.query = q
-      end
-    end
-    
-    req = Net::HTTP.const_get(method_mod).new(uri.request_uri)
-    
-    
-    if auth
-      raise ArgumentError, 
-        "The `auth` parameter must be a Hash with a :username and :password value." unless 
-        auth.kind_of? Hash
-      req.basic_auth auth[:username] || auth['username'], auth[:password] || auth['password']
-    end
-    
-    unless method_mod == 'Get'
-      req.set_form_data(params, '&')
-    end
-    
-    @@log.debug("Sending #{method.inspect} request to #{url.inspect} with data #{params.inspect}"+
-        (auth ? " with authentication" : "")+".") if @@log
- 
-    client = Net::HTTP.new(uri.host, uri.port)
-    client.use_ssl = (uri.scheme == 'https')
-    res = client.start do |http|
-      http.request(req)
-    end
-    
-    case res
-    when Net::HTTPSuccess
-      if res.content_type == 'text/xml'
-        @@log.debug("Got XML response.") if @@log
-        return XmlSimple.xml_in_string(res.body,
-          'forcearray'   => false,
-          'keeproot'     => false
-        )
-      else
-        @@log.debug("Got #{res.content_type.inspect} response.") if @@log
-        return res.body
-      end
-    else
-      $LAST_ERROR_BODY = res.body # FIXME: this is dumb... need a better way of reporting errors
-      @@log.error("Got error response '#{res.message}(#{res.code})': #{$LAST_ERROR_BODY}") if @@log
-      res.error!      
-    end
-  end
-  
-  class InvalidRequestMethod < Exception
-  end
-end