drive_time 0.0.7 → 0.0.8

data/lib/drive_time/converters/spreadsheets_converter.rb

@@ -104,10 +104,13 @@ module DriveTime
     def worksheet_for_association(name, worksheets)
       # And find the worksheet that satisfies it
       worksheets.each do |worksheet|
+        puts "#{name} --->"
         class_name = DriveTime.class_name_from_title(worksheet.title)
-        resolved = @class_name_map.resolve_mapped_from_original class_name
+        puts " --  #{DriveTime.underscore_from_text(worksheet.title)}"
+        #resolved = @class_name_map.resolve_mapped_from_original class_name
+        #puts "Resolved  --  #{resolved}"
         # If the name matches we have a dependent relationship
-        if resolved.underscore == name
+        if name == DriveTime.underscore_from_text(worksheet.title)
           return worksheet
         end
       end

data/lib/drive_time/converters/worksheet_converter.rb

@@ -6,7 +6,7 @@ module DriveTime
 
     class NoClassWithTitleError < StandardError; end
     class NoFieldNameError < StandardError; end
-
+    class NoMethodError < StandardError; end
     class NoKeyError < StandardError; end
     class PolymorphicAssociationError < StandardError; end
 
@@ -57,7 +57,8 @@ module DriveTime
       model_key = build_id_for_model mapping
       Logger.log_as_sub_header "Model Key: #{model_key}"
       # Build hash ready to pass into model
-      model_fields = row_fields_to_model_fields mapping, model_key
+      model_fields = row_fields_to_model_fields(mapping, model_key)
+      method_calls = row_fields_to_method_calls(mapping, model_key)
 
       # Set the model key as an attribute on the model
       if mapping[:key_to]
@@ -65,8 +66,23 @@ module DriveTime
       end
 
       Logger.debug "Creating Model of class '#{clazz.name.to_s}' with Model Fields #{model_fields.to_s}"
+
       # Create new model
       model = clazz.new(model_fields, without_protection: true)
+
+      # Invoke any method calls
+      method_calls.each do |method_call|
+        call_step = model
+        methods = method_call["methods"]
+        methods.each_with_index do |method, index|
+          if index == method_call.length - 1
+            call_step.send(method, method_call["value"])
+          else
+            call_step = call_step.send(method)
+          end
+        end
+      end
+
       # Add its associations
       add_associations(model, mapping)
       # Store the model using its ID
@@ -85,39 +101,46 @@ module DriveTime
       end
     end
 
+    def row_fields_to_method_calls(mapping, model_key)
+      method_calls = []
+      # Run through the mapping, pulling values from row_map as required
+      if mapping[:calls]
+        mapping[:calls].each do |call_mapping|
+          field_name = call_mapping[:name]
+          methods = call_mapping[:methods]
+
+          unless methods
+            raise NoMethodError "Missing Method: Name for call field: #{field_name} in mapping: #{mapping}"
+          end
+
+          field_value = parse_field_value(@row_map[field_name])
+
+          # handle multi-values
+          if call_mapping[:builder] == "multi"
+            field_value = MultiBuilder.new.build(field_value)
+          end
+          method_calls << {"methods" => methods, "value" => field_value}
+        end
+      end
+      return method_calls
+    end
+
     # Run through the mapping's fields and convert them
     def row_fields_to_model_fields(mapping, model_key)
       model_fields = HashWithIndifferentAccess.new
+
       # Run through the mapping, pulling values from row_map as required
       if mapping[:fields]
         mapping[:fields].each do |field_mapping|
           field_name = field_mapping[:name]
           mapped_to_field_name = field_mapping[:map_to]
+
           unless field_name
             raise NoFieldNameError "Missing Field: Name for field: #{value} in mapping: #{mapping}"
           end
 
-          field_value = @row_map[field_name]
-          # Check for token pattern: {{some_value}}
-          match = /\{\{(.*?)\}\}/.match(field_value)
-          if match
-            field_value = @field_expander.expand(match[1], model_key)
-          end
-
-          # Check for Boolean values
-          if field_value
-            downcased = field_value.downcase
-            if downcased == 'y' || downcased == 'yes' || downcased == 'true'
-              field_value = true
-            elsif downcased == 'n' || downcased == 'no' || downcased == 'false'
-              field_value = false
-            end
-          end
-
-          # Make sure any empty cells give us nil (rather than an empty string)
-          field_value = nil if field_value.blank?
+          field_value = parse_field_value(@row_map[field_name])
           model_fields[mapped_to_field_name || field_name] = field_value
-
         end
       end
       return model_fields
@@ -133,7 +156,7 @@ module DriveTime
         associations_mapping.each do |association_mapping|
           # Use the spreadsheet name unless 'map_to_class' is set
           if !association_mapping[:polymorphic]
-            association_class_name = @class_name_map.resolve_mapped_from_original association_mapping[:name].classify
+            association_class_name = @class_name_map.resolve_mapped_from_original(association_mapping[:name].classify)
           else
             possible_class_names = association_mapping[:name]
             # The classname will be taken from the type collumn
@@ -180,7 +203,7 @@ module DriveTime
       associated_models.each do |associated_model|
         Logger.debug " - Associated Model: #{associated_model}"
         unless association_mapping[:inverse] == true
-          association_name = association_class_name.underscore
+          association_name = association_class_name.split('::').last.underscore
           if association_mapping[:singular] == true
             Logger.debug "   - Adding association #{associated_model} to #{model}::#{association_name}"
             # Set the association
@@ -210,9 +233,11 @@ module DriveTime
     def associated_models_from_builder(association_mapping, class_name)
       associated_models = []
       if association_mapping[:builder] == 'multi' # It's a multi value, find a matching cell and split its value by comma
-        cell_value = @row_map[class_name.underscore.pluralize]
-        raise MissingAssociationError "No field #{class_name.underscore.pluralize} to satisfy multi association" if !cell_value && association_mapping[:optional] != true
-        components = cell_value.split ','
+        # Use only the classname for the fieldname, discarding namespace
+        field_name = class_name.split("::").last.underscore.pluralize
+        cell_value = @row_map[field_name]
+        raise MissingAssociationError "No field #{class_name.underscore.pluralize} to satisfy multi association" if cell_value.blank? && association_mapping[:optional] != true
+        components = MultiBuilder.new.build(cell_value)
         components.each do |component|
           associated_models << model_for_id(component, namespaced_class_name(class_name))
         end
@@ -252,9 +277,40 @@ module DriveTime
       end
     end
 
-    def namespaced_class_name class_name
+    def namespaced_class_name(class_name)
       class_name = "#{@namespace}::#{class_name}" unless @namespace.blank?
       class_name.constantize
     end
+
+    def parse_field_value(field_value)
+      if field_value
+        field_value = check_for_token(field_value)
+        field_value = check_for_boolean(field_value)
+      end
+      # Make sure any empty cells give us nil (rather than an empty string)
+      field_value = nil if field_value.blank?
+      field_value
+    end
+
+    def check_for_token(field_value)
+      # Check for token pattern: {{some_value}}
+      match = /\{\{(.*?)\}\}/.match(field_value)
+      if match
+        @field_expander.expand(match[1], model_key)
+      else
+        field_value
+      end
+    end
+
+    def check_for_boolean(field_value)
+      downcased = field_value.downcase
+      if downcased == 'y' || downcased == 'yes' || downcased == 'true'
+        true
+      elsif downcased == 'n' || downcased == 'no' || downcased == 'false'
+        false
+      else
+        field_value
+      end
+    end
   end
 end

data/lib/drive_time/model_store.rb

@@ -32,6 +32,7 @@ module DriveTime
       class_string = clazz.to_s
       # Sanitise key
       key = DriveTime.underscore_from_text(key)
+
       @logger.debug "Adding model with key #{key} of class #{clazz}"
       if !@store[class_string]
         @store[class_string] = {}
@@ -43,7 +44,6 @@ module DriveTime
 
     def get_model(clazz, key)
       @logger.debug "Request for model with key #{key} of class #{clazz}"
-
       models_for_class = @store[clazz.to_s]
       # Are there any classes of this type in the store?
       if models_for_class.nil?
@@ -52,8 +52,7 @@ module DriveTime
 
       # Is there an instance
       model = models_for_class[key]
-
-      if !model
+      unless model.preset?
         raise NoModelOfClassWithKeyInStoreError, "No model of class #{clazz} with a key of #{key} in model store"
       end
 
@@ -61,13 +60,21 @@ module DriveTime
     end
 
     def save_all
+      @logger.log_as_header "Saving Models"
       @store.each do |key, models|
         models.each do |key, model|
-          model.save!
+          @logger.debug "Saving Model: #{key} #{model.inspect}"
+          begin
+            model.save!
+          rescue Exception => error
+              @logger.warn "Failed To Save Model: #{key}"
+              @logger.warn "Error: #{error}"
+              @logger.warn "#{model.inspect}"
+              raise error
+            end
         end
       end
     end
 
   end
-
 end

data/lib/drive_time/version.rb

@@ -1,3 +1,3 @@
 module DriveTime
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/drive_time.rb

@@ -15,6 +15,7 @@ require 'drive_time/loader'
 require 'drive_time/class_name_map'
 require 'drive_time/builders/join_builder'
 require 'drive_time/builders/name_builder'
+require 'drive_time/builders/multi_builder'
 require 'drive_time/converters/spreadsheets_converter'
 require 'drive_time/converters/worksheet_converter'
 require 'drive_time/logging'

data/spec/fixtures/mapping.yml

@@ -21,7 +21,7 @@ spreadsheets:
             builder: use_fields
             field_names: [label_1, label_2, label_3]
             singular: true
-          - name: act
+          - name: group
             singular: true
 
       - title: Label

data/spec/full_tests.rb

@@ -45,4 +45,4 @@ module DriveTime
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drive_time
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r