dm-rest-adapter 0.9.3 → 0.9.4

data/Manifest.txt

@@ -23,4 +23,4 @@ stories/helper.rb
 stories/resources/helpers/book.rb
 stories/resources/helpers/story_helper.rb
 stories/resources/steps/read.rb
-stories/resources/steps/using_rest_adapter.rb
+stories/resources/steps/using_rest_adapter.rb

data/lib/rest_adapter.rb

@@ -3,7 +3,10 @@ require 'pathname'
 require Pathname(__FILE__).dirname + 'rest_adapter/version'
 gem 'dm-core', DataMapper::More::RestAdapter::VERSION
 require 'dm-core'
+
+gem 'extlib', '=0.9.4'
 require 'extlib'
+
 require 'dm-serializer'
 require 'net/http'
 require 'rexml/document'
@@ -14,7 +17,7 @@ module DataMapper
   module Adapters
     class RestAdapter < AbstractAdapter
       include Extlib
-      
+
       # Creates a new resource in the specified repository.
       def create(resources)
         count = 0
@@ -22,7 +25,7 @@ module DataMapper
           resource_name = Inflection.underscore(resource.class.name)
           result = http_post("/#{resource_name.pluralize}.xml", resource.to_xml)
           # TODO: Raise error if cannot reach server
-          success = result.instance_of?(Net::HTTPCreated) 
+          success = result.instance_of?(Net::HTTPCreated)
           if success
             count += 1
             # TODO: Fix commented out code below to work through the identity_map of the repository
@@ -33,7 +36,7 @@ module DataMapper
         end
         count
       end
-      
+
       # read_set
       #
       # Examples of query string:
@@ -62,7 +65,7 @@ module DataMapper
           end
         end
       end
-      
+
       def read_one(query)
         resource = nil
         resource_name = resource_name_from_query(query)
@@ -73,16 +76,16 @@ module DataMapper
         else
           id = query.conditions.first[2]
           # KLUGE: Again, we're assuming below that we're dealing with a pluralized resource mapping
-          
+
           response = http_get("/#{resource_name.pluralize}/#{id}.xml")
-        
+
           # KLUGE: Rails returns HTML if it can't find a resource.  A properly RESTful app would return a 404, right?
           return nil if response.is_a? Net::HTTPNotFound || response.content_type == "text/html"
-        
+
           data = response.body
           resource_meta = parse_resource(data, query.model, query)
         end
-        if resource_meta 
+        if resource_meta
           if resource_meta.has_key?(:associations)
             load_nested_resources_from resource_meta[:associations], query
           end
@@ -90,13 +93,13 @@ module DataMapper
         end
         resource
       end
-      
+
       def update(attributes, query)
         # TODO What if we have a compound key?
         raise NotImplementedError.new unless is_single_resource_query? query
         id = query.conditions.first[2]
         resource = nil
-        query.repository.scope do 
+        query.repository.scope do
           resource = query.model.get(id)
         end
         attributes.each do |attr, val|
@@ -107,15 +110,15 @@ module DataMapper
         # TODO: Raise error if cannot reach server
         res.kind_of?(Net::HTTPSuccess) ? 1 : 0
       end
-      
+
       def delete(query)
         raise NotImplementedError.new unless is_single_resource_query? query
         id = query.conditions.first[2]
         res = http_delete("/#{resource_name_from_query(query).pluralize}/#{id}.xml")
         res.kind_of?(Net::HTTPSuccess) ? 1 : 0
       end
-      
-    protected    
+
+    protected
       def load_nested_resources_from(nested_resources, query)
         nested_resources.each do |resource_meta|
           # TODO: Houston, we have a problem.  Model#load expects a Query.  When we're nested, we don't have a query yet...
@@ -125,7 +128,7 @@ module DataMapper
           #end
         end
       end
-    
+
       def read_set_all(repository, query, resource_name)
         # TODO: how do we know whether the resource we're talking to is singular or plural?
         res = http_get("/#{resource_name.pluralize}.xml")
