dm-rest-adapter 0.9.11 → 0.10.0

data/lib/rest_adapter/connection.rb

@@ -15,9 +15,16 @@ module DataMapperRest
     # this is used to run the http verbs like http_post, http_put, http_delete etc.
     # TODO: handle nested resources, see prefix in ActiveResource
     def method_missing(method, *args)
-      @uri.path = "/#{args[0]}.#{@format.extension}" # Should be the form of /resources
-      if verb = method.to_s.match(/^http_(get|post|put|delete|head)$/)
-        run_verb(verb.to_s.split("_").last, args[1])
+      if verb = method.to_s.match(/\Ahttp_(get|post|put|delete|head)\z/)
+
+        orig_uri, @uri = @uri, @uri.dup
+        begin
+          path, query = args[0].split('?', 2)
+          @uri.path = "#{path}.#{@format.extension}#{'?' << query if query}" # Should be the form of /resources
+          run_verb(verb.to_s.split('_').last, args[1])
+        ensure
+          @uri = orig_uri
+        end
       end
     end
 
@@ -25,8 +32,8 @@ module DataMapperRest
 
       def run_verb(verb, data = nil)
         request do |http|
-          mod = Net::HTTP::module_eval(Inflection.camelize(verb))
-          request = mod.new(@uri.to_s, @format.header)
+          klass = Net::HTTP.find_const(Inflection.camelize(verb))
+          request = klass.new(@uri.to_s, @format.header)
           request.basic_auth(@uri.user, @uri.password) if @uri.user && @uri.password
           result = http.request(request, data)
 

data/lib/rest_adapter/exceptions.rb

@@ -44,9 +44,9 @@ module DataMapperRest
   # 409 Conflict
   class ResourceConflict < ClientError; end # :nodoc:
 
-  # 422
+  # 422 Unprocessable Entity
   class ResourceInvalid < ClientError; # :nodoc:
-    # On this case, we could try to retrieve the validation_errors from message body:
+    # On this case, we could try to retrieve the validation_errors from message body:
     attr_reader :body
     def initialize(response, message = nil)
       super(response, message)

data/lib/rest_adapter/formats.rb

@@ -9,7 +9,7 @@ module DataMapperRest
     end
 
     def header
-      {'Content-Type' => @mime}
+      { 'Content-Type' => @mime }
     end
 
   end

data/lib/rest_adapter/version.rb

@@ -1,3 +1,3 @@
 module DataMapperRest
-  VERSION = '0.9.11'
+  VERSION = '0.10.0'.freeze
 end

data/spec/fixtures/book.rb

@@ -0,0 +1,8 @@
+class Book
+  include DataMapper::Resource
+
+  property :id,         Serial
+  property :created_at, DateTime
+  property :title,      String
+  property :author,     String
+end

data/spec/{connection_spec.rb → semipublic/connection_spec.rb}

@@ -1,4 +1,3 @@
-$LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
 describe 'A Connection instance' do
@@ -6,15 +5,14 @@ describe 'A Connection instance' do
   before do
     @username = "admin"
     @password = "tot@ls3crit"
-    @uri = DataObjects::URI.parse(Addressable::URI.new(
-      :scheme       => 'http',
-      :adapter      => 'rest',
-      :user         => @username,
-      :password     => @password,
-      :host         => 'localhost',
-      :port         => '4000',
-      :query        => nil
-      ))
+    @uri = Addressable::URI.new(
+      :scheme   => 'http',
+      :user     => @username,
+      :password => @password,
+      :host     => 'localhost',
+      :port     => '4000',
+      :query    => nil
+    )
     @connection = DataMapperRest::Connection.new(@uri, "xml")
   end
 

data/spec/semipublic/rest_adapter_spec.rb

@@ -0,0 +1,224 @@
+require 'spec_helper'
+
+describe DataMapper::Adapters::RestAdapter do
+  before :all do
+    @adapter = DataMapper::Repository.adapters[:default]
+  end
+
+  after :all do
+    FakeWeb.clean_registry
+  end
+
+  describe '#create' do
+    describe 'when provided a Resource' do
+      before :all do
+        body = <<-XML.compress_lines
+          <book>
+            <id type='datamapper::types::serial'>1</id>
+            <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
+            <title>DataMapper</title>
+            <author>Dan Kubb</author>
+          </book>
+        XML
+
+        headers = { 'Content-Length' => body.respond_to?(:bytesize) ? body.bytesize : body.size }
+
+        FakeWeb.register_uri(:post, 'http://admin:secret@localhost:4000/books.xml', :status => 200, :headers => headers, :body => body)
+      end
+
+      before :all do
+        @resource  = Book.new(:created_at => DateTime.parse('2009-05-17T22:38:42-07:00'), :title => 'DataMapper', :author => 'Dan Kubb')
+        @resources = [ @resource ]
+
+        @response = @adapter.create(@resources)
+      end
+
+      it 'should return an Array containing the Resource' do
+        @response.should equal(@resources)
+      end
+
+      it 'should set the identity field' do
+        @resource.id.should == 1
+      end
+    end
+  end
+
+  describe '#read' do
+    describe 'with unscoped query' do
+      before :all do
+        body = <<-XML.compress_lines
+          <books>
+            <book>
+              <id type='datamapper::types::serial'>1</id>
+              <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
+              <title>DataMapper</title>
+              <author>Dan Kubb</author>
+            </book>
+          </books>
+        XML
+
+        headers = { 'Content-Length' => body.respond_to?(:bytesize) ? body.bytesize : body.size }
+
+        FakeWeb.register_uri(:get, 'http://admin:secret@localhost:4000/books.xml', :status => 200, :headers => headers, :body => body)
+      end
+
+      before :all do
+        @query = Book.all.query
+
+        @response = @adapter.read(@query)
+      end
+
+      it 'should return an Array with the matching Records' do
+        @response.should == [ { 'id' => 1, 'created_at' => DateTime.parse('2009-05-17T22:38:42-07:00'), 'title' => 'DataMapper', 'author' => 'Dan Kubb' } ]
+      end
+    end
+
+    describe 'with query scoped by a key' do
+      before :all do
+
+      end
+
+
+      before :all do
+        @query = Book.all(:id => 1, :limit => 1).query
+
+        body = <<-XML.compress_lines
+          <book>
+            <id type='datamapper::types::serial'>1</id>
+            <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
+            <title>DataMapper</title>
+            <author>Dan Kubb</author>
+          </book>
+        XML
+
+        headers = { 'Content-Length' => body.respond_to?(:bytesize) ? body.bytesize : body.size }
+
+        FakeWeb.register_uri(:get, 'http://admin:secret@localhost:4000/books/1.xml', :status => 200, :headers => headers, :body => body)
+
+        @response = @adapter.read(@query)
+      end
+
+      it 'should return an Array with the matching Records' do
+        @response.should == [ { 'id' => 1, 'created_at' => DateTime.parse('2009-05-17T22:38:42-07:00'), 'title' => 'DataMapper', 'author' => 'Dan Kubb' } ]
+      end
+    end
+
+    describe 'with query scoped by a non-key' do
+      before :all do
+        body = <<-XML.compress_lines
+          <books>
+            <book>
+              <id type='datamapper::types::serial'>1</id>
+              <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
+              <title>DataMapper</title>
+              <author>Dan Kubb</author>
+            </book>
+
+            <!-- provide an extra resource, which should be filtered out -->
+            <book>
+              <id type='datamapper::types::serial'>2</id>
+              <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
+              <title>DataMapper</title>
+              <author>John Doe</author>
+            </book>
+          </books>
+        XML
+
+        headers = { 'Content-Length' => body.respond_to?(:bytesize) ? body.bytesize : body.size }
+
+        FakeWeb.register_uri(:get, 'http://admin:secret@localhost:4000/books.xml?author=Dan+Kubb', :status => 200, :headers => headers, :body => body)
+      end
+
+      before :all do
+        @query = Book.all(:author => 'Dan Kubb').query
+
+        @response = @adapter.read(@query)
+      end
+
+      it 'should return an Array with the matching Records' do
+        @response.should == [ { 'id' => 1, 'created_at' => DateTime.parse('2009-05-17T22:38:42-07:00'), 'title' => 'DataMapper', 'author' => 'Dan Kubb' } ]
+      end
+    end
+  end
+
+  describe '#update' do
+    before :all do
+      body = <<-XML.compress_lines
+        <books>
+          <book>
+            <id type='datamapper::types::serial'>1</id>
+            <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
+            <title>DataMapper</title>
+            <author>Dan Kubb</author>
+          </book>
+        </books>
+      XML
+
+      headers = { 'Content-Length' => body.respond_to?(:bytesize) ? body.bytesize : body.size }
+
+      FakeWeb.register_uri(:get, 'http://admin:secret@localhost:4000/books.xml', :status => 200, :headers => headers, :body => body)
+    end
+
+    before :all do
+      body = <<-XML.compress_lines
+        <book>
+          <id type='datamapper::types::serial'>1</id>
+          <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
+          <title>DataMapper</title>
+          <author>John Doe</author>
+        </book>
+      XML
+
+      headers = { 'Content-Length' => body.respond_to?(:bytesize) ? body.bytesize : body.size }
+
+      FakeWeb.register_uri(:put, 'http://admin:secret@localhost:4000/books/1.xml', :status => 200, :headers => headers, :body => body)
+    end
+
+    before :all do
+      @resources = Book.all
+
+      @response = @adapter.update({ Book.properties[:author] => 'John Doe' }, @resources)
+    end
+
+    it 'should return the number of updated Resources' do
+      @response.should == 1
+    end
+
+    it 'should modify the Resource' do
+      @resources.first.author.should == 'John Doe'
+    end
+  end
+
+  describe '#delete' do
+    before :all do
+      body = <<-XML.compress_lines
+        <books>
+          <book>
+            <id type='datamapper::types::serial'>1</id>
+            <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
+            <title>DataMapper</title>
+            <author>Dan Kubb</author>
+          </book>
+        </books>
+      XML
+
+      headers = { 'Content-Length' => body.respond_to?(:bytesize) ? body.bytesize : body.size }
+
+      FakeWeb.register_uri(:get, 'http://admin:secret@localhost:4000/books.xml', :status => 200, :headers => headers, :body => body)
+    end
+
+    before :all do
+      FakeWeb.register_uri(:delete, 'http://admin:secret@localhost:4000/books/1.xml', :status => 204)
+    end
+
+    before :all do
+      @resources = Book.all
+
+      @response = @adapter.delete(@resources)
+    end
+
+    it 'should return the number of updated Resources' do
+      @response.should == 1
+    end
+  end
+end

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -1,20 +1,31 @@
-require 'pathname'
 require 'rubygems'
+require 'pathname'
+require 'fakeweb'
+
+# use local dm-core if running from a typical dev checkout.
+lib = File.join('..', '..', '..', 'dm-core', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-core'
+
+# use local dm-validations if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-validations', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-validations'
+
+# use local dm-serializer if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-serializer', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-serializer'
+
+# Support running specs with 'rake spec' and 'spec'
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
 
-ROOT = Pathname(__FILE__).dirname.parent.expand_path
+require 'rest_adapter'
 
-# use local dm-serializer if running from dm-more directly
-lib = ROOT.parent.parent.join('dm-serializer', 'lib').expand_path
-$LOAD_PATH.unshift(lib) if lib.directory?
+ROOT = Pathname(__FILE__).dirname.parent
 
-require ROOT + 'lib/rest_adapter'
+DataMapper.setup(:default, 'rest://admin:secret@localhost:4000/?format=xml')
 
-load ROOT + 'config/database.rb.example'
+Dir[ROOT / 'spec' / 'fixtures' / '**' / '*.rb'].each { |rb| require rb }
 
-class Book
-  include DataMapper::Resource
-  property :author,     String
-  property :created_at, DateTime
-  property :id,         Integer, :serial => true
-  property :title,      String
-end
+FakeWeb.allow_net_connect = false

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rest-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Scott Burton @ Joyent Inc
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: REST Adapter for DataMapper
 email: 
 - scott.burton [a] joyent [d] com
@@ -30,39 +21,38 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.markdown
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
-- config/database.rb.example
-- dm-rest-adapter.gemspec
 - lib/rest_adapter.rb
 - lib/rest_adapter/adapter.rb
 - lib/rest_adapter/connection.rb
 - lib/rest_adapter/exceptions.rb
 - lib/rest_adapter/formats.rb
 - lib/rest_adapter/version.rb
-- spec/connection_spec.rb
-- spec/crud_spec.rb
-- spec/ruby_forker.rb
+- spec/fixtures/book.rb
+- spec/semipublic/connection_spec.rb
+- spec/semipublic/rest_adapter_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
 homepage: http://github.com/datamapper/dm-more/tree/master/adapters/dm-rest-adapter
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -80,9 +70,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: REST Adapter for DataMapper
 test_files: []