wrest 1.0.0.beta3 → 1.0.0.beta4

data/CHANGELOG

@@ -18,6 +18,9 @@ Features under a numbered section are complete and available in the Wrest gem.
 
 == Current
 
+== 1.0.0.beta4
+ * GH#34 Wrest::Uri extensions swallow existing path
+ 
 == 1.0.0.beta3
  * GH#13 Works for get and delete with parameters appended to the uri string and 
    with ? and no parameters appended to the uri string

data/README.rdoc

@@ -1,4 +1,4 @@
-= Wrest 1.0.0.beta3
+= Wrest 1.0.0.beta4
 
 (c) Copyright 2009-2010 {Sidu Ponnappa}[http://blog.sidu.in]. All Rights Reserved.
 
@@ -17,55 +17,38 @@ To receive notifications whenever new features are added to Wrest, please subscr
 
 For Facebook, Twitter, Delicious, GitHub and other API examples, see http://github.com/kaiwren/wrest/tree/master/examples
 
-== Installation
-
-The source is available at git://github.com/kaiwren/wrest.git
-
-To install the Wrest gem, do <tt>(sudo) gem install wrest --pre</tt>.
-
-Wrest is currently available as a gem for for Ruby and JRuby.
-
-=== Shell
-
-You can launch the interactive Wrest shell by running bin/wrest if you have the source or invoking <tt>wrest</tt> from your prompt if you've installed the gem.
-  $ wrest
-  >> y 'http://twitter.com/statuses/public_timeline.json'.to_uri(:timeout => 5).get.deserialise
-
-=== Library
-
-  require 'rubygems'
-  require 'wrest'
-  y "http://search.yahooapis.com/NewsSearchService/V1/newsSearch".to_uri.get(
-                  :appid  => 'YahooDemo', 
-                  :output => 'xml',
-                  :query  => 'India',
-                  :results=> '3',
-                  :start  => '1'
-                )
 === Basic Http Calls
 
 ==== GET
 
-A couple of ways to get Yahoo news as a hash map. 
-
-* This example simply does a get on a uri and figures out the appropriate deserialiser using the content-type (in this case 'text/javascript', which uses Wrest::Translators::Json). See content_types.rb under lib/wrest/mappers/translators.
- "http://search.yahooapis.com/NewsSearchService/V1/newsSearch?appid=YahooDemo&output=json&query=India&results=3&start=1".to_uri.get.deserialise
-
-* This example does a get on a base uri with several parameters passed to it, resulting in a uri essentially the same as the one above. It also shows how you can specify a custom deserialiser to produce a hash-map from the response, as well as a hash mutator to clean up the deserialised hash.
- require 'rubygems'
- require 'wrest'
- include Wrest::Components
- y "http://search.yahooapis.com/NewsSearchService/V1/newsSearch".to_uri.get(
+* Basic API calls
+  
+    'http://twitter.com/statuses/public_timeline.json'.to_uri.get.deserialise  # works with json and xml out of the box
+
+    'http://twitter.com/statuses/public_timeline.xml'.to_uri.get.deserialise   # see lib/wrest/components/translators to add other formats
+* Timeout support
+  
+    'http://twitter.com/statuses/public_timeline.json'.to_uri.get(:timeout => 5).body
+* Redirect support
+  
+    'http://google.com'.to_uri(:follow_redirects => false).get
+  
+    'http://google.com'.to_uri(:follow_redirects_limit => 1).get
+* More complex call with custom deserialiser
+  
+    'http://search.yahooapis.com/NewsSearchService/V1/newsSearch'.to_uri.get(
                   :appid  => 'YahooDemo', 
                   :output => 'xml',
                   :query  => 'India',
                   :results=> '3',
                   :start  => '1'
                 ).deserialise_using(
-                  Translators::Xml
-                ).mutate_using(
-                  Mutators::XmlMiniTypeCaster.new
+                  Wrest::Translators::Xml
                 )
+* Basic HTTP auth and URI extensions using Wrest::Uri#[]
+  
+    base_uri = 'https://api.del.icio.us/v1'.to_uri(:username => 'kaiwren', :password => 'fupupp1es')
+    bookmarks = base_uri['/posts/get'].get.deserialise
 
 ==== DELETE
 
@@ -125,3 +108,17 @@ Wrest RDocs can be found at http://wrest.rubyforge.org
 == Roadmap
 
 Features that are planned, in progress or already implemented are documented in the {CHANGELOG}[http://github.com/kaiwren/wrest/tree/master/CHANGELOG] starting from version 0.0.8.
+
+== Installation
+
+The source is available at git://github.com/kaiwren/wrest.git
+
+To install the Wrest gem, do <tt>(sudo) gem install wrest --pre</tt>.
+
+Wrest is currently available as a gem for for Ruby and JRuby.
+
+=== Shell
+
+You can launch the interactive Wrest shell by running bin/wrest if you have the source or invoking <tt>wrest</tt> from your prompt if you've installed the gem.
+  $ wrest
+  >> y 'http://twitter.com/statuses/public_timeline.json'.to_uri(:timeout => 5).get.deserialise

data/lib/wrest/uri.rb

@@ -58,7 +58,7 @@ module Wrest #:nodoc:
     #  uri = "https://localhost:3000/v1".to_uri(:username => 'foo', :password => 'bar')
     #  uri['/oogas/1', {:username => 'meh', :password => 'baz'}].get
     def [](path, options = nil)
-      Uri.new(URI.join(uri_string, path), options || @options)
+      Uri.new(uri + File.join(uri_path, path), options || @options)
     end
     
     # Clones a Uri, building a new instance with exactly the same uri string.

data/lib/wrest/version.rb

@@ -13,7 +13,7 @@ module Wrest
       MAJOR  = 1
       MINOR  = 0
       TINY   = 0
-      BUILD = 'beta3'
+      BUILD = 'beta4'
       
       STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: wrest
 version: !ruby/object:Gem::Version 
-  hash: 299253595
+  hash: -1848230056
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta3
-  version: 1.0.0.beta3
+  - beta4
+  version: 1.0.0.beta4
 platform: ruby
 authors: 
 - Sidu Ponnappa
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +05:30
+date: 2010-09-17 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,63 +96,63 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- bin/wrest_shell.rb
 - bin/wrest
-- lib/wrest.rb
-- lib/wrest/uri_template.rb
-- lib/wrest/version.rb
-- lib/wrest/resource/state.rb
-- lib/wrest/resource/base.rb
-- lib/wrest/resource/collection.rb
-- lib/wrest/test.rb
+- bin/wrest_shell.rb
+- lib/wrest/components/container/alias_accessors.rb
+- lib/wrest/components/container/typecaster.rb
+- lib/wrest/components/container.rb
+- lib/wrest/components/mutators/base.rb
+- lib/wrest/components/mutators/camel_to_snake_case.rb
+- lib/wrest/components/mutators/xml_mini_type_caster.rb
+- lib/wrest/components/mutators/xml_simple_type_caster.rb
+- lib/wrest/components/mutators.rb
+- lib/wrest/components/translators/content_types.rb
+- lib/wrest/components/translators/json.rb
+- lib/wrest/components/translators/xml.rb
+- lib/wrest/components/translators.rb
+- lib/wrest/components.rb
 - lib/wrest/core_ext/hash/conversions.rb
 - lib/wrest/core_ext/hash.rb
 - lib/wrest/core_ext/string/conversions.rb
 - lib/wrest/core_ext/string.rb
-- lib/wrest/curl.rb
-- lib/wrest/native.rb
-- lib/wrest/http_shared.rb
-- lib/wrest/native/session.rb
-- lib/wrest/native/redirection.rb
-- lib/wrest/native/response.rb
-- lib/wrest/native/options.rb
-- lib/wrest/native/get.rb
-- lib/wrest/native/connection_factory.rb
-- lib/wrest/native/request.rb
-- lib/wrest/native/post.rb
-- lib/wrest/native/put_multipart.rb
-- lib/wrest/native/put.rb
-- lib/wrest/native/delete.rb
-- lib/wrest/native/post_multipart.rb
-- lib/wrest/uri.rb
-- lib/wrest/components.rb
-- lib/wrest/curl/session.rb
-- lib/wrest/curl/response.rb
-- lib/wrest/curl/options.rb
+- lib/wrest/curl/delete.rb
 - lib/wrest/curl/get.rb
-- lib/wrest/curl/request.rb
+- lib/wrest/curl/options.rb
 - lib/wrest/curl/post.rb
 - lib/wrest/curl/put.rb
-- lib/wrest/curl/delete.rb
+- lib/wrest/curl/request.rb
+- lib/wrest/curl/response.rb
+- lib/wrest/curl/session.rb
+- lib/wrest/curl.rb
 - lib/wrest/exceptions.rb
-- lib/wrest/components/translators/json.rb
-- lib/wrest/components/translators/xml.rb
-- lib/wrest/components/translators/content_types.rb
-- lib/wrest/components/mutators.rb
-- lib/wrest/components/translators.rb
-- lib/wrest/components/container.rb
-- lib/wrest/components/container/alias_accessors.rb
-- lib/wrest/components/container/typecaster.rb
-- lib/wrest/components/mutators/camel_to_snake_case.rb
-- lib/wrest/components/mutators/xml_mini_type_caster.rb
-- lib/wrest/components/mutators/base.rb
-- lib/wrest/components/mutators/xml_simple_type_caster.rb
-- lib/wrest/http_shared/standard_tokens.rb
-- lib/wrest/http_shared/standard_headers.rb
 - lib/wrest/http_shared/headers.rb
+- lib/wrest/http_shared/standard_headers.rb
+- lib/wrest/http_shared/standard_tokens.rb
+- lib/wrest/http_shared.rb
+- lib/wrest/multipart.rb
+- lib/wrest/native/connection_factory.rb
+- lib/wrest/native/delete.rb
+- lib/wrest/native/get.rb
+- lib/wrest/native/options.rb
+- lib/wrest/native/post.rb
+- lib/wrest/native/post_multipart.rb
+- lib/wrest/native/put.rb
+- lib/wrest/native/put_multipart.rb
+- lib/wrest/native/redirection.rb
+- lib/wrest/native/request.rb
+- lib/wrest/native/response.rb
+- lib/wrest/native/session.rb
+- lib/wrest/native.rb
+- lib/wrest/resource/base.rb
+- lib/wrest/resource/collection.rb
+- lib/wrest/resource/state.rb
 - lib/wrest/resource.rb
 - lib/wrest/test/request_patches.rb
-- lib/wrest/multipart.rb
+- lib/wrest/test.rb
+- lib/wrest/uri.rb
+- lib/wrest/uri_template.rb
+- lib/wrest/version.rb
+- lib/wrest.rb
 - README.rdoc
 - CHANGELOG
 - LICENCE