datashift_spree 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/loaders/spree/product_loader.rb

@@ -14,12 +14,17 @@ module DataShift
 
     class ProductLoader < SpreeBaseLoader
 
-      # depending on version get_product_class should return us right class, namespaced or not
-
+      # Options
+      #  
+      #  :reload           : Force load of the method dictionary for object_class even if already loaded
+      #  :verbose          : Verboise logging and to STDOUT
+      #
       def initialize(product = nil, options = {})
 
         opts = {:instance_methods => true}.merge( options )
 
+        # depending on version get_product_class should return us right class, namespaced or not
+
         super( DataShift::SpreeHelper::get_product_class(), true, product, opts)
 
         raise "Failed to create Product for loading" unless @load_object
@@ -120,10 +125,10 @@ module DataShift
       # Special case for OptionTypes as it's two stage process
       # First add the possible option_types to Product, then we are able
       # to define Variants on those options values.
-      #  To defiene a Variant :
-      #  1) define at least one OptionType on Product, for example Size
-      #  2) Provide a value for at least one of these OptionType
-      #  3) A composite Variant can be created by supplyiung a vlaue for more than one OptionType
+      # So to defiene a Variant :
+      #   1) define at least one OptionType on Product, for example Size
+      #   2) Provide a value for at least one of these OptionType
+      #   3) A composite Variant can be created by supplying a value for more than one OptionType
       #       fro example Colour : Red and Size Medium
       # Supported Syntax :
       #  '|' seperates Variants
@@ -134,15 +139,18 @@ module DataShift
       #     mime_type:jpeg;print_type:black_white|mime_type:jpeg|mime_type:png, PDF;print_type:colour
       #
       def add_options
-
+      
         # TODO smart column ordering to ensure always valid by time we get to associations
         save_if_new
 
         # example : mime_type:jpeg;print_type:black_white|mime_type:jpeg|mime_type:png, PDF;print_type:colour
 
-        variants = get_each_assoc#current_value.split( Delimiters::multi_assoc_delim )
+        variants = get_each_assoc
 
-        # 1) mime_type:jpeg;print_type:black_white  2) mime_type:jpeg  3) mime_type:png, PDF;print_type:colour
+        # example line becomes :  
+        #   1) mime_type:jpeg;print_type:black_white  
+        #   2) mime_type:jpeg  
+        #   3) mime_type:png, PDF;print_type:colour
 
         variants.each do |per_variant|
 
@@ -166,7 +174,7 @@ module DataShift
               end
               puts "Created missing OptionType #{option_type.inspect}"
             end
-
+                      
             # OptionTypes must be specified first on Product to enable Variants to be created
             # TODO - is include? very inefficient ??
             @load_object.option_types << option_type unless @load_object.option_types.include?(option_type)
@@ -185,30 +193,39 @@ module DataShift
           # Now create set of Variants, some of which maybe composites
           # Find the longest set of OVs to use as base for combining with the rest
           sorted_map = optiontype_vlist_map.sort_by { |k,v| v.size }.reverse
-
-          # ovalues = 'pdf','jpeg','png'
-          option_type, ovalues = sorted_map.shift
+       
+          # [ [mime, ['pdf', 'jpeg', 'gif']], [print_type, ['black_white']] ]
+          
+          lead_option_type, lead_ovalues = sorted_map.shift
+          
           # TODO .. benchmarking to find most efficient way to create these but ensure Product.variants list
           # populated .. currently need to call reload to ensure this (seems reqd for Spree 1/Rails 3, wasn't required b4
-          ovalues.each do |ovname|
+          lead_ovalues.each do |ovname|
 
             ov_list = []
 
-            unless ov = @@option_value_klass.find_by_name_and_option_type_id(ovname.strip, option_type.id)
-              ov = @@option_value_klass.create!(:name => ovname.strip, :presentation => ovname.strip.humanize)
-              ov.update_attribute(:option_type_id, option_type.id)
-            end
+            ovname.strip!
+            
+            ov = @@option_value_klass.find_or_create_by_name_and_option_type_id(ovname, lead_option_type.id, :presentation => ovname.humanize)
 
             ov_list << ov if ov
-
-            sorted_map.each do |ot, ovlist| ovlist.each do |for_composite|
-                ov = @@option_value_klass.find_or_create_by_name_and_option_type_id(for_composite.strip, ot.id)
+ 
+            # Process rest of array of types => values
+            sorted_map.each do |ot, ovlist| 
+                ovlist.each do |for_composite|
+                
+                for_composite.strip!
+                
+                ov = @@option_value_klass.find_or_create_by_name_and_option_type_id(for_composite, ot.id, :presentation => for_composite.humanize)
 
                 ov_list << ov if(ov)
               end
             end
 
             unless(ov_list.empty?)
+              
+              puts "Creating Variant from OptionValue(s) #{ov_list.collect(&:name).inspect}" if(verbose)
+              
               i = @load_object.variants.size + 1
 
               # This one line seems to works for 1.1.0 - 3.2 but not 1.0.0 - 3.1 ??
@@ -218,13 +235,12 @@ module DataShift
                 variant = @@variant_klass.create( :product => @load_object, :sku => "#{@load_object.sku}_#{i}", :price => @load_object.price, :available_on => @load_object.available_on)
               end
 
-              variant.option_values << ov_list if(variant)
+              variant.option_values << ov_list if(variant)    
             end
           end
 
-          #puts "DEBUG Load Object now has Variants : #{@load_object.variants.inspect}"
           @load_object.reload unless @load_object.new_record?
-          #puts "DEBUG Load Object now has Variants : #{@load_object.variants.inspect}"
+          #puts "DEBUG Load Object now has Variants : #{@load_object.variants.inspect}" if(verbose)
         end
 
       end # each Variant

data/lib/thor/spree/products_images.thor

@@ -41,7 +41,7 @@ module Datashift
 
       require 'product_loader'
 
-      loader = DataShift::SpreeHelper::ProductLoader.new
+      loader = DataShift::SpreeHelper::ProductLoader.new( nil, {:verbose => options[:verbose]})
 
       # YAML configuration file to drive defaults etc
 

data/spec/spree_variants_loader_spec.rb

@@ -133,31 +133,31 @@ describe 'Spree Variants Loader' do
   # Composite Variant Syntax is option_type_A_name:value;option_type_B_name:value
   # which creates a SINGLE Variant with 2 option types
 
-  it "should create Variants with MULTIPLE option types from single column", :new => true  do
+  it "should create Variants with MULTIPLE option types from single column in CSV", :new => true  do
     @product_loader.perform_load( ifixture_file('SpreeMultiVariant.csv'), :mandatory => ['sku', 'name', 'price'] )
 
+    expected_single_column_multi_variants
+  end
+
+  it "should create Variants with MULTIPLE option types from single column in XLS", :new => true  do
+    @product_loader.perform_load( ifixture_file('SpreeMultiVariant.xls'), :mandatory => ['sku', 'name', 'price'] )
+
+    expected_single_column_multi_variants
+  end
+  
+  def expected_single_column_multi_variants
+    
     # Product 1)
     # 1 + 2) mime_type:jpeg,PDF;print_type:colour	 equivalent to (mime_type:jpeg;print_type:colour|mime_type:PDF;print_type:colour)
     # 3) mime_type:PNG
     #
-    # Product 2
-    # 4) mime_type:jpeg;print_type:black_white
-    # 5) mime_type:PNG;print_type:black_white
-    #
-    # Product 3
-    # 6 +7) mime_type:jpeg;print_type:colour,sepia;size:large
-    # 8) mime_type:jpeg;print_type:colour
-    # 9) mime_type:PNG
-    # 9 + 10) mime_type:PDF|print_type:black_white
-
     prod_count = 3
     var_count = 10
 
-    # plus 3 MASTER VARIANTS
     @Product_klass.count.should == prod_count
-    @Variant_klass.count.should == prod_count + var_count
+    @Variant_klass.count.should == prod_count + var_count     # plus 3 MASTER VARIANTS
 
-    p = @Product_klass.first
+    p = @Product_klass.all[0]
 
     p.variants_including_master.should have_exactly(4).items
     p.variants.should have_exactly(3).items
@@ -167,7 +167,33 @@ describe 'Spree Variants Loader' do
     v1 = p.variants[0]
     v1.option_values.should have_exactly(2).items
     v1.option_values.collect(&:name).sort.should == ['colour','jpeg']
+    v1.option_values.collect(&:presentation).sort.should == ['Colour','Jpeg']
+
+    # Product 2
+    # 4) mime_type:jpeg;print_type:black_white
+    # 5) mime_type:PNG;print_type:black_white
+    #
+    p = @Product_klass.all[1]
+    
+    p.variants_including_master.should have_exactly(3).items
+    p.variants.should have_exactly(2).items
+
+    p.option_types.should have_exactly(2).items # mime_type, print_type
+
+    p.option_types.collect(&:name).sort.should == ['mime_type','print_type']
+    
+    p.variants[0].option_values.collect(&:name).sort.should == ['black_white','jpeg']
+    p.variants[0].option_values.collect(&:presentation).sort.should == ['Black white','Jpeg']
+    
+    p.variants[1].option_values.collect(&:name).sort.should == ['PNG', 'black_white']
+    
+    # Product 3
+    # 6 +7) mime_type:jpeg;print_type:colour,sepia;size:large
+    # 8) mime_type:jpeg;print_type:colour
+    # 9) mime_type:PNG
+    # 9 + 10) mime_type:PDF|print_type:black_white
 
+        
   end
 
 

metadata

@@ -1,105 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: datashift_spree
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  version: 0.4.1
 platform: ruby
-authors: 
-  - Thomas Statter
+authors:
+- Thomas Statter
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-02 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: datashift
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.12.0
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: mechanize
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :runtime
-    version_requirements: *id002
-description: Comprehensive Excel/CSV import/export for Spree, Products,Images, any model with full associations
+date: 2013-01-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: datashift
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Comprehensive Excel/CSV import/export for Spree, Products,Images, any
+  model with full associations
 email: rubygems@autotelik.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - datashift_spree.thor
-  - README.markdown
-  - datashift_spree.gemspec
-  - VERSION
-  - LICENSE.txt
-  - lib/datashift_spree.rb
-  - lib/datashift_spree_helper.rb
-  - lib/helpers/spree_helper.rb
-  - lib/loaders/spree/image_loader.rb
-  - lib/loaders/spree/product_loader.rb
-  - lib/loaders/spree/spree_base_loader.rb
-  - lib/thor/spree/bootstrap_cleanup.thor
-  - lib/thor/spree/products_images.thor
-  - lib/thor/spree/reports.thor
-  - 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
-  - spec/spree_taxons_loader_spec.rb
-  - spec/spree_variants_loader_spec.rb
-  - spec/thor_spec.rb
+files:
+- datashift_spree.thor
+- README.markdown
+- datashift_spree.gemspec
+- VERSION
+- LICENSE.txt
+- lib/datashift_spree.rb
+- lib/loaders/spree/spree_base_loader.rb
+- lib/loaders/spree/image_loader.rb
+- lib/loaders/spree/product_loader.rb
+- lib/thor/spree/products_images.thor
+- lib/thor/spree/reports.thor
+- lib/thor/spree/bootstrap_cleanup.thor
+- lib/datashift_spree_helper.rb
+- lib/helpers/spree_helper.rb
+- spec/spree_generator_spec.rb
+- spec/spree_loader_spec.rb
+- spec/spree_variants_loader_spec.rb
+- spec/thor_spec.rb
+- spec/spree_images_loader_spec.rb
+- spec/spree_exporter_spec.rb
+- spec/spree_taxons_loader_spec.rb
+- spec/spree_method_mapping_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/autotelik/datashift_spree
-licenses: 
-  - MIT
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Product and image import/export for Spree from Excel/CSV
-test_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
-  - spec/spree_taxons_loader_spec.rb
-  - spec/spree_variants_loader_spec.rb
-  - spec/thor_spec.rb
+test_files:
+- spec/spree_generator_spec.rb
+- spec/spree_loader_spec.rb
+- spec/spree_variants_loader_spec.rb
+- spec/thor_spec.rb
+- spec/spree_images_loader_spec.rb
+- spec/spree_exporter_spec.rb
+- spec/spree_taxons_loader_spec.rb
+- spec/spree_method_mapping_spec.rb
+- spec/spec_helper.rb