wrest 1.0.0.beta5-universal-java-1.6 → 1.0.0.beta6-universal-java-1.6

data/CHANGELOG

@@ -18,6 +18,10 @@ Features under a numbered section are complete and available in the Wrest gem.
 
 == Current
 
+== 1.0.0.beta6
+ * GH#35 Wrest::UriTemplate extensions swallow existing path
+ * GH#41 Make Hash core_ext opt out
+ 
 == 1.0.0.beta5
  * GH#30 Replace rails app in spec/sample_rails_app with a lighter sinatra app
  * GH#37 Allow opting out of Adding to_uri to string

data/README.rdoc

@@ -1,4 +1,4 @@
-= Wrest 1.0.0.beta4
+= Wrest 1.0.0.beta5
 
 (c) Copyright 2009-2010 {Sidu Ponnappa}[http://blog.sidu.in]. All Rights Reserved.
 
@@ -147,10 +147,10 @@ You can launch the interactive Wrest shell by running bin/wrest if you have the
   
 == Contributors
  
- * Sidu Ponnappa : {kaiwren}[http://github.com/kaiwren]
- * Niranjan Paranjape : {achamian}[http://github.com/achamian]
- * Aakash Dharmadhkari  : {aakashd}[http://github.com/aakashd]
- * Srushti : {srushti}[http://github.com/srushti]
- * Preethi Ramdev  : {preethiramdev}[http://github.com/preethiramdev]
- * Nikhil Vallishayee  : {preethiramdev}[http://github.com/preethiramdev]
- * Jacques Crocker: {railsjedi}[http://github.com/railsjedi]
+* Sidu Ponnappa : {kaiwren}[http://github.com/kaiwren]
+* Niranjan Paranjape : {achamian}[http://github.com/achamian]
+* Aakash Dharmadhkari : {aakashd}[http://github.com/aakashd]
+* Srushti : {srushti}[http://github.com/srushti]
+* Preethi Ramdev : {preethiramdev}[http://github.com/preethiramdev]
+* Nikhil Vallishayee : {nikhilvallishayee}[http://github.com/nikhilvallishayee]
+* Jacques Crocker : {railsjedi}[http://github.com/railsjedi]

data/lib/wrest.rb

@@ -80,7 +80,8 @@ RUBY_PLATFORM =~ /java/ ? gem('json-jruby', '>= 1.4.2') : gem('json', '>= 1.4.2'
 ActiveSupport::JSON.backend = "JSONGem"
 
 
-Dir["#{File.expand_path(File.dirname(__FILE__))}/wrest/core_ext/*.rb"].each { |file| require file }
+
+require "#{Wrest::Root}/wrest/core_ext/string"
 
 # Load Wrest Core
 require "#{Wrest::Root}/wrest/version"

data/lib/wrest/components.rb

@@ -16,5 +16,4 @@ module Wrest
 end
 
 require "#{Wrest::Root}/wrest/components/container"
-require "#{Wrest::Root}/wrest/components/mutators"
-require "#{Wrest::Root}/wrest/components/translators"
+require "#{Wrest::Root}/wrest/components/translators"

data/lib/wrest/components/mutators.rb

@@ -32,8 +32,9 @@ module Wrest
     end
   end
 end
-
+require "#{Wrest::Root}/wrest/core_ext/hash"
 require "#{Wrest::Root}/wrest/components/mutators/base"
 require "#{Wrest::Root}/wrest/components/mutators/xml_simple_type_caster"
 require "#{Wrest::Root}/wrest/components/mutators/xml_mini_type_caster"
-require "#{Wrest::Root}/wrest/components/mutators/camel_to_snake_case"
+require "#{Wrest::Root}/wrest/components/mutators/camel_to_snake_case"
+

data/lib/wrest/components/translators/xml.rb

@@ -6,19 +6,61 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the License
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
-
+# require 'jruby'
+# include Java
+# 
+# java_import javax.xml.parsers.DocumentBuilder
+# java_import javax.xml.parsers.DocumentBuilderFactory
+# java_import java.io.StringReader
+# java_import org.xml.sax.InputSource
+# java_import javax.xml.xpath.XPath
+# java_import javax.xml.xpath.XPathFactory
+# java_import javax.xml.xpath.XPathConstants
+# java_import javax.xml.xpath.XPathExpression
+# #java_import Java::org.jdom.input.SAXBuilder
 module Wrest
   module Components::Translators
     module Xml
       extend self
 
-      def deserialise(response)
-        Hash.from_xml(response.body)
+      def deserialise(response,options={})
+        if(!options[:xpath].nil?)
+          Hash.from_xml(filter(response,options[:xpath]))
+        else
+          Hash.from_xml(response.body)
+        end
       end
 
       def serialise(hash, options = {})
         hash.to_xml(options)
       end
+
+      def filter(response,xpath)
+        filter_rexml(response,xpath)
+      end
+      
+      def filter_rexml(response,xpath)
+        doc = REXML::Document.new(response.body)
+        REXML::XPath.first(doc,xpath).to_s
+      end
+
+
+      # def filter_jdom(response,xpath)
+      #  # string_reader = StringReader.new(response.body)
+      #   input_source = InputSource.new(string_reader)
+      #   #p input_source.to_s
+      #   doc = DocumentBuilderFactory.new_instance.new_document_builder.parse(input_source)
+      #   #doc = SAXBuilder.new.build(string_reader)
+      #   p doc
+      #   p doc.toString
+      #   #xpath_instance = XPathFactory.new_instance.newXPath
+      #   #expr = xpath_instance.compile(xpath)
+      #   #p expr.to_s
+      #   #result = expr.evaluate(doc)
+
+      #   #puts result
+      # end
+
     end
   end
 end

data/lib/wrest/core_ext/hash.rb

@@ -2,4 +2,4 @@ require "#{Wrest::Root}/wrest/core_ext/hash/conversions"
 
 class Hash #:nodoc:
   include Wrest::CoreExt::Hash::Conversions
-end
+end

data/lib/wrest/curl/response.rb

@@ -30,12 +30,12 @@ module Wrest #:nodoc:
         initialize_http_header
       end
 
-      def deserialise
-        deserialise_using(Wrest::Components::Translators.lookup(content_type))
+      def deserialise(options = {})
+        deserialise_using(Wrest::Components::Translators.lookup(content_type),options)
       end
 
-      def deserialise_using(translator)
-        translator.deserialise(@http_response)
+      def deserialise_using(translator,options={})
+        translator.deserialise(@http_response,options)
       end
       
       def code
@@ -68,4 +68,4 @@ module Wrest #:nodoc:
       end
     end
   end
-end
+end

data/lib/wrest/native/response.rb

@@ -6,7 +6,7 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the License 
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 # See the License for the specific language governing permissions and limitations under the License. 
-
+require "rexml/document"
 module Wrest #:nodoc:
   module Native #:nodoc:
     # Decorates a response providing support for deserialisation.
@@ -40,12 +40,13 @@ module Wrest #:nodoc:
         @http_response = http_response
       end
 
-      def deserialise
-        deserialise_using(Wrest::Components::Translators.lookup(@http_response.content_type))
+
+      def deserialise(options = {})
+        deserialise_using(Wrest::Components::Translators.lookup(@http_response.content_type),options)
       end
 
-      def deserialise_using(translator)
-        translator.deserialise(@http_response)
+      def deserialise_using(translator,options = {})
+        translator.deserialise(@http_response,options)
       end
 
       def headers
@@ -54,7 +55,7 @@ module Wrest #:nodoc:
       
       # A null object implementation - invoking this method on
       # a response simply returns the same response unless
-      # the response is a Redirection (code 3xx), in which case a 
+      # the response is Redirection (code 3xx), in which case a 
       # get is invoked on the url stored in the response headers
       # under the key 'location' and the new Response is returned.
       def follow(redirect_request_options = {})

data/lib/wrest/uri_template.rb

@@ -47,7 +47,7 @@ module Wrest
     end
 
     def [](path)
-       UriTemplate.new(URI.join(uri_pattern,path).to_s)
+      UriTemplate.new(File.join(uri_pattern, path))
     end
 
     def ==(other)

data/lib/wrest/version.rb

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

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
     - 1
     - 0
     - 0
-    - beta5
-  version: 1.0.0.beta5
+    - beta6
+  version: 1.0.0.beta6
 platform: universal-java-1.6
 authors: 
   - Sidu Ponnappa
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-19 00:00:00 +05:30
+date: 2010-09-21 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -108,63 +108,63 @@ extensions: []
 extra_rdoc_files: 
   - README.rdoc
 files: 
-  - bin/wrest
   - bin/wrest_shell.rb
-  - lib/wrest.rb
+  - bin/wrest
   - lib/wrest_no_ext.rb
-  - lib/wrest/components.rb
+  - lib/wrest.rb
+  - lib/wrest/uri_template.rb
+  - lib/wrest/version.rb
+  - lib/wrest/test.rb
   - lib/wrest/curl.rb
-  - lib/wrest/exceptions.rb
-  - lib/wrest/http_shared.rb
-  - lib/wrest/multipart.rb
   - lib/wrest/native.rb
-  - lib/wrest/resource.rb
-  - lib/wrest/test.rb
+  - lib/wrest/http_shared.rb
   - lib/wrest/uri.rb
-  - lib/wrest/uri_template.rb
-  - lib/wrest/version.rb
-  - lib/wrest/components/container.rb
-  - lib/wrest/components/mutators.rb
-  - lib/wrest/components/translators.rb
-  - lib/wrest/components/container/alias_accessors.rb
-  - lib/wrest/components/container/typecaster.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/translators/content_types.rb
-  - lib/wrest/components/translators/json.rb
-  - lib/wrest/components/translators/xml.rb
+  - lib/wrest/components.rb
+  - lib/wrest/exceptions.rb
+  - lib/wrest/resource.rb
+  - lib/wrest/multipart.rb
+  - lib/wrest/resource/state.rb
+  - lib/wrest/resource/base.rb
+  - lib/wrest/resource/collection.rb
   - lib/wrest/core_ext/hash.rb
   - lib/wrest/core_ext/string.rb
   - lib/wrest/core_ext/hash/conversions.rb
   - lib/wrest/core_ext/string/conversions.rb
-  - lib/wrest/curl/delete.rb
-  - lib/wrest/curl/get.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/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/request.rb
-  - lib/wrest/curl/response.rb
-  - lib/wrest/curl/session.rb
-  - lib/wrest/http_shared/headers.rb
-  - lib/wrest/http_shared/standard_headers.rb
+  - lib/wrest/curl/delete.rb
+  - lib/wrest/components/mutators.rb
+  - lib/wrest/components/translators.rb
+  - lib/wrest/components/container.rb
+  - lib/wrest/components/translators/json.rb
+  - lib/wrest/components/translators/xml.rb
+  - lib/wrest/components/translators/content_types.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/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/resource/base.rb
-  - lib/wrest/resource/collection.rb
-  - lib/wrest/resource/state.rb
+  - lib/wrest/http_shared/standard_headers.rb
+  - lib/wrest/http_shared/headers.rb
   - lib/wrest/test/request_patches.rb
   - README.rdoc
   - CHANGELOG