dm-restful-adapter 0.0.4 → 0.0.5

data/lib/dm-restful-adapter/adapter.rb

@@ -2,39 +2,44 @@ module Restful
   class Adapter < DataMapper::Adapters::AbstractAdapter
 
     def create(resources)
-      resources.each { |resource|
+      resources.map { |resource|
         dirty_attributes = resource.dirty_attributes.inject({}) { |hash, (k,v)| hash.update(k.name => v) }
-        response = Request.post(resource.model.storage_name, dirty_attributes) 
-        properties =  resource.model.properties
-        response.each do |attr_name, val|
-          if prop = properties[attr_name.to_sym]
-            prop.set!(resource, val)
+        response = Request.post(resource.model.storage_name, dirty_attributes)
+        if response.status == 200
+          properties =  resource.model.properties
+          response.body.each do |attr_name, val|
+            if prop = properties[attr_name.to_sym]
+              prop.set!(resource, val)
+            end
           end
         end
-      }.size
+      }.compact.size
     end
 
     def read(query)
-      Request.get(query.model.storage_name, query.params)
+      Request.get(query.model.storage_name, query.params).body
     end
 
     def update(attrs, resources)
-      resources.each do |resource|
+      resources.map do |resource|
         attr_hash = attrs.inject({}) { |h, (k, v)| h.merge(k.name => v) }
         response = Request.put(resource.model.storage_name, resource.key, attr_hash)
-        properties =  resource.model.properties.inspect
-        response.except(:id).each do |k, v|
-          if prop = properties[k.to_sym]
-            prop.set!(resource, v)
+        if response.status == 200
+          properties =  resource.model.properties.inspect
+          response.body.except(:id).each do |k, v|
+            if prop = properties[k.to_sym]
+              prop.set!(resource, v)
+            end
           end
         end
-      end.size
+      end.compact.size
     end
 
     def delete(resources)
-      resources.each do |resource|
-        Request.delete(resource.model.storage_name, resource.key)
-      end.size
+      resources.map do |resource|
+        response = Request.delete(resource.model.storage_name, resource.key)
+        response.status == 200 ? response.body : nil
+      end.compact.size
     end
   end
 end

data/lib/dm-restful-adapter/backends/typhoeus.rb

@@ -3,7 +3,7 @@ module Restful
     class Typhoeus
       def self.call(method, path, params={})
         response = ::Typhoeus::Request.run(path, :method => method, :params => params)
-        Configuration.parser.decode(response.body)
+        ::Restful::Response.new(:body => Configuration.parser.decode(response.body), :status => response.code)
       end
     end
   end

data/lib/dm-restful-adapter/response.rb

@@ -0,0 +1,16 @@
+module Restful
+  class Response
+    def initialize(options={})
+      @body = options[:body]
+      @status = options[:status]
+    end
+
+    def body
+      @body
+    end
+
+    def status
+      @status
+    end
+  end
+end

data/lib/dm-restful-adapter/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Adapters
     module RestfulAdapter
-      VERSION = '0.0.4'
+      VERSION = '0.0.5'
     end
   end
 end

data/lib/dm-restful-adapter.rb

@@ -6,6 +6,7 @@ require 'dm-restful-adapter/version'
 module Restful
   autoload :Adapter,       'dm-restful-adapter/adapter'
   autoload :Request,       'dm-restful-adapter/request'
+  autoload :Response,       'dm-restful-adapter/response'
   autoload :Configuration, 'dm-restful-adapter/configuration'
 
   module Backends

data/spec/dm-restful-adapter_spec.rb

@@ -3,13 +3,94 @@ require File.dirname(__FILE__) + '/spec_helper'
 require 'dm-core/spec/shared/adapter_spec'
 
 describe DataMapper::Adapters::RestfulAdapter do
-  before :all do
-    @adapter = DataMapper.setup(:default, :adapter => 'restful')
-  end
+  let!(:adapter) { DataMapper.setup(:default, :adapter => 'restful') }
+  let!(:repository) { DataMapper.repository(:default) }
+  let!(:heffalump) {
+    class ::Heffalump
+      include DataMapper::Resource
+
+      property :id,        Serial
+      property :color,     String
+      property :num_spots, Integer
+      property :striped,   Boolean
+    end
+
+
+    # create all tables and constraints before each spec
+    if @repository.respond_to?(:auto_migrate!)
+      Heffalump.auto_migrate!
+    end
+  }
+  let!(:failing_heffalump) {
+    class FailingHeffalump < ::Heffalump
+      storage_names[:default] = 'failing_heffalumps'
+      def self.name; 'FailingHeffalump'; end
+    end
+  }
+
+  before { DataMapper.finalize }
 
   def self.described_type
     described_class
   end
 
   it_should_behave_like 'An Adapter'
+
+  describe '#create' do
+    context 'success' do
+      it 'returns number of records successfully created' do
+        heffalump = ::Heffalump.new(:color => 'red')
+        adapter.create([heffalump]).should == 1
+      end
+    end
+
+    context 'error' do
+      it 'returns 0 if no records are successfully created' do
+        DataMapper.finalize
+
+        failing_heffalump = FailingHeffalump.new(:color => 'red')
+        adapter.create([failing_heffalump]).should == 0
+      end
+    end
+  end
+
+  describe '#update' do
+    context 'success' do
+      it 'returns number of records successfully saved' do
+        RemoteHeffalumpModel.create(:color => 'red')
+        heffalump = Heffalump.all.first
+        props = {heffalump.model.properties.detect { |prop| prop.name == :color} => 'blue'}
+        heffalump.color = 'blue'
+        adapter.update(props, [heffalump]).should == 1
+      end
+    end
+
+    context 'error' do
+      it 'returns 0 if no records are successfully saved' do
+        RemoteHeffalumpModel.create(:color => 'red')
+        failing_heffalump = FailingHeffalump.all.first
+        props = {failing_heffalump.model.properties.detect { |prop| prop.name ==:color} => 'blue'}
+        adapter.update(props, [failing_heffalump]).should == 0
+      end
+    end
+  end
+
+  describe '#delete' do
+    context 'success' do
+      it 'returns number of records successfully saved' do
+        RemoteHeffalumpModel.create(:color => 'red')
+        heffalump = Heffalump.all.first
+        adapter.delete([heffalump]).should == 1
+      end
+    end
+
+    context 'error' do
+      it 'returns 0 if no records are successfully saved' do
+        RemoteHeffalumpModel.create(:color => 'red')
+        failing_heffalump = FailingHeffalump.all.first
+        adapter.delete([failing_heffalump]).should == 0
+      end
+    end
+
+  end
 end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ require 'database_cleaner'
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.fail_fast = true
+  #config.fail_fast = true
   config.filter_run :focus
 
   config.before(:suite) do

data/spec/support/mimic.rb

@@ -2,8 +2,9 @@ require 'mimic'
 require 'active_record'
 require 'spec/support/setup_mimic_db'
 
-class HeffalumpModel < ActiveRecord::Base
+class RemoteHeffalumpModel < ActiveRecord::Base
   self.include_root_in_json = false
+  self.table_name = 'heffalump_models'
 
   def self.search(params)
     params = format_params(params)
@@ -79,7 +80,7 @@ end
 
 Mimic.mimic(:port => 4000) do
   post "/heffalumps" do
-    heffalump = HeffalumpModel.new(params['heffalump'])
+    heffalump = RemoteHeffalumpModel.new(params['heffalump'])
     if heffalump.save
       response = heffalump.to_json
       [200, {'Content-Type' => 'application/json', 'Content-Length' => response.bytesize}, response]
@@ -89,27 +90,55 @@ Mimic.mimic(:port => 4000) do
     end
   end
 
+  put "/heffalumps/:id" do
+    heffalump = RemoteHeffalumpModel.find(params['id'])
+    heffalump.update_attributes(params['heffalump'])
+    response = heffalump.to_json
+    [200, {'Content-Type' => 'application/json', 'Content-Length' => response.bytesize}, response]
+  end
+
+  delete "/heffalumps/:id" do
+    heffalump = RemoteHeffalumpModel.find(params['id'])
+    heffalump.destroy
+    response =  [].to_json
+    [200, {'Content-Type' => 'application/json', 'Content-Length' => response.bytesize}, response]
+  end
+
   get "/heffalumps" do
     if params.empty?
-      lumps = HeffalumpModel.all
+      lumps = RemoteHeffalumpModel.all
     else
-      lumps = HeffalumpModel.search(params)
+      lumps = RemoteHeffalumpModel.search(params)
     end
     response = lumps.to_json
     [200, {'Content-Type' => 'application/json', 'Content-Length' => response.bytesize}, response]
   end
 
-  put "/heffalumps/:id" do
-    heffalump = HeffalumpModel.find(params['id'])
-    heffalump.update_attributes(params['heffalump'])
-    response = heffalump.to_json
+  get "/failing_heffalumps" do
+    if params.empty?
+      lumps = RemoteHeffalumpModel.all
+    else
+      lumps = RemoteHeffalumpModel.search(params)
+    end
+    response = lumps.to_json
     [200, {'Content-Type' => 'application/json', 'Content-Length' => response.bytesize}, response]
   end
 
-  delete "/heffalumps/:id" do
-    heffalump = HeffalumpModel.find(params['id'])
-    heffalump.destroy
+  post "/failing_heffalumps" do
+    failing_heffalump = RemoteHeffalumpModel.new(params['failing_heffalump'])
+    response = failing_heffalump.to_json
+    [422, {'Content-Type' => 'application/json', 'Content-Length' => response.bytesize}, response]
+  end
+  
+  put "/failing_heffalumps/:id" do
+    heffalump = RemoteHeffalumpModel.find(params['id'])
+    response = heffalump.to_json
+    [422, {'Content-Type' => 'application/json', 'Content-Length' => response.bytesize}, response]
+  end
+
+  delete "/failing_heffalumps/:id" do
+    heffalump = RemoteHeffalumpModel.find(params['id'])
     response =  [].to_json
-    [200, {'Content-Type' => 'application/json', 'Content-Length' => response.bytesize}, response]
+    [422, {'Content-Type' => 'application/json', 'Content-Length' => response.bytesize}, response]
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-restful-adapter
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ryan Moran
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-29 00:00:00 Z
+date: 2012-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
@@ -148,6 +148,7 @@ files:
 - lib/dm-restful-adapter/backends/typhoeus.rb
 - lib/dm-restful-adapter/configuration.rb
 - lib/dm-restful-adapter/request.rb
+- lib/dm-restful-adapter/response.rb
 - lib/dm-restful-adapter/version.rb
 - spec/dm-restful-adapter_spec.rb
 - spec/spec_helper.rb
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ""