datashift 0.2.2 → 0.4.0

data/spec/datashift_spec.rb

@@ -23,5 +23,24 @@ describe 'DataShift' do
   it "should provide root_path" do
     DataShift.root_path.should_not be_empty
   end
+
+  it "should provide a log" do
+    class Blah
+      include DataShift::Logging
+      
+      def try_me
+        logger.info "hello datashift spec"
+      end
+    end
+    
+    
+    b = Blah.new()
+    
+    b.logger.info "try me"
+    
+    b.try_me
+    
+    
+  end
   
 end

data/spec/excel_exporter_spec.rb

@@ -38,7 +38,7 @@ if(Guards::jruby?)
     end
   
     it "should be able to create a new excel generator" do
-      generator = ExcelGenerator.new( 'dummy.xls' )
+      generator = ExcelExporter.new( 'dummy.xls' )
       
       generator.should_not be_nil
     end
@@ -47,7 +47,7 @@ if(Guards::jruby?)
 
       expect = result_file('project_template_spec.xls')
 
-      gen = ExcelGenerator.new( expect )
+      gen = ExcelExporter.new( expect )
     
       gen.generate(Project)
  
@@ -75,5 +75,5 @@ if(Guards::jruby?)
 
   end
 else
-  puts "WARNING: skipped excel_generator_spec : Requires JRUBY - JExcelFile requires JAVA"
+  puts "WARNING: skipped excel_exporter_spec : Requires JRUBY - JExcelFile requires JAVA"
 end # jruby

data/spec/fixtures/spree/SpreeProductsDefaults.yml

@@ -0,0 +1,15 @@
+## YAML Template.
+
+# Format is :
+#  --- !ruby/object:ActiveRecordModel
+#   :datashift_defaults
+#       key: value
+#
+
+Spree::Product: 
+  datashift_defaults: 
+   available_on: Time.now.to_s(:db)
+   cost_price: 1.0 
+   meta_description: 'super duper meta desc.'
+   meta_keywords: 'techno dubstep d&b'
+      

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../lib/datashift'
 
 include DataShift
 
-#.# Copyright:: (c) Autotelik Media Ltd 2011
+# Copyright:: (c) Autotelik Media Ltd 2011
 # Author ::   Tom Statter
 # Date ::     Aug 2011
 # License::   MIT
@@ -128,7 +128,7 @@ module SpecHelper
     @Taxon_klass.delete_all
     @zone_klass.delete_all
     
-    %w{OptionType OptionValue Property ProductProperty Variant Taxonomy}.each do |k|
+    %w{Image OptionType OptionValue Property ProductProperty Variant Taxonomy}.each do |k|
       instance_variable_set("@#{k}_klass", SpreeHelper::get_spree_class(k)) 
       instance_variable_get("@#{k}_klass").delete_all
     end

data/spec/spree_generator_spec.rb

@@ -75,4 +75,18 @@ describe 'SpreeLoader' do
     
   end
     
+   it "should be able to exclude single associations from template" do
+
+    expect = result_file('product_and_assoc_export_spec.xls')
+
+    excel = ExcelGenerator.new(expect)
+      
+    excel.generate_with_associations(@klass, :exclude => :has_many)
+
+    File.exists?(expect).should be_true
+
+    puts "You can check results manually in file #{expect}"
+    
+  end
+  
 end

data/spec/spree_images_loader_spec.rb

@@ -0,0 +1,73 @@
+# Copyright:: (c) Autotelik Media Ltd 2011
+# Author ::   Tom Statter
+# Date ::     Summer 2011
+#
+# License::   MIT - Free, OpenSource
+#
+# Details::   Specification for Spree aspect of datashift gem.
+#
+#             Provides Loaders and rake tasks specifically tailored for uploading or exporting
+#             Spree Products, associations and Images
+#
+require File.dirname(__FILE__) + '/spec_helper'
+
+require 'spree_helper'
+require 'product_loader'
+
+include DataShift
+  
+describe 'SpreeLoader' do
+
+      
+  before(:all) do
+    SpecHelper::before_all_spree
+  end
+
+  before(:each) do
+
+    begin
+    
+      include SpecHelper
+      extend SpecHelper
+      
+      before_each_spree
+    
+      @klass.count.should == 0
+      
+      MethodDictionary.clear
+      MethodDictionary.find_operators( @klass )
+    
+      @product_loader = DataShift::SpreeHelper::ProductLoader.new
+    rescue => e
+      puts e.inspect
+      puts e.backtrace
+    end
+  end
+
+
+  it "should load Products with associated image" do
+   
+    @product_loader.perform_load( SpecHelper::spree_fixture('SpreeProductsWithImages.csv'), :mandatory => ['sku', 'name', 'price'] )
+     
+    p = @klass.find_by_name("Demo Product for AR Loader")
+    
+    p.name.should == "Demo Product for AR Loader"
+    p.images.should have_exactly(1).items
+    
+    @klass.all.each {|p| p.images.should have_exactly(1).items }
+  end
+  
+  
+  it "should be able to assign Images to preloaded Products" do
+    
+    @product_loader.perform_load( SpecHelper::spree_fixture('SpreeProductsMultiColumn.csv'), :mandatory => ['sku', 'name', 'price'] )
+  
+    @Image_klass.all.size.should == 0
+    
+    @klass.all.each {|p| p.images.should have_exactly(0).items }
+    
+    loader = DataShift::SpreeHelper::ImageLoader.new
+    
+  end
+  
+end

data/spec/spree_loader_spec.rb

@@ -83,12 +83,16 @@ describe 'SpreeLoader' do
     test_basic_product('SpreeProductsSimple.xls')
   end
 
-  it "should load basic Products from .csv via Spree loader" do
+  it "should load basic Products from .csv via Spree loader", :csv => true do
     test_basic_product('SpreeProductsSimple.csv')
   end
 
+  it "should raise an error for missing file" do
+    lambda { test_basic_product('SpreeProductsSimple.txt') }.should raise_error BadFile
+  end
+
   it "should raise an error for unsupported file types" do
-    lambda { test_basic_product('SpreeProductsSimple.xml') }.should raise_error UnsupportedFileType
+    lambda { test_basic_product('SpreeProductsDefaults.yml') }.should raise_error UnsupportedFileType
   end
   
   def test_basic_product( source )
@@ -116,6 +120,53 @@ describe 'SpreeLoader' do
     @klass.last.count_on_hand.should == 23
   end
 
+  
+  it "should support default values for Spree Products loader", :fail => true do
+   
+    @expected_time =  Time.now.to_s(:db) 
+    
+    @product_loader.set_default_value('available_on', @expected_time)
+    @product_loader.set_default_value('cost_price', 1.0 )
+    @product_loader.set_default_value('meta_description', 'super duper meta desc.' )
+    @product_loader.set_default_value('meta_keywords', 'techno dubstep d&b' )
+      
+
+    @product_loader.set_prefix('sku', 'SPEC_')
+      
+    test_default_values
+
+  end
+
+  it "should support default values from config for Spree Products loader", :fail => true do
+   
+    @product_loader.configure_from(  SpecHelper::spree_fixture('SpreeProductsDefaults.yml') )
+    
+    @product_loader.set_prefix('sku', 'SPEC_')
+      
+    test_default_values
+
+  end
+  
+  def test_default_values
+    @product_loader.perform_load( SpecHelper::spree_fixture('SpreeProductsMandatoryOnly.xls'), :mandatory => ['sku', 'name', 'price'] )
+    
+    @klass.count.should == 3
+
+    @product_loader.failed_objects.size.should == 0
+    @product_loader.loaded_objects.size.should == 3
+    
+    p = @klass.first
+    
+    p.sku.should == "SPEC_SIMPLE_001"
+      
+    @klass.all { |p|
+      p.sku.should.include "SPEC_"
+      p.cost_price = 1.0
+      p.available_on.should == @expected_time
+      p.meta_description.should == 'super duper meta desc.'
+      p.meta_keywords.should == 'techno dubstep d&b'
+    }
+  end
 
   # Operation and results should be identical when loading multiple associations
   # if using either single column embedded syntax, or one column per entry.
