datashift 0.4.0 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

data/datashift.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datashift"
-  s.version = "0.4.0"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Statter"]
-  s.date = "2012-03-12"
+  s.date = "2012-03-31"
   s.description = "A suite of tools to move data between ActiveRecord models,databases,applications like Excel/Open Office, files and projects including Spree"
   s.email = "rubygems@autotelik.co.uk"
   s.extra_rdoc_files = [

data/lib/datashift/method_detail.rb

@@ -11,6 +11,7 @@
 #             and assign values to AR object, without knowing anything about that receiving object.
 #
 require 'to_b'
+require 'logging'
 
 module DataShift
 

data/lib/loaders/spree/image_loader.rb

@@ -18,7 +18,7 @@ module DataShift
     def create_image(klass, image_path, viewable_record = nil, options = {})
        
       unless File.exists?(image_path) && File.readable?(image_path)
-        logger.error("Cannot process Image : Invalid Path #{image_path}")
+        logger.error("Cannot process Image from #{Dir.pwd}: Invalid Path #{image_path}")
         raise "Cannot process Image : Invalid Path #{image_path}"
       end
       

data/lib/loaders/spree/product_loader.rb

@@ -35,6 +35,8 @@ module DataShift
         @@variant_klass ||= SpreeHelper::get_spree_class('Variant')
         
         raise "Failed to create Product for loading" unless @load_object
+        
+        logger.debug "PRODUCT #{@load_object.inspect} MASTER: #{@load_object.master.inspect}"
       end
 
       # Based on filename call appropriate loading function
@@ -98,21 +100,31 @@ module DataShift
   
           # Spree has some stock management stuff going on, so dont usually assign to column vut use
           # on_hand and on_hand=
-          if(@load_object.variants.size > 0 && current_value.to_s.include?(LoaderBase::multi_assoc_delim))
+          if(@load_object.variants.size > 0)
+            
+            if(current_value.to_s.include?(LoaderBase::multi_assoc_delim))
 
-            #puts "DEBUG: COUNT_ON_HAND PER VARIANT",current_value.is_a?(String),
+              #puts "DEBUG: COUNT_ON_HAND PER VARIANT",current_value.is_a?(String),
           
-            # Check if we processed Option Types and assign count per option
-            values = current_value.to_s.split(LoaderBase::multi_assoc_delim)
+              # Check if we processed Option Types and assign count per option
+              values = current_value.to_s.split(LoaderBase::multi_assoc_delim)
 
-            if(@load_object.variants.size == values.size)
-              @load_object.variants.each_with_index {|v, i| v.on_hand = values[i]; v.save; }
+              if(@load_object.variants.size == values.size)
+                @load_object.variants.each_with_index {|v, i| v.on_hand = values[i].to_i; v.save; }
+              else
+                puts "WARNING: Count on hand entries did not match number of Variants - None Set"
+              end
+            end
+            
+            # can only set count on hand on Product if no Variants exist, else model throws
+            
+          elsif(@load_object.variants.size == 0) 
+            if(current_value.to_s.include?(LoaderBase::multi_assoc_delim))
+              puts "WARNING: Multiple count_on_hand values specified but no Variants/OptionTypes created" 
+              load_object.on_hand = current_value.to_s.split(LoaderBase::multi_assoc_delim).first.to_i
             else
-              puts "WARNING: Count on hand entries did not match number of Variants - None Set"
+              load_object.on_hand = current_value.to_i
             end
-          else
-            puts "WARNING: Multiple count_on_hand values specified but no Variants/OptionTypes created" if(@load_object.variants.empty?)
-            load_object.on_hand = current_value.to_i
           end
 
         else
@@ -153,6 +165,7 @@ module DataShift
               puts "WARNING: OptionType #{oname} NOT found - Not set Product"
               next
             end
+            puts "Created missing OptionType #{option_type.inspect}"
           end
 
           @load_object.option_types << option_type unless @load_object.option_types.include?(option_type)
@@ -167,7 +180,7 @@ module DataShift
           # populated .. currently need to call reload to ensure this (seems reqd for Spree 1/Rails 3, wasn't required b4
           ovalues.each_with_index do |ovname, i|
             ovname.strip!
-            ov = @@option_value_klass.find_or_create_by_name(ovname)
+            ov = @@option_value_klass.find_or_create_by_name_and_option_type_id(ovname, option_type.id)
             if ov
               variant = @@variant_klass.create( :product => @load_object, :sku => "#{@load_object.sku}_#{i}", :price => @load_object.price, :available_on => @load_object.available_on)
               #puts "DEBUG: Created New Variant: #{variant.inspect}"

data/lib/thor/spree/bootstrap_cleanup.thor

@@ -22,10 +22,19 @@ module Datashift
 
       require File.expand_path('config/environment.rb')
     
-      %w{Image OptionType OptionValue Product Property ProductProperty Variant Taxonomy Taxon Zone}.each do |k|
+      %w{Image OptionType OptionValue Product Property ProductGroup ProductProperty ProductOptionType Variant Taxonomy Taxon Zone}.each do |k|
         instance_variable_set("@#{k}_klass", DataShift::SpreeHelper::get_spree_class(k)) 
+        puts "Clearing model #{DataShift::SpreeHelper::get_spree_class(k)}"
         instance_variable_get("@#{k}_klass").delete_all
       end
+      
+      if(File.exists?('public/spree/products') )
+        puts "Removing old Product assets from 'public/spree/products'"
+        FileUtils::rm_rf('public/public/spree/products') 
+      end
+      
+      FileUtils::rm_rf('MissingRecords') if(File.exists?('MissingRecords') )
+      
     end
   
   end

data/lib/thor/spree/products_images.thor

@@ -45,6 +45,7 @@ module Datashift
       else
         loader.set_default_value('available_on', Time.now.to_s(:db) )
         loader.set_default_value('cost_price', 0.0 )
+        loader.set_default_value('price', 0.0 )
       end
       
       loader.set_prefix('sku', options[:sku_prefix] ) if(options[:sku_prefix])
@@ -82,7 +83,11 @@ module Datashift
       require 'image_loader'
 
       @image_cache = options[:input]
-        
+       
+      puts "Using Product Name for lookup" unless(options[:sku])
+      puts "Using SKU for lookup" if(options[:sku])
+         
+     
       attachment_klazz  = DataShift::SpreeHelper::get_spree_class('Product' )
       sku_klazz         = DataShift::SpreeHelper::get_spree_class('Variant' )
 
@@ -140,10 +145,11 @@ module Datashift
           else
             missing_records << image_name
           end
+          
+          next if(options[:dummy]) # Don't actually create/upload to DB if we are doing dummy run
 
-          # Now do actual upload to DB unless we are doing a dummy run,
-          # or the Image must have an associated record
-          unless(options[:dummy] == 'true' || (options[:process_when_no_assoc] && record.nil?))
+          # Check if Image must have an associated record
+          if(record || (record.nil? && options[:process_when_no_assoc]))
             image_loader.reset()
             puts "Process Image"
             image_loader.process( image_name, record )

data/spec/spree_loader_spec.rb

@@ -114,14 +114,13 @@ describe 'SpreeLoader' do
     p.description.should == "blah blah"
     p.cost_price.should == 320.00
     p.option_types.should have_exactly(1).items
+    p.option_types.should have_exactly(1).items
     p.count_on_hand.should == 12
-    
-    @klass.last.option_types.should have_exactly(2).items
     @klass.last.count_on_hand.should == 23
   end
 
   
-  it "should support default values for Spree Products loader", :fail => true do
+  it "should support default values for Spree Products loader" do
    
     @expected_time =  Time.now.to_s(:db) 
     
@@ -137,7 +136,7 @@ describe 'SpreeLoader' do
 
   end
 
-  it "should support default values from config for Spree Products loader", :fail => true do
+  it "should support default values from config for Spree Products loader" do
    
     @product_loader.configure_from(  SpecHelper::spree_fixture('SpreeProductsDefaults.yml') )
     
@@ -171,12 +170,12 @@ describe 'SpreeLoader' do
   # Operation and results should be identical when loading multiple associations
   # if using either single column embedded syntax, or one column per entry.
 
-  it "should load Products and create Variants from single column", :fail => true do
+  it "should load Products and create Variants from single column" do
     test_variants_creation('SpreeProducts.xls')
   end
 
   
-  it "should load Products and create Variants from multiple column" do
+  it "should load Products and create Variants from multiple column", :fail => true do
     test_variants_creation('SpreeProductsMultiColumn.xls')
   end
   
@@ -207,20 +206,45 @@ describe 'SpreeLoader' do
 
     @klass.all.select {|m| m.is_master.should == true  }
 
-    p.variants.should have_exactly(3).items  # count => 12|6|7
-  
+
+    # mime_type:jpeg mime_type:PDF mime_type:PNG
+        
+    p.variants.should have_exactly(3).items 
+     
+    p.option_types.should have_exactly(1).items # mime_type
+    
+    p.option_types[0].name.should == "mime_type"
+    p.option_types[0].presentation.should == "Mime type"
+        
     @Variant_klass.all[1].sku.should == "DEMO_001_0"
     @Variant_klass.all[1].price.should == 399.99
 
-    v = p.variants[0] 
+    # V1
+    v1 = p.variants[0] 
 
-    v.sku.should == "DEMO_001_0"
-    v.price.should == 399.99
-    v.count_on_hand.should == 12
+    v1.sku.should == "DEMO_001_0"
+    v1.price.should == 399.99    
+    v1.count_on_hand.should == 12
 
-    p.variants[1].count_on_hand.should == 6
-    p.variants[2].count_on_hand.should == 7
+    
+    v1.option_values.should have_exactly(1).items # mime_type: jpeg
+    v1.option_values[0].name.should == "jpeg"
 
+    
+    v2 = p.variants[1]
+    v2.count_on_hand.should == 6
+    v2.option_values.should have_exactly(1).items # mime_type: jpeg
+    v2.option_values[0].name.should == "PDF"
+    
+    v2.option_values[0].option_type.should_not be_nil
+    v2.option_values[0].option_type.position.should == 0
+    
+    
+    v3 = p.variants[2]
+    v3.count_on_hand.should == 7
+    v3.option_values.should have_exactly(1).items # mime_type: jpeg
+    v3.option_values[0].name.should == "PNG"
+    
     @Variant_klass.last.price.should == 50.34
     @Variant_klass.last.count_on_hand.should == 18
 

metadata

@@ -2,7 +2,7 @@
 name: datashift
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors: 
   - Thomas Statter
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2012-03-31 00:00:00 Z
 dependencies: []
 
 description: A suite of tools to move data between ActiveRecord models,databases,applications like Excel/Open Office, files and projects including Spree