csv_pirate 4.0.10 → 4.0.11

data/CHANGELOG

@@ -1,3 +1,10 @@
+Version 4.0.11 2010-03-08
+- PirateShip now respects CsvPirate.parlay setting instead of always overwriting it.
+- CsvPirate importing actually works now
+
+Version 4.0.8, 4.0.9, 4.0.10 2010-03-08
+- Trying to get a gemcutter push to work
+
 Version 4.0.7 2010-03-08
 - Fixed bug preventing use with rake db: tasks (create, reset, etc)
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 10
+:minor: 0
+:patch: 11
 :major: 4
 :build: 
-:minor: 0

data/csv_pirate.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csv_pirate}
-  s.version = "4.0.10"
+  s.version = "4.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Boling"]

data/lib/csv_pirate.rb

@@ -342,50 +342,44 @@ class CsvPirate
           buccaneers << self.grub.create(data_hash)
       else
         if permanence[:find_or_new]
-          obj = self.grub.send("find_by_#{permanence[:find_or_new].join('_and_')}".to_sym)
+          obj = self.send_aye(data_hash, permanence[:find_or_new])
           buccaneers << self.grub.new(data_hash) if obj.nil?
         elsif permanence[:find_or_save]
-          obj = self.grub.send("find_by_#{permanence[:find_or_save].join('_and_')}".to_sym)
+          obj = self.send_aye(data_hash, permanence[:find_or_save])
           if obj.nil?
             obj = self.grub.new(data_hash)
             obj.save(false) if obj.respond_to?(:save)
           end
           buccaneers << obj
         elsif permanence[:find_or_create]
-          obj = self.grub.send("find_by_#{permanence[:find_or_create].join('_and_')}".to_sym) || self.grub.create(data_hash)
+          obj = self.send_aye(data_hash, permanence[:find_or_create])
+          if obj.nil?
+            self.grub.create(data_hash)
+          end
           buccaneers << obj
         elsif permanence[:update_or_new]
-          obj = self.grub.send("find_by_#{permanence[:update_or_new].join('_and_')}".to_sym)
+          obj = self.send_aye(data_hash, permanence[:update_or_new])
           if obj.nil?
             obj = self.grub.new(data_hash)
           else
-            data_hash.each do |k,v|
-              obj.send("#{k}=".to_sym, v)
-              obj.save(false)
-            end
+            self.save_object(obj, data_hash)
           end
           buccaneers << obj
         elsif permanence[:update_or_save]
-          obj = self.grub.send("find_by_#{permanence[:update_or_save].join('_and_')}".to_sym)
+          obj = self.send_aye(data_hash, permanence[:update_or_save])
           if obj.nil?
             obj = self.grub.new(data_hash)
             obj.save(false)
           else
-            data_hash.each do |k,v|
-              obj.send("#{k}=".to_sym, v)
-              obj.save(false)
-            end
+            self.save_object(obj, data_hash)
           end
           buccaneers << obj
         elsif permanence[:update_or_create]
-          obj = self.grub.send("find_by_#{permanence[:update_or_create].join('_and_')}".to_sym)
+          obj = self.send_aye(data_hash, permanence[:update_or_create])
           if obj.nil?
             obj = self.grub.create(data_hash)
           else
-            data_hash.each do |k,v|
-              obj.send("#{k}=".to_sym, v)
-              obj.save(false)
-            end
+            self.save_object(obj, data_hash)
           end
           buccaneers << obj
         end
@@ -394,6 +388,44 @@ class CsvPirate
     buccaneers
   end
 
+  def save_object(obj, data_hash)
+    data_hash.each do |k,v|
+      obj.send("#{k}=".to_sym, v)
+    end
+    unless obj.save(false)
+      puts "Save Failed: #{obj.inspect}" if CsvPirate.parlance(1)
+    end
+  end
+
+  def send_aye(data_hash, columns)
+    obj = self.grub.send(self.find_aye(columns), self.find_aye_arr(data_hash, columns))
+    if obj
+      puts "#{self.grub}.#{find_aye(columns)}(#{self.find_aye_arr(data_hash, columns).inspect}): found id = #{obj.id}" if CsvPirate.parlance(2)
+    end
+  end
+
+  def find_aye(columns)
+    "find_by_#{columns.join('_and_')}".to_sym
+  end
+
+  def find_aye_arr(data_hash, columns)
+    columns.map do |col|
+      data_hash[col.to_s]
+    end
+  end
+
+  def data_hash_from_row(row, exclude_id = true, exclude_timestamps = true, example = nil)
+    plunder = {}
+    my_booty = self.booty.reject {|x| x.is_a?(Hash)}
+    my_booty = exclude_id ? my_booty.reject {|x| a = x.to_sym; [:id, :ID,:dbid, :DBID, :db_id, :DB_ID].include?(a)} : self.booty
+    my_booty = exclude_timestamps ? my_booty.reject {|x| a = x.to_sym; [:created_at, :updated_at, :created_on, :updated_on].include?(a)} : self.booty
+    my_booty = my_booty.reject {|x| !example.respond_to?("#{x}=".to_sym)} unless example.nil?
+    my_booty.each do |method|
+      plunder = plunder.merge({method => row[self.pinnacle[self.booty.index(method)]]})
+    end
+    plunder
+  end
+
   def data_hash_from_row(row, exclude_id = true, exclude_timestamps = true, example = nil)
     data_hash = {}
     my_booty = self.booty.reject {|x| x.is_a?(Hash)}

data/lib/ninth_bit/pirate_ship.rb

@@ -57,8 +57,8 @@ module NinthBit
         begin
           defined?(ActiveRecord) && ActiveRecord::Base.connected? ?
                 self.respond_to?(:table_name) && ActiveRecord::Base.connection.tables.include?(self.table_name) :
-                false
-        #The only error that occurs here is when ActiveRecord checks for the table but the database isn't setup yet.
+                self.respond_to?(:column_names)
+         #The only error that occurs here is when ActiveRecord checks for the table but the database isn't setup yet.
          #It was preventing rake db:create from working.
          rescue
            puts "csv_pirate: failed to connect to database, or table missing"
@@ -134,7 +134,7 @@ module NinthBit
       protected
 
       def piratey_args(args = {})
-        CsvPirate.parlay = args[:parlay] || self.piratey_options[:parlay]
+        CsvPirate.parlay ||= args[:parlay] || self.piratey_options[:parlay]
         return { :chart => args[:chart] || self.piratey_options[:chart],
           :aft => args[:aft] || self.piratey_options[:aft],
           :gibbet => args[:gibbet] || self.piratey_options[:gibbet],

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 4
   - 0
-  - 10
-  version: 4.0.10
+  - 11
+  version: 4.0.11
 platform: ruby
 authors: 
 - Peter Boling