@@ -304,15 +355,6 @@ describe 'SpreeLoader' do
 
  
   end
-
-  it "should load Products with associated image", :img => true do
-    pending("embedded images")
-    @product_loader.perform_load( SpecHelper::spree_fixture('SpreeProductsWithImages.csv'), :mandatory => ['sku', 'name', 'price'] )
-     
-    p = @klass.find_by_name("Demo Product for AR Loader")
-    
-    p.images.should have_exactly(1).items
-  end
   
   
   # REPEAT THE WHOLE TEST SUITE VIA CSV
@@ -334,14 +376,6 @@ describe 'SpreeLoader' do
     expected_multi_column_taxons
   end
 
-  it "should load Products with assoicated image" do
-    test_variants_creation('SpreeProductsMultiColumn.csv')
-    
-    expected_multi_column_properties
-    
-    expected_multi_column_taxons
-  end
-  
   
   it "should raise exception when mandatory columns missing from .xls", :ex => true do
     expect {@product_loader.perform_load($SpreeNegativeFixturePath + '/SpreeProdMissManyMandatory.xls', :mandatory => ['sku', 'name', 'price'] )}.to raise_error(DataShift::MissingMandatoryError)

data/tasks/spree/image_load.rake

@@ -14,7 +14,8 @@ namespace :datashift do
 
   namespace :spree do
 
-    desc "Populate the DB with images.\nDefault location db/image_seeds, or specify :input=<path> or dir under db/image_seeds with :folder"
+    #DEPRECATED FOTR THOR
+    #desc "Populate the DB with images.\nDefault location db/image_seeds, or specify :input=<path> or dir under db/image_seeds with :folder"
     # :dummy => dummy run without actual saving to DB
     task :images, [:input, :folder, :dummy, :sku, :skip_if_no_assoc, :skip_if_loaded, :model] => :environment do |t, args|
 
@@ -30,33 +31,37 @@ namespace :datashift do
         @image_cache =  File.join(@image_cache, args[:folder]) if(args[:folder])
       end
 
-      attachment_klazz = Product
+      
+      attachment_klazz = SpreeHelper::get_spree_class('Product' )
+      sku_klazz = SpreeHelper::get_spree_class('Variant' )
 
-      begin
-        attachment_klazz = Kernel.const_get(args[:model]) if(args[:model])
-      rescue NameError
-        attachment_klazz = Product
-      end
+      # TODO generalise for any paperclip project, for now just Spree
+      #begin
+      #  attachment_klazz = Kernel.const_get(args[:model]) if(args[:model])
+     # rescue NameError
+      #  raise "Could not find contant for model #{args[:model]}"
+      #end
 
       image_loader = ImageLoader.new
 
-      if(File.exists? @image_cache )
+      if(File.directory? @image_cache )
         puts "Loading images from #{@image_cache}"
 
         missing_records = []
-        Dir.glob("#{@image_cache}/*.{jpg,png,gif}") do |image_name|
+        Dir.glob("#{@image_cache}/**/*.{jpg,png,gif}") do |image_name|
 
-          puts "Processing #{image_name} : #{File.exists?(image_name)}"
           base_name = File.basename(image_name, '.*')
-
+           
+          puts "Processing #{base_name} : #{File.exists?(image_name)}"
+           
           record = nil
-          if(attachment_klazz == Product && args[:sku])
+          if(args[:sku])
             sku = base_name.slice!(/\w+/)
             sku.strip!
             base_name.strip!
 
             puts "Looking fo SKU #{sku}"
-            record = Variant.find_by_sku(sku)
+            record = sku_klazz.find_by_sku(sku)
             if record
               record = record.product   # SKU stored on Variant but we want it's master Product
             else

metadata

@@ -2,7 +2,7 @@
 name: datashift
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors: 
   - Thomas Statter
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-05 00:00:00 Z
+date: 2012-03-12 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
@@ -36,11 +36,14 @@ files:
   - lib/datashift.rb
   - lib/datashift/exceptions.rb
   - lib/datashift/file_definitions.rb
+  - lib/datashift/logging.rb
   - lib/datashift/mapping_file_definitions.rb
   - lib/datashift/method_detail.rb
+  - lib/datashift/method_details_manager.rb
   - lib/datashift/method_dictionary.rb
   - lib/datashift/method_mapper.rb
   - lib/datashift/model_mapper.rb
+  - lib/datashift/populator.rb
   - lib/exporters/csv_exporter.rb
   - lib/exporters/excel_exporter.rb
   - lib/exporters/exporter_base.rb
@@ -72,6 +75,9 @@ files:
   - lib/loaders/spree/image_loader.rb
   - lib/loaders/spree/product_loader.rb
   - lib/thor/generate_excel.thor
+  - lib/thor/import_excel.thor
+  - lib/thor/spree/bootstrap_cleanup.thor
+  - lib/thor/spree/products_images.thor
   - public/spree/products/large/DEMO_001_ror_bag.jpeg
   - public/spree/products/large/DEMO_002_Powerstation.jpg
   - public/spree/products/large/DEMO_003_ror_mug.jpeg
@@ -122,6 +128,8 @@ files:
   - spec/fixtures/simple_template_spec.xls
   - spec/fixtures/spree/SpreeProducts.csv
   - spec/fixtures/spree/SpreeProducts.xls
+  - spec/fixtures/spree/SpreeProductsDefaults.yml
+  - spec/fixtures/spree/SpreeProductsMandatoryOnly.xls
   - spec/fixtures/spree/SpreeProductsMultiColumn.csv
   - spec/fixtures/spree/SpreeProductsMultiColumn.xls
   - spec/fixtures/spree/SpreeProductsSimple.csv
@@ -137,6 +145,7 @@ files:
   - spec/spec_helper.rb
   - spec/spree_exporter_spec.rb
   - spec/spree_generator_spec.rb
+  - spec/spree_images_loader_spec.rb
   - spec/spree_loader_spec.rb
   - spec/spree_method_mapping_spec.rb
   - tasks/config/seed_fu_product_template.erb
@@ -146,7 +155,6 @@ files:
   - tasks/import/csv.rake
   - tasks/import/excel.rake
   - tasks/spree/image_load.rake
-  - tasks/spree/product_loader.rake
   - tasks/word_to_seedfu.rake
   - test/helper.rb
   - test/test_interact.rb

data/tasks/spree/product_loader.rake

@@ -1,44 +0,0 @@
-# Copyright:: (c) Autotelik Media Ltd 2011
-# Author ::   Tom Statter
-# Date ::     Feb 2011
-# License::   MIT. Free, Open Source.
-#
-# REQUIRES:   JRuby access to Java
-#
-# Usage::
-#
-# e.g.  => jruby -S rake datashift:spree:products input=vendor/extensions/autotelik/fixtures/SiteSpreadsheetInfo.xls
-#       => jruby -S rake datashift:spree:products input=C:\MyProducts.xls verbose=true
-#
-require 'datashift'
-
-namespace :datashift do
-
-  namespace :spree do
-
-    desc "Populate Spree Product/Variant data from .xls (Excel) or CSV file"
-    task :products, [:input, :verbose, :sku_prefix] => :environment do |t, args|
-
-      input = ENV['input']
-
-      raise "USAGE: jruby -S rake  datashift:spree:products input=excel_file.xls" unless input
-      raise "ERROR: Could not find file #{args[:input]}" unless File.exists?(input)
-
-      require 'product_loader'
-
-      # COLUMNS WITH DEFAULTS - TODO create YAML configuration file to drive defaults etc
-
-      loader = DataShift::ProductLoader.new
-
-      loader.set_default_value('available_on', Time.now.to_s(:db) )
-      loader.set_default_value('cost_price', 0.0 )
-
-      loader.set_prefix('sku', args[:sku_prefix] ) if(args[:sku_prefix])
-      
-      puts "Loading from file: #{input}"
-
-      loader.perform_load(input, :mandatory => ['sku', 'name', 'price'] )
-    end
-  end 
-
-end