datashift 0.14.0 → 0.15.0

data/VERSION

@@ -1 +1 @@
-0.14.0
+0.15.0

data/lib/datashift.rb

@@ -117,6 +117,7 @@ end
 DataShift::require_libraries
 
 require 'datashift/guards'
+require 'datashift/logging'
 require 'datashift/method_detail'
 require 'datashift/method_dictionary'
 require 'datashift/method_mapper'

data/lib/datashift/method_detail.rb

@@ -131,6 +131,7 @@ module DataShift
               break
             end
           rescue => e
+            logger.error "Failed to match belongs_to association #{value}"
             puts "ERROR: #{e.inspect}"
             if(x == Populator::insistent_method_list.last)
               raise "I'm sorry I have failed to assign [#{value}] to #{@assignment}" unless value.nil?

data/lib/datashift/populator.rb

@@ -75,8 +75,14 @@ module DataShift
     end
     
     def assign(method_detail, record, value )
-      
+     
       @current_value = value
+       
+      # Rails 4 - not an array any more
+      if( value.is_a? ActiveRecord::Relation )
+        logger.warn("Relation passed rather than value #{value.inspect}")
+        @current_value = value.to_a
+      end
 
       # logger.info("WARNING nil value supplied for Column [#{@name}]") if(@current_value.nil?)
 
@@ -89,24 +95,24 @@ module DataShift
 
       elsif( method_detail.operator_for(:has_many) )
         
-        #puts "DEBUG : VALUE TYPE [#{value.class.name.include?(operator.classify)}] [#{ModelMapper.class_from_string(value.class.name)}]" unless(value.is_a?(Array))
+        puts "DEBUG : VALUE TYPE [#{value.class.name.include?(operator.classify)}] [#{ModelMapper.class_from_string(value.class.name)}]" unless(value.is_a?(Array))
      
         # The include? check is best I can come up with right now .. to handle module/namespaces
         # TODO - can we determine the real class type of an association
         # e.g given a association taxons, which operator.classify gives us Taxon, but actually it's Spree::Taxon
         # so how do we get from 'taxons' to Spree::Taxons ? .. check if further info in reflect_on_all_associations
 
-        if(value.is_a?(Array) || value.class.name.include?(operator.classify))
-          record.send(operator) << value
+        if(@current_value.is_a?(Array) || @current_value.class.name.include?(operator.classify))
+          record.send(operator) << @current_value
         else
-          puts "ERROR #{value.class} - Not expected type for has_many #{operator} - cannot assign"
+          puts "ERROR #{@current_value.class} - Not expected type for has_many #{operator} - cannot assign"
         end
 
       elsif( method_detail.operator_for(:has_one) )
 
         #puts "DEBUG : HAS_MANY :  #{@name} : #{operator}(#{operator_class}) - Lookup #{@current_value} in DB"
-        if(value.is_a?(method_detail.operator_class))
-          record.send(operator + '=', value)
+        if(@current_value.is_a?(method_detail.operator_class))
+          record.send(operator + '=', @current_value)
         else
           logger.error("ERROR #{value.class} - Not expected type for has_one #{operator} - cannot assign")
           # TODO -  Not expected type - maybe try to look it up somehow ?"
@@ -127,6 +133,7 @@ module DataShift
         insistent_assignment(record, @current_value, operator)
       else
         puts "WARNING: No assignment possible on #{record.inspect} using [#{operator}]"
+        logger.error("WARNING: No assignment possible on #{record.inspect} using [#{operator}]")
       end
     end
     
@@ -171,7 +178,7 @@ module DataShift
               break
             end
           rescue => e
-            puts "ERROR: #{e.inspect}"
+            logger.error("Attempt to find  associated object failed for #{method_detail}")
             if(x == Populator::insistent_method_list.last)
               raise "Populator failed to assign [#{value}] via moperator #{operator}" unless value.nil?
             end

data/lib/loaders/excel_loader.rb

@@ -198,6 +198,9 @@ module DataShift
 
 
     def perform_load( file_name, options = {} )
+      
+      logger.info "Starting bulk load from Excel : #{file_name}"
+       
       perform_excel_load( file_name, options )
 
       puts "Excel loading stage complete - #{loaded_count} rows added."  

data/lib/loaders/paperclip/datashift_paperclip.rb

@@ -18,7 +18,7 @@ module DataShift
 
     attr_accessor :attachment
 
-    # Get all image files (based on file extensions) from supplied path.
+    # Get all files (based on file extensions) from supplied path.
     # Options :
     #     :glob : The glob to use to find files
     # =>  :recursive : Descend tree looking for files rather than just supplied path
@@ -86,7 +86,7 @@ module DataShift
       begin
         @attachment = klass.new(paperclip_attributes, :without_protection => true)
       rescue => e
-        puts e.inspect
+        logger.error( e.backtrace)
         logger.error("Failed to create PaperClip Attachment : #{e.inspect}")
         raise CreateAttachmentFailed.new("Failed to create PaperClip Attachment from : #{attachment_path}")
       ensure

data/lib/thor/generate.thor

@@ -17,7 +17,7 @@
 #    bundle exec thor help  datashift:generate:excel
 #
 require 'datashift'
-require 'excel_generator'
+require 'generators/excel_generator'
 
 # Note, not DataShift, case sensitive, create namespace for command line : datashift
 module Datashift

data/spec/excel_loader_spec.rb

@@ -52,9 +52,9 @@ describe 'Excel Loader' do
     loader.loaded_count.should == (Project.count - count)
   end
 
-  it "should process multiple associationss from single column" do
-
+  it "should process multiple associationss from single column", :fail => true do 
     
+  
     DataShift::MethodDictionary.find_operators( Category )
     
     DataShift::MethodDictionary.build_method_details( Category )
@@ -64,6 +64,7 @@ describe 'Excel Loader' do
 
     loader = ExcelLoader.new(Project)
     
+
     loader.perform_load( ifixture_file('ProjectsSingleCategories.xls') )
 
     loader.loaded_count.should be > 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datashift
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet