datashift 0.0.2 → 0.1.0

data/spec/method_mapper_spec.rb

@@ -8,231 +8,35 @@
 #             and a classes different types of assignment operators
 #
 require File.dirname(__FILE__) + '/spec_helper'
-
+    
 describe 'Method Mapping' do
 
   before(:all) do
     db_connect( 'test_file' )    # , test_memory, test_mysql
+    
+    # load our test model definitions - Project etc
+    require ifixture_file('test_model_defs')  
+
     migrate_up
-    @klazz = Project
-    @assoc_klazz = Milestone
   end
   
   before(:each) do
-    MethodMapper.clear
-    MethodMapper.find_operators( @klazz )
-    MethodMapper.find_operators( @assoc_klazz )
-  end
-  
-  it "should populate method map for a given AR model" do
-
-    MethodMapper.has_many.should_not be_empty
-    MethodMapper.has_many[Project].should include('milestones')
-
-    MethodMapper.assignments.should_not be_empty
-    MethodMapper.assignments[Project].should include('id')
-    MethodMapper.assignments[Project].should include('value_as_string')
-    MethodMapper.assignments[Project].should include('value_as_text')
-
-    MethodMapper.belongs_to.should_not be_empty
-    MethodMapper.belongs_to[Project].should be_empty
-
-
-    MethodMapper.column_types.should be_is_a(Hash)
-    MethodMapper.column_types.should_not be_empty
-    MethodMapper.column_types[Project].size.should == Project.columns.size
-
-
+    MethodDictionary.clear
+    
+    MethodDictionary.find_operators( Project )
+    MethodDictionary.find_operators( Milestone )
+    
+    
+    MethodDictionary.build_method_details( Project )
+    MethodDictionary.build_method_details( Milestone )
+    
   end
-
-  it "should populate assigment members without the equivalent association names" do
-
-    # we should remove has-many & belongs_to from basic assignment set as they require a DB lookup
-    # or a Model.create call, not a simple assignment
-
-    MethodMapper.assignments_for(@klazz).should_not include( MethodMapper.belongs_to_for(@klazz) )
-    MethodMapper.assignments_for(@klazz).should_not include( MethodMapper.has_many_for(@klazz) )
-  end
-
-
-  it "should populate assignment operators for method details for different forms of a column name" do
-
-    [:value_as_string, 'value_as_string', "VALUE as_STRING", "value as string"].each do |format|
-
-      method_details = MethodMapper.find_method_detail( @klazz, format )
-
-      method_details.class.should == MethodDetail
-
-      method_details.name.should eq( format.to_s )
-
-      method_details.operator.should == 'value_as_string'
-      method_details.operator_for(:assignment).should == 'value_as_string'
-      
-      method_details.operator?('value_as_string').should be_true
-      method_details.operator?('blah_as_string').should be_false
-
-      method_details.operator_for(:belongs_to).should be_nil
-      method_details.operator_for(:has_many).should be_nil
-    end
-  end
-
-
-  # Note : Not all assignments will currently have a column type, for example
-  # those that are derived from a delegate_belongs_to
-
-  it "should populate column types for assignment operators in method details" do
-
-    [:value_as_string, 'value_as_string', "VALUE as_STRING", "value as string"].each do |format|
-
-      method_details = MethodMapper.find_method_detail( @klazz, format )
-
-      method_details.class.should == MethodDetail
-
-      method_details.col_type.should_not be_nil
-      method_details.col_type.name.should == 'value_as_string'
-      method_details.col_type.default.should == nil
-      method_details.col_type.sql_type.should include 'varchar(255)'   # db specific, sqlite
-      method_details.col_type.type.should == :string
-    end
-  end
-
-  it "should populate required Class for assignment operators based on column type" do
-
-    [:value_as_string, 'value_as_string', "VALUE as_STRING", "value as string"].each do |format|
-
-      method_details = MethodMapper.find_method_detail( Project, format )
-
-      method_details.operator_class_name.should == 'String'
-      method_details.operator_class.should be_is_a(Class)
-      method_details.operator_class.should == String
-    end
-
-  end
-
-  it "should populate belongs_to operator for method details for different forms of a column name" do
-
-    # milestone.project = project.id
-    [:project, 'project', "PROJECT", "prOJECt"].each do |format|
-
-      method_details = MethodMapper.find_method_detail( Milestone, format )
-
-      method_details.should_not be_nil
-
-      method_details.operator.should == 'project'
-      method_details.operator_for(:belongs_to).should == 'project'
-
-      method_details.operator_for(:assignment).should be_nil
-      method_details.operator_for(:has_many).should be_nil
-    end
-
-  end
-
-  it "should populate required Class for belongs_to operator method details" do
-
-    MethodMapper.find_operators( LoaderRelease )
-    MethodMapper.find_operators( LongAndComplexTableLinkedToVersion )
-
-    # release.project = project.id
-    [:project, 'project', "PROJECT", "prOJECt"].each do |format|
-
-      method_details = MethodMapper.find_method_detail( LoaderRelease, format )
-
-      method_details.operator_class_name.should == 'Project'
-      method_details.operator_class.should == Project
-    end
-
-
-    #LongAndComplexTableLinkedToVersion.version = version.id
-
-    [:version, "Version", "verSION"].each do |format|
-      method_details = MethodMapper.find_method_detail( LongAndComplexTableLinkedToVersion, format )
-
-      method_details.operator_type.should == :belongs_to
-
-      method_details.operator_class_name.should == 'Version'
-      method_details.operator_class.should == Version
-    end
-  end
-
-   it "should populate required Class for has_one operator method details" do
-
-    MethodMapper.find_operators( Version )
-
-    # version.long_and_complex_table_linked_to_version = LongAndComplexTableLinkedToVersion.create()
-
-    [:long_and_complex_table_linked_to_version, 'LongAndComplexTableLinkedToVersion', "Long And Complex_Table_Linked To  Version", "Long_And_Complex_Table_Linked_To_Version"].each do |format|
-      method_details = MethodMapper.find_method_detail( Version, format )
-
-      method_details.should_not be_nil
-
-      method_details.operator.should == 'long_and_complex_table_linked_to_version'
-      
-      method_details.operator_type.should == :has_one
-
-      method_details.operator_class_name.should == 'LongAndComplexTableLinkedToVersion'
-      method_details.operator_class.should == LongAndComplexTableLinkedToVersion
-    end
-  end
-
-
-  it "should find has_many operator for method details" do
-
-    [:milestones, "Mile Stones", 'mileSTONES', 'MileStones'].each do |format|
-
-      method_details = MethodMapper.find_method_detail( Project, format )
-
-      method_details.class.should == MethodDetail
-      
-      result = 'milestones'
-      method_details.operator.should == result
-      method_details.operator_for(:has_many).should == result
-
-      method_details.operator_for(:belongs_to).should be_nil
-      method_details.operator_for(:assignments).should be_nil
-    end
-
-  end
-
  
-  it "should return nil when non existent column name" do
-    ["On sale", 'on_sale'].each do |format|
-      detail = MethodMapper.find_method_detail( @klazz, format )
-
-      detail.should be_nil
-    end
-  end
-
-
   it "should find a set of methods based on a list of column names" do
-
-    mapper = MethodMapper.new
-
-    [:value_as_string, 'value_as_string', "VALUE as_STRING", "value as string"].each do |column_name_format|
-
-      method_details = MethodMapper.find_method_detail( @klazz, column_name_format )
-
-      method_details.class.should == MethodDetail
-
-      method_details.col_type.should_not be_nil
-      method_details.col_type.name.should == 'value_as_string'
-      method_details.col_type.default.should == nil
-      method_details.col_type.sql_type.should include 'varchar(255)'   # db specific, sqlite
-      method_details.col_type.type.should == :string
-    end
-  end
-
-  it "should not by default map setter methods", :fail => true do
-    MethodMapper.assignments[Milestone].should_not include('title')
-  end
-  
-  it "should support reload and  inclusion of setter methods", :fail => true do
-
-    MethodMapper.assignments[Milestone].should_not include('title')
-        
-    MethodMapper.find_operators( Milestone, :reload => true, :instance_methods => true )
+     pending("key API - map column headers to set of methods")
      
-    # Milestone delegates :title to Project
-    MethodMapper.assignments[Milestone].should include('title')
+    @method_mapper.map_inbound_to_methods( load_object_class, @headers )
   end
 
+
 end

data/spec/spec_helper.rb

@@ -21,6 +21,7 @@ $DataShiftDatabaseYml = File.join($DataShiftFixturePath, 'config/database.yml')
 
 module DataShift
  
+
   def db_connect( env = 'test_file', version = nil)
 
     version ? gem('activerecord', version) : gem('activerecord')

data/spec/spree_loader_spec.rb

@@ -51,7 +51,7 @@ describe 'SpreeLoader' do
   before(:each) do
 
     MethodMapper.clear
-    MethodMapper.find_operators( @klazz )
+    MethodDictionary.find_operators( @klazz )
 
     # Reset main tables - TODO should really purge properly, or roll back a transaction
     [OptionType, OptionValue, Product, Property, Variant, Taxonomy, Taxon, Zone].each { |x| x.delete_all }
@@ -269,6 +269,15 @@ describe 'SpreeLoader' do
 
   end
 
+  it "should load Products with assoicated image", :img => true do
+    
+    @product_loader.perform_load( spree_fix('SpreeProductsWithImages.csv'), :mandatory => ['sku', 'name', 'price'] )
+     
+    p = Product.find_by_sku( "DEMO_001")
+    
+    p.images.should have_exactly(1).items
+  end
+  
   
   # REPEAT THE WHOLE TEST SUITE VIA CSV
 
@@ -288,6 +297,14 @@ 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

data/spec/spree_method_mapping_spec.rb

@@ -39,7 +39,7 @@ describe 'SpreeLoader' do
 
   before(:each) do
     MethodMapper.clear
-    MethodMapper.find_operators( @klazz )
+    MethodDictionary.find_operators( @klazz )
   end
 
   
@@ -109,7 +109,7 @@ describe 'SpreeLoader' do
 
   it "should populate method details correctly for assignment operators (none columns on #{@klazz})" do
 
-    MethodMapper.find_operators( @klazz, :reload => true, :instance_methods => true )
+    MethodDictionary.find_operators( @klazz, :reload => true, :instance_methods => true )
 
     # Example of delegates i.e. cost_price column on Variant, delegated to Variant by Product
 
@@ -128,7 +128,7 @@ describe 'SpreeLoader' do
 
   it "should enable assignment via operators for none columns on #{@klazz}" do
 
-    MethodMapper.find_operators( @klazz, :reload => true, :instance_methods => true )
+    MethodDictionary.find_operators( @klazz, :reload => true, :instance_methods => true )
 
     klazz_object = @klazz.new
 
@@ -184,7 +184,7 @@ describe 'SpreeLoader' do
 
   it "should enable assignment to has_many association using existing objects" do
 
-    MethodMapper.find_operators( @klazz )
+    MethodDictionary.find_operators( @klazz )
 
     method_detail = MethodMapper.find_method_detail( @klazz, 'product_properties' )
 

metadata

@@ -2,7 +2,7 @@
 name: datashift
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
   - Thomas Statter
@@ -10,129 +10,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-12 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rails
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 3.1.3
-    requirement: *id001
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: activerecord
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 3.1.3
-    requirement: *id002
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: activesupport
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 3.1.3
-    requirement: *id003
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id004
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: activerecord-jdbcsqlite3-adapter
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id005
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: spree
-    version_requirements: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.70.3
-    requirement: *id006
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    version_requirements: &id007 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id007
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: shoulda
-    version_requirements: &id008 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id008
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rdoc
-    version_requirements: &id009 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "3.12"
-    requirement: *id009
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: bundler
-    version_requirements: &id010 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.0.0
-    requirement: *id010
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jeweler
-    version_requirements: &id011 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.8.3
-    requirement: *id011
-    prerelease: false
-    type: :development
+date: 2012-02-27 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
 email: rubygems@autotelik.co.uk
 executables: []
@@ -145,13 +25,12 @@ extra_rdoc_files:
   - README.rdoc
 files: 
   - .document
-  - Gemfile
   - LICENSE.txt
   - README.markdown
   - README.rdoc
   - Rakefile
   - VERSION
-  - datashift-0.0.2.gem
+  - datashift-0.1.0.gem
   - datashift.gemspec
   - lib/applications/jruby/jexcel_file.rb
   - lib/applications/jruby/word.rb
@@ -160,6 +39,7 @@ files:
   - lib/datashift/file_definitions.rb
   - lib/datashift/mapping_file_definitions.rb
   - lib/datashift/method_detail.rb
+  - lib/datashift/method_dictionary.rb
   - lib/datashift/method_mapper.rb
   - lib/generators/csv_generator.rb
   - lib/generators/excel_generator.rb
@@ -190,17 +70,22 @@ files:
   - spec/csv_loader_spec.rb
   - spec/datashift_spec.rb
   - spec/db/migrate/20110803201325_create_test_bed.rb
+  - spec/excel_exporter_spec.rb
   - spec/excel_generator_spec.rb
   - spec/excel_loader_spec.rb
   - spec/file_definitions.rb
-  - spec/fixtures/.~lock.ProjectsSingleCategories.xls#
   - spec/fixtures/BadAssociationName.xls
   - spec/fixtures/DemoNegativeTesting.xls
   - spec/fixtures/ProjectsDefaults.yml
   - spec/fixtures/ProjectsMultiCategories.xls
+  - spec/fixtures/ProjectsMultiCategoriesHeaderLookup.xls
   - spec/fixtures/ProjectsSingleCategories.xls
   - spec/fixtures/SimpleProjects.xls
   - spec/fixtures/config/database.yml
+  - spec/fixtures/images/DEMO_001_ror_bag.jpeg
+  - spec/fixtures/images/DEMO_002_Powerstation.jpg
+  - spec/fixtures/images/DEMO_003_ror_mug.jpeg
+  - spec/fixtures/images/DEMO_004_ror_ringer.jpeg
   - spec/fixtures/interact_models_db.sqlite
   - spec/fixtures/interact_spree_db.sqlite
   - spec/fixtures/negative/SpreeProdMiss1Mandatory.csv
@@ -215,10 +100,12 @@ files:
   - spec/fixtures/spree/SpreeProductsMultiColumn.xls
   - spec/fixtures/spree/SpreeProductsSimple.csv
   - spec/fixtures/spree/SpreeProductsSimple.xls
+  - spec/fixtures/spree/SpreeProductsWithImages.xls
   - spec/fixtures/spree/SpreeZoneExample.csv
   - spec/fixtures/spree/SpreeZoneExample.xls
   - spec/fixtures/test_model_defs.rb
   - spec/loader_spec.rb
+  - spec/method_dictionary_spec.rb
   - spec/method_mapper_spec.rb
   - spec/spec_helper.rb
   - spec/spree_generator_spec.rb
@@ -249,9 +136,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false