data_miner 3.0.0.beta → 3.0.0.rc1

data/CHANGELOG

@@ -1,3 +1,9 @@
+3.0.0.rc1 / 2013-08-08
+
+* Enhancements
+
+  * :field_name can be passed as an Array like [ :first_name, :last_name ], which will join them with a space
+
 3.0.0.beta / 2013-07-26
 
 * Enhancements

data/lib/data_miner/attribute.rb

@@ -134,16 +134,18 @@ class DataMiner
       @hstore_key = name.split('.', 2)[1]
     end
 
-    # Where to find the data in the row.
-    # @return [String]
+    # Where to find the data in the row. If more than one field name, values are joined with a space.
+    # @return [Array<String>]
     def field_name
       return @field_name if defined?(@field_name)
-      @field_name = if @field_name_settings
-        @field_name_settings.to_s
+      @field_name = if @field_name_settings.is_a?(::Array)
+        @field_name_settings.map(&:to_s)
+      elsif @field_name_settings.is_a?(::String) or @field_name_settings.is_a?(::Symbol)
+        [ @field_name_settings.to_s ]
       elsif hstore?
-        hstore_key
+        [ hstore_key ]
       else
-        name
+        [ name ]
       end
     end
 
@@ -168,6 +170,8 @@ class DataMiner
     end
 
     # @private
+    ROW_HASH_FIELD_NAME = ['row_hash']
+    SINGLE_SPACE = ' '
     def read(row)
       if not column_exists?
         raise RuntimeError, "[data_miner] Table #{model.table_name} does not have column #{(hstore? ? hstore_column : name).inspect}"
@@ -182,10 +186,10 @@ class DataMiner
         else
           row[field_number]
         end
-      elsif field_name == 'row_hash'
+      elsif field_name == ROW_HASH_FIELD_NAME
         row.row_hash
       elsif row.is_a?(::Hash) or row.is_a?(::ActiveSupport::OrderedHash)
-        row[field_name] # remote_table hash keys are always strings
+        field_name.length > 1 ? row.values_at(*field_name).join(SINGLE_SPACE) : row[field_name[0]]
       end
       if value.nil?
         return

data/lib/data_miner/step/test.rb

@@ -32,11 +32,12 @@ class DataMiner
 
       # @private
       def initialize(script, description, settings, &blk)
+        settings = settings.stringify_keys
         @script = script
         @description = description
         @blk = blk
-        @after = settings[:after]
-        @every = settings[:every]
+        @after = settings['after']
+        @every = settings['every']
         raise "can't do both after and every" if after and every
       end
       

data/lib/data_miner/version.rb

@@ -1,3 +1,3 @@
 class DataMiner
-  VERSION = '3.0.0.beta'
+  VERSION = '3.0.0.rc1'
 end

data/test/support/pet.rb

@@ -14,6 +14,7 @@ class Pet < ActiveRecord::Base
   col :favorite_food
   col :command_phrase
   col :emphatic_command_phrase
+  col :age_weight
   belongs_to :breed
 
 
@@ -36,6 +37,7 @@ class Pet < ActiveRecord::Base
       store :emphatic_command_phrase do |row|
         (row['command_phrase'] + "!!!!!") if row['command_phrase']
       end
+      store :age_weight, field_name: [:age, :weight]
     end
 
   end

data/test/test_data_miner.rb

@@ -47,6 +47,10 @@ describe DataMiner do
         FileUtils.mv "#{PETS}.bak", PETS
       end
     end
+    it "combines fields with a space if array passed to :field_name" do
+      Pet.run_data_miner!
+      Pet.find('Jerry').age_weight.must_equal '5 10'
+    end
     it "provides :run_data_miner_on_parent_associations!" do
       Pet.run_data_miner!
       Pet.find('Jerry').breed.must_equal Breed.find('Beagle')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_miner
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta
+  version: 3.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord