barometer 0.6.3 → 0.6.4

data/README.rdoc

@@ -15,7 +15,7 @@ this.
 
 == version
 
-Version 0.6.3 is the current release of this gem.
+Version 0.6.4 is the current release of this gem.
 The gem is available from github (attack-barometer) or rubyforge (barometer).
 It is fully functional (for five weather service APIs).
 
@@ -80,7 +80,7 @@ Tzinfo handles this time zone manipulation.
 
 The query handling is one of the most beneficial and powerful features of
 Barometer.  Every weather service accepts a different set of possible
-queries, so it usually the case that the same query can only be used
+queries, so it usually is the case that the same query can only be used
 for a couple weather services.
 
 Barometer will allow the use of all query formats for all services

data/Rakefile

@@ -5,14 +5,18 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "barometer"
-    gem.summary = %Q{TODO}
+    gem.summary = "A multi API consuming weather forecasting superstar."
+    gem.description = "A multi API consuming weather forecasting superstar."
     gem.email = "barometer@attackcorp.com"
     gem.homepage = "http://github.com/attack/barometer"
     gem.authors = ["Mark G"]
-    gem.rubyforge_project = 'barometer'
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    
+    gem.add_dependency 'httparty', '>= 0.4.5'
+    gem.add_dependency 'tzinfo', '>= 0.3.14'
+    
+    #gem.add_development_dependency "mocha"
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
@@ -46,32 +50,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = "barometer #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/barometer/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end
-
-
+end

data/TODO

@@ -1,5 +1,6 @@
 == now
 
+- google geocoding terms of service indicate that "a map must be shown" ... what to do?
 - driver: hamweather
 - driver: meter
 

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:patch: 3
 :major: 0
 :minor: 6
+:patch: 4
+:build: 

data/barometer.gemspec

@@ -1,18 +1,23 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{barometer}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark G"]
-  s.date = %q{2009-05-21}
+  s.date = %q{2010-01-29}
   s.default_executable = %q{barometer}
+  s.description = %q{A multi API consuming weather forecasting superstar.}
   s.email = %q{barometer@attackcorp.com}
   s.executables = ["barometer"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.rdoc",
+     "TODO"
   ]
   s.files = [
     ".document",
@@ -135,13 +140,11 @@ Gem::Specification.new do |s|
      "spec/web_services/geocode_spec.rb",
      "spec/web_services/web_services_spec.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/attack/barometer}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{barometer}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{TODO}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A multi API consuming weather forecasting superstar.}
   s.test_files = [
     "spec/barometer_spec.rb",
      "spec/data/distance_spec.rb",
@@ -181,11 +184,18 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httparty>, [">= 0.4.5"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0.3.14"])
     else
+      s.add_dependency(%q<httparty>, [">= 0.4.5"])
+      s.add_dependency(%q<tzinfo>, [">= 0.3.14"])
     end
   else
+    s.add_dependency(%q<httparty>, [">= 0.4.5"])
+    s.add_dependency(%q<tzinfo>, [">= 0.3.14"])
   end
 end
+

data/lib/barometer/data/geo.rb

@@ -27,8 +27,13 @@ module Barometer
       placemark = placemark.first if placemark.is_a?(Array)
       
       if placemark && placemark["Point"] && placemark["Point"]["coordinates"]
-        @latitude = placemark["Point"]["coordinates"].split(',')[1].to_f
-        @longitude = placemark["Point"]["coordinates"].split(',')[0].to_f
+        if placemark["Point"]["coordinates"].is_a?(Array)
+          @latitude = placemark["Point"]["coordinates"][1].to_f
+          @longitude = placemark["Point"]["coordinates"][0].to_f
+        else
+          @latitude = placemark["Point"]["coordinates"].split(',')[1].to_f
+          @longitude = placemark["Point"]["coordinates"].split(',')[0].to_f
+        end
       end
       if placemark && placemark["AddressDetails"] && placemark["AddressDetails"]["Country"]
         if placemark["AddressDetails"]["Country"]["AdministrativeArea"]

data/lib/barometer/web_services/geocode.rb

@@ -14,11 +14,11 @@ module Barometer
         "http://maps.google.com/maps/geo",
         :query => {
           :gl => query.country_code, :key => Barometer.google_geocode_key,
-          :output => "xml", :q => query.q
+          :output => "json", :q => query.q, :sensor => "false"
         },
-        :format => :xml, :timeout => Barometer.timeout
+        :format => :json, :timeout => Barometer.timeout
       )
-      location = location['kml']['Response'] if location && location['kml']
+      location = location['kml']['Response'] if (location && location['kml'])
       location ? (geo = Data::Geo.new(location)) : nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: barometer
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Mark G
@@ -9,11 +9,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -06:00
+date: 2010-01-29 00:00:00 -07:00
 default_executable: barometer
-dependencies: []
-
-description: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.14
+    version: 
+description: A multi API consuming weather forecasting superstar.
 email: barometer@attackcorp.com
 executables: 
 - barometer
@@ -22,6 +41,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+- TODO
 files: 
 - .document
 - .gitignore
@@ -144,6 +164,8 @@ files:
 - spec/web_services/web_services_spec.rb
 has_rdoc: true
 homepage: http://github.com/attack/barometer
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -163,11 +185,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: barometer
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: TODO
+specification_version: 3
+summary: A multi API consuming weather forecasting superstar.
 test_files: 
 - spec/barometer_spec.rb
 - spec/data/distance_spec.rb