data_miner 0.4.19 → 0.4.20

data/VERSION

@@ -1 +1 @@
-0.4.19
+0.4.20

data/data_miner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{data_miner}
-  s.version = "0.4.19"
+  s.version = "0.4.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere", "Andy Rossmeissl"]

data/lib/data_miner/attribute.rb

@@ -6,12 +6,34 @@ module DataMiner
 
     delegate :resource, :to => :step
 
+    VALID_OPTIONS = [
+      :from_units,
+      :to_units,
+      :static,
+      :dictionary,
+      :field_name,
+      :delimiter,
+      :split,
+      :units,
+      :sprintf,
+      :nullify,
+      :overwrite,
+      :upcase,
+      :units_field_name,
+      :units_field_number,
+      :field_number,
+      :chars
+    ]
+
     def initialize(step, name, options = {})
       options.symbolize_keys!
-      @options = options
 
       @step = step
       @name = name
+      
+      invalid_option_keys = options.keys.select { |k| not VALID_OPTIONS.include? k }
+      DataMiner.log_or_raise "Invalid options: #{invalid_option_keys.map(&:inspect).to_sentence} (#{inspect})" if invalid_option_keys.any?
+      @options = options
     end
         
     def inspect
@@ -83,8 +105,8 @@ module DataMiner
     end
     
     def do_convert(row, value)
-      DataMiner.log_or_raise "If you use :from_units, you need to set :to_units (#{resource.name}##{name})" unless wants_units?
-      value.to_f.convert((from_units || unit_from_source(row)), to_units)
+      DataMiner.log_or_raise "If you use :from_units, you need to set :to_units (#{inspect})" unless wants_units?
+      value.to_f.convert((from_units || unit_from_source(row)), (to_units || unit_from_source(row)))
     end
     
     def do_sprintf(value)
@@ -151,23 +173,12 @@ module DataMiner
       options[:split]
     end
     
-    # Normal options
-    # %w(from_units to_units conditions sprintf nullify overwrite upcase units_field_name field_number chars static).each do |name|
-    #   puts <<-EOS
-    #     def #{name}
-    #       options[:#{name}]
-    #     end
-    #   EOS
-    # end
     def from_units
       options[:from_units]
     end
     def to_units
       options[:to_units] || options[:units]
     end
-    def conditions
-      options[:conditions]
-    end
     def sprintf
       options[:sprintf]
     end

data/lib/data_miner.rb

@@ -1,4 +1,11 @@
 require 'active_support'
+require 'active_support/version'
+%w{
+  active_support/core_ext/array/conversions
+}.each do |active_support_3_requirement|
+  require active_support_3_requirement
+end if ActiveSupport::VERSION::MAJOR == 3
+
 require 'active_record'
 require 'blockenspiel'
 require 'conversions'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 19
-  version: 0.4.19
+  - 20
+  version: 0.4.20
 platform: ruby
 authors: 
 - Seamus Abshere