datashift 0.15.0 → 0.16.0

data/spec/spec_helper.rb

@@ -9,58 +9,74 @@
 # We are not setup as a Rails project so need to mimic an active record database setup so
 # we have some  AR models to test against. Create an in memory database from scratch.
 #
+
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+
 require 'active_record'
 require 'thor/actions'
 require 'bundler'
 require 'stringio'
 require 'paperclip'
+require 'factory_girl_rails'
+require 'database_cleaner'
 
 $:.unshift '.'  # 1.9.3 quite strict, '.' must be in load path for relative paths to work from here
-    
-datashift_spec_base = File.expand_path( File.join(File.dirname(__FILE__), '..') )
-
-require File.join(datashift_spec_base, 'lib/datashift')
 
+require File.expand_path("../../lib/datashift", __FILE__)
 
 RSpec.configure do |config|
+
   config.before do
     ARGV.replace []
+    FactoryGirl.reload    # fixes factories not autoloading
   end
 
-  shared_context "ActiveRecordTestModelsConnected" do
-    
-    before(:all) do
-      bundler_setup()
-    
-      # load all test model definitions - Project etc  
-      require ifixture_file('test_model_defs')  
-  
-      db_connect( 'test_file' )    # , test_memory, test_mysql
+  config.include FactoryGirl::Syntax::Methods
 
-      migrate_up
-    end
+  config.before(:suite) do
+
+    FileUtils.mkdir_p(results_path()) unless File.exists?(results_path)
+
+    bundler_setup()
+
+    rails_sandbox
+
+    # load all test model definitions - Project etc
+    require ifixture_file('test_model_defs')
+
+    db_connect( 'test_file' )    # , test_memory, test_mysql
+
+    migrate_up
+
+    DatabaseCleaner.clean_with(:truncation)
+
+    DataShift::MethodDictionary.clear
+
+    #TODO this is bad here - remove
+    DataShift::MethodDictionary.find_operators( Project )
+
+    DataShift::MethodDictionary.build_method_details( Project )
   end
-  
-  
+
+  config.before(:each) do
+    DatabaseCleaner.strategy = :transaction
+
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+
+=begin
   shared_context "ClearAndPopulateProject" do
-  
     before(:each) do
-      
-      Project.delete_all
-      Owner.delete_all
-      
-      DataShift::MethodDictionary.clear
-    
-      DataShift::MethodDictionary.find_operators( Project )
-    
-      DataShift::MethodDictionary.build_method_details( Project )
-    
-      DataShift::MethodDictionary.for?(Project).should == true
     end
   end
-  
-  
-  def run_in(dir )
+=end
+
+  def run_in(dir)
     puts "RSpec .. running test in path [#{dir}]"
     original_dir = Dir.pwd
     begin
@@ -85,7 +101,11 @@ RSpec.configure do |config|
   end  
   
   alias :silence :capture
-  
+
+  def rspec_datashift_root()
+    File.expand_path("../../", __FILE__)
+  end
+
   def fixtures_path()
     File.expand_path(File.dirname(__FILE__) + '/fixtures')
   end
@@ -107,10 +127,14 @@ RSpec.configure do |config|
     expect
   end
   
-  def results_clear
-    begin FileUtils.rm_rf(results_path); rescue; end
-    
-    FileUtils.mkdir(results_path) unless File.exists?(results_path);
+  def results_clear( glob = nil )
+    if(glob)
+      begin FileUtils.rm_rf( File.join(results_path, glob) ); rescue; end
+    else
+      begin FileUtils.rm_rf(results_path); rescue; end
+
+      FileUtils.mkdir(results_path) unless File.exists?(results_path);
+    end
   end
   
   def set_logger( name = 'datashift_spec.log')
@@ -119,10 +143,6 @@ RSpec.configure do |config|
     logdir = File.join(File.dirname(__FILE__), 'log')
     FileUtils.mkdir_p(logdir) unless File.exists?(logdir)
     ActiveRecord::Base.logger = Logger.new( File.join(logdir, name) )
-
-    # Anyway to direct one logger to another ????? ... Logger.new(STDOUT)
-    
-    @dslog = ActiveRecord::Base.logger
   end
   
   def bundler_setup(gemfile = File.join(DataShift::root_path, 'spec', 'Gemfile') )
@@ -132,7 +152,8 @@ RSpec.configure do |config|
     ENV['BUNDLE_GEMFILE'] = gemfile
     #Bundler.setup
     begin
-      Bundler.setup(:default, :development)
+      #Bundler.setup(:default, :development)
+      Bundler.setup(:default, :test)
     rescue Bundler::BundlerError => e
       $stderr.puts e.message
       $stderr.puts "Run `bundle install` to install missing gems"
@@ -154,7 +175,9 @@ RSpec.configure do |config|
     # Some active record stuff seems to rely on the RAILS_ENV being set ?
 
     ENV['RAILS_ENV'] = env
- 
+
+    puts "Load DB Config for Env : #{env}"
+
     # We have multiple schemas and hence connections tested in single spec directory   
     db_clear_connections
      
@@ -163,24 +186,11 @@ RSpec.configure do |config|
     configuration[:database_configuration] = YAML::load( ERB.new( IO.read(database_yml_path) ).result )
     db = configuration[:database_configuration][ env ]
 
-    puts "Setting DB Config:", db.inspect
-    ActiveRecord::Base.configurations = db
-    
-    #dbtype = Rails.configuration.database_configuration[Rails.env]['adapter'].to_sym
-
     set_logger
     
-    puts "Connecting to DB"
+    puts "Connecting to DB", db.inspect
     
     ActiveRecord::Base.establish_connection( db )
-
-    # See errors  #<NameError: uninitialized constant RAILS_CACHE> when doing save (AR without Rails)
-    # so copied this from ... Rails::Initializer.initialize_cache
-    #Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store( :memory_store ) unless defined?(RAILS_CACHE)
-
-    puts "Connected to DB"
-    
-    @dslog.info "Connected to DB - #{ActiveRecord::Base.connection.inspect}"
   end
   
   # These are our test models with associations
@@ -204,37 +214,39 @@ RSpec.configure do |config|
 
   def rails_sandbox( force = false)
     
-    rails_sandbox = rails_sandbox_path
+    sandbox = rails_sandbox_path
      
-    if(force == true && File.exists?(rails_sandbox))
-      FileUtils::rm_rf(rails_sandbox)
+    if(force == true && File.exists?(sandbox))
+      FileUtils::rm_rf(sandbox)
     end
     
-    unless(File.exists?(rails_sandbox))
-      
-      puts "Creating new Rails sandbox : ", File.expand_path( "#{rails_sandbox}/.." )
-    
-      run_in( File.expand_path("#{rails_sandbox}/..") ) do |path|
+    unless(File.exists?(sandbox))
+
+      sandbox_exe_path =  File.expand_path( "#{sandbox}/.." )
+
+      puts "Creating new Rails sandbox in : #{sandbox_exe_path}"
+
+      run_in( sandbox_exe_path ) do |path|
           
-        name = File.basename(DataShift::sandbox)
-      
-        puts "Creating new Rails sandbox in : #{path}"
+        name = File.basename(rails_sandbox_path)
+
         system('rails new ' + name)
           
         puts "Copying over models :", Dir.glob(File.join(fixtures_path, 'models', '*.rb')).inspect
         
         FileUtils::cp_r( Dir.glob(File.join(fixtures_path, 'models', '*.rb')), File.join(name, 'app/models'))
         
-        migrations = File.expand_path('../../spec/db/migrate', __FILE__)
+        migrations = File.expand_path(File.join(fixtures_path, 'db', 'migrate'), __FILE__)
         
-        FileUtils::cp_r( migrations, File.join(rails_sandbox, 'db'))
+        FileUtils::cp_r( migrations, File.join(rails_sandbox_path, 'db'))
         
         puts "Running db:migrate"
-        
-        run_in(rails_sandbox) { system('bundle exec rake db:migrate') }
       end
+
+      run_in(rails_sandbox_path) { system('bundle exec rake db:migrate') }
+
     end
-    rails_sandbox
+    return sandbox
   end
   
 end

data/spec/thor_spec.rb

@@ -31,17 +31,21 @@ describe 'Thor high level command line tasks' do
   #thor datashift:tools:zip -p, --path=PATH -r, --results=RESULTS               ...
 
   it "should list available datashift thor tasks" do
-    x = capture(:stdout){ Thor::Runner.start(["list"]) }
-    x.should start_with("datashift\n--------")
-    x.should =~ / csv -i/
-    x.should =~ / excel -i/
+
+   skip "better understanding of testign thor"
+   
+    #x = capture(:stdout){ Thor::Runner.start(["list"]) }
+    #x.should start_with("datashift\n--------")
+    #x.should =~ / csv -i/
+    #x.should =~ / excel -i/
   end
 
   # N.B Tasks that fire up Rails application need to be run in own Thread or else get
   #  ...  You cannot have more than one Rails::Application
         
   it "should be able to import a model from a complex excel through import CLI" do
-    pending "How to run once rails already initialzed .. error : database configuration does not specify adapter"
+    skip "How to run once rails already initialzed .. error : database configuration does not specify adapter"
+    
     x = Thread.new {
       run_in(rails_sandbox()) do
         stdout = capture(:stdout){ 
@@ -52,4 +56,35 @@ describe 'Thor high level command line tasks' do
     }
     x.join
   end
+  
+  
+  it "should attach Images to a specified Class from a directory" do
+   
+    skip "better understanding of testign thor"
+    
+    # Owner has_many :digitals of type Digital
+    
+    # Owner has a name by which we can id/look it up
+      
+    args = [
+      '--attachment-klass',        'Digital', 
+      '--attach-to-klass',         'Owner',  
+      '--attach-to-find-by-field', 'name',
+      '--attach-to-field',         'digitals']
+      
+    # which boils down to
+    # 
+    # Digital.find_by_name( abc ).digitals << :Digital.new( File.read('abc_001.jpg') )
+      
+    args << '--input' << File.join(fixtures_path(), 'images')
+     
+    puts "Running attach with: #{args}"
+    
+    x = capture(:stdout){ Thor::Runner.start(["datashift:paperclip:attach", [], args]) }
+    
+    expect(x).to include ("datashift\n--------")
+    #x.should =~ / csv -i/
+    #x.should =~ / excel -i/
+
+  end
 end

metadata

@@ -1,50 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: datashift
 version: !ruby/object:Gem::Version
-  version: 0.15.0
-  prerelease: 
+  version: 0.16.0
 platform: ruby
 authors:
 - Thomas Statter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   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'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   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 tools to import/export between Excel/CSV and ActiveRecord
-  databases, Rails apps, and any Ruby project.
+description: Comprehensive import/export tools between Excel/CSV & ActiveRecord Databases,
+  Rails apps, and any Ruby project.
 email: rubygems@autotelik.co.uk
 executables: []
 extensions: []
@@ -59,125 +54,137 @@ files:
 - Rakefile
 - VERSION
 - datashift.gemspec
-- tasks/config/seed_fu_product_template.erb
-- tasks/config/tidy_config.txt
-- tasks/db_tasks.rake
-- tasks/file_tasks.rake
-- tasks/word_to_seedfu.rake
-- lib/applications/ruby_poi_translations.rb
-- lib/applications/jexcel_file_extensions.rb
-- lib/applications/spreadsheet_extensions.rb
-- lib/applications/excel.rb
 - lib/applications/apache_poi_extensions.rb
-- lib/applications/excel_base.rb
+- lib/applications/excel.rb
+- lib/applications/jexcel_file.rb
+- lib/applications/jexcel_file_extensions.rb
 - lib/applications/jruby/old_pre_proxy_jexcel_file.rb
 - lib/applications/jruby/word.rb
-- lib/applications/jexcel_file.rb
+- lib/applications/ruby_poi_translations.rb
+- lib/applications/spreadsheet_extensions.rb
+- lib/datashift.rb
+- lib/datashift/column_packer.rb
+- lib/datashift/data_transforms.rb
+- lib/datashift/delimiters.rb
+- lib/datashift/excel_base.rb
+- lib/datashift/exceptions.rb
+- lib/datashift/file_definitions.rb
+- lib/datashift/guards.rb
+- lib/datashift/load_object.rb
+- lib/datashift/logging.rb
+- lib/datashift/mapping_file_definitions.rb
+- lib/datashift/mapping_service.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/datashift/querying.rb
+- lib/datashift/thor_base.rb
+- lib/exporters/csv_exporter.rb
+- lib/exporters/excel_exporter.rb
+- lib/exporters/exporter_base.rb
+- lib/generators/csv_generator.rb
+- lib/generators/excel_generator.rb
+- lib/generators/generator_base.rb
+- lib/generators/mapping_generator.rb
+- lib/helpers/core_ext/csv_file.rb
+- lib/helpers/core_ext/to_b.rb
+- lib/java/poi-3.7/LICENSE
 - lib/java/poi-3.7/NOTICE
-- lib/java/poi-3.7/poi-examples-3.7-20101029.jar
 - lib/java/poi-3.7/RELEASE_NOTES.txt
-- lib/java/poi-3.7/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar
-- lib/java/poi-3.7/ooxml-lib/xmlbeans-2.3.0.jar
-- lib/java/poi-3.7/ooxml-lib/dom4j-1.6.1.jar
-- lib/java/poi-3.7/LICENSE
-- lib/java/poi-3.7/lib/junit-3.8.1.jar
 - lib/java/poi-3.7/lib/commons-logging-1.1.jar
+- lib/java/poi-3.7/lib/junit-3.8.1.jar
 - lib/java/poi-3.7/lib/log4j-1.2.13.jar
-- lib/java/poi-3.7/poi-scratchpad-3.7-20101029.jar
+- lib/java/poi-3.7/ooxml-lib/dom4j-1.6.1.jar
+- lib/java/poi-3.7/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar
+- lib/java/poi-3.7/ooxml-lib/xmlbeans-2.3.0.jar
 - lib/java/poi-3.7/poi-3.7-20101029.jar
-- lib/java/poi-3.7/poi-ooxml-schemas-3.7-20101029.jar
+- lib/java/poi-3.7/poi-examples-3.7-20101029.jar
 - lib/java/poi-3.7/poi-ooxml-3.7-20101029.jar
+- lib/java/poi-3.7/poi-ooxml-schemas-3.7-20101029.jar
+- lib/java/poi-3.7/poi-scratchpad-3.7-20101029.jar
 - lib/loaders/csv_loader.rb
 - lib/loaders/excel_loader.rb
-- lib/loaders/reporter.rb
 - lib/loaders/loader_base.rb
-- lib/loaders/paperclip/datashift_paperclip.rb
 - lib/loaders/paperclip/attachment_loader.rb
+- lib/loaders/paperclip/datashift_paperclip.rb
 - lib/loaders/paperclip/image_loading.rb
-- lib/exporters/exporter_base.rb
-- lib/exporters/excel_exporter.rb
-- lib/exporters/csv_exporter.rb
-- lib/datashift/populator.rb
-- lib/datashift/querying.rb
-- lib/datashift/method_detail.rb
-- lib/datashift/column_packer.rb
-- lib/datashift/method_details_manager.rb
-- lib/datashift/model_mapper.rb
-- lib/datashift/guards.rb
-- lib/datashift/method_mapper.rb
-- lib/datashift/mapping_file_definitions.rb
-- lib/datashift/logging.rb
-- lib/datashift/exceptions.rb
-- lib/datashift/method_dictionary.rb
-- lib/datashift/file_definitions.rb
-- lib/datashift/delimiters.rb
-- lib/datashift.rb
-- lib/generators/generator_base.rb
-- lib/generators/csv_generator.rb
-- lib/generators/excel_generator.rb
+- lib/loaders/reporter.rb
 - lib/thor/export.thor
+- lib/thor/generate.thor
+- lib/thor/import.thor
+- lib/thor/mapping.thor
 - lib/thor/paperclip.thor
 - lib/thor/tools.thor
-- lib/thor/import.thor
-- lib/thor/generate.thor
-- lib/helpers/core_ext/to_b.rb
-- spec/csv_exporter_spec.rb
-- spec/excel_generator_spec.rb
-- spec/spec_helper.rb
 - spec/Gemfile
-- spec/thor_spec.rb
+- spec/Gemfile.lock
+- spec/csv_exporter_spec.rb
+- spec/csv_generator_spec.rb
+- spec/csv_loader_spec.rb
 - spec/datashift_spec.rb
-- spec/populator_spec.rb
-- spec/excel_loader_spec.rb
-- spec/method_dictionary_spec.rb
 - spec/excel_exporter_spec.rb
-- spec/Gemfile.lock
+- spec/excel_generator_spec.rb
+- spec/excel_loader_spec.rb
+- spec/excel_spec.rb
 - spec/file_definitions.rb
 - spec/loader_base_spec.rb
-- spec/csv_loader_spec.rb
-- spec/paperclip_loader_spec.rb
+- spec/mapping_spec.rb
+- spec/method_dictionary_spec.rb
 - spec/method_mapper_spec.rb
-- spec/excel_spec.rb
+- spec/model_mapper_spec.rb
+- spec/paperclip_loader_spec.rb
+- spec/populator_spec.rb
+- spec/spec_helper.rb
+- spec/thor_spec.rb
+- tasks/config/seed_fu_product_template.erb
+- tasks/config/tidy_config.txt
+- tasks/db_tasks.rake
+- tasks/file_tasks.rake
+- tasks/word_to_seedfu.rake
 homepage: http://github.com/autotelik/datashift
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 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
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Shift data betwen Excel/CSV and any Ruby app
 test_files:
-- spec/csv_exporter_spec.rb
-- spec/excel_generator_spec.rb
-- spec/spec_helper.rb
 - spec/Gemfile
-- spec/thor_spec.rb
+- spec/Gemfile.lock
+- spec/csv_exporter_spec.rb
+- spec/csv_generator_spec.rb
+- spec/csv_loader_spec.rb
 - spec/datashift_spec.rb
-- spec/populator_spec.rb
-- spec/excel_loader_spec.rb
-- spec/method_dictionary_spec.rb
 - spec/excel_exporter_spec.rb
-- spec/Gemfile.lock
+- spec/excel_generator_spec.rb
+- spec/excel_loader_spec.rb
+- spec/excel_spec.rb
 - spec/file_definitions.rb
 - spec/loader_base_spec.rb
-- spec/csv_loader_spec.rb
-- spec/paperclip_loader_spec.rb
+- spec/mapping_spec.rb
+- spec/method_dictionary_spec.rb
 - spec/method_mapper_spec.rb
-- spec/excel_spec.rb
+- spec/model_mapper_spec.rb
+- spec/paperclip_loader_spec.rb
+- spec/populator_spec.rb
+- spec/spec_helper.rb
+- spec/thor_spec.rb