@@ -133,18 +136,18 @@ module DataMapper
         parse_resources(data, query.model, query)
         # TODO: Raise error if cannot reach server
       end
-      
+
       #    GET /books/4200
       def read_set_for_condition(repository, query, resource_name)
         # More complex conditions
         raise NotImplementedError.new
-      end    
-          
+      end
+
       # query.conditions like [[:eql, #<Property:Book:id>, 4200]]
       def is_single_resource_query?(query)
         query.conditions.length == 1 && query.conditions.first.first == :eql && query.conditions.first[1].name == :id
       end
-      
+
       def http_put(uri, data = nil)
         request { |http| http.put(uri, data, {"Content-Type", "application/xml"}) }
       end
@@ -167,13 +170,13 @@ module DataMapper
           res = yield(http)
         end
         res
-      end  
+      end
 
       def values_from_rexml(entity_element, dm_model_class)
         resource = {}
         resource[:values] = []
         entity_element.elements.each do |field_element|
-          attribute = dm_model_class.properties(repository.name).find do |property| 
+          attribute = dm_model_class.properties(repository.name).find do |property|
             # *MUST* use Inflection.underscore on the XML as Rails converts '_' to '-' in the XML
             property.name.to_s == Inflection.underscore(field_element.name.to_s)
           end
@@ -188,7 +191,7 @@ module DataMapper
             field_element.each_element do |associated_element|
               model = association[1].child_model
               (resource[:associations] ||= []) << {
-                :model => model, 
+                :model => model,
                 :value => values_from_rexml(associated_element, association[1].child_model)
               }
             end
@@ -204,7 +207,7 @@ module DataMapper
         return nil unless entity_element
         values_from_rexml(entity_element, dm_model_class)
       end
-      
+
       def parse_resources(xml, dm_model_class, query = nil)
         doc = REXML::Document::new(xml)
         # # TODO: handle singular resource case as well....
@@ -216,15 +219,15 @@ module DataMapper
         doc.elements.collect("#{resource_name.pluralize}/#{resource_name}") do |entity_element|
           values_from_rexml(entity_element, dm_model_class)
         end
-      end  
-      
+      end
+
       def resource_name_from_model(model)
         Inflection.underscore(model.name)
       end
-      
+
       def resource_name_from_query(query)
         resource_name_from_model(query.model)
       end
     end
   end
-end
+end

data/lib/rest_adapter/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module More
     class RestAdapter
-      VERSION = "0.9.3"
+      VERSION = "0.9.4"
     end
   end
-end
+end

data/spec/create_spec.rb

@@ -2,20 +2,20 @@ $LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
 describe 'A REST adapter' do
-  
+
   before do
     @adapter = DataMapper::Repository.adapters[:default]
   end
-  
+
   describe 'when saving a resource' do
-  
+
     before do
       @book = Book.new(:title => 'Hello, World!', :author => 'Anonymous')
     end
-  
+
     it 'should make an HTTP Post' do
       @adapter.should_receive(:http_post).with('/books.xml', @book.to_xml)
       @book.save
     end
   end
-end
+end

data/spec/delete_spec.rb

@@ -2,21 +2,21 @@ $LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
 describe 'A REST adapter' do
-  
+
   before do
     @adapter = DataMapper::Repository.adapters[:default]
   end
-  
+
   describe 'when deleting an existing resource' do
     before do
       @book = Book.new(:title => 'Hello, World!', :author => 'Anonymous')
       @book.stub!(:new_record?).and_return(false)
     end
-    
+
     it 'should do an HTTP DELETE' do
       @adapter.should_receive(:http_delete)
       @book.destroy
     end
-    
+
   end
-end
+end

data/spec/read_spec.rb

@@ -2,15 +2,15 @@ $LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
 describe 'A REST adapter' do
-  
+
   before do
     @adapter = DataMapper::Repository.adapters[:default]
   end
-  
+
   describe 'when getting one resource' do
 
     describe 'if the resource exists' do
-    
+
       before do
         book_xml = <<-BOOK
         <?xml version='1.0' encoding='UTF-8'?>
@@ -27,25 +27,25 @@ describe 'A REST adapter' do
         @response.stub!(:body).and_return(book_xml)
         @adapter.stub!(:http_get).and_return(@response)
       end
-        
+
       it 'should return the resource' do
         book = Book.get(@id)
         book.should_not be_nil
         book.id.should be_an_instance_of(Fixnum)
         book.id.should == 1
       end
-        
+
       it 'should do an HTTP GET' do
         @adapter.should_receive(:http_get).with('/books/1.xml').and_return(@response)
         Book.get(@id)
       end
-      
+
       it "it be equal to itself" do
         Book.get(@id).should == Book.get(@id)
-      end      
+      end
     end
-      
-    
+
+
     describe 'if the resource does not exist' do
       it 'should return nil' do
         @id = 1
@@ -58,9 +58,9 @@ describe 'A REST adapter' do
       end
     end
   end
-  
+
   describe 'when getting all resource of a particular type' do
-    before do      
+    before do
       books_xml = <<-BOOK
       <?xml version='1.0' encoding='UTF-8'?>
       <books type='array'>
@@ -70,7 +70,7 @@ describe 'A REST adapter' do
           <id type='integer'>1</id>
           <title>The Dispossed</title>
           <updated-at type='datetime'>2008-06-08T17:02:28Z</updated-at>
-        </book>      
+        </book>
         <book>
           <author>Stephen King</author>
           <created-at type='datetime'>2008-06-08T17:03:07Z</created-at>
@@ -84,18 +84,18 @@ describe 'A REST adapter' do
       @response.stub!(:body).and_return(books_xml)
       @adapter.stub!(:http_get).and_return(@response)
     end
-    
+
     it 'should get a non-empty list' do
       Book.all.should_not be_empty
     end
-    
+
     it 'should receive one Resource for each entity in the XML' do
       Book.all.size.should == 2
     end
-    
+
     it 'should do an HTTP GET' do
       @adapter.should_receive(:http_get).and_return(@response)
       Book.first
-    end    
+    end
   end
-end
+end

data/spec/ruby_forker.rb

@@ -10,4 +10,4 @@ module RubyForker
     cmd << " 2> #{stderr}" unless stderr.nil?
     `#{cmd}`
   end
-end
+end

data/spec/update_spec.rb

@@ -2,7 +2,7 @@ $LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
 describe 'A REST adapter' do
-  
+
   describe 'when updating an existing resource' do
     before do
       @books_xml = <<-XML
@@ -16,11 +16,11 @@ describe 'A REST adapter' do
       repository do |repo|
         @repository = repo
         @book = Book.new(:id => 42,
-                         :title => 'Starship Troopers', 
-                         :author => 'Robert Heinlein', 
+                         :title => 'Starship Troopers',
+                         :author => 'Robert Heinlein',
                          :created_at => DateTime.parse('2008-06-08T17:02:28Z'))
         @book.instance_eval { @new_record = false }
-        @repository.identity_map(Book).set(@book.key, @book)      
+        @repository.identity_map(Book).set(@book.key, @book)
         @book.title = "Mary Had a Little Lamb"
       end
     end
@@ -28,9 +28,9 @@ describe 'A REST adapter' do
     it 'should do an HTTP PUT' do
       adapter = @repository.adapter #DataMapper::Repository.adapters[:default]
       adapter.should_receive(:http_put).with('/books/42.xml', @book.to_xml)
-      @repository.scope do 
+      @repository.scope do
         @book.save
       end
     end
   end
-end
+end

data/stories/crud/create

@@ -28,12 +28,12 @@ Story: remote app wants to create a resource
     
   Scenario: remote app supplies a new valid Resource associated with another new invalid Resource
     Given a new Resource
-    And another new invalid Resource associted with the first
+    And another new invalid Resource associated with the first
     When I try to save the first Resource
     Neither Resource should save
     
   Scenario: remote app supplies a new invalid Resource associated with another new invalid Resource
     Given a new invalid Resource
-    And another new invalid Resource associted with the first
+    And another new invalid Resource associated with the first
     When I try to save the first Resource
     Neither Resource should save

data/stories/crud/stories.rb

@@ -15,4 +15,4 @@ Dir["#{File.dirname(__FILE__)}/*"].each do |file|
       run file if File.file?(file)
     end
   end
-end
+end

data/stories/helper.rb

@@ -6,4 +6,4 @@ require 'dm-core'
 #require 'pathname'
 #require Pathname(__FILE__).dirname.parent.expand_path + '../../lib/rest_adapter'
 require File.join(File.dirname(__FILE__), *%w[resources helpers story_helper])
-require File.join(File.dirname(__FILE__), *%w[resources steps using_rest_adapter])
+require File.join(File.dirname(__FILE__), *%w[resources steps using_rest_adapter])

data/stories/resources/helpers/story_helper.rb

@@ -1,2 +1,2 @@
 require 'spec/story'
-require File.dirname(__FILE__) + '/../../../spec/ruby_forker'
+require File.dirname(__FILE__) + '/../../../spec/ruby_forker'

data/stories/resources/steps/read.rb

@@ -7,9 +7,9 @@ steps_for :read do
       has n, :books
     end
   end
-  
+
   Given "the ID of an existing Resource that has associated Resources" do
-    # Assuming that resource 1 is there.  
+    # Assuming that resource 1 is there.
     # @type.first would do a GET; that's what we're testing
     @resource_id = 1
   end
@@ -21,15 +21,15 @@ steps_for :read do
   When "I GET <nested resource>/<id>" do
     @resource = Shelf.get(@resource_id)
   end
-  
+
   Then "I should get the Resource" do
     @resource.should_not be_nil
     @resource.should be_an_instance_of(Shelf)
     @resource.id.should == 1
   end
-  
+
   Then "the Resource will have associated Resources" do
     @resource.books.should_not be_empty
     @resource.books.first.should be_an_instance_of(Book)
   end
-end
+end

data/stories/resources/steps/using_rest_adapter.rb

@@ -39,18 +39,18 @@ steps_for :using_rest_adapter do
     @resource = Book.first
     @resource_id = @resource.id
   end
-  
+
   When("I try to save the Resource") do
     @result = @resource.save
   end
-  
+
   When("I request all of the Resources of that type") do
     require File.join(File.dirname(__FILE__), '..', 'helpers', 'book')
     @resources = Book.all
   end
-  
+
   When("I request the Resource") do
-    require File.join(File.dirname(__FILE__), '..', 'helpers', 'book')    
+    require File.join(File.dirname(__FILE__), '..', 'helpers', 'book')
     @resource = Book.get(@resource_id)
   end
 
@@ -61,19 +61,19 @@ steps_for :using_rest_adapter do
   When("I make invalid changes to that Resource") do
     @resource.title = nil
   end
-  
+
   When("I destroy the Resource") do
     @resource.destroy
   end
-  
+
   Then("the Resource should save") do
     @result.should be_true
   end
-  
+
   Then("the Resource should not save") do
     @result.should be_false
   end
-  
+
   Then("I should not receive an empty list") do
     @resources.should_not be_empty
   end
@@ -86,7 +86,7 @@ steps_for :using_rest_adapter do
   Then("I should get nothing in return") do
     @resource.should be_nil
   end
-  
+
   Then("the Resource will no longer be available") do
     # TODO refactor
     require File.join(File.dirname(__FILE__), '..', 'helpers', 'book')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rest-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Potomac Ruby Hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-24 00:00:00 -05:00
+date: 2008-08-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe