data_science_theater_3000 0.0.5 → 0.0.6

data/README.md

@@ -13,6 +13,16 @@
 
 #### Just ...
     require "data_science_theater_3000"
+    
+    DataScienceTheater3000.ip2coordinates(ip_string)
+    DataScienceTheater3000.file2text(path_to_file) # local files only right now
+    DataScienceTheater3000.coordinates2politics(lat_long_string)
+    DataScienceTheater3000.street2coordinates(address_string)
+
+Or
+    dst3k = DataScienceTheater3000
+    dst3k.coordinates2politics( dst3k.ip2coordinates(ip_string) )
+    dst3k.coordinates2politics( dst3k.street2coordinates(address_string) )
 
 ## Contributing
 

data/lib/data_science_theater_3000.rb

@@ -7,18 +7,23 @@ module DataScienceTheater3000
   # Converts an ip address into a location hash
   #
   # @param [String] ip the ip address to be located
-  # @return [Hash] key is the ip string passed in as parameter, value is a hash of location information.
+  # @return [Hash] hash of location information. Can be passed as input to coordinates2politics
   def self.ip2coordinates ip
     url = "http://www.datasciencetoolkit.org"
     response = Curl::Easy.perform( url + "/ip2coordinates/" + ip ).body_str
 
     coordinates = make_hashy(response)
+    # Account for satellite provider or anonymous proxy
+    if coordinates.invert.keys.include?(nil)
+      coordinates[ip] = { :longitude => "unknown", :latitude => "unknown", :country => "unknown", :region => "unknown", :postal_code => "unknown" }
+    end
+    coordinates
   end
 
   # Converts a street address into a location hash
   #
   # @param [String] address the address to be located
-  # @return [Hash] key is the address string passed in as a paremeter, value is a hash of location information
+  # @return [Hash] hash of location information. Can be passed as input to coordinates2politics
   def self.street2coordinates address
     url = "http://www.datasciencetoolkit.org"
     address.gsub!( "," , "%2c" )
@@ -31,9 +36,13 @@ module DataScienceTheater3000
   # Uses latitude,longitude pair to find detailed political information about a location.
   # Currently supporting a single pair.
   #
-  # @param [String] "latitude,longitude"
-  # @return [Array] Array containing hashes with detailed political information about a location
-  def self.coordinates2politics coords
+  # @param [String,Hash] coords "lat,long" or the hash returned from ip2coordinates/street2coordinates
+  # @return [Array] contains hashes with detailed political information for a location
+  def self.coordinates2politics coords 
+    if coords.class == Hash
+      coords = coords.keys.map{|k| "#{coords[k]["latitude"]},#{coords[k]["longitude"]}"}.first
+    end
+
     url = "http://www.datasciencetoolkit.org"
     coords.gsub!( "," , "%2c" )
     response = Curl::Easy.perform( url + "/coordinates2politics/" + coords ).body_str
@@ -64,6 +73,9 @@ module DataScienceTheater3000
   # @param [String] file_path
   # @return [String] text discerned from image
   def self.file2text file_path
+    file_reg = /([^\s]+(\.(?i)(jpg|png|gif|bmp))$)/
+    raise "Does not look like path to a file: #{file_path}" if !file_reg.match(file_path)
+    raise "Support paths to images hosted remotely soon" if file_path.include?('http:')
     url = "http://www.datasciencetoolkit.org"
     c = Curl::Easy.new( url + '/file2text')
     c.multipart_form_post = true
@@ -72,7 +84,6 @@ module DataScienceTheater3000
     response = c.body_str
   end
 
-
   def self.make_hashy response
     ActiveSupport::JSON.decode(response)
   end

data/lib/data_science_theater_3000/version.rb

@@ -1,3 +1,3 @@
 module DataScienceTheater3000
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_science_theater_3000
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000Z
+date: 2012-01-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &20685060 !ruby/object:Gem::Requirement
+  requirement: &13277320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20685060
+  version_requirements: *13277320
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &20684140 !ruby/object:Gem::Requirement
+  requirement: &13276660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20684140
+  version_requirements: *13276660
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &20683500 !ruby/object:Gem::Requirement
+  requirement: &13275860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20683500
+  version_requirements: *13275860
 description: Ruby interface to issue Data Science Toolkit API calls.
 email:
 - tad@isotope11.com