dupe 0.5.0 → 0.5.1

data/README.rdoc

@@ -38,6 +38,11 @@ It will also place example Dupe definitions in RAILS_ROOT/features/dupe/definiti
 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
   
 
+= Tutorial
+
+Checkout the {dupe example application}[http://github.com/moonmaster9000/dupe_example_app] for a tutorial on cuking an application with
+ActiveResource and Dupe.
+
 = Features
 
 ==Creating resources
@@ -508,7 +513,7 @@ Now, when you try to create an Author without a name, it will respond with the a
   irb# a = a.new?
     ==> true
     
-Because the resource would invalidate, the Dupe object is not created.
+Because our custom Post mock determined that the resource was invalid, Dupe did not mock the resource:
   
   irb# Dupe.find(:authors)
     ==> []
@@ -524,11 +529,127 @@ When we create the Author with the required attributes, it will now be considere
   irb# a.new?
     ==> false
     
-Now, Dupe will go ahead and create the resource.
+Since our custom Post mock considered the resource valid, it went ahead and created the resource:
 
   irb# Dupe.find(:authors)
     ==> [<#Duped::Author name="CS Lewis" id=1>]
   
+
+===PUT requests
+
+In ActiveResource, when you update a resource that already exists via the "save" method, it translates to a PUT request. 
+Dupe provides basic PUT intercept mocks out of the box, and like GET and POST mocks, 
+it allows you to override the default PUT intercept mock, and create new ones. 
+
+Let's again examine an "author" resource:
+
+  irb# Dupe.define :author
+
+  irb# class Author < ActiveResource::Base; self.site = ''; end
+    ==> ""
+
+  irb# Author.create :name => "CS Lewis" # --> Dupe intercepts this POST request
+    ==> #<Author:0x1a4ca58 @attributes={"name"=>"CS Lewis", "id"=>1}, @prefix_options={}>
+
+  irb# Dupe.find :authors
+    ==> [<#Duped::Author name="CS Lewis" id=1>]
+ 
+  irb# a = Author.find 1 # --> Dupe intercepts this GET request
+    ==> #<Author:0x1a4ca58 @attributes={"name"=>"CS Lewis", "id"=>1}, @prefix_options={}>
+
+So far, we've created a resource (via dupe's POST intercept mocking), and we've also found the resource we create (via dupe's GET
+intercept mocking). Now, let's attempt to update (PUT) the resource:
+
+  irb# a.name = "Frank Herbert"
+  
+  irb# a.save # --> Dupe intercepts this PUT request
+    ==> true
+
+Dupe intercepted the PUT request that ActiveResource attempted to send, and updated the Duped resource accordingly:
+
+  irb# a
+    ==> #<Author:0x1a4ca58 @attributes={"name"=>"Frank Herbert", "id"=>1}, @prefix_options={}>
+
+  irb# Dupe.find :authors
+    ==> [<#Duped::Author name="Frank Herbert" id=1>]
+ 
+You can also overwrite the default PUT intercept mock for your resource by using the "Put" method:
+
+  irb# Put %r{/authors/(\d+)\.xml} do |id, put_data|
+         raise Dupe::UnprocessableEntity.new(:name => " must be present.") unless put_data[:name]
+         Dupe.find(:author) {|a| a.id == id.to_i}.merge! put_data
+       end
+    ==> #<Dupe::Network::PostMock:0x1a1afe4 @url_pattern=/\/authors\.xml/, @response=#<Proc:0x01a1b084@(irb):13>, @verb=:post>
+  
+Now, if we try to update our Author without a name, it will respond with the appropriate errors.
+  
+  irb# Dupe.find :authors
+    ==> [<#Duped::Author name="Frank Herbert" id=1>]
+
+  irb# a = Author.find 1 # --> Dupe intercepts this GET request
+    ==> #<Author:0x1a4ca58 @attributes={"name"=>"Frank Herbert", "id"=>1}, @prefix_options={}>
+
+  irb# a.name = nil
+
+  irb# a.save
+    ==> false
+
+  irb# a.errors.on_base
+    ==> ["name must be present"]
+
+Since our Put intercept mock raise the Dupe::UnprocessableEntity exception, 
+the underlying Duped record remains unchanged, just as we would expect the real service to have operated:
+
+  irb# Dupe.find :authors
+    ==> [<#Duped::Author name="Frank Herbert" id=1>]
+
+We can, of course, at this point still update the name to a non-nil value and attempt to save it again:
+
+  irb# a.name = "Matt Parker"
+  
+  irb# a.save
+    ==> true
+
+  irb# Dupe.find :authors
+    ==> [<#Duped::Author name="Matt Parker" id=1>]
+
+===DELETE requests
+
+As you might have guessed, Dupe also supports DELETE intercept mocking (ActiveResource::Base#destroy):
+
+  irb# Dupe.define :author
+
+  irb# class Author < ActiveResource::Base; self.site = ''; end
+    ==> ""
+
+  irb# Author.create :name => "CS Lewis" # --> Dupe intercepts this POST request
+    ==> #<Author:0x1a4ca58 @attributes={"name"=>"CS Lewis", "id"=>1}, @prefix_options={}>
+
+  irb# Dupe.find :authors
+    ==> [<#Duped::Author name="CS Lewis" id=1>]
+ 
+  irb# a = Author.find 1 # --> Dupe intercepts this GET request
+    ==> #<Author:0x1a4ca58 @attributes={"name"=>"CS Lewis", "id"=>1}, @prefix_options={}>
+
+  irb# a.destroy
+    ==> #<ActiveResource::Response:0x181c1c0 @body="", @message="200", @code=200, @headers={"Content-Length"=>"0"}
+
+  irb# Dupe.find :authors
+    ==> []
+
+And also, as you might have guessed, you can override the default DELETE intercept mock for a resource:
+
+  irb# Delete %r{/books/(\d+)\.xml} do |id|
+         puts "deleting the book with id #{id}"
+         Dupe.delete(:book) {|b| b.id == id.to_i}
+       end
+
+  irb# a = Author.create :name => "some author"
+
+  irb# a.destroy
+    ==> "deleting the book with id 1"
+
+
 == More
 
 Consult the API documentation at http://moonmaster9000.github.com/dupe/api/

data/lib/dupe/active_resource_extensions.rb

@@ -50,5 +50,48 @@ module ActiveResource #:nodoc:
       end
       response
     end
+    
+    def put(path, body = '', headers = {}) #:nodoc:
+      begin
+        response = request(:put, path, body.to_s, build_request_headers(headers, :put))
+        
+      # if the request threw an exception
+      rescue
+        resource_hash = Hash.from_xml(body)
+        resource_hash = resource_hash[resource_hash.keys.first]
+        resource_hash = {} unless resource_hash.kind_of?(Hash)
+        resource_hash.symbolize_keys!
+
+        begin
+          error = false
+          mocked_response, path = Dupe.network.request(:put, path, resource_hash)
+        rescue Dupe::UnprocessableEntity => e
+          mocked_response = {:error => e.message.to_s}.to_xml(:root => 'errors')
+          error = true
+        end
+        ActiveResource::HttpMock.respond_to do |mock|
+          if error
+            mock.put(path, {}, mocked_response, 422, "Content-Type" => 'application/xml')
+          else
+            mock.put(path, {}, mocked_response, 204)
+          end
+        end
+        response = request(:put, path, body.to_s, build_request_headers(headers, :put))
+        ActiveResource::HttpMock.delete_mock(:put, path)
+      end
+      response
+    end
+
+    def delete(path, headers = {})
+      Dupe.network.request(:delete, path)
+
+      ActiveResource::HttpMock.respond_to do |mock|
+        mock.delete(path, {}, nil, 200)
+      end
+      response = request(:delete, path, build_request_headers(headers, :delete))
+      
+      ActiveResource::HttpMock.delete_mock(:delete, path)
+      response
+    end
   end
 end

data/lib/dupe/custom_mocks.rb

@@ -105,4 +105,12 @@ end
 
 def Post(url_pattern, &block)
   Dupe.network.define_service_mock :post, url_pattern, block
-end
+end
+
+def Put(url_pattern, &block)
+  Dupe.network.define_service_mock :put, url_pattern, block
+end
+
+def Delete(url_pattern, &block)
+  Dupe.network.define_service_mock :delete, url_pattern, block
+end

data/lib/dupe/database.rb

@@ -12,6 +12,23 @@ class Dupe
     def initialize
       @tables = {}
     end
+
+    # database.delete :books # --> would delete all books
+    # database.delete :book # --> would delete the first book record found
+    # database.delete :book, proc {|b| b.id < 10} # --> would delete all books found who's id is less than 10
+    # database.delete :books, proc {|b| b.id < 10} # --> would delete all books found who's id is less than 10
+    def delete(resource_name, conditions=nil)
+      model_name = resource_name.to_s.singularize.to_sym
+      raise StandardError, "Invalid DELETE operation: The resource #{model_name} has not been defined" unless @tables[model_name]
+      
+      if conditions
+        @tables[model_name].reject!(&conditions) 
+      elsif resource_name.singular?
+        @tables[model_name].shift
+      elsif resource_name.plural?
+        @tables[model_name] = []
+      end
+    end
     
     # pass in a Dupe::Database::Record object, and this method will store the record
     # in the appropriate table
@@ -49,4 +66,4 @@ class Dupe
     end
     
   end
-end
+end

data/lib/dupe/dupe.rb

@@ -8,7 +8,7 @@ class Dupe
     attr_reader :sequences #:nodoc:
     attr_reader :database #:nodoc:
     
-    # set this to "true" if you Dupe to spit out mocked requests
+    # set this to "true" if you want Dupe to spit out mocked requests
     # after each of your cucumber scenario's run
     attr_accessor :debug
     
@@ -184,6 +184,16 @@ class Dupe
             %r{^#{model_name.to_s.titleize.constantize.prefix rescue '/'}#{model_name.to_s.pluralize}\\.xml$}, 
             proc { |post_body| Dupe.create(:#{model_name.to_s}, post_body) }
           )
+          network.define_service_mock(
+            :put,
+            %r{^#{model_name.to_s.titleize.constantize.prefix rescue '/'}#{model_name.to_s.pluralize}/(\\d+)\\.xml$}, 
+            proc { |id, put_data| Dupe.find(:#{model_name.to_s}) {|resource| resource.id == id.to_i}.merge!(put_data) }
+          )
+          network.define_service_mock(
+            :delete,
+            %r{^#{model_name.to_s.titleize.constantize.prefix rescue '/'}#{model_name.to_s.pluralize}/(\\d+)\\.xml$}, 
+            proc { |id| Dupe.delete(:#{model_name.to_s}) {|resource| resource.id == id.to_i} }
+          )
         }
         eval(mocks)
       end
@@ -392,6 +402,10 @@ class Dupe
       end
     end
 
+    def delete(resource, &conditions)
+      database.delete resource, conditions 
+    end
+
     def sequence(name, &block)
       sequences[name.to_sym] = Sequence.new 1, block
     end
@@ -517,4 +531,4 @@ end
 
 class Dupe
   class UnprocessableEntity < StandardError; end
-end
+end

data/lib/dupe/mock.rb

@@ -1,24 +1,18 @@
 class Dupe
   class Network #:nodoc:
     class Mock #:nodoc:
-      include Dupe::Network::RestValidation
-      
       class ResourceNotFoundError < StandardError; end
       
-      attr_reader :verb
       attr_reader :url_pattern
       attr_reader :response
     
-      def initialize(verb, url_pattern, response_proc=nil)
-        validate_request_type verb
-        
+      def initialize(url_pattern, response_proc=nil)
         raise(
           ArgumentError,
           "The URL pattern parameter must be a type of regular expression."
         ) unless url_pattern.kind_of?(Regexp)
             
         @response = response_proc || proc {}
-        @verb = verb
         @url_pattern = url_pattern
       end
     
@@ -39,7 +33,7 @@ class Dupe
       end
       
       def process_response(resp, url)
-        raise NotImplementedError, "Need to specify the appropriate mock class: GetMock, PostMock, PutMock or DeleteMock"
+        raise NotImplementedError, "When you extend Dupe::Network::Mock, you must implement the #process_response instance method."
       end
     end
   end
@@ -50,18 +44,21 @@ class Dupe
     class GetMock < Mock #:nodoc:
       def process_response(resp, url)
         case resp
-        when NilClass
-          raise ResourceNotFoundError, "Failed with 404: the request '#{url}' returned nil." 
-        when Dupe::Database::Record
-          resp = resp.to_xml_safe(:root => resp.__model__.name.to_s)
-        when Array
-          if resp.empty?
-            resp = [].to_xml :root => 'results'
-          else
-            resp = resp.map {|r| HashPruner.prune(r)}.to_xml(:root => resp.first.__model__.name.to_s.pluralize)
-          end
+          
+          when NilClass
+            raise ResourceNotFoundError, "Failed with 404: the request '#{url}' returned nil." 
+            
+          when Dupe::Database::Record
+            resp = resp.to_xml_safe(:root => resp.__model__.name.to_s)
+
+          when Array
+            if resp.empty?
+              resp = [].to_xml :root => 'results'
+            else
+              resp = resp.map {|r| HashPruner.prune(r)}.to_xml(:root => resp.first.__model__.name.to_s.pluralize)
+            end
         end
-        Dupe.network.log.add_request @verb, url, resp
+        Dupe.network.log.add_request :get, url, resp
         resp
       end
     end
@@ -71,19 +68,60 @@ end
 class Dupe
   class Network
     class PostMock < Mock #:nodoc:
+      
+      # returns a tuple representing the xml of the processed entity, plus the url to the entity. 
       def process_response(resp, url)
         case resp
-        when NilClass
-          raise ResourceNotFoundError, "Failed with 404: the request '#{url}' returned nil." 
-        when Dupe::Database::Record
-          new_path = "/#{resp.__model__.name.to_s.pluralize}/#{resp.id}.xml"
-          resp = resp.to_xml_safe(:root => resp.__model__.name.to_s)
-          Dupe.network.log.add_request @verb, url, resp
-          return resp, new_path
-        else
-          raise StandardError, "Unknown PostMock Response. Your Post intercept mocks must return a Duped resource object or nil"
+          
+          when NilClass
+            raise StandardError, "Failed with 500: the request '#{url}' returned nil." 
+          
+          when Dupe::Database::Record
+            new_path = "/#{resp.__model__.name.to_s.pluralize}/#{resp.id}.xml"
+            resp = resp.to_xml_safe(:root => resp.__model__.name.to_s)
+            Dupe.network.log.add_request :post, url, resp
+            return resp, new_path
+          
+          else
+            raise StandardError, "Unknown PostMock Response. Your Post intercept mocks must return a Duped resource object or nil"
         end
       end
     end
   end
-end
+end
+
+class Dupe
+  class Network
+    class PutMock < Mock #:nodoc:
+      
+      # returns a tuple representing the xml of the processed entity, plus the url to the entity. 
+      def process_response(resp, url)
+        case resp
+          
+          when NilClass
+            raise StandardError, "Failed with 500: the request '#{url}' returned nil." 
+          
+          when Dupe::Database::Record
+            resp = nil
+            Dupe.network.log.add_request :put, url, ""
+            return resp, url
+          
+          else
+            raise StandardError, "Unknown PutMock Response. Your Post intercept mocks must return a Duped resource object or nil"
+        end
+      end
+    end
+  end
+end
+
+class Dupe
+  class Network
+    class DeleteMock < Mock #:nodoc:
+      # logs the request 
+      def process_response(resp, url)
+        Dupe.network.log.add_request :delete, url, ""
+        nil
+      end
+    end
+  end
+end

data/lib/dupe/network.rb

@@ -21,15 +21,23 @@ class Dupe
       validate_request_type verb
       case verb
       when :get
-        GetMock.new(verb, url_pattern, response_proc).tap do |mock|
+        GetMock.new(url_pattern, response_proc).tap do |mock|
           @mocks[verb] << mock
         end
       when :post
-        PostMock.new(verb, url_pattern, response_proc).tap do |mock|
+        PostMock.new(url_pattern, response_proc).tap do |mock|
+          @mocks[verb].unshift mock
+        end
+      when :put
+        PutMock.new(url_pattern, response_proc).tap do |mock|
+          @mocks[verb].unshift mock
+        end
+      when :delete
+        DeleteMock.new(url_pattern, response_proc).tap do |mock|
           @mocks[verb].unshift mock
         end
       else
-        raise StandardError, "Dupe does not (yet) support mocking #{verb.to_s.upcase} requests."
+        raise StandardError, "Dupe does not support mocking #{verb.to_s.upcase} requests."
       end
     end
     
@@ -45,4 +53,4 @@ class Dupe
     end
     
   end
-end
+end

data/spec/lib_specs/active_resource_extensions_spec.rb

@@ -62,4 +62,80 @@ describe ActiveResource::Connection do
       b.errors.should be_empty
     end
   end
-end
+
+  describe "#put" do
+    before do
+      @book = Dupe.create :book, :label => 'rooby', :title => 'Rooby'
+      class Book < ActiveResource::Base
+        self.site = ''
+      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
+      @ar_book.title = 'Rails!'
+      @ar_book.save
+    end
+    
+    it "should parse the xml and turn the result into active resource objects" do
+      @book.title.should == "Rooby"
+      @ar_book.title = "Rails!"
+      @ar_book.save
+      @ar_book.new?.should == false
+      @ar_book.valid?.should == true
+      @ar_book.id.should == 1
+      @ar_book.label.should == "rooby"
+      @book.title.should == "Rails!"
+      @book.id.should == 1
+      @book.label.should == 'rooby'
+    end
+    
+    it "should make ActiveResource throw an unprocessable entity exception if our Put mock throws a Dupe::UnprocessableEntity exception" do
+      Put %r{/books/(\d+)\.xml} do |id, put_data|
+        raise Dupe::UnprocessableEntity.new(:title => " must be present.") unless put_data[:title]
+        Dupe.find(:book) {|b| b.id == id.to_i}.merge!(put_data)
+      end
+      
+      @ar_book.title = nil
+      @ar_book.save.should == false
+      @ar_book.errors.on_base.should_not be_empty
+
+      @ar_book.title = "Rails!"
+      @ar_book.save.should == true
+      # the following line should be true, were it not for a bug in active_resource 2.3.3 - 2.3.5
+      # i reported the bug here: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4169-activeresourcebasesave-put-doesnt-clear-out-errors
+      # @ar_book.errors.should be_empty
+    end
+  end
+
+  describe "#delete" do
+    before do
+      @book = Dupe.create :book, :label => 'rooby', :title => 'Rooby'
+      class Book < ActiveResource::Base
+        self.site = ''
+      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(:delete, '/books/1.xml').once
+      @ar_book.destroy
+    end
+    
+    it "trigger a Dupe.delete to delete the mocked resource from the duped database" do
+      Dupe.find(:books).length.should == 1
+      @ar_book.destroy
+      Dupe.find(:books).length.should == 0
+    end
+
+    it "should allow you to override the default DELETE intercept mock" do
+      Delete %r{/books/(\d+)\.xml} do |id|
+        raise StandardError, "Testing Delete override"
+      end
+
+      proc {@ar_book.destroy}.should raise_error(StandardError, "Testing Delete override")
+    end
+  end
+
+end

data/spec/lib_specs/database_spec.rb

@@ -16,6 +16,36 @@ describe Dupe::Database do
     end
   end
   
+  describe "delete" do
+    before do 
+      Dupe.stub 10, :books
+    end
+
+    it "should delete the first record found if the resource name is singular and there is no conditions proc" do
+      Dupe.find(:books).length.should == 10
+      Dupe.database.delete :book
+      Dupe.find(:books).length.should == 9
+    end
+
+    it "should delete all records if the resource name is plural and there is no conditions proc" do
+      Dupe.find(:books).length.should == 10
+      Dupe.database.delete :books
+      Dupe.find(:books).length.should == 0
+    end
+
+    it "should delete all matching records if there is a conditions proc and the resource name is singular" do
+      Dupe.find(:books).length.should == 10
+      Dupe.database.delete :book, proc {|b| b.id < 3}
+      Dupe.find(:books).length.should == 8
+    end
+
+    it "should delete all matching records if there is a conditions proc and the resource name is plural" do
+      Dupe.find(:books).length.should == 10
+      Dupe.database.delete :books, proc {|b| b.id < 3}
+      Dupe.find(:books).length.should == 8
+    end
+  end
+  
   describe "insert" do
     before do
       Dupe.define :book

data/spec/lib_specs/dupe_spec.rb

@@ -173,15 +173,56 @@ describe Dupe do
       Dupe.network.mocks[:get].length.should == 2
       
       find_all_mock = Dupe.network.mocks[:get].first
-      find_all_mock.verb.should == :get
+      find_all_mock.class.should == Dupe::Network::GetMock
       find_all_mock.url_pattern.should == %r{^/books\.xml$}
       find_all_mock.mocked_response('/books.xml').should == Dupe.find(:books).to_xml(:root => 'books')
       
       find_one_mock = Dupe.network.mocks[:get].last
-      find_one_mock.verb.should == :get
+      find_one_mock.class.should == Dupe::Network::GetMock
       find_one_mock.url_pattern.should == %r{^/books/(\d+)\.xml$}
       find_one_mock.mocked_response('/books/1.xml').should == Dupe.find(:book).to_xml(:root => 'book')
     end
+
+    it "should add a POST (create resource) mock to the network" do
+      Dupe.network.mocks[:post].should be_empty
+      Dupe.define :book
+      Dupe.network.mocks[:post].should_not be_empty
+      Dupe.network.mocks[:post].length.should == 1
+
+      post_mock = Dupe.network.mocks[:post].first
+      post_mock.class.should == Dupe::Network::PostMock
+      post_mock.url_pattern.should == %r{^/books\.xml$}
+      resp, url = post_mock.mocked_response('/books.xml', {:title => "Rooby"})
+      resp.should == Dupe.find(:book).to_xml(:root => 'book')
+      url.should == "/books/1.xml"
+    end
+
+    it "should add a PUT (update resource) mock to the network" do
+      Dupe.network.mocks[:put].should be_empty
+      book = Dupe.create :book, :title => 'Rooby!'
+      Dupe.network.mocks[:put].should_not be_empty
+      Dupe.network.mocks[:put].length.should == 1
+
+      put_mock = Dupe.network.mocks[:put].first
+      put_mock.class.should == Dupe::Network::PutMock
+      put_mock.url_pattern.should == %r{^/books/(\d+)\.xml$}
+      resp, url = put_mock.mocked_response('/books/1.xml', {:title => "Rails!"})
+      resp.should == nil
+      url.should == "/books/1.xml"
+      book.title.should == "Rails!"
+    end
+
+    it "should add a DELETE mock to the network" do
+      Dupe.network.mocks[:delete].should be_empty
+      book = Dupe.create :book, :title => 'Rooby!'
+      Dupe.network.mocks[:delete].should_not be_empty
+      Dupe.network.mocks[:delete].length.should == 1
+
+      delete_mock = Dupe.network.mocks[:delete].first
+      delete_mock.class.should == Dupe::Network::DeleteMock
+      delete_mock.url_pattern.should == %r{^/books/(\d+)\.xml$}
+    end
+
     
     it "should honor ActiveResource site prefix's for the find(:all) and find(<id>) mocks" do
       Dupe.network.mocks[:get].should be_empty
@@ -191,12 +232,12 @@ describe Dupe do
       Dupe.network.mocks[:get].length.should == 2
       
       find_all_mock = Dupe.network.mocks[:get].first
-      find_all_mock.verb.should == :get
+      find_all_mock.class.should == Dupe::Network::GetMock
       find_all_mock.url_pattern.should == %r{^/book_services/authors\.xml$}
       find_all_mock.mocked_response('/book_services/authors.xml').should == Dupe.find(:authors).to_xml(:root => 'authors')
       
       find_one_mock = Dupe.network.mocks[:get].last
-      find_one_mock.verb.should == :get
+      find_one_mock.class.should == Dupe::Network::GetMock
       find_one_mock.url_pattern.should == %r{^/book_services/authors/(\d+)\.xml$}
       find_one_mock.mocked_response('/book_services/authors/1.xml').should == Dupe.find(:author).to_xml(:root => 'author')
     end    
@@ -461,4 +502,21 @@ describe Dupe do
       b2.genre.name.should == 'Science Fiction'
     end
   end
+
+  describe "##delete" do
+    it "should remove any resources that match the conditions provided in the block" do
+      Dupe.stub 10, :authors
+      Dupe.find(:authors).length.should == 10
+      Dupe.delete :author
+      Dupe.find(:authors).length.should == 9
+      Dupe.delete :authors
+      Dupe.find(:authors).length.should == 0
+      Dupe.create :author, :name => 'CS Lewis'
+      Dupe.create :author, :name => 'Robert Lewis Stevenson'
+      Dupe.create :author, :name => 'Frank Herbert'
+      Dupe.delete(:author) {|a| a.name.match /Lewis/}
+      Dupe.find(:authors).length.should == 1
+      Dupe.find(:authors).first.name.should == 'Frank Herbert'
+    end
+  end
 end

data/spec/lib_specs/mock_spec.rb

@@ -6,26 +6,17 @@ describe Dupe::Network::Mock do
   end
   
   describe "new" do
-    it "should require a valid REST type" do
-      proc { Dupe::Network::Mock.new :unknown, /\//, proc {} }.should raise_error(Dupe::Network::UnknownRestVerbError)
-      proc { Dupe::Network::Mock.new :get,     /\//, proc {} }.should_not raise_error
-      proc { Dupe::Network::Mock.new :post,    /\//, proc {} }.should_not raise_error
-      proc { Dupe::Network::Mock.new :put,     /\//, proc {} }.should_not raise_error
-      proc { Dupe::Network::Mock.new :delete,  /\//, proc {} }.should_not raise_error
-    end
-    
     it "should require the url be a kind of regular expression" do
-      proc { Dupe::Network::Mock.new :get, '', proc {} }.should raise_error(
+      proc { Dupe::Network::Mock.new '', proc {} }.should raise_error(
         ArgumentError,
         "The URL pattern parameter must be a type of regular expression."
       )
     end
     
-    it "should set the @verb, @url, and @response parameters accordingly" do
+    it "should set the, @url, and @response parameters accordingly" do
       url_pattern = /\//
       response = proc {}
-      mock = Dupe::Network::Mock.new :get, url_pattern, response
-      mock.verb.should == :get
+      mock = Dupe::Network::Mock.new url_pattern, response
       mock.url_pattern.should == url_pattern
       mock.response.should == response
     end
@@ -35,7 +26,7 @@ describe Dupe::Network::Mock do
     it "should determine if a given string matches the mock's url pattern" do
       url = %r{/blogs/(\d+).xml}
       response = proc {}
-      mock = Dupe::Network::Mock.new :get, url, response
+      mock = Dupe::Network::Mock.new url, response
       mock.match?('/blogs/1.xml').should == true
       mock.match?('/bogs/1.xml').should == false
     end
@@ -53,13 +44,13 @@ describe Dupe::Network::GetMock do
         url_pattern = %r{/books/(\d+)\.xml}
         response = proc {|id| Dupe.find(:book) {|b| b.id == id.to_i}}
         book = Dupe.create :book
-        mock = Dupe::Network::GetMock.new :get, url_pattern, response
+        mock = Dupe::Network::GetMock.new url_pattern, response
         mock.mocked_response('/books/1.xml').should == book.to_xml(:root => 'book')
         
         proc { mock.mocked_response('/books/2.xml') }.should raise_error(Dupe::Network::GetMock::ResourceNotFoundError)
         
         Dupe.define :author
-        mock = Dupe::Network::GetMock.new :get, %r{/authors\.xml$}, proc {Dupe.find :authors}
+        mock = Dupe::Network::GetMock.new %r{/authors\.xml$}, proc {Dupe.find :authors}
         mock.mocked_response('/authors.xml').should == [].to_xml(:root => 'results')
       end
       
@@ -67,7 +58,7 @@ describe Dupe::Network::GetMock do
         url_pattern = %r{/books/([a-zA-Z0-9-]+)\.xml}
         response = proc {|label| Dupe.find(:book) {|b| b.label == label}}
         book = Dupe.create :book, :label => 'rooby'
-        mock = Dupe::Network::GetMock.new :get, url_pattern, response
+        mock = Dupe::Network::GetMock.new url_pattern, response
         Dupe.network.log.requests.length.should == 0
         mock.mocked_response('/books/rooby.xml')
         Dupe.network.log.requests.length.should == 1
@@ -79,7 +70,7 @@ describe Dupe::Network::GetMock do
         url_pattern = %r{/authors/(\d+)\.xml}
         response = proc { |id| Dupe.find(:author) {|a| a.id == id.to_i}}
         Dupe.define :author
-        mock = Dupe::Network::GetMock.new :get, url_pattern, response
+        mock = Dupe::Network::GetMock.new url_pattern, response
         proc {mock.mocked_response('/authors/1.xml')}.should raise_error(Dupe::Network::GetMock::ResourceNotFoundError)
       end
     end
@@ -87,13 +78,13 @@ describe Dupe::Network::GetMock do
     describe "on a mock object whose response returns an empty array" do
       it "should convert the empty array to an xml array record set with root 'results'" do        
         Dupe.define :author
-        mock = Dupe::Network::GetMock.new :get, %r{/authors\.xml$}, proc {Dupe.find :authors}
+        mock = Dupe::Network::GetMock.new %r{/authors\.xml$}, proc {Dupe.find :authors}
         mock.mocked_response('/authors.xml').should == [].to_xml(:root => 'results')
       end
       
       it "should add a request to the Dupe::Network#log" do
         Dupe.define :author
-        mock = Dupe::Network::GetMock.new :get, %r{/authors\.xml$}, proc {Dupe.find :authors}
+        mock = Dupe::Network::GetMock.new %r{/authors\.xml$}, proc {Dupe.find :authors}
         Dupe.network.log.requests.length.should == 0
         mock.mocked_response('/authors.xml')
         Dupe.network.log.requests.length.should == 1
@@ -103,13 +94,13 @@ describe Dupe::Network::GetMock do
     describe "on a mock object whose response returns an array of duped records" do
       it "should convert the array to xml" do        
         Dupe.create :author  
-        mock = Dupe::Network::GetMock.new :get, %r{/authors\.xml$}, proc {Dupe.find :authors}
+        mock = Dupe::Network::GetMock.new %r{/authors\.xml$}, proc {Dupe.find :authors}
         mock.mocked_response('/authors.xml').should == Dupe.find(:authors).to_xml(:root => 'authors')
       end
       
       it "should add a request to the Dupe::Network#log" do
         Dupe.create :author
-        mock = Dupe::Network::GetMock.new :get, %r{/authors\.xml$}, proc {Dupe.find :authors}
+        mock = Dupe::Network::GetMock.new %r{/authors\.xml$}, proc {Dupe.find :authors}
         Dupe.network.log.requests.length.should == 0
         mock.mocked_response('/authors.xml')
         Dupe.network.log.requests.length.should == 1
@@ -127,7 +118,7 @@ describe Dupe::Network::PostMock do
     describe "on a mock object whose response returns a location of a new record" do
       it "should convert the new post to xml" do        
         Dupe.define :author  
-        mock = Dupe::Network::PostMock.new :post, %r{/authors\.xml$}, proc {|post_data| Dupe.create(:author, post_data)}
+        mock = Dupe::Network::PostMock.new %r{/authors\.xml$}, proc {|post_data| Dupe.create(:author, post_data)}
         resp, url = mock.mocked_response('/authors.xml', {:name => "Rachel"})
         resp.should == Dupe.find(:authors).first.to_xml_safe(:root => 'author')
         url.should == "/authors/1.xml"
@@ -135,11 +126,69 @@ describe Dupe::Network::PostMock do
       
       it "should add a request to the Dupe::Network#log" do
         Dupe.define :author
-        mock = Dupe::Network::PostMock.new :post, %r{/authors\.xml$}, proc {|post_data| Dupe.create(:author, post_data)}
+        mock = Dupe::Network::PostMock.new %r{/authors\.xml$}, proc {|post_data| Dupe.create(:author, post_data)}
         Dupe.network.log.requests.length.should == 0
         mock.mocked_response('/authors.xml', {:name => "Rachel"})
         Dupe.network.log.requests.length.should == 1
       end
     end
   end
-end
+end
+
+describe Dupe::Network::PutMock do
+  before do
+    Dupe.reset
+  end
+  
+  describe "mocked_response" do
+    describe "on a mock object whose response returns a location of a new record" do
+      before do
+        Dupe.define :author  
+        @a = Dupe.create :author, :name => "Matt"
+        @mock = Dupe::Network::PutMock.new %r{/authors/(\d+)\.xml$}, proc {|id, put_data| Dupe.find(:author) {|a| a.id == id.to_i}.merge!(put_data)}
+      end
+
+      it "should convert the put to xml" do        
+        resp, url = @mock.mocked_response('/authors/1.xml', {:name => "Rachel"})
+        resp.should == nil
+        @a.name.should == "Rachel"
+        url.should == "/authors/1.xml"
+      end
+      
+      it "should add a request to the Dupe::Network#log" do
+        Dupe.network.log.requests.length.should == 0
+        @mock.mocked_response('/authors/1.xml', {:name => "Rachel"})
+        Dupe.network.log.requests.length.should == 1
+      end
+    end
+  end
+end
+
+describe Dupe::Network::DeleteMock do
+  before do
+    Dupe.reset
+  end
+  
+  describe "mocked_response" do
+    describe "on a mock object whose response returns a location of a new record" do
+      before do
+        Dupe.define :author  
+        @a = Dupe.create :author, :name => "Matt"
+        @mock = Dupe::Network::DeleteMock.new %r{/authors/(\d+)\.xml$}, proc {|id| Dupe.delete(:author) {|a| a.id == id.to_i}}
+      end
+
+      it "should convert the put to xml" do        
+        Dupe.find(:authors).length.should == 1
+        resp = @mock.mocked_response('/authors/1.xml')
+        resp.should == nil
+        Dupe.find(:authors).length.should == 0
+      end
+      
+      it "should add a request to the Dupe::Network#log" do
+        Dupe.network.log.requests.length.should == 0
+        @mock.mocked_response('/authors/1.xml')
+        Dupe.network.log.requests.length.should == 1
+      end
+    end
+  end
+end

data/spec/lib_specs/network_spec.rb

@@ -68,7 +68,7 @@ describe Dupe::Network do
       proc { @network.define_service_mock :invalid_rest_verb, // }.should raise_error(Dupe::Network::UnknownRestVerbError)
       proc { @network.define_service_mock :get, // }.should_not raise_error(Dupe::Network::UnknownRestVerbError)
       proc { @network.define_service_mock :post, // }.should_not raise_error(Dupe::Network::UnknownRestVerbError)
-
+      proc { @network.define_service_mock :put, // }.should_not raise_error(Dupe::Network::UnknownRestVerbError)
     end
     
     it "should require a valid Regexp url pattern" do
@@ -76,7 +76,6 @@ describe Dupe::Network do
       proc { @network.define_service_mock :post, 'not a regular expression' }.should raise_error(ArgumentError)
       proc { @network.define_service_mock :get, // }.should_not raise_error
       proc { @network.define_service_mock :post, // }.should_not raise_error
-
     end
     
     it "should create and return a new get service mock when given valid parameters" do
@@ -86,7 +85,7 @@ describe Dupe::Network do
       @network.mocks[:get].should be_empty
       mock = @network.define_service_mock verb, pattern, response
       @network.mocks[:get].should_not be_empty
-      @network.mocks[:post].first.class == "GetMock"
+      @network.mocks[:get].first.class.should == Dupe::Network::GetMock
       @network.mocks[:get].length.should == 1
       @network.mocks[:get].first.should == mock
     end
@@ -98,12 +97,34 @@ describe Dupe::Network do
       @network.mocks[:post].should be_empty
       mock = @network.define_service_mock verb, pattern, response
       @network.mocks[:post].should_not be_empty
-      @network.mocks[:post].first.class == "PostMock"
+      @network.mocks[:post].first.class.should == Dupe::Network::PostMock
       @network.mocks[:post].length.should == 1
       @network.mocks[:post].first.should == mock
     end
-
     
+    it "should create and return a new put service mock when given valid parameters" do
+      verb = :put
+      pattern = //
+      response = proc { 'test' }
+      @network.mocks[:put].should be_empty
+      mock = @network.define_service_mock verb, pattern, response
+      @network.mocks[:put].should_not be_empty
+      @network.mocks[:put].first.class.should == Dupe::Network::PutMock
+      @network.mocks[:put].length.should == 1
+      @network.mocks[:put].first.should == mock
+    end
+    
+    it "should create and return a new delete service mock when given valid parameters" do
+      verb = :delete
+      pattern = //
+      response = proc { 'test' }
+      @network.mocks[:delete].should be_empty
+      mock = @network.define_service_mock verb, pattern, response
+      @network.mocks[:delete].should_not be_empty
+      @network.mocks[:delete].first.class.should == Dupe::Network::DeleteMock
+      @network.mocks[:delete].length.should == 1
+      @network.mocks[:delete].first.should == mock
+    end
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dupe
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Matt Parker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -05:00
+date: 2010-03-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency