datashift 0.10.1 → 0.10.2

data/lib/thor/paperclip.thor

@@ -22,8 +22,12 @@ module Datashift
   
     include DataShift::Logging   
 
-    desc "attach", "Attach files from a directory\nwhere file names contain somewhere the lookup info"
-    
+    desc "attach", "Attach files from a directory\nThe attachment file names must contain the lookup info within them.
+    The instance of :attach_to_klass can be searched for and the new attachment assigned.
+      Examples     
+        Owner has_many pdfs and mp3 files as Digitals .... :attach_to_klass = Owner
+        User has a single image used as an avatar ... :attach_to_klass = User"
+
     # :dummy => dummy run without actual saving to DB
     method_option :input, :aliases => '-i', :required => true, :desc => "The input path containing images "
     
@@ -31,11 +35,27 @@ module Datashift
     method_option :recursive, :aliases => '-r', :type => :boolean, :desc => "Scan sub directories of input for images"
      
     method_option :attachment_klass, :required => true, :aliases => '-a', :desc => "Ruby Class name of the Attachment e.g Image, Icon"
-    method_option :attach_to_klass, :required => true, :aliases => '-k', :desc => "Ruby Class name attachment belongs to e.g Product, Blog"
-    method_option :attach_to_klass_field, :required => true, :aliases => '-f', :desc => "Attachment belongs to field e.g Product.image, Blog.digital"
+    method_option :attach_to_klass, :required => true, :aliases => '-k', :desc => "A class that has a relationship with the attachment (has_many, has_one, belongs_to)"
+
     
-    method_option :attach_to_lookup_field, :required => true, :aliases => '-l', :desc => "The field to use to find the :attach_to_klass record"
+    method_option :attach_to_field, :required => true, :aliases => '-f', :desc => "Attachment belongs to field e.g Product.image, Blog.digital"
     
+    method_option :attach_to_find_by_field, :required => true, :aliases => '-l', :desc => "The field to use to find the :attach_to_klass record"
+    
+    
+      # => :attach_to_find_by_field    
+      #       For the :attach_to_klass, this is the field used to search for the parent
+      #       object to assign the new attachment to.
+      #     Examples     
+      #       Owner has a unique 'name' field ... :attach_to_find_by_field = :name
+      #       User has a unique  'login' field  ... :attach_to_klass = :login
+      #
+      # => :attach_to_field    
+      #       Attribute/association to assign attachment to on :attach_to_klass.
+      #      Examples
+      #         :attach_to_field => digitals  : Owner.digitals = attachment
+      #         :attach_to_field => avatar    : User.avatar = attachment
+      
     method_option :split_file_name_on,  :type => :string, :desc => "delimiter to progressivley split filename for lookup", :default => ' '
     method_option :case_sensitive, :type => :boolean, :desc => "Use case sensitive where clause to find :attach_to_klass"
     method_option :use_like, :type => :boolean, :desc => "Use :lookup_field LIKE 'string%' instead of :lookup_field = 'string' in where clauses to find :attach_to_klass"

data/spec/Gemfile

@@ -18,7 +18,8 @@ end
        
 # DEFINE WHICH VERSIONS WE WANT TO TEST WITH
 
-gem 'spreadsheet'
-
 gem 'rails', '3.2.8'
 
+gem 'spreadsheet'
+gem 'paperclip'
+

data/spec/excel_generator_spec.rb

@@ -164,6 +164,34 @@ describe 'Excel Generator' do
   end
     
     
+   it "should enable us to remove standard rails feilds from template .xls file ", :fail => true do
+
+    expect= result_file('project_plus_some_assoc_template_spec.xls')
+
+    gen = ExcelGenerator.new(expect)
+
+    options = {:remove_rails => true}
+      
+    gen.generate_with_associations(Project, options)
+
+    File.exists?(expect).should be_true, "Failed to find expected result file #{expect}"
+      
+    excel = Excel.new
+    excel.open(expect)
+    
+    excel.worksheets.should have(1).items
+    
+    excel.worksheet(0).name.should == 'Project'
+      
+    headers = excel.worksheets[0].row(0)
+
+    ["id", "updated_at", "created_at"].each do |check|
+      headers.should_not include check
+    end
+    
+    
+  end
+  
   it "should enable us to autosize columns in the .xls file" do
 
     expect= result_file('project_autosized_template_spec.xls')

data/spec/excel_loader_spec.rb

@@ -14,32 +14,27 @@ include DataShift
 
 describe 'Excel Loader' do
 
-  before(:all) do
+  include_context "ActiveRecordTestModelsConnected"
   
-    # load our test model definitions - Project etc  
-    require ifixture_file('test_model_defs')  
-  
-    db_connect( 'test_file' )    # , test_memory, test_mysql
+  before(:each) do
+    DataShift::MethodDictionary.clear   
     
-    # handle migration changes or reset of test DB
-    migrate_up
-     
-    db_clear()    # todo read up about proper transactional fixtures
-
-    @assoc_klazz = Category
+    @method_mapper = DataShift::MethodMapper.new
   end
   
+  
+  include_context "ClearAndPopulateProject"
+  
   before(:each) do
 
-    Project.delete_all
-    
     %w{category_001 category_002 category_003 category_004 category_005}.each do |cat|
-      @assoc_klazz.find_or_create_by_reference(cat)
+      Category.find_or_create_by_reference(cat)
     end
 
-    MethodDictionary.clear
-    MethodDictionary.find_operators( Project )
-    MethodDictionary.find_operators( @assoc_klazz )
+    DataShift::MethodDictionary.find_operators( Category )
+    
+    DataShift::MethodDictionary.build_method_details( Category )
+    
   end
   
   it "should be able to create a new excel loader and load object" do

data/spec/fixtures/config/database.yml

@@ -2,7 +2,7 @@
 # These entires can be used in call to db_connect ( see spec_helper )
 
 <% adapter = 'sqlite3' %>
-<% adapter = 'jdbcsqlite3' if(Guards::jruby? ) %>
+<% adapter = 'jdbcsqlite3' if(DataShift::Guards::jruby? ) %>
 
 test_mysql:
   adapter: jdbcmysql

data/spec/fixtures/db/migrate/20121009161700_add_digitals.rb

@@ -0,0 +1,24 @@
+# Author ::   Tom Statter
+# Date ::     Oct 2012
+# License::   MIT
+#
+# Details::   Migration for paperclip specs
+
+class AddDigitals < ActiveRecord::Migration
+  
+  def self.up
+
+     create_table :digitals do |t|
+      t.integer :owner_id
+      t.string  :attachment_file_name
+      t.string  :attachment_content_type
+      t.integer :attachment_file_size
+      t.timestamps
+    end
+    
+  end
+
+  def self.down
+    drop_table :digitals
+  end
+end

data/spec/fixtures/models/digital.rb

@@ -0,0 +1,14 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'paperclip'
+
+class Digital < ActiveRecord::Base
+  
+  include Paperclip::Glue
+  
+  attr_accessible :attachment
+  
+  has_attached_file :attachment, :styles => { :medium => "300x300>", :thumb => "100x100>" }, :path => ":rails_root/private/digitals/:id/:basename.:extension"
+  
+end

data/spec/fixtures/models/owner.rb

@@ -1,5 +1,7 @@
-
-
 class Owner < ActiveRecord::Base
-  belongs_to :project
+    
+  belongs_to :project, :dependent => :destroy
+  
+  has_many :digitals, :dependent => :destroy
+  
 end

data/spec/fixtures/test_model_defs.rb

@@ -1,67 +1,9 @@
-# A set of models and associations we can use in our specs to test
-# basic database columns and also relationships
 
-# See Companion migration spec/db/migrate
 
-class Project < ActiveRecord::Base
+# TODO investigate potential gem that might this require_all
 
-  has_one  :owner
-
-  has_many :milestones
-
-  has_many :loader_releases
-  has_many :versions, :through => :loader_releases
-
-
-  #has_many :release_versions, :through => :loader_releases, :source => :versions
-
-  has_and_belongs_to_many :categories
-
-  attr_accessible  :value_as_string, :value_as_boolean, :value_as_double
-  
-  def multiply
-    10 * value_as_double
-  end
+base = File.join(File.dirname(__FILE__), 'models')
   
-end
-
-class Owner < ActiveRecord::Base
-  belongs_to :project
-end
-
-class Milestone < ActiveRecord::Base
-  belongs_to :project
-  #validate the name, cost
-
-  delegate :title, :title=, :to => :project
-end
-
-# had_and_belongs to join table
-class Category < ActiveRecord::Base
-  has_and_belongs_to_many :projects
-end
-
-
-class Version < ActiveRecord::Base
-  has_many :releases
-
-  has_one :long_and_complex_table_linked_to_version
-end
-
-# Join Table with additional columns
-class LoaderRelease < ActiveRecord::Base
-  
-  belongs_to :project
-  belongs_to :version
-
-  #validate the name
-end
-
-class Empty < ActiveRecord::Base
-end
-
-# Join Table with additional columns
-class LongAndComplexTableLinkedToVersion < ActiveRecord::Base
-
-  belongs_to :version
+Dir[ File.join(base, '*.rb') ].each do |file| 
+  require File.join(base, File.basename(file, File.extname(file) ))
 end

data/spec/loader_spec.rb

@@ -11,71 +11,66 @@ require 'erb'
 
 describe 'Basic Loader' do
 
-  before(:all) do
-    
-    # load our test model definitions - Project etc  
-    require ifixture_file('test_model_defs')  
+  include_context "ActiveRecordTestModelsConnected"
   
-    db_connect( 'test_file' )    # , test_memory, test_mysql
-      
-    migrate_up
-    @klazz = Project
-  end
+  include_context "ClearAndPopulateProject"
   
-  before(:each) do
-    MethodDictionary.clear
-    MethodDictionary.find_operators( @klazz )
+  before(:each) do    
+    @loader = DataShift::LoaderBase.new(Project)
   end
   
   it "should be able to create a new loader and load object" do
-    loader = LoaderBase.new( @klazz )
-
-    loader.load_object.should_not be_nil
-    loader.load_object.should be_is_a(@klazz)
-    loader.load_object.new_record?.should be_true
+    @loader.load_object.should_not be_nil
+    @loader.load_object.should be_is_a(Project)
+    @loader.load_object.new_record?.should be_true
   end
 
+
   it "should process a string field against an assigment method detail" do
 
-    loader = LoaderBase.new(Project)
+    column = 'Value As String'
+    row = 'Another Lazy fox '
+
+    @loader.find_and_process(column, row)
+
+    @loader.load_object.errors.should have_exactly(0).items
+  end
+  
+  it "should process a string field against an assigment method detail" do
 
     column = 'Value As String'
     row = 'Another Lazy fox '
 
-    loader.find_and_process(column, row)
+    @loader.find_and_process(column, row)
 
-    loader.load_object.value_as_string.should == row
+    @loader.load_object.value_as_string.should == row
   end
 
   it "should process a text field against an assigment method detail" do
 
-    loader = LoaderBase.new(Project)
-
     column = :value_as_text
     row = "Another Lazy fox\nJumped over something and bumped,\nHis head"
 
-    loader.find_and_process(column, row)
+    @loader.find_and_process(column, row)
 
-    loader.load_object.value_as_text.should == row
+    @loader.load_object.value_as_text.should == row
 
   end
 
   it "should process a boolean field against an assigment method detail" do
 
-    loader = LoaderBase.new(Project)
-
     column = :value_as_boolean
     row = true
 
-    loader.find_and_process(column, row)
+    @loader.find_and_process(column, row)
 
-    loader.load_object.value_as_boolean.should == row
+    @loader.load_object.value_as_boolean.should == row
 
     row = 'false'
 
-    loader.find_and_process(column, row)
+    @loader.find_and_process(column, row)
 
-    loader.load_object.value_as_boolean.should == false
+    @loader.load_object.value_as_boolean.should == false
 
 
   end
@@ -84,38 +79,35 @@ describe 'Basic Loader' do
   end
 
   it "should process various date formats against a date assigment operator" do
-
-    loader = LoaderBase.new(Project)
-
     column = :value_as_datetime
 
-    loader.find_and_process(column, Time.now)
-    loader.load_object.value_as_datetime.should_not be_nil
+    @loader.find_and_process(column, Time.now)
+    @loader.load_object.value_as_datetime.should_not be_nil
 
-    loader.find_and_process(column, "2011-07-23")
-    loader.load_object.value_as_datetime.should_not be_nil
+    @loader.find_and_process(column, "2011-07-23")
+    @loader.load_object.value_as_datetime.should_not be_nil
 
-    loader.find_and_process(column, "Sat Jul 23 09:01:56 +0100 2011")
-    loader.load_object.value_as_datetime.should_not be_nil
+    @loader.find_and_process(column, "Sat Jul 23 09:01:56 +0100 2011")
+    @loader.load_object.value_as_datetime.should_not be_nil
 
-    loader.find_and_process(column,  Time.now.to_s(:db))
-    loader.load_object.value_as_datetime.should_not be_nil
+    @loader.find_and_process(column,  Time.now.to_s(:db))
+    @loader.load_object.value_as_datetime.should_not be_nil
 
-    loader.find_and_process(column,  "Jul 23 2011 23:02:59")
-    loader.load_object.value_as_datetime.should_not be_nil
+    @loader.find_and_process(column,  "Jul 23 2011 23:02:59")
+    @loader.load_object.value_as_datetime.should_not be_nil
 
-    if(Guards.jruby?)
-      loader.find_and_process(column,  "07/23/2011")    # dd/mm/YYYY
-      loader.load_object.value_as_datetime.should_not be_nil
+    if(DataShift::Guards.jruby?)
+      @loader.find_and_process(column,  "07/23/2011")    # dd/mm/YYYY
+      @loader.load_object.value_as_datetime.should_not be_nil
     end
     
     # bad casts - TODO - is this really an error needs raising ?
-    loader.find_and_process(column, "2011 07 23")
-    loader.load_object.value_as_datetime.should be_nil
+    @loader.find_and_process(column, "2011 07 23")
+    @loader.load_object.value_as_datetime.should be_nil
 
 
-    loader.find_and_process(column,  "2011-23-07")
-    loader.load_object.value_as_datetime.should be_nil
+    @loader.find_and_process(column,  "2011-23-07")
+    @loader.load_object.value_as_datetime.should be_nil
 
   end
 

data/spec/method_dictionary_spec.rb

@@ -7,19 +7,12 @@
 #             MethodMapper provides the bridge between 'strings' e.g column headings
 #             and a classes different types of assignment operators
 #
-require File.dirname(__FILE__) + '/spec_helper'
+require File.join(File.dirname(__FILE__), 'spec_helper')
     
-describe 'Method Mapping' do
+describe 'Method Dictionary' do
 
-  before(:all) do
-    
-    # load our test model definitions - Project etc  
-    require ifixture_file('test_model_defs')  
+  include_context "ActiveRecordTestModelsConnected"
   
-    db_connect( 'test_file' )    # , test_memory, test_mysql
-
-    migrate_up
-  end
   
   before(:each) do
     MethodDictionary.clear