seamusabshere-data_miner 0.1.6 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/data_miner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{data_miner}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere", "Andy Rossmeissl"]
-  s.date = %q{2009-09-02}
+  s.date = %q{2009-09-08}
   s.description = %q{Mine remote data into your ActiveRecord models. You can also perform associations and convert units.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [

data/lib/data_miner/attribute.rb

@@ -75,7 +75,11 @@ module DataMiner
     def value_as_association(step, value)
       @_value_as_association ||= {}
       @_value_as_association[step] ||= {}
-      @_value_as_association[step][value] ||= reflection_klass(step).send("find_by_#{foreign_key(step)}", value)
+      if !@_value_as_association[step].has_key?(value)
+        dynamic_matcher = wants_create?(step) ? "find_or_create_by_#{foreign_key(step)}" : "find_by_#{foreign_key(step)}"
+        @_value_as_association[step][value] = reflection_klass(step).send(dynamic_matcher, value)
+      end
+      @_value_as_association[step][value]
     end
     
     # this will overwrite nils, even if wants_overwriting?(step) is false
@@ -193,7 +197,7 @@ module DataMiner
     {
       :static => 'options_for_step[step].has_key?(:static)',
       :prefix => :prefix,
-      :create => 'create(step) != false',
+      :create => :create,
       :keep => :keep,
       :upcase => :upcase,
       :conversion => '!from(step).nil? or !unit_in_source(step).nil?',
@@ -247,7 +251,7 @@ module DataMiner
     end
     
     def wants_inline_association?
-      !reflection.nil?
+      reflection.present?
     end
     
     def callback(step)

data/test/data_miner_test.rb

@@ -69,10 +69,10 @@ class DataMinerTest < Test::Unit::TestCase
     assert_equal 0, Airport.count
   end
   
-  # should "mine all classes" do
-  #   DataMiner.mine
-  #   uy = Country.find_by_iso_3166('UY')
-  #   assert_equal 'Uruguay', uy.name
-  #   assert_equal uy, Airport.find_by_iata_code('MVD').country
-  # end
+  should "mine all classes" do
+    DataMiner.mine
+    uy = Country.find_by_iso_3166('UY')
+    assert_equal 'Uruguay', uy.name
+    assert_equal uy, Airport.find_by_iata_code('MVD').country
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: seamusabshere-data_miner
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -07:00
+date: 2009-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency