data_miner 1.3.4 → 1.3.6

data/lib/data_miner/attribute.rb

@@ -105,8 +105,15 @@ class DataMiner
     end
     
     def do_convert(row, value)
-      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)))
+      unless wants_units?
+        raise ::RuntimeError, "[data_miner] If you use 'from_units', you need to set 'to_units' (#{inspect})"
+      end
+      final_from_units = (from_units || unit_from_source(row))
+      final_to_units = (to_units || unit_from_source(row))
+      if final_from_units.blank? or final_to_units.blank?
+        raise ::RuntimeError, "[data_miner] Missing units (from=#{final_from_units.inspect}, to=#{final_to_units.inspect}"
+      end
+      value.to_f.convert final_from_units, final_to_units
     end
     
     def do_sprintf(value)

data/lib/data_miner/tap.rb

@@ -1,5 +1,9 @@
 require 'posix/spawn'
+require 'uri'
 class DataMiner
+  # Note that you probably shouldn't put taps into your Gemfile, because it depends on sequel and other gems that may not compile on Heroku (etc.)
+  #
+  # This class automatically detects if you have Bundler installed, and if so, executes the `taps` binary with a "clean" environment (i.e. one that will not pay attention to the fact that taps is not in your Gemfile)
   class Tap
     attr_reader :config
     attr_reader :description
@@ -97,12 +101,21 @@ class DataMiner
       }
     end
     
-    def db_locator
+    # "user:pass"
+    # "user"
+    # nil
+    def userinfo
+      if username.present?
+        [username, password].select(&:present?).join(':')
+      end
+    end
+    
+    def db_url
       case adapter
       when 'sqlite'
-        database
+        "sqlite://#{database}"
       else
-        "#{username}:#{password}@#{host}:#{port}/#{database}"
+        ::URI::Generic.new(adapter, userinfo, host, port, nil, "/#{database}", nil, nil, nil).to_s
       end
     end
     
@@ -110,15 +123,25 @@ class DataMiner
       args = [
         'taps',
         'pull',
-        "#{adapter}://#{db_locator}",
+        db_url,
         source,
         '--indexes-first',
         '--tables',
         source_table_name
       ]
-      child = ::POSIX::Spawn::Child.new *args
+      child = nil
+      
+      # https://github.com/carlhuda/bundler/issues/1579
+      if defined?(::Bundler)
+        ::Bundler.with_clean_env do
+          child = ::POSIX::Spawn::Child.new(*args)
+        end
+      else
+        child = ::POSIX::Spawn::Child.new(*args)
+      end
+      
       unless child.success?
-        raise %{[data_miner gem] Got "#{child.err}" back when tried to run "#{args.join(' ')}". You may need to install taps manually.}
+        raise %{[data_miner gem] Got "#{child.err}" when tried "#{args.join(' ')}". You need to have the taps binary in your PATH. Putting it in your Gemfile, however, is not recommended.}
       end
     end
   end

data/lib/data_miner/version.rb

@@ -1,3 +1,3 @@
 class DataMiner
-  VERSION = '1.3.4'
+  VERSION = '1.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_miner
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: remote_table
-  requirement: &2164482280 !ruby/object:Gem::Requirement
+  requirement: &2164579240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2164482280
+  version_requirements: *2164579240
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2164513760 !ruby/object:Gem::Requirement
+  requirement: &2164578480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164513760
+  version_requirements: *2164578480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164513300 !ruby/object:Gem::Requirement
+  requirement: &2164577700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164513300
+  version_requirements: *2164577700
 - !ruby/object:Gem::Dependency
   name: conversions
-  requirement: &2164512840 !ruby/object:Gem::Requirement
+  requirement: &2164577080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164512840
+  version_requirements: *2164577080
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &2164512380 !ruby/object:Gem::Requirement
+  requirement: &2164576420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2164512380
+  version_requirements: *2164576420
 - !ruby/object:Gem::Dependency
   name: errata
-  requirement: &2164511920 !ruby/object:Gem::Requirement
+  requirement: &2164575740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164511920
+  version_requirements: *2164575740
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &2164511540 !ruby/object:Gem::Requirement
+  requirement: &2164575260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164511540
+  version_requirements: *2164575260
 - !ruby/object:Gem::Dependency
   name: mini_record-compat
-  requirement: &2164511080 !ruby/object:Gem::Requirement
+  requirement: &2164574580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164511080
+  version_requirements: *2164574580
 - !ruby/object:Gem::Dependency
   name: loose_tight_dictionary
-  requirement: &2164510580 !ruby/object:Gem::Requirement
+  requirement: &2164573940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *2164510580
+  version_requirements: *2164573940
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2164510160 !ruby/object:Gem::Requirement
+  requirement: &2164573360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164510160
+  version_requirements: *2164573360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2164509700 !ruby/object:Gem::Requirement
+  requirement: &2164572800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164509700
+  version_requirements: *2164572800
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2164509280 !ruby/object:Gem::Requirement
+  requirement: &2164572140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164509280
+  version_requirements: *2164572140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164508860 !ruby/object:Gem::Requirement
+  requirement: &2164571480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,7 +155,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164508860
+  version_requirements: *2164571480
 description: Mine remote data into your ActiveRecord models. You can also convert
   units.
 email:
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: data_miner
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Mine remote data into your ActiveRecord models.
@@ -229,3 +229,4 @@ test_files:
 - test/test_data_miner_process.rb
 - test/test_old_syntax.rb
 - test/test_tap.rb
+has_rdoc: