undestroy 0.1.0 → 0.1.1

data/lib/undestroy/archive.rb

@@ -1,6 +1,6 @@
 
 class Undestroy::Archive
-  attr_accessor :source, :config, :transfer
+  attr_accessor :source, :config, :transfer, :transfer_options
 
   def initialize(args={})
     validate_arguments(args)
@@ -8,12 +8,15 @@ class Undestroy::Archive
     self.source = args[:source]
     self.config = args[:config]
     self.transfer = args[:transfer]
+    self.transfer_options = args[:transfer_options]
   end
 
   def transfer
     @transfer ||= self.config.internals[:transfer].new(
-      :klass => self.config.target_class,
-      :fields => archive_fields
+      {
+        :klass => self.config.target_class,
+        :fields => archive_fields
+      }.merge(self.transfer_options || {})
     )
   end
 

data/lib/undestroy/binding/active_record.rb

@@ -17,7 +17,11 @@ class Undestroy::Binding::ActiveRecord
   end
 
   def before_destroy(instance)
-    config.internals[:archive].new(:config => config, :source => instance).run
+    config.internals[:archive].new(
+      :config => config,
+      :transfer_options => { :target => target(instance) },
+      :source => instance
+    ).run if active?
   end
 
   def prefix_table_name(name)
@@ -34,6 +38,12 @@ class Undestroy::Binding::ActiveRecord
 
   protected
 
+  def target(source)
+    source_pk = config.source_class.primary_key
+    target_pk = config.target_class.primary_key
+    config.target_class.where(target_pk => source[source_pk]).first
+  end
+
   def set_defaults
     self.config.source_class = self.model
     self.config.table_name ||= prefix_table_name(self.model.table_name) if self.model.respond_to?(:table_name)

data/lib/undestroy/transfer.rb

@@ -6,7 +6,7 @@ class Undestroy::Transfer
     raise ArgumentError, ":klass option required" unless args[:klass]
     args[:fields] ||= {}
 
-    self.target = args[:klass].new
+    self.target = args[:target] || args[:klass].new
 
     # Set instance values directly to avoid AR's filtering of protected fields
     args[:fields].each do |field, value|

data/lib/undestroy/version.rb

@@ -1,4 +1,4 @@
 module Undestroy
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
 

data/test/fixtures/ar.rb

@@ -1,8 +1,12 @@
 
 class Undestroy::Test::Fixtures::ARFixture
+  cattr_accessor :calls, :primary_key
   attr_accessor :attributes
   attr_reader :saved
 
+  self.calls = []
+  self.primary_key = :id
+
   alias :saved? :saved
 
   def initialize(attributes={})
@@ -41,5 +45,14 @@ class Undestroy::Test::Fixtures::ARFixture
     end
   end
 
+  def self.where(*attrs)
+    self.calls << [:where, attrs]
+    self
+  end
+
+  def self.first(*attrs)
+    self.calls << [:first, attrs]
+  end
+
 end
 

data/test/integration/active_record_test.rb

@@ -85,6 +85,20 @@ module Undestroy::Test::Integration::ActiveRecordTest
       assert_equal 0, @model.all.size
     end
 
+    should "only create archive record once" do
+      @model.undestroy
+      target_class = @model.undestroy_model_binding.config.target_class
+
+      @model.create(:name => "foo")
+      original1 = @model.first
+      original2 = @model.first
+      original1.destroy
+      assert_not_raises { original2.destroy }
+
+      assert target_class.first
+      assert_equal 1, target_class.count
+    end
+
     should "restore an archived record removing the archive" do
       @model.undestroy
       @model.create(:name => "Fart")
@@ -128,6 +142,16 @@ module Undestroy::Test::Integration::ActiveRecordTest
       assert_equal 2, @model.count
       assert_equal 1, @model.archived.count
     end
+
+    should "destroy without archive when destory! called" do
+      @model.undestroy
+      record = @model.create :name => "Foo"
+      assert_equal 1, @model.count
+
+      record.destroy!
+      assert_equal 0, @model.count
+      assert_equal 0, @model.archived.count
+    end
   end
 
   class BasicModelWithDifferentBase < Base

data/test/unit/archive_test.rb

@@ -21,7 +21,7 @@ module Undestroy::Archive::Test
     subject { archive_instance }
     desc 'basic instance'
 
-    should have_accessors :source, :config, :transfer
+    should have_accessors :source, :config, :transfer, :transfer_options
   end
 
   class InitMethod < Base
@@ -47,6 +47,11 @@ module Undestroy::Archive::Test
       obj = archive_instance :transfer => "foo"
       assert_equal "foo", obj.transfer
     end
+
+    should "set optional :transfer_options to transfer_options attr" do
+      obj = archive_instance :transfer_options => { :foo => 'bar' }
+      assert_equal({ :foo => 'bar' }, obj.transfer_options)
+    end
   end
 
   class TransferMethod < BasicInstance
@@ -80,6 +85,24 @@ module Undestroy::Archive::Test
       assert_equal @archive.source, val
       assert_equal "FOO", target.attributes[:test]
     end
+
+    should "merge transfer_options attr onto arguments" do
+      fixture = Class.new do
+        attr_accessor :args
+        def initialize(args)
+          @args = args
+        end
+        def [](key)
+          @args[key]
+        end
+      end
+      @archive.config.internals[:transfer] = fixture
+      @archive.transfer_options = { :foo => 'bar', :fields => 123 }
+
+      assert_equal 'bar', @archive.transfer[:foo]
+      assert_equal 123, @archive.transfer[:fields]
+      assert_equal @archive.config.target_class, @archive.transfer[:klass]
+    end
   end
 
   class RunMethod < Base

data/test/unit/binding/active_record_test.rb

@@ -307,9 +307,32 @@ module Undestroy::Binding::ActiveRecord::Test
       subject.config.internals[:archive] = test_class
       subject.before_destroy(ar_source)
 
-      assert_equal({ :config => subject.config, :source => ar_source }, test_class.data[:args])
+      assert_equal subject.config, test_class.data[:args][:config]
+      assert_equal ar_source, test_class.data[:args][:source]
       assert_equal [[:run]], test_class.data[:calls]
     end
+
+    should "pass :target value in :transfer_options if archive record exists and nil otherwise" do
+      archive_class = Undestroy::Test::Fixtures::Archive
+      ar_source = Undestroy::Test::Fixtures::ARFixture.new
+      ar_source[:id] = 1
+      subject.config.internals[:archive] = archive_class
+      subject.config.source_class = ar_source.class
+      subject.config.target_class = ar_source.class
+      subject.before_destroy(ar_source)
+
+      assert_equal [:where, [{ :id => 1 }]], ar_source.calls[0]
+      assert_equal [:first, []], ar_source.calls[1]
+    end
+
+    should "not run the archival if active is false" do
+      archive_class = Undestroy::Test::Fixtures::Archive
+      ar_source = Undestroy::Test::Fixtures::ARFixture.new
+      subject.config.internals[:archive] = archive_class
+      subject.active = false
+      subject.before_destroy(ar_source)
+      assert_equal 0, archive_class.data[:calls].size
+    end
   end
 
   class PrefixTableNameMethod < Base

data/test/unit/transfer_test.rb

@@ -23,7 +23,8 @@ module Undestroy::Transfer::Test
         :name => "Foo",
         :description => "Foo Description"
       }
-      @transfer = subject.new :klass => Undestroy::Test::Fixtures::ARFixture, :fields => @fields
+      @init_args = { :klass => Undestroy::Test::Fixtures::ARFixture, :fields => @fields }
+      @transfer = subject.new @init_args
     end
 
     should "raise ArgumentError if no :klass key" do
@@ -34,6 +35,12 @@ module Undestroy::Transfer::Test
       assert_not_raises { subject.new :klass => Undestroy::Test::Fixtures::ARFixture }
     end
 
+    should "use :target arg if passed" do
+      target = @init_args[:klass].new
+      @transfer = subject.new @init_args.merge(:target => target)
+      assert_equal target.object_id, @transfer.target.object_id
+    end
+
     should "create :klass instance with :fields" do
       assert_instance_of Undestroy::Test::Fixtures::ARFixture, @transfer.target
       assert_equal @fields[:id], @transfer.target[:id]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: undestroy
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Travis Petticrew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 Z
+date: 2012-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime