datashift 0.5.0 → 0.6.0

data/spec/fixtures/spree/SpreeProductsWithImages.csv

@@ -1,4 +1,4 @@
 SKU,Name,Description,Available On,     Price,CostPrice,product_properties,Taxons,Variants,count_on_hand,Images
-DEMO_001,Demo Product for AR Loader,blah blah,14/02/2011,399.99,320,test_pp_001,Paintings|WaterColour,"mime_type:jpeg,PDF,PNG",12|6|7,spec/fixtures/images/DEMO_001_ror_bag.jpeg
-DEMO_002,Demo Excel Load via Jruby,less blah,14/05/2011,100,30,test_pp_003,Paintings|Landscape|Oils,"mime_type:jpeg, PDF,PNG",5|4|2,spec/fixtures/images/DEMO_002_Powerstation.jpg
-DEMO_003,Demo third row in future,more blah blah,01/07/2012,50.34,23.34,test_pp_002|test_pp_003:Example free value|yet_another_property,Drawings,"mime_type:jpeg,PDF,PNG|print_type:black_white,colour",12|4|7|12|18,spec/fixtures/images/DEMO_003_ror_mug.jpeg
+DEMO_001,Demo Product for AR Loader,blah blah,14/02/2011,399.99,320,test_pp_001,Paintings|WaterColour,"mime_type:jpeg,PDF,PNG",12|6|7,fixtures/images/DEMO_001_ror_bag.jpeg
+DEMO_002,Demo Excel Load via Jruby,less blah,14/05/2011,100,30,test_pp_003,Paintings|Landscape|Oils,"mime_type:jpeg, PDF,PNG",5|4|2,fixtures/images/DEMO_002_Powerstation.jpg
+DEMO_003,Demo third row in future,more blah blah,01/07/2012,50.34,23.34,test_pp_002|test_pp_003:Example free value|yet_another_property,Drawings,"mime_type:jpeg,PDF,PNG|print_type:black_white,colour",12|4|7|12|18,fixtures/images/DEMO_003_ror_mug.jpeg

data/spec/fixtures/test_model_defs.rb

@@ -13,6 +13,7 @@ class Project < ActiveRecord::Base
 
   has_and_belongs_to_many :categories
 
+  attr_accessible  :value_as_string, :value_as_boolean, :value_as_double
 end
 
 class Owner < ActiveRecord::Base

data/spec/spec_helper.rb

@@ -115,7 +115,7 @@ module SpecHelper
     File.join($SpreeFixturePath, source)
   end
   
-  def self.before_all_spree 
+  def before_all_spree 
 
     # we are not a Spree project, nor is it practical to externally generate
     # a complete Spree application for testing so we implement a mini migrate/boot of our own
@@ -125,22 +125,24 @@ module SpecHelper
     puts "Testing Spree standalone - version #{SpreeHelper::version}"
         
     SpreeHelper.migrate_up      # create an sqlite Spree database on the fly
+    
+    @spree_klass_list  =  %w{Image OptionType OptionValue Property ProductProperty Variant Taxon Taxonomy Zone}
+    
+    @klass = SpreeHelper::get_product_class
+    @Product_klass = @klass  
+  
+    @spree_klass_list.each do |k|
+      instance_variable_set("@#{k}_klass", SpreeHelper::get_spree_class(k)) 
+    end
+    
   end
   
   def before_each_spree
       
-    @klass = SpreeHelper::get_product_class
-    @Product_klass = @klass
-    @Taxon_klass  = SpreeHelper::get_spree_class('Taxon')   
-    @zone_klass   = SpreeHelper::get_spree_class('Zone')
-        
     # Reset main tables - TODO should really purge properly, or roll back a transaction      
-    @klass.delete_all
-    @Taxon_klass.delete_all
-    @zone_klass.delete_all
+    @Product_klass.delete_all
     
-    %w{Image OptionType OptionValue Property ProductProperty Variant Taxonomy}.each do |k|
-      instance_variable_set("@#{k}_klass", SpreeHelper::get_spree_class(k)) 
+   @spree_klass_list.each do |k|
       instance_variable_get("@#{k}_klass").delete_all
     end
   end

data/spec/spree_exporter_spec.rb

@@ -16,17 +16,19 @@ require 'excel_exporter'
 
 include DataShift
   
-describe 'SpreeLoader' do
+describe 'SpreeExporter' do
 
+  include SpecHelper
+  extend SpecHelper
+    
   before(:all) do
-    SpecHelper::before_all_spree
+    before_all_spree
     results_clear()
   end
 
   before do
     
-    include SpecHelper
-    extend SpecHelper
+
       
     before_each_spree   # inits tests, cleans DB setups model types
     

data/spec/spree_generator_spec.rb

@@ -16,25 +16,29 @@ require 'excel_generator'
 
 include DataShift
   
-describe 'SpreeLoader' do
+describe 'SpreeGenerator' do
 
+  include SpecHelper
+  extend SpecHelper
+    
   before(:all) do
-    SpecHelper::before_all_spree
+    before_all_spree
   end
 
   before do
-    
-    #include SpecHelper
-    extend SpecHelper
-      
+       
     before_each_spree   # inits tests, cleans DB setups model types
     
     # Create some test data
     root = @Taxonomy_klass.create( :name => 'Paintings' )
     
-    @Taxon_klass.create( :name => 'Landscape', :taxonomy => root )
-    @Taxon_klass.create( :name => 'Sea', :taxonomy => root )
-      
+    if(SpreeHelper::version.to_f > 1 )
+      root.taxons.create( :name => 'Landscape' )
+      root.taxons.create( :name => 'Sea' )
+    else
+      @Taxon_klass.create( :name => 'Landscape', :taxonomy => root )
+      @Taxon_klass.create( :name => 'Sea', :taxonomy => root )
+    end
   end
 
   it "should export any Spree model to .xls spreedsheet" do
@@ -75,7 +79,7 @@ describe 'SpreeLoader' do
     
   end
     
-   it "should be able to exclude single associations from template" do
+  it "should be able to exclude single associations from template" do
 
     expect = result_file('product_and_assoc_export_spec.xls')
 

data/spec/spree_images_loader_spec.rb

@@ -16,23 +16,23 @@ require 'product_loader'
 
 include DataShift
   
-describe 'SpreeLoader' do
+describe 'SpreeImageLoading' do
 
+  include SpecHelper
+  extend SpecHelper
       
   before(:all) do
-    SpecHelper::before_all_spree
+    before_all_spree
   end
 
   before(:each) do
 
     begin
     
-      include SpecHelper
-      extend SpecHelper
-      
       before_each_spree
-    
-      @klass.count.should == 0
+
+      @Image_klass.count.should == 0
+      @Product_klass.count.should == 0
       
       MethodDictionary.clear
       MethodDictionary.find_operators( @klass )
@@ -48,42 +48,77 @@ describe 'SpreeLoader' do
   it "should load Products with associated image from CSV" do
     
     # In >= 1.1.0 Image moved to master Variant from Product
-    if(SpreeHelper::version.to_f < 1.1)
    
-      @product_loader.perform_load( SpecHelper::spree_fixture('SpreeProductsWithImages.csv'), :mandatory => ['sku', 'name', 'price'] )
+    options = {:mandatory => ['sku', 'name', 'price']}
+    
+    options[:force_inclusion] = ['sku', 'images'] if(SpreeHelper::version.to_f > 1 )
+    
+    @product_loader.perform_load( SpecHelper::spree_fixture('SpreeProductsWithImages.csv'), options )
      
-      p = @klass.find_by_name("Demo Product for AR Loader")
+    @Image_klass.all.each_with_index {|i, x| puts "RESULT IMAGE #{x}", i.inspect }
+        
+    p = @Product_klass.find_by_name("Demo Product for AR Loader")
     
-      p.name.should == "Demo Product for AR Loader"
-      p.images.should have_exactly(1).items
+    p.name.should == "Demo Product for AR Loader"
     
-      @klass.all.each {|p| p.images.should have_exactly(1).items }
-    end
+    p.images.should have_exactly(1).items
+    p.master.images.should have_exactly(1).items
+    
+    @Product_klass.all.each {|p| p.images.should have_exactly(1).items }
+    
+    @Image_klass.count.should == 3
   end
   
   
-  it "should load Products with associated image", :fail => true do
+  it "should load Products with associated image" do
    
-    if(SpreeHelper::version.to_f < 1.1)
-      @product_loader.perform_load( SpecHelper::spree_fixture('SpreeProductsWithImages.xls'), :mandatory => ['sku', 'name', 'price'] )
+    options = {:mandatory => ['sku', 'name', 'price']}
+    
+    options[:force_inclusion] = ['sku', 'images'] if(SpreeHelper::version.to_f > 1 )
+    
+    @product_loader.perform_load( SpecHelper::spree_fixture('SpreeProductsWithImages.xls'), options )
      
-      p = @klass.find_by_name("Demo Product for AR Loader")
+    @Image_klass.all.each_with_index {|i, x| puts "RESULT IMAGE #{x}", i.inspect }
+        
+    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
+    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
+    @Product_klass.all.each {|p| p.images.should have_exactly(1).items }
+     
+    @Image_klass.count.should == 3
+
   end
   
-  it "should be able to assign Images to preloaded Products" do
+  it "should be able to assign Images to preloaded Products", :fail => true  do
+    
+    MethodDictionary.find_operators( @Image_klass )
+    
+    @Product_klass.count.should == 0
+    
+    @product_loader.perform_load( SpecHelper::spree_fixture('SpreeProducts.xls'))
     
     @Image_klass.all.size.should == 0
 
+    options = { :force_inclusion => ['sku', 'attachment'] } if(SpreeHelper::version.to_f > 1 )
+    
     loader = DataShift::SpreeHelper::ImageLoader.new
     
-    loader.perform_load( SpecHelper::spree_fixture('SpreeProductImages.xls') )
+    loader.perform_load( SpecHelper::spree_fixture('SpreeImages.xls'), options )
     
+    @Image_klass.all.each_with_index {|i, x| puts "RESULT IMAGE #{x}", i.inspect }
+     
+    @Image_klass.count.should == 3
+        
+    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
+    
+    @Product_klass.all.each {|p| p.images.should have_exactly(1).items }
+   
   end
   
 end

data/spec/spree_loader_spec.rb

@@ -19,17 +19,19 @@ include DataShift
 describe 'SpreeLoader' do
 
       
+  include SpecHelper
+  extend SpecHelper
+      
+      
   before(:all) do
-    SpecHelper::before_all_spree
+    before_all_spree
   end
 
   before(:each) do
 
     begin
     
-      include SpecHelper
-      extend SpecHelper
-      
+     
       before_each_spree
     
       @Product_klass.count.should == 0
@@ -58,24 +60,24 @@ describe 'SpreeLoader' do
 
   it "should process a simple .xls spreadsheet" do
 
-    @zone_klass.delete_all
+    @Zone_klass.delete_all
 
-    loader = ExcelLoader.new(@zone_klass)
+    loader = ExcelLoader.new(@Zone_klass)
     
     loader.perform_load( SpecHelper::spree_fixture('SpreeZoneExample.xls') )
 
-    loader.loaded_count.should == @zone_klass.count
+    loader.loaded_count.should == @Zone_klass.count
   end
 
   it "should process a simple csv file" do
 
-    @zone_klass.delete_all
+    @Zone_klass.delete_all
 
-    loader = CsvLoader.new(@zone_klass)
+    loader = CsvLoader.new(@Zone_klass)
 
     loader.perform_load( SpecHelper::spree_fixture('SpreeZoneExample.csv') )
 
-    loader.loaded_count.should == @zone_klass.count
+    loader.loaded_count.should == @Zone_klass.count
   end
   
 

data/spec/spree_method_mapping_spec.rb

@@ -16,17 +16,17 @@ require 'product_loader'
 
 include DataShift
   
-describe 'SpreeLoader' do
+describe 'SpreeMethodMapping' do
 
+  include SpecHelper
+  extend SpecHelper
+    
   before(:all) do
-    SpecHelper::before_all_spree
+    before_all_spree
   end
 
   before(:each) do
-    
-    include SpecHelper
-    extend SpecHelper
-      
+   
     before_each_spree
       
     MethodDictionary.clear
@@ -196,7 +196,9 @@ describe 'SpreeLoader' do
 
     klazz_object = @Product_klass.new
 
-    @ProductProperty_klass.new(:property => @prop1)
+    pp = @ProductProperty_klass.new
+    
+    pp.property = @prop1
 
     # NEW ASSOCIATION ASSIGNMENT
     klazz_object.send( method_detail.operator ) << @ProductProperty_klass.new
@@ -207,10 +209,15 @@ describe 'SpreeLoader' do
     klazz_object.product_properties.size.should == 3
 
     # Use generic assignment on method detail - expect has_many to use << not =
-    method_detail.assign( klazz_object, @ProductProperty_klass.new(:property => @prop1) )
+    pp2 = @ProductProperty_klass.new
+    pp2.property = @prop1
+    method_detail.assign( klazz_object,  pp2)
     klazz_object.product_properties.size.should == 4
 
-    method_detail.assign( klazz_object, [@ProductProperty_klass.new(:property => @prop2), @ProductProperty_klass.new(:property => @prop3)])
+    pp3, pp4 = @ProductProperty_klass.new, @ProductProperty_klass.new
+    pp3.property = @prop2
+    pp4.property = @prop3
+    method_detail.assign( klazz_object, [pp3, pp4])
     klazz_object.product_properties.size.should == 6
 
   end

data/tasks/spree/image_load.rake

@@ -35,15 +35,9 @@ namespace :datashift do
       attachment_klazz = SpreeHelper::get_spree_class('Product' )
       sku_klazz = SpreeHelper::get_spree_class('Variant' )
 
-      # 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.directory? @image_cache )
         puts "Loading images from #{@image_cache}"
 

metadata

@@ -2,7 +2,7 @@
 name: datashift
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
   - Thomas Statter
@@ -10,9 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-08 00:00:00 Z
-dependencies: []
-
+date: 2012-05-18 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: spreadsheet
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id001
 description: A suite of tools to move data between ActiveRecord models,databases,applications like Excel/Open Office, files and projects including Spree
 email: rubygems@autotelik.co.uk
 executables: []
@@ -30,7 +40,6 @@ files:
   - README.rdoc
   - Rakefile
   - VERSION
-  - datashift-0.5.0.gem
   - datashift.gemspec
   - lib/applications/jruby/jexcel_file.rb
   - lib/applications/jruby/word.rb
@@ -128,7 +137,7 @@ files:
   - spec/fixtures/negative/SpreeProdMissManyMandatory.xls
   - spec/fixtures/simple_export_spec.xls
   - spec/fixtures/simple_template_spec.xls
-  - spec/fixtures/spree/SpreeProductImages.xls
+  - spec/fixtures/spree/SpreeImages.xls
   - spec/fixtures/spree/SpreeProducts.csv
   - spec/fixtures/spree/SpreeProducts.xls
   - spec/fixtures/spree/SpreeProductsDefaults.yml