dumpable 0.2.0 → 0.2.1

data/README.rdoc

@@ -46,7 +46,6 @@ At the moment, Dumpable will not work on any complex relationships. This include
 It also will not work on models that have a different primary key than id or on models with complex keys.
 
 It is also only setup to work with MySQL databases and is untested with any other databases.
->>>>>>> Regenerate gemspec for version 0.2.0
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/dumpable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dumpable"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Hunter"]

data/lib/dumpable/active_record_extensions.rb

@@ -11,7 +11,7 @@ module Dumpable
         class_eval do
           cattr_accessor :dumpable_options
         end
-        self.dumpable_options = Dumpable.config.merge(options)
+        self.dumpable_options = options
       end
 
       def dump(options={})

data/lib/dumpable/dumper.rb

@@ -4,7 +4,7 @@ module Dumpable
 
     def initialize(dumpee, options)
       @dumpee = dumpee
-      @options = options
+      @options = Dumpable.config.merge(options)
       @id_padding = @options[:id_padding] || (@dumpee.class.respond_to?(:dumpable_options) && @dumpee.class.dumpable_options[:id_padding]) || Dumpable.config.id_padding
       @dumps = @options[:dumps] || (@dumpee.class.respond_to?(:dumpable_options) && @dumpee.class.dumpable_options[:dumps])
       @lines = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dumpable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -158942502906389966
+      hash: 3952123303802621730
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: