dupe 0.4.6 → 0.4.7

data/lib/dupe/database.rb

@@ -21,6 +21,7 @@ class Dupe
       end
       @tables[record.__model__.name] ||= []
       @tables[record.__model__.name] << record
+      record.__model__.run_after_create_callbacks(record)
     end
     
     # pass in a model_name (e.g., :book) and optionally a proc with 

data/lib/dupe/dupe.rb

@@ -468,6 +468,7 @@ class Dupe
         "as the second parameter to create_and_insert."
       ) if !into || !into.kind_of?(Hash) || !into[:into]
       
+      # do we have several records to create, and are they each a hash?
       if records.kind_of?(Array) and
          records.inject(true) {|bool, r| bool and r.kind_of?(Hash)}
         [].tap do |results|
@@ -475,8 +476,11 @@ class Dupe
             results << models[into[:into]].create(record).tap {|r| database.insert r}
           end
         end
+      
+      # do we only have one record to create, and is it a hash?
       elsif records.kind_of?(Hash)
         models[into[:into]].create(records).tap {|r| database.insert r}
+      
       else
         raise ArgumentError, "You must call Dupe.create with either a hash or an array of hashes."
       end

data/lib/dupe/hash_pruner.rb

@@ -0,0 +1,37 @@
+class HashPruner
+  class << self
+    def prune(hash)
+      HashPruner.new.prune hash
+    end
+  end
+ 
+  def initialize()
+    @visited = {}
+  end
+ 
+  def prune(item)
+    if item.kind_of? Array
+      item.map {|i| prune(i)}.reject {|v| v==nil}
+    elsif item.kind_of? Hash
+      if @visited[item.object_id]
+        item.dup.delete_if {|k,v| v.kind_of?(Hash) || v.kind_of?(Array)}
+      else
+        @visited[item.object_id] = true
+        new_hash = {}
+        item.each do |k,v|
+          new_hash[k] = prune(v)
+        end
+        @visited.delete item.object_id
+        new_hash
+      end
+    else
+      item
+    end
+  end
+end
+
+class Hash 
+  def to_xml_safe(options={})
+    HashPruner.prune(self).to_xml(options)  
+  end
+end

data/lib/dupe/mock.rb

@@ -39,12 +39,12 @@ class Dupe
           when NilClass
             raise ResourceNotFoundError, "Failed with 404: the request '#{url}' returned nil." 
           when Dupe::Database::Record
-            resp = resp.to_xml(:root => resp.__model__.name.to_s)
+            resp = resp.to_xml_safe(:root => resp.__model__.name.to_s)
           when Array
             if resp.empty?
               resp = [].to_xml :root => 'results'
             else
-              resp = resp.to_xml(:root => resp.first.__model__.name.to_s.pluralize)
+              resp = resp.map {|r| HashPruner.prune(r)}.to_xml(:root => resp.first.__model__.name.to_s.pluralize)
             end
         end
         
@@ -55,4 +55,4 @@ class Dupe
     
     end
   end
-end
+end

data/lib/dupe/model.rb

@@ -20,9 +20,13 @@ class Dupe
         record.id = @id_sequence.next
         record.merge! default_record
         record.merge! transform(attributes)
-        @schema.after_create_callbacks.each do |callback|
-          callback.call record
-        end
+      end
+    end
+    
+    # called by the Dupe::Database#insert method
+    def run_after_create_callbacks(record)
+      @schema.after_create_callbacks.each do |callback|
+        callback.call record
       end
     end
     

data/lib/dupe.rb

@@ -1,3 +1,4 @@
+require 'dupe/hash_pruner'
 require 'active_resource'
 require 'active_resource/http_mock'
 require 'dupe/singular_plural_detection'
@@ -16,4 +17,4 @@ require 'dupe/schema'
 require 'dupe/model'
 require 'dupe/custom_mocks'
 require 'dupe/active_resource_extensions'
-require 'dupe/cucumber_hooks'
+require 'dupe/cucumber_hooks'

data/spec/lib_specs/dupe_spec.rb

@@ -288,6 +288,25 @@ describe Dupe do
     end
   end
   
+  describe "create resources that have an after_create callback" do
+    before do
+      Dupe.define :book do |book|
+        book.uniquify :title, :author, :genre
+      
+        book.after_create do |b|
+          b.label = b.title.downcase.gsub(/\ +/, '-') unless b.label
+        end
+      end
+    end
+    
+    it "should create a label based on the title if a label is passed in during the create call" do
+      b = Dupe.create :book, :title => 'Testing Testing'
+      b.label.should == 'testing-testing'
+      b = Dupe.create :book, :title => 'Testing Testing', :label => 'testbook'
+      b.label.should == 'testbook'
+    end
+  end
+  
   describe "find" do
     before do
       Dupe.define :book

data/spec/lib_specs/hash_pruner.rb

@@ -0,0 +1,73 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe HashPruner do
+  describe "#prune" do
+    it "should nil out any repeated hashes" do
+      clarke = {:name => "Arthur C. Clarke"}
+      heinlein = {:name => "Robert Heinlein"}
+      sci_fi = {:name => "Science Fiction", :authors => [clarke, heinlein]}
+      clarke[:genre] = sci_fi
+      odyssey = {:name => "2001", :genre => sci_fi, :author => clarke}
+      hoag = {:name => "the unpleasant profession", :genre => sci_fi, :author => heinlein}
+      clarke[:books] = [odyssey]
+      heinlein[:books] = [hoag]
+
+      HashPruner.prune(clarke).should == 
+        { 
+          :name=>"Arthur C. Clarke", 
+          :genre => {
+            :name => "Science Fiction",
+            :authors => [
+              {
+                :name=>"Arthur C. Clarke"
+              },
+              {
+                :name=>"Robert Heinlein", 
+                :books=> [
+                  {
+                    :name => "the unpleasant profession",
+                    :genre => {
+                      :name => "Science Fiction"
+                    }, 
+                    :author => {
+                      :name => "Robert Heinlein"
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          :books=> [
+            { 
+              :name => "2001",
+              :genre => {
+                :name => "Science Fiction",
+                :authors => [
+                  {
+                    :name => "Arthur C. Clarke"                    
+                  },
+                  {
+                    :name=>"Robert Heinlein", 
+                    :books=> [
+                      {
+                        :name => "the unpleasant profession",
+                        :genre => {
+                          :name => "Science Fiction"
+                        }, 
+                        :author => {
+                          :name => "Robert Heinlein"
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              :author => {
+                :name => "Arthur C. Clarke"
+              } 
+            }
+          ]
+        }
+    end
+  end
+end

data/spec/lib_specs/mock_definitions_spec.rb

@@ -26,7 +26,7 @@ describe "Mock Definition Methods" do
       Dupe.network.mocks[:get].last.should == mock
       Dupe.network.mocks[:get].last.url_pattern.should == %r{/books/([^&]+)\.xml}
       book = Dupe.find(:book)
-      Dupe.network.request(:get, '/books/rooby.xml').should == book.to_xml(:root => 'book')
+      Dupe.network.request(:get, '/books/rooby.xml').should == book.to_xml_safe(:root => 'book')
     end
   end
 end

data/spec/lib_specs/mock_spec.rb

@@ -108,8 +108,8 @@ describe Dupe::Network::Mock do
         mock.mocked_response('/authors.xml')
         Dupe.network.log.requests.length.should == 1
       end
-    end    
+    end 
   end
   
   
-end
+end

data/spec/lib_specs/model_spec.rb

@@ -77,13 +77,18 @@ describe Dupe::Model do
       book.id.should == 1
       book.title.should == 'Untitled'
       book.author.should == 'Anon'
-      book.label.should == 'untitled'
+      
+      # the callback shouldn't get run until the database record is inserted into the duped 'database'
+      book.label.should == nil
       
       book = @book_model.create :title => 'Rooby On Rails', :author => 'Matt Parker'
       book.__model__.name.should == :book
       book.id.should == 2
       book.title.should == 'Rooby On Rails'
-      book.label.should == 'rooby-on-rails'
+      
+      # the callback shouldn't get run until the database record is inserted into the duped 'database'
+      book.label.should == nil
+      
       book.author.should == 'Author: Matt Parker'
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dupe
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - Matt Parker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 -05:00
+date: 2010-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
 - lib/dupe/custom_mocks.rb
 - lib/dupe/database.rb
 - lib/dupe/dupe.rb
+- lib/dupe/hash_pruner.rb
 - lib/dupe/log.rb
 - lib/dupe/mock.rb
 - lib/dupe/model.rb
@@ -90,6 +91,7 @@ test_files:
 - spec/lib_specs/attribute_template_spec.rb
 - spec/lib_specs/database_spec.rb
 - spec/lib_specs/dupe_spec.rb
+- spec/lib_specs/hash_pruner.rb
 - spec/lib_specs/log_spec.rb
 - spec/lib_specs/logged_request_spec.rb
 - spec/lib_specs/mock_definitions_spec.rb