wrest 0.0.6 → 0.0.7

data/lib/wrest/resource/state.rb

@@ -0,0 +1,6 @@
+module Wrest
+  module Resource
+    class State
+    end
+  end
+end

data/lib/wrest/response.rb

@@ -34,5 +34,9 @@ module Wrest #:nodoc:
     def deserialise_using(translator)
       translator.deserialise(@http_response)
     end
+    
+    def headers
+      @http_response.to_hash
+    end
   end
 end

data/lib/wrest/uri.rb

@@ -47,11 +47,15 @@ module Wrest #:nodoc:
     def delete(parameters = {}, headers = {})
       do_request 'delete', parameters.empty? ? @uri.request_uri : "#{@uri.request_uri}?#{parameters.to_query}", headers.stringify_keys
     end
+
+    def options
+      do_request 'options', @uri.request_uri
+    end
     
     def do_request(method, url, *args)
       response = nil
 
-      Wrest.logger.info  "#{method} -> #{url}"
+      Wrest.logger.info "--> (#{method}) #{@uri.scheme}://#{@uri.host}:#{@uri.port}#{url}"
       time = Benchmark.realtime { response = Wrest::Response.new(http.send(method, url, *args)) }
       Wrest.logger.info "--> %d %s (%d %.2fs)" % [response.code, response.message, response.body ? response.body.length : 0, time]
 

data/lib/wrest/version.rb

@@ -12,7 +12,7 @@ module Wrest
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 0
-      TINY   = 6
+      TINY   = 7
 
       STRING = [MAJOR, MINOR, TINY].join('.')
 

data/spec/spec.opts

@@ -1,6 +1,6 @@
 --colour
 --format
-progress
+specdoc
 --loadby
 mtime
 --reverse

data/spec/spec_helper.rb

@@ -11,7 +11,14 @@ Wrest.logger = Logger.new(File.open("#{WREST_ROOT}/../log/test.log", 'a'))
 
 def p(*args)
  # super *(args << caller[0])
- super *(args << '<br>')
+ super *(args << '<br/>')
+ # super *args
+end
+
+def puts(*args)
+ # super *(args << caller[0])
+ super *(args << '<br/>')
+ # super *args
 end
 
 Spec::Runner.configure do |config|

data/spec/wrest/components/attributes_container/typecaster_spec.rb

@@ -0,0 +1,63 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+module Wrest::Components
+  describe AttributesContainer::Typecaster do
+    before :each do
+      @Demon = Class.new
+      @Demon.class_eval do
+        include AttributesContainer
+        include AttributesContainer::Typecaster
+      end
+    end
+
+    it "should know how to apply a lambda to the string value of a given key casting it to a new type" do
+      @Demon.class_eval{ typecast :age => lambda{|id_string| id_string.to_i} }
+      kai_wren = @Demon.new('age' => '1')
+      kai_wren.age.should == 1
+    end
+
+    it "should not apply a lambda to the value of a given key if it is not a string" do
+      @Demon.class_eval{ typecast :age => lambda{|id_string| id_string.to_i} }
+      kai_wren = @Demon.new('age' => :ooga)
+      kai_wren.age.should == :ooga
+    end
+
+    it "should leave nils unchanged" do
+      @Demon.class_eval{ typecast :age => lambda{|id_string| id_string.to_i} }
+      kai_wren = @Demon.new('age' => nil)
+      kai_wren.age.should be_nil
+    end
+
+    it "should provide helpers for typcasting common types" do
+      @Demon.class_eval{ typecast :age => as_integer }
+      kai_wren = @Demon.new('age' => '1500')
+      kai_wren.age.should == 1500
+    end
+
+    describe 'in subclasses' do
+      before :each do
+        @Sidhe = Class.new
+        @Sidhe.class_eval do
+          include AttributesContainer
+          include AttributesContainer::Typecaster
+
+          typecast :age => as_integer
+        end
+      end
+
+      it "should inherit all defined typecasts" do
+        @ChineseSidhe = Class.new(@Sidhe)
+        kai_wren = @ChineseSidhe.new('age' => '1500')
+        kai_wren.age.should == 1500
+      end
+
+      it "should discard all typecasts from parent if defined in child" do
+        @ChineseSidhe = Class.new(@Sidhe)
+        @ChineseSidhe.class_eval{ typecast :born_in => as_integer }
+        kai_wren = @ChineseSidhe.new('age' => '1500', 'born_in' => '509')
+        kai_wren.age.should == '1500'
+        kai_wren.born_in.should == 509
+      end
+    end
+  end
+end

data/spec/wrest/components/attributes_container_spec.rb

@@ -13,69 +13,14 @@ module Wrest::Components
   describe AttributesContainer do
     class HumanBeing
       include AttributesContainer
-      has_attributes :id
+      always_has :id
     end
 
     it "should allow instantiation with no attributes" do
       lambda{ HumanBeing.new }.should_not raise_error
     end
 
-    describe 'typecast' do
-      before :each do
-        @Demon = Class.new
-        @Demon.class_eval{include AttributesContainer}
-      end
-
-      it "should know how to apply a lambda to the string value of a given key casting it to a new type" do
-        @Demon.class_eval{ typecast :age => lambda{|id_string| id_string.to_i} }
-        kai_wren = @Demon.new('age' => '1')
-        kai_wren.age.should == 1
-      end
-
-      it "should not apply a lambda to the value of a given key if it is not a string" do
-        @Demon.class_eval{ typecast :age => lambda{|id_string| id_string.to_i} }
-        kai_wren = @Demon.new('age' => :ooga)
-        kai_wren.age.should == :ooga
-      end
-
-      it "should leave nils unchanged" do
-        @Demon.class_eval{ typecast :age => lambda{|id_string| id_string.to_i} }
-        kai_wren = @Demon.new('age' => nil)
-        kai_wren.age.should be_nil
-      end
-
-      it "should provide helpers for typcasting common types" do
-        @Demon.class_eval{ typecast :age => as_integer }
-        kai_wren = @Demon.new('age' => '1500')
-        kai_wren.age.should == 1500
-      end
-
-      describe 'in subclasses' do
-        before :each do
-          @Sidhe = Class.new
-          @Sidhe.class_eval{
-            include AttributesContainer
-            typecast :age => as_integer
-          }
-        end
-
-        it "should inherit all defined typecasts" do
-          @ChineseSidhe = Class.new(@Sidhe)
-          kai_wren = @ChineseSidhe.new('age' => '1500')
-          kai_wren.age.should == 1500
-        end
-        
-        it "should discard all typecasts from parent if defined in child" do
-          @ChineseSidhe = Class.new(@Sidhe)
-          @ChineseSidhe.class_eval{ typecast :born_in => as_integer }
-          kai_wren = @ChineseSidhe.new('age' => '1500', 'born_in' => '509')
-          kai_wren.age.should == '1500'
-          kai_wren.born_in.should == 509
-        end
-      end
-    end
-
-    describe 'has_attributes' do
+    describe 'always_has' do
       describe 'method creation' do
         before :each do
           @Demon = Class.new
@@ -87,7 +32,7 @@ module Wrest::Components
 
           @Demon.class_eval{
             include AttributesContainer
-            has_attributes :trainer
+            always_has :trainer
           }
 
           kai_wren.methods.should include('trainer')
@@ -99,7 +44,7 @@ module Wrest::Components
 
           @Demon.class_eval{
             include AttributesContainer
-            has_attributes :trainer
+            always_has :trainer
           }
 
           kai_wren.methods.should include('trainer=')
@@ -111,7 +56,7 @@ module Wrest::Components
 
           @Demon.class_eval{
             include AttributesContainer
-            has_attributes :trainer
+            always_has :trainer
           }
           kai_wren.methods.should include('trainer?')
         end
@@ -122,7 +67,7 @@ module Wrest::Components
           @Demon = Class.new
           @Demon.class_eval{
             include AttributesContainer
-            has_attributes :trainer
+            always_has :trainer
 
             def method_missing(method_name, *args)
               # Ensuring that the instance level

data/spec/wrest/components/mutators/base_spec.rb

@@ -33,6 +33,10 @@ module Wrest::Components
       }]]
       ).should == ["result", {"publish_date" => "1240326000", "news_source" => {"online"=>"PC via News", "unique_id"=>1}}]
     end
-
+    
+    it "should register all subclasses in the registry" do
+      class SomeMutator < Mutators::Base; end
+      Mutators::REGISTRY[:some_mutator].should == SomeMutator
+    end
   end
 end

data/spec/wrest/components/mutators/xml_mini_type_caster_spec.rb

@@ -0,0 +1,75 @@
+# 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
+# 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 File.dirname(__FILE__) + '/../../../spec_helper'
+
+module Wrest::Components
+  describe Mutators::XmlMiniTypeCaster do
+    before(:each) do
+      @mutator = Mutators::XmlMiniTypeCaster.new
+    end
+
+    # {"lead-bottle"=>{"name"=>{"__content__"=>"Wooz"}, "universe-id"=>{"type"=>"integer", "nil"=>"true"}, "id"=>{"__content__"=>"1", "type"=>"integer"}}}
+
+    it "should typecast a nil value in a tuple" do
+      @mutator.mutate(
+        ["universe-id", {"type"=>"integer", "nil"=>"true"}]
+      ).should == ["universe-id", nil]
+    end
+
+    it "should leave a string value in a tuple unchanged" do
+      @mutator.mutate(
+        ["name", {"__content__" => "Wooz"}]  
+      ).should == ["name", "Wooz"]
+    end
+
+    it "should cast an integer value in a tuple" do
+      @mutator.mutate(
+        ["id", {"type"=>"integer", "__content__"=>"1"}]
+      ).should == ["id", 1]
+    end
+    
+    it "should step into a value if it is a hash" do
+      @mutator.mutate(
+        ["ResultSet", {
+                        "firstResultPosition"=>"1", "totalResultsReturned"=>"1", 
+                        "xsi:schemaLocation"=>"urn:ooga:on http://api.search.ooga.com/NewsSearchService/V1/NewsSearchResponse.xsd", 
+                        "totalResultsAvailable"=>"23287", 
+                        "Result"=>{
+                          "UniqueId"=>{"__content__"=>"1", "type" => "integer"},
+                          "PublishDate"=>{"__content__"=>"20090424", "type" => "date"}, 
+                          "Language"=>{"__content__"=>"en"}, 
+                          "Title"=>{"__content__"=>"Wootler: Wook focus should be Klingon, not India"}, 
+                          "ClickUrls"=>[
+                                      {"One" => {"__content__"=>"http://news.ooga.com/s/ap/20090424/ap_on_go_ca_st_pe/us_us_wookieland_5"}},
+                                      {"Two" => {"__content__"=>"http://news.ooga.com/s/ap/20090424/ap_on_go_ca_st_pe/us_us_wookieland_6"}},
+                                    ]
+                                       
+                        }
+                      }
+        ]
+      ).should == ["ResultSet", {
+                        "firstResultPosition"=>"1", "totalResultsReturned"=>"1", 
+                        "xsi:schemaLocation"=>"urn:ooga:on http://api.search.ooga.com/NewsSearchService/V1/NewsSearchResponse.xsd", 
+                        "totalResultsAvailable"=>"23287", 
+                        "Result"=>{
+                          "UniqueId"=> 1,
+                          "PublishDate"=>Date.parse("20090424"),
+                          "Language"=>"en", 
+                          "Title"=>"Wootler: Wook focus should be Klingon, not India", 
+                          "ClickUrls"=>[
+                                      {"One" => "http://news.ooga.com/s/ap/20090424/ap_on_go_ca_st_pe/us_us_wookieland_5"},
+                                      {"Two" => "http://news.ooga.com/s/ap/20090424/ap_on_go_ca_st_pe/us_us_wookieland_6"},
+                                    ]
+                        }
+                      }
+        ]
+    end
+  end
+end

data/spec/wrest/components/mutators_spec.rb

@@ -0,0 +1,21 @@
+# 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 
+# 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 File.dirname(__FILE__) + '/../../spec_helper'
+
+module Wrest::Components
+  describe Mutators do
+    it "should know how to chain mutators without having to namespace them all" do
+      mutator = Mutators.chain(:xml_mini_type_caster, :xml_simple_type_caster, :camel_to_snake_case)
+      mutator.class.should == Mutators::XmlMiniTypeCaster
+      mutator.next_mutator.class.should == Mutators::XmlSimpleTypeCaster
+      mutator.next_mutator.next_mutator.class.should == Mutators::CamelToSnakeCase
+    end
+  end
+end

data/spec/wrest/components/translators/xml_spec.rb

@@ -6,7 +6,7 @@ module Wrest::Components::Translators
       http_response = mock('Http Reponse')
       http_response.should_receive(:body).and_return("<ooga><age>12</age></ooga>")
 
-      Xml.deserialise(http_response).should == {"ooga"=>[{"age"=>["12"]}]}
+      Xml.deserialise(http_response).should == {"ooga"=>{"age"=>{"__content__" => "12"}}}
     end
   end
 end

data/spec/wrest/components/translators_spec.rb

@@ -1,3 +1,12 @@
+# 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 
+# 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 File.dirname(__FILE__) + '/../../spec_helper'
 
 module Wrest::Components

data/spec/wrest/uri_spec.rb

@@ -33,13 +33,13 @@ module Wrest
       Uri.new('https://localhost:3000').should_not == Uri.new('http://localhost:3000')
       Uri.new('http://localhost:3000').should == Uri.new('http://localhost:3000')
     end
-    
-    
+
+
     it "should have the same hash code if it is the same uri" do
       Uri.new('https://localhost:3000').hash.should == Uri.new('https://localhost:3000').hash
       Uri.new('https://localhost:3001').hash.should_not == Uri.new('https://localhost:3000').hash
     end
-    
+
     describe 'Get' do
       it "should know how to get" do
         uri = "http://localhost:3000/glassware".to_uri
@@ -77,7 +77,7 @@ module Wrest
         uri.get(:owner => 'Kai', :type => 'bottle')
       end
     end
-    
+
     it "should know how to post" do
       uri = "http://localhost:3000/glassware".to_uri
       uri.should_not be_https
@@ -114,6 +114,18 @@ module Wrest
       uri.delete({:owner => 'Kai', :type => 'bottle'}, :page => '2', :per_page => '5')
     end
 
+    it "should know how to ask for options on a URI" do
+      uri = "http://localhost:3000/glassware".to_uri
+      uri.should_not be_https
+
+      http = mock(Net::HTTP)
+      Net::HTTP.should_receive(:new).with('localhost', 3000).and_return(http)
+
+      http.should_receive(:options).with('/glassware').and_return(build_ok_response(nil))
+
+      uri.options
+    end
+
     it "should not mutate state of the uri across requests" do
       uri = "http://localhost:3000/glassware".to_uri
       uri.should_not be_https

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wrest
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sidu Ponnappa
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 +05:30
-default_executable: wrest
+date: 2009-05-07 00:00:00 +05:30
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -20,17 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: xml-simple
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.11
+        version: 2.3.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -46,6 +36,7 @@ description: Wrest is a REST client library which allows you to quickly build ob
 email: ckponnappa@gmail.com
 executables: 
 - wrest
+- jwrest
 extensions: []
 
 extra_rdoc_files: 
@@ -60,15 +51,16 @@ files:
 - lib/wrest.rb
 - lib/wrest/components.rb
 - lib/wrest/components/attributes_container.rb
+- lib/wrest/components/attributes_container/typecaster.rb
 - lib/wrest/components/mutators.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.rb
 - lib/wrest/components/translators/content_types.rb
 - lib/wrest/components/translators/json.rb
 - lib/wrest/components/translators/xml.rb
-- lib/wrest/components/typecast_helpers.rb
 - lib/wrest/core_ext/hash.rb
 - lib/wrest/core_ext/hash/conversions.rb
 - lib/wrest/core_ext/string.rb
@@ -79,6 +71,7 @@ files:
 - lib/wrest/resource.rb
 - lib/wrest/resource/base.rb
 - lib/wrest/resource/collection.rb
+- lib/wrest/resource/state.rb
 - lib/wrest/response.rb
 - lib/wrest/uri.rb
 - lib/wrest/uri_template.rb
@@ -87,10 +80,13 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/wrest/components/attributes_container/typecaster_spec.rb
 - spec/wrest/components/attributes_container_spec.rb
 - spec/wrest/components/mutators/base_spec.rb
 - spec/wrest/components/mutators/camel_to_snake_spec.rb
+- spec/wrest/components/mutators/xml_mini_type_caster_spec.rb
 - spec/wrest/components/mutators/xml_simple_type_caster_spec.rb
+- spec/wrest/components/mutators_spec.rb
 - spec/wrest/components/translators/xml_spec.rb
 - spec/wrest/components/translators_spec.rb
 - spec/wrest/core_ext/hash/conversions_spec.rb
@@ -130,10 +126,13 @@ summary: REST client library for Ruby.
 test_files: 
 - spec/custom_matchers/custom_matchers.rb
 - spec/spec_helper.rb
+- spec/wrest/components/attributes_container/typecaster_spec.rb
 - spec/wrest/components/attributes_container_spec.rb
 - spec/wrest/components/mutators/base_spec.rb
 - spec/wrest/components/mutators/camel_to_snake_spec.rb
+- spec/wrest/components/mutators/xml_mini_type_caster_spec.rb
 - spec/wrest/components/mutators/xml_simple_type_caster_spec.rb
+- spec/wrest/components/mutators_spec.rb
 - spec/wrest/components/translators/xml_spec.rb
 - spec/wrest/components/translators_spec.rb
 - spec/wrest/core_ext/hash/conversions_spec.rb