drive_time 0.0.8 → 0.0.9

data/README.md

@@ -1,6 +1,7 @@
 # DriveTime
+[![Gem Version](https://badge.fury.io/rb/drive_time.png)](http://badge.fury.io/rb/drive_time)
 
-Drive Time allows you to transform one or more Google Spreadsheet's into a Rails model graph.
+Drive Time allows you transfer data from one or more Google Spreadsheets to your Rails Models. It supports associations and has a number of useful features to give you choices on how to mapthe data.
 
 ## Installation
 

data/lib/drive_time/builders/multi_builder.rb

@@ -0,0 +1,15 @@
+module DriveTime
+
+  # Split a string on ',' into an array of values
+  class MultiBuilder
+
+   def build(value)
+    if value.present?
+      value = value.gsub("\n", "").strip.split(',')
+    else
+      []
+    end
+   end
+
+  end
+end

data/lib/drive_time/builders/name_builder.rb

@@ -6,7 +6,6 @@ module DriveTime
     protected
 
       def process_value(value)
-
         # Add a period to initials
         if value.length == 1
           return "#{value}."

data/lib/drive_time/converters/spreadsheets_converter.rb

@@ -104,11 +104,7 @@ 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)
-        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 name == DriveTime.underscore_from_text(worksheet.title)
           return worksheet

data/lib/drive_time/converters/worksheet_converter.rb

@@ -35,7 +35,6 @@ module DriveTime
       fields = rows.shift.map{ |row| row }
       # Reject rows of only empty strings (empty cells).
       rows.reject! {|row| row.all?(&:empty?)}
-
       rows.each do |row|
         generate_model_from_row clazz, worksheet.mapping, fields, row
       end
@@ -70,18 +69,7 @@ module DriveTime
       # 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
+      invoke_methods_on_model(model, method_calls)
 
       # Add its associations
       add_associations(model, mapping)
@@ -101,6 +89,21 @@ module DriveTime
       end
     end
 
+    def invoke_methods_on_model(model, method_calls)
+      # 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
+    end
+
     def row_fields_to_method_calls(mapping, model_key)
       method_calls = []
       # Run through the mapping, pulling values from row_map as required
@@ -113,7 +116,7 @@ module DriveTime
             raise NoMethodError "Missing Method: Name for call field: #{field_name} in mapping: #{mapping}"
           end
 
-          field_value = parse_field_value(@row_map[field_name])
+          field_value = parse_field_value(@row_map[field_name], model_key)
 
           # handle multi-values
           if call_mapping[:builder] == "multi"
@@ -139,14 +142,13 @@ module DriveTime
             raise NoFieldNameError "Missing Field: Name for field: #{value} in mapping: #{mapping}"
           end
 
-          field_value = parse_field_value(@row_map[field_name])
+          field_value = parse_field_value(@row_map[field_name], model_key)
           model_fields[mapped_to_field_name || field_name] = field_value
         end
       end
       return model_fields
     end
 
-    # TODO: Refactor this big ugly beast
     def add_associations(model, mapping)
       associations_mapping = mapping[:associations]
       if associations_mapping
@@ -282,9 +284,9 @@ module DriveTime
       class_name.constantize
     end
 
-    def parse_field_value(field_value)
+    def parse_field_value(field_value, model_key)
       if field_value
-        field_value = check_for_token(field_value)
+        field_value = check_for_token(field_value, model_key)
         field_value = check_for_boolean(field_value)
       end
       # Make sure any empty cells give us nil (rather than an empty string)
@@ -292,7 +294,7 @@ module DriveTime
       field_value
     end
 
-    def check_for_token(field_value)
+    def check_for_token(field_value, model_key)
       # Check for token pattern: {{some_value}}
       match = /\{\{(.*?)\}\}/.match(field_value)
       if match

data/lib/drive_time/model_store.rb

@@ -52,7 +52,7 @@ module DriveTime
 
       # Is there an instance
       model = models_for_class[key]
-      unless model.preset?
+      unless model.present?
         raise NoModelOfClassWithKeyInStoreError, "No model of class #{clazz} with a key of #{key} in model store"
       end
 

data/lib/drive_time/version.rb

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

data/spec/drive_time/builder/join_builder_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module DriveTime
 

data/spec/drive_time/builder/multi_buider_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+module DriveTime
+
+  describe MultiBuilder do
+
+    before :each do
+      @builder = MultiBuilder.new
+      @valid_string = "one,two,three"
+      @valid_string_with_newlines = "\none,\ntwo,\nthree\n"
+    end
+
+    context "for a valid string" do
+
+      it "should split a string on commas" do
+        @builder.build(@valid_string).should == ["one", "two", "three"]
+      end
+
+      it "should remove all newlines" do
+        @builder.build(@valid_string_with_newlines).should == ["one", "two", "three"]
+      end
+
+    end
+
+    it "should return an empty array for an empty string" do
+      @builder.build("").should == []
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drive_time
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -171,6 +171,7 @@ files:
 - lib/drive_time.rb
 - lib/drive_time/bi_directional_hash.rb
 - lib/drive_time/builders/join_builder.rb
+- lib/drive_time/builders/multi_builder.rb
 - lib/drive_time/builders/name_builder.rb
 - lib/drive_time/class_name_map.rb
 - lib/drive_time/converters/spreadsheets_converter.rb
@@ -182,15 +183,16 @@ files:
 - lib/drive_time/version.rb
 - spec/drive_time/bi_directional_hash_spec.rb
 - spec/drive_time/builder/join_builder_spec.rb
+- spec/drive_time/builder/multi_buider_spec.rb
 - spec/drive_time/builder/name_builder_spec.rb
 - spec/drive_time/class_name_map_spec.rb
 - spec/drive_time/converters/worksheet_converter_spec.rb
 - spec/drive_time/field_expander_spec.rb
+- spec/drive_time/integration/full.rb
 - spec/drive_time/loader_spec.rb
 - spec/drive_time/model_store_spec.rb
 - spec/drive_time_spec.rb
 - spec/fixtures/mapping.yml
-- spec/full_tests.rb
 - spec/spec_helper.rb
 homepage: https://github.com/stationkeeping/drive_time
 licenses: []
@@ -220,14 +222,15 @@ summary: Map Worksheets to Models and their columns to model attributes. Seed yo
 test_files:
 - spec/drive_time/bi_directional_hash_spec.rb
 - spec/drive_time/builder/join_builder_spec.rb
+- spec/drive_time/builder/multi_buider_spec.rb
 - spec/drive_time/builder/name_builder_spec.rb
 - spec/drive_time/class_name_map_spec.rb
 - spec/drive_time/converters/worksheet_converter_spec.rb
 - spec/drive_time/field_expander_spec.rb
+- spec/drive_time/integration/full.rb
 - spec/drive_time/loader_spec.rb
 - spec/drive_time/model_store_spec.rb
 - spec/drive_time_spec.rb
 - spec/fixtures/mapping.yml
-- spec/full_tests.rb
 - spec/spec_helper.rb
 has_rdoc: