data_science_theater_3000 0.0.7.1 → 0.0.8

data/lib/data_science_theater_3000.rb

@@ -6,10 +6,14 @@ require "data_science_theater_3000/version"
 module DataScienceTheater3000
   # Converts an ip address into a location hash
   #
-  # @param [String] ip the ip address to be located
-  # @return [Hash] hash of location information. Can be passed as input to coordinates2politics
+  # @param [Array, String] ip Either an array of ip strings or a single ip address to be located
+  # @return [Hash] hash of location information. Singular output can be passed as input to coordinates2politics
   def self.ip2coordinates ip
     url = "http://www.datasciencetoolkit.org"
+    if ip.class == Array
+      ip.each {|i| i.gsub!(",", "%2c") }
+      ip = ActiveSupport::JSON.encode(ip)
+    end
     response = Curl::Easy.perform( url + "/ip2coordinates/" + ip ).body_str
 
     coordinates = make_hashy(response)
@@ -23,42 +27,49 @@ module DataScienceTheater3000
   # Converts a street address into a location hash
   #
   # @param [String, Array] address as either a single string or array of strings
-  # @return [Hash] hash of location information. Can be passed as input to coordinates2politics
+  # @return [Hash] hash of location information. Singular output can be passed as input to coordinates2politics
   def self.street2coordinates address
     url = "http://www.datasciencetoolkit.org"
     if address.class == String
       address.gsub!(",", "%2c").gsub!(" ", "+")
-      response = Curl::Easy.perform( url + "/street2coordinates/" + address ).body_str
     elsif address.class == Array
       address.each {|a| a.gsub!(",", "%2c").gsub!(" ", "+") }
       address = ActiveSupport::JSON.encode(address)
-      response = Curl::Easy.perform( url + "/street2coordinates/" + address ).body_str
     end
+    response = Curl::Easy.perform( url + "/street2coordinates/" + address ).body_str
+
     coordinates = make_hashy(response)
   end
   
   # Uses latitude,longitude pair to find detailed political information about a location.
   # Currently supporting a single pair.
   #
-  # @param [Hash,String] hash returned from ip2coordinates/street2coordinates or just a string like "33,-86"
+  # @param [Hash,String] coords hash returned from ip2coordinates/street2coordinates or just a string like "33,-86"
   # @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"
+    if coords.class == Hash && coords.keys.count == 1
+      coords = coords.keys.map{ |k| "#{coords[k]["latitude"]},#{coords[k]["longitude"]}" }.first
+    end
     coords.gsub!( "," , "%2c" )
     response = Curl::Easy.perform( url + "/coordinates2politics/" + coords ).body_str
 
-    coordinates = make_hashy(response)
+    politics = make_hashy(response)
   end
   
+  # Specify a name or names and return parsed result as well as a best-guess for gender
+  #
+  # @param [Array, String] name can be array of name strings or a single name
+  # @return [Hash] information related to the provided name
   def self.text2people name
-    #url = "http://www.datasciencetoolkit.org"
-    #response = Curl::Easy.perform( url + "/text2people/" + name ).body_str
+    url = "http://www.datasciencetoolkit.org"
+    name = ActiveSupport::JSON.encode(name)
+    c = Curl::Easy.new( url + '/text2people')
+    c.multipart_form_post = true
+    c.http_post(Curl::PostField.content('body', name))
+    response = c.body_str
 
-    #person = make_hashy(response)
+    person = make_hashy(response)
   end
 
   def self.text2times text

data/lib/data_science_theater_3000/version.rb

@@ -1,3 +1,3 @@
 module DataScienceTheater3000
-  VERSION = "0.0.7.1"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_science_theater_3000
 version: !ruby/object:Gem::Version
-  version: 0.0.7.1
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &21456080 !ruby/object:Gem::Requirement
+  requirement: &14674740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21456080
+  version_requirements: *14674740
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &21455500 !ruby/object:Gem::Requirement
+  requirement: &14674140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21455500
+  version_requirements: *14674140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21454620 !ruby/object:Gem::Requirement
+  requirement: &14673300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21454620
+  version_requirements: *14673300
 description: Ruby interface to issue Data Science Toolkit API calls.
 email:
 - tad@isotope11.com