data_science_theater_3000 0.0.6.1 → 0.0.7.1

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/lib/data_science_theater_3000.rb

@@ -22,21 +22,25 @@ module DataScienceTheater3000
 
   # Converts a street address into a location hash
   #
-  # @param [String] address the address to be located
+  # @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
   def self.street2coordinates address
     url = "http://www.datasciencetoolkit.org"
-    address.gsub!( "," , "%2c" )
-    address.gsub!( " " , "+"   )
-    response = Curl::Easy.perform( url + "/street2coordinates/" + address ).body_str
-
+    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
     coordinates = make_hashy(response)
   end
   
   # Uses latitude,longitude pair to find detailed political information about a location.
   # Currently supporting a single pair.
   #
-  # @param [Hash] hash returned from ip2coordinates/street2coordinates or just a string like "33,-86"
+  # @param [Hash,String] 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
@@ -51,8 +55,6 @@ module DataScienceTheater3000
   end
   
   def self.text2people name
-    #TODO should take array of names as well
-    #FIXME curl wants different arguments
     #url = "http://www.datasciencetoolkit.org"
     #response = Curl::Easy.perform( url + "/text2people/" + name ).body_str
 
@@ -61,8 +63,6 @@ module DataScienceTheater3000
 
   def self.text2times text
     #url = "http://www.datasciencetoolkit.org"
-    #text.gsub!( "," , "%2c" )
-    #FIXME curl wants different arguments
     #response = Curl::Easy.perform( url + "/text2times/" + text ).body_str
 
     #times = make_hashy(response)

data/lib/data_science_theater_3000/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_science_theater_3000
 version: !ruby/object:Gem::Version
-  version: 0.0.6.1
+  version: 0.0.7.1
   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: &16112460 !ruby/object:Gem::Requirement
+  requirement: &21456080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16112460
+  version_requirements: *21456080
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &16111880 !ruby/object:Gem::Requirement
+  requirement: &21455500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16111880
+  version_requirements: *21455500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &16111040 !ruby/object:Gem::Requirement
+  requirement: &21454620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16111040
+  version_requirements: *21454620
 description: Ruby interface to issue Data Science Toolkit API calls.
 email:
 - tad@isotope11.com
@@ -55,7 +55,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- Screenshot-1.png
 - data_science_theater_3000.gemspec
 - doc/sample.png
 - lib/data_science_theater_3000.rb