dupe 0.5.3 → 0.6.0

data/README.rdoc

@@ -15,39 +15,9 @@ If you want to install this for use in something other than a rails project, sim
 
   # gem install dupe
 
-If you're going to use this in a rails (2.3.*) project, add this to your cucumber.rb environment (config/environments/cucumber.rb)
-  
-  config.gem 'dupe'
-  
-Then run this rake task to install the gem: 
-
-  # rake gems:install RAILS_ENV=cucumber
-
-Lastly, from your rails project root, run:
-
-  # script/generate dupe
-  
-That last command will create the following directories:
-
-- RAILS_ROOT/features/dupe
-- RAILS_ROOT/features/dupe/definitions
-- RAILS_ROOT/features/dupe/custom_mocks
-  
-It will also place example Dupe definitions in RAILS_ROOT/features/dupe/definitions/definitions.rb as well as example custom mocks in RAILS_ROOT/features/dupe/custom_mocks/custom_mocks.rb
-
-Lastly, it will add a load_dupe.rb file (that loads up the definitions and custom mocks) to RAILS_ROOT/features/support/load_dupe.rb
-
 == Rails 3
 
-{Thorbjørn Hermansen}[http://github.com/thhermansen] has contributed a branch[http://github.com/moonmaster9000/dupe/tree/rails3] for rails 3 compatibility! 
-If you need Dupe for a rails 3 project, give it a whirl. Simply add something like the following to your bundler file: 
-
-  gem 'dupe', :git => 'git://github.com/moonmaster9000/dupe.git', :branch => 'rails3' 
-
-"script/generate dupe" doesn't yet work in Rails3. 
-
-Once Rails3 goes production, we'll be merging this branch into master and only supporting Rails3 from that point on. (Of course, if 
-anyone at that point still has a need to use Dupe in a rails 2.3 project, they will still be able to use one of the older versions).
+Dupe versions 0.6.0 and greater only work with Rails 3 / ActiveResource 3. If you're working on a Rails 2.* project, use Dupe version 0.5.3.
 
 = Tutorial
 

data/lib/dupe/active_resource_extensions.rb

@@ -8,7 +8,7 @@ module ActiveResource #:nodoc:
   class Connection #:nodoc:
     def get(path, headers = {}) #:nodoc:
       begin
-        response = request(:get, path, build_request_headers(headers, :get))
+        response = request(:get, path, build_request_headers(headers, :get, self.site.merge(path)))
 
       # if the request threw an exception
       rescue
@@ -16,7 +16,7 @@ module ActiveResource #:nodoc:
         ActiveResource::HttpMock.respond_to do |mock|
           mock.get(path, {}, mocked_response)
         end
-        response = request(:get, path, build_request_headers(headers, :get))
+        response = request(:get, path, build_request_headers(headers, :get, self.site.merge(path)))
         ActiveResource::HttpMock.delete_mock(:get, path)
       end
       format.decode(response.body)
@@ -24,7 +24,7 @@ module ActiveResource #:nodoc:
     
     def post(path, body = '', headers = {}) #:nodoc:
       begin
-        response = request(:post, path, body.to_s, build_request_headers(headers, :post))
+        response = request(:post, path, body.to_s, build_request_headers(headers, :post, self.site.merge(path)))
         
       # if the request threw an exception
       rescue
@@ -45,7 +45,7 @@ module ActiveResource #:nodoc:
             mock.post(path, {}, mocked_response, 201, "Location" => new_path)
           end
         end
-        response = request(:post, path, body.to_s, build_request_headers(headers, :post))
+        response = request(:post, path, body.to_s, build_request_headers(headers, :post, self.site.merge(path)))
         ActiveResource::HttpMock.delete_mock(:post, path)
       end
       response
@@ -53,12 +53,14 @@ module ActiveResource #:nodoc:
     
     def put(path, body = '', headers = {}) #:nodoc:
       begin
-        response = request(:put, path, body.to_s, build_request_headers(headers, :put))
+        response = request(:put, path, body.to_s, build_request_headers(headers, :put, self.site.merge(path)))
         
       # if the request threw an exception
       rescue
-        resource_hash = Hash.from_xml(body)
-        resource_hash = resource_hash[resource_hash.keys.first]
+        unless body.blank?
+          resource_hash = Hash.from_xml(body)
+          resource_hash = resource_hash[resource_hash.keys.first]
+        end
         resource_hash = {} unless resource_hash.kind_of?(Hash)
         resource_hash.symbolize_keys!
 
@@ -76,7 +78,7 @@ module ActiveResource #:nodoc:
             mock.put(path, {}, mocked_response, 204)
           end
         end
-        response = request(:put, path, body.to_s, build_request_headers(headers, :put))
+        response = request(:put, path, body.to_s, build_request_headers(headers, :put, self.site.merge(path)))
         ActiveResource::HttpMock.delete_mock(:put, path)
       end
       response
@@ -88,7 +90,7 @@ module ActiveResource #:nodoc:
       ActiveResource::HttpMock.respond_to do |mock|
         mock.delete(path, {}, nil, 200)
       end
-      response = request(:delete, path, build_request_headers(headers, :delete))
+      response = request(:delete, path, build_request_headers(headers, :delete, self.site.merge(path)))
       
       ActiveResource::HttpMock.delete_mock(:delete, path)
       response

data/lib/dupe.rb

@@ -1,6 +1,9 @@
 require 'dupe/hash_pruner'
+require 'active_support/inflector'
+require 'active_support/core_ext'
 require 'active_resource'
 require 'active_resource/http_mock'
+require 'active_resource/version'
 require 'dupe/singular_plural_detection'
 require 'dupe/symbol'
 require 'dupe/string'

data/spec/lib_specs/active_resource_extensions_spec.rb

@@ -9,7 +9,7 @@ describe ActiveResource::Connection do
     before do
       @book = Dupe.create :book, :title => 'Rooby', :label => 'rooby'
       class Book < ActiveResource::Base
-        self.site = ''
+        self.site = 'http://www.example.com'
       end
     end
     
@@ -32,7 +32,7 @@ describe ActiveResource::Connection do
       @book = Dupe.create :book, :label => 'rooby', :title => 'Rooby'
       @book.delete(:id)
       class Book < ActiveResource::Base
-        self.site = ''
+        self.site = 'http://www.example.com'
       end
     end
     
@@ -56,7 +56,7 @@ describe ActiveResource::Connection do
       
       b = Book.create
       b.new?.should be_true
-      b.errors.errors.should_not be_empty
+      b.errors.should_not be_empty
       b = Book.create(:title => "hello")
       b.new?.should be_false
       b.errors.should be_empty
@@ -67,16 +67,43 @@ describe ActiveResource::Connection do
     before do
       @book = Dupe.create :book, :label => 'rooby', :title => 'Rooby'
       class Book < ActiveResource::Base
-        self.site = ''
+        self.site = 'http://www.example.com'
       end
       @ar_book = Book.find(1)
     end
     
     it "should pass a request off to the Dupe network if the original request failed" do
-      Dupe.network.should_receive(:request).with(:put, '/books/1.xml', Hash.from_xml(@book.merge(:title => "Rails!").to_xml(:root => 'book'))["book"].symbolize_keys!).once
+      Dupe.network.should_receive(:request).with(:put, '/books/1.xml', Hash.from_xml(@book.merge(:title => "Rails!").to_xml(:root => 'book'))["book"].symbolize_keys!).once.and_return([nil, '/books/1.xml'])
       @ar_book.title = 'Rails!'
       @ar_book.save
     end
+
+    context "put methods that return HTTP 204" do
+      before(:each) do
+        class ExpirableBook < ActiveResource::Base
+          self.site = 'http://www.example.com'
+          attr_accessor :state
+
+          def expire_copyrights!
+            put(:expire)
+          end
+        end
+
+        Put %r{/expirable_books/(\d)+/expire.xml} do |id, body|
+          Dupe.find(:expirable_book) { |eb| eb.id == id.to_i }.tap { |book|
+            book.state = 'expired'
+          }
+        end
+
+        @e = Dupe.create :expirable_book, :title => 'Impermanence', :state => 'active'
+      end
+
+      it "should handle no-content responses" do 
+        response = ExpirableBook.find(@e.id).expire_copyrights!
+        response.body.should be_blank
+        response.code.to_s.should == "204"
+      end
+    end
     
     it "should parse the xml and turn the result into active resource objects" do
       @book.title.should == "Rooby"
@@ -99,7 +126,7 @@ describe ActiveResource::Connection do
       
       @ar_book.title = nil
       @ar_book.save.should == false
-      @ar_book.errors.on_base.should_not be_empty
+      @ar_book.errors[:base].should_not be_empty
 
       @ar_book.title = "Rails!"
       @ar_book.save.should == true
@@ -113,7 +140,7 @@ describe ActiveResource::Connection do
     before do
       @book = Dupe.create :book, :label => 'rooby', :title => 'Rooby'
       class Book < ActiveResource::Base
-        self.site = ''
+        self.site = 'http://www.example.com'
       end
       @ar_book = Book.find(1)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dupe
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Matt Parker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2011-01-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,13 +24,15 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: -1848230022
         segments: 
-        - 2
         - 3
-        version: "2.3"
+        - 0
+        - 0
+        - beta2
+        version: 3.0.0.beta2
   type: :runtime
   version_requirements: *id001
 description: |-
@@ -92,8 +94,8 @@ homepage: http://github.com/moonmaster9000/dupe
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement