wrest 1.0.0.beta2 → 1.0.0.beta3

data/CHANGELOG

@@ -18,6 +18,14 @@ Features under a numbered section are complete and available in the Wrest gem.
 
 == Current
 
+== 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
+ * GH#26 'http://localhost'.to_uri['foo/bar'] fails
+ * GH#11 Handle gem dependencies using bundler
+ * GH#22 Converts Uri to UriTemplate
+ * GH#23 Supports extension of UriTemplate via #[]
+ 
 == 1.0.0.beta2
  * GH#2 Make Components::Containers hash store a HashWithIndifferentAccess
  * GH#6 Net::HTTP based calls to Twitter public APIs fail
@@ -56,4 +64,4 @@ Features under a numbered section are complete and available in the Wrest gem.
 == 0.0.8
  * Added URI extension using the [] method (see examples/delicious.rb)
  * Refactored out Request as the first step to adding Response caching
- 
+ 

data/README.rdoc

@@ -1,4 +1,4 @@
-= Wrest 1.0.0.beta2
+= Wrest 1.0.0.beta3
 
 (c) Copyright 2009-2010 {Sidu Ponnappa}[http://blog.sidu.in]. All Rights Reserved.
 
@@ -7,7 +7,7 @@ Wrest is a ruby REST/HTTP client library which
 * Allows allows you to quickly build object oriented wrappers around any web service 
 * Designed to be used as a library, not just a command line REST client (fewer class/static methods, more object oriented)
 * Is spec driven, strongly favours immutable objects and avoids class methods and setters making it better suited for use as a library, especially in multi-threaded environments 
-* Runs on Ruby 1.8, Ruby 1.9.2 and JRuby with Rubinius, MacRuby and IronRuby support on the way
+* Runs on Ruby 1.8, Ruby 1.9.2, JRuby and Rubinius with MacRuby and IronRuby support on the way
 * Provides convenient HTTP wrappers, redirect handling, serialisation and deserialisation with response caching in the works
 * Supports using either Net::HTTP or libcurl as the underlying HTTP library
 

data/lib/wrest/curl.rb

@@ -8,9 +8,9 @@
 # See the License for the specific language governing permissions and limitations under the License.
 
 begin
-  gem 'patron', '>=0.4.4'
+  gem 'patron', '~> 0.4.9'
 rescue Gem::LoadError => e
-  Wrest.logger.debug "Patron >= 0.4.4 not found. Patron is necessary to use libcurl. To install Patron run `sudo gem install patron` (patron is not available on JRuby, but you shouldn't need it anyway)."
+  Wrest.logger.debug "Patron ~> 0.4.9 not found. Patron is necessary to use libcurl. To install Patron run `sudo gem install patron` (patron is not available on JRuby, but you shouldn't need it anyway)."
   raise e
 end
 require 'patron'

data/lib/wrest/multipart.rb

@@ -8,9 +8,9 @@
 # See the License for the specific language governing permissions and limitations under the License.
 
 begin
-  gem 'multipart-post', '>= 1.0'
+  gem 'multipart-post', '~> 1.0'
 rescue Gem::LoadError => e
-  Wrest.logger.debug "Multipart Post >= 1.0 not found. Multipart Post is necessary to be able to post multipart. To install Multipart Post run 'sudo gem install multipart-post'"
+  Wrest.logger.debug "Multipart Post ~> 1.0 not found. Multipart Post is necessary to be able to post multipart. To install Multipart Post run 'sudo gem install multipart-post'"
   raise e
 end
 
@@ -28,7 +28,7 @@ module Wrest
   # The methods in this module are mixed into Wrest::Uri.
   module Multipart
     # Makes a multipart/form-data encoded POST request to this URI. This is a convenience API
-    # that mimics a multipart form being posted; some allegly RESTful APIs like FCBK require 
+    # that mimics a multipart form being posted; some allegedly RESTful APIs like FCBK require 
     # this for file uploads.
     #
     #   File.open('/path/to/image.jpg') do |file|

data/lib/wrest/native/get.rb

@@ -1,5 +1,4 @@
 # Copyright 2009 Sidu Ponnappa
-
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0

data/lib/wrest/native/request.rb

@@ -84,7 +84,11 @@ module Wrest::Native
     end
 
     def build_request(request_klass, uri, parameters, headers)
-      request_klass.new(parameters.empty? ? uri.full_path : "#{uri.full_path}?#{parameters.to_query}", headers)
+      if(!uri.query.empty?)
+        request_klass.new(parameters.empty? ? "#{uri.uri_path}?#{uri.query}" : "#{uri.uri_path}?#{uri.query}&#{parameters.to_query}", headers)
+      else
+        request_klass.new(parameters.empty? ? "#{uri.uri_path}" : "#{uri.uri_path}?#{parameters.to_query}", headers)
+      end
     end
   
     def do_request

data/lib/wrest/uri.rb

@@ -22,17 +22,26 @@ module Wrest #:nodoc:
   #
   # You can find examples that use real APIs (like delicious) under the wrest/examples directory.
   class Uri
-    attr_reader :uri, :username, :password, :uri_string
+    attr_reader :uri, :username, :password, :uri_string, :uri_path, :query
         
     # See Wrest::Http::Request for the available options and their default values.
     def initialize(uri_string, options = {})
-      @options = options
-      @uri_string = uri_string.clone
-      @uri = URI.parse(uri_string)
-      @username = (@options[:username] ||= @uri.user)
-      @password = (@options[:password] ||= @uri.password)
-    end
+        @options = options
+        @uri_string = uri_string.to_s
+        @uri = URI.parse(@uri_string)
+        uri_scheme = URI.split(@uri_string)
+        @uri_path = uri_scheme[-4].split('?').first || ''
+        @uri_path = (@uri_path.empty? ? '/' : @uri_path) 
+        @query = uri_scheme[-2] || ''
+        @username = (@options[:username] ||= @uri.user)
+        @password = (@options[:password] ||= @uri.password)
+    end 
     
+    def to_template(pattern)
+      template_pattern = URI.join(uri_string,pattern).to_s
+      UriTemplate.new(template_pattern)
+    end
+        
     # Build a new Wrest::Uri by appending _path_ to
     # the current uri. If the original Wrest::Uri
     # has a username and password, that will be
@@ -49,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_string+path, options || @options)
+      Uri.new(URI.join(uri_string, path), options || @options)
     end
     
     # Clones a Uri, building a new instance with exactly the same uri string.
@@ -130,10 +139,10 @@ module Wrest #:nodoc:
       Http::Options.new(self, @options).invoke
     end
 
-    def https?
+    def https? 
       @uri.is_a?(URI::HTTPS)
     end
-    
+
     # Provides the full path of a request.
     # For example, for
     #  http://localhost:3000/demons/1/chi?sort=true
@@ -142,7 +151,7 @@ module Wrest #:nodoc:
     def full_path
       uri.request_uri
     end
-    
+
     def protocol
       uri.scheme
     end

data/lib/wrest/uri_template.rb

@@ -45,5 +45,14 @@ module Wrest
         uri_string.gsub(":#{key.to_s}", value.to_s)
       end.to_uri
     end
+
+    def [](path)
+       UriTemplate.new(URI.join(uri_pattern,path).to_s)
+    end
+
+    def ==(other)
+      return false if other.class != self.class
+      return other.uri_pattern == self.uri_pattern 
+    end
   end
 end

data/lib/wrest/version.rb

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

data/lib/wrest.rb

@@ -57,7 +57,7 @@ begin
   ActiveSupport::XmlMini.backend='LibXML'
 rescue Gem::LoadError
   begin
-    gem 'nokogiri', '>= 1.3.3'
+    gem 'nokogiri', '~> 1.4.3.1'
     ActiveSupport::XmlMini.backend='Nokogiri'
   rescue Gem::LoadError
     unless RUBY_PLATFORM =~ /java/
@@ -66,7 +66,7 @@ rescue Gem::LoadError
     Wrest.logger.debug "Warning: Nokogiri >= 1.3.3 not found, falling back to #{ActiveSupport::XmlMini.backend} (which is probably significantly slower). To install Nokogiri run `(sudo) (jruby -S) gem install nokogiri`"
     if RUBY_PLATFORM =~ /java/
       begin
-        gem 'jrexml', '>= 0.5.3'
+        gem 'jrexml', '~> 0.5.3'
         require 'jrexml'
         Wrest.logger.debug "Detected JRuby, JREXML loaded."
       rescue Gem::LoadError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: wrest
 version: !ruby/object:Gem::Version 
-  hash: -1848230054
+  hash: 299253595
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta2
-  version: 1.0.0.beta2
+  - beta3
+  version: 1.0.0.beta3
 platform: ruby
 authors: 
 - Sidu Ponnappa
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +05:30
+date: 2010-09-15 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,15 +26,16 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1967355497
+        hash: 62196431
         segments: 
         - 2
         - 0
         - 0
-        - beta19
-        version: 2.0.0.beta19
+        - beta
+        - 22
+        version: 2.0.0.beta.22
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,7 +44,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -54,12 +55,28 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: builder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 11
         segments: 
@@ -68,7 +85,7 @@ dependencies:
         - 6
         version: 1.4.6
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 description: Wrest is a HTTP and REST client library which allows you to quickly build well encapsulated, object oriented wrappers around any web service.
 email: 
 - sidu@c42.in
@@ -79,103 +96,63 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- bin/wrest
 - bin/wrest_shell.rb
-- lib/wrest/components/container/alias_accessors.rb
-- lib/wrest/components/container/alias_accessors.rbc
-- lib/wrest/components/container/typecaster.rb
-- lib/wrest/components/container/typecaster.rbc
-- lib/wrest/components/container.rb
-- lib/wrest/components/container.rbc
-- lib/wrest/components/mutators/base.rb
-- lib/wrest/components/mutators/base.rbc
-- lib/wrest/components/mutators/camel_to_snake_case.rb
-- lib/wrest/components/mutators/camel_to_snake_case.rbc
-- lib/wrest/components/mutators/xml_mini_type_caster.rb
-- lib/wrest/components/mutators/xml_mini_type_caster.rbc
-- lib/wrest/components/mutators/xml_simple_type_caster.rb
-- lib/wrest/components/mutators/xml_simple_type_caster.rbc
-- lib/wrest/components/mutators.rb
-- lib/wrest/components/mutators.rbc
-- lib/wrest/components/translators/content_types.rb
-- lib/wrest/components/translators/content_types.rbc
-- lib/wrest/components/translators/json.rb
-- lib/wrest/components/translators/json.rbc
-- lib/wrest/components/translators/xml.rb
-- lib/wrest/components/translators/xml.rbc
-- lib/wrest/components/translators.rb
-- lib/wrest/components/translators.rbc
-- lib/wrest/components.rb
-- lib/wrest/components.rbc
+- 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
 - lib/wrest/core_ext/hash/conversions.rb
-- lib/wrest/core_ext/hash/conversions.rbc
 - lib/wrest/core_ext/hash.rb
-- lib/wrest/core_ext/hash.rbc
 - lib/wrest/core_ext/string/conversions.rb
-- lib/wrest/core_ext/string/conversions.rbc
 - lib/wrest/core_ext/string.rb
-- lib/wrest/core_ext/string.rbc
-- lib/wrest/curl/delete.rb
-- lib/wrest/curl/get.rb
-- lib/wrest/curl/options.rb
-- lib/wrest/curl/post.rb
-- lib/wrest/curl/put.rb
-- lib/wrest/curl/request.rb
-- lib/wrest/curl/response.rb
-- lib/wrest/curl/session.rb
 - lib/wrest/curl.rb
-- lib/wrest/curl.rbc
-- lib/wrest/exceptions.rb
-- lib/wrest/exceptions.rbc
-- lib/wrest/http_shared/headers.rb
-- lib/wrest/http_shared/headers.rbc
-- lib/wrest/http_shared/standard_headers.rb
-- lib/wrest/http_shared/standard_headers.rbc
-- lib/wrest/http_shared/standard_tokens.rb
-- lib/wrest/http_shared/standard_tokens.rbc
+- lib/wrest/native.rb
 - lib/wrest/http_shared.rb
-- lib/wrest/http_shared.rbc
-- lib/wrest/multipart.rb
-- lib/wrest/native/connection_factory.rb
-- lib/wrest/native/connection_factory.rbc
-- lib/wrest/native/delete.rb
-- lib/wrest/native/delete.rbc
-- lib/wrest/native/get.rb
-- lib/wrest/native/get.rbc
+- lib/wrest/native/session.rb
+- lib/wrest/native/redirection.rb
+- lib/wrest/native/response.rb
 - lib/wrest/native/options.rb
-- lib/wrest/native/options.rbc
+- lib/wrest/native/get.rb
+- lib/wrest/native/connection_factory.rb
+- lib/wrest/native/request.rb
 - lib/wrest/native/post.rb
-- lib/wrest/native/post.rbc
-- lib/wrest/native/post_multipart.rb
-- lib/wrest/native/put.rb
-- lib/wrest/native/put.rbc
 - lib/wrest/native/put_multipart.rb
-- lib/wrest/native/redirection.rb
-- lib/wrest/native/redirection.rbc
-- lib/wrest/native/request.rb
-- lib/wrest/native/request.rbc
-- lib/wrest/native/response.rb
-- lib/wrest/native/response.rbc
-- lib/wrest/native/session.rb
-- lib/wrest/native/session.rbc
-- lib/wrest/native.rb
-- lib/wrest/native.rbc
-- lib/wrest/resource/base.rb
-- lib/wrest/resource/base.rbc
-- lib/wrest/resource/collection.rb
-- lib/wrest/resource/state.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/get.rb
+- lib/wrest/curl/request.rb
+- lib/wrest/curl/post.rb
+- lib/wrest/curl/put.rb
+- lib/wrest/curl/delete.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/resource.rb
-- lib/wrest/resource.rbc
 - lib/wrest/test/request_patches.rb
-- lib/wrest/test.rb
-- lib/wrest/uri.rb
-- lib/wrest/uri.rbc
-- lib/wrest/uri_template.rb
-- lib/wrest/uri_template.rbc
-- lib/wrest/version.rb
-- lib/wrest/version.rbc
-- lib/wrest.rb
-- lib/wrest.rbc
+- lib/wrest/multipart.rb
 - README.rdoc
 - CHANGELOG
 - LICENCE