google-geocoder 0.0.3 → 0.1.0

data/CHANGES

@@ -12,3 +12,7 @@
 == Version 0.0.3
 
 * Small bug fixes.
+
+== Version 0.1.0
+
+* Added launch location in the browser.

data/Rakefile

@@ -9,34 +9,39 @@ require 'rcov/rcovtask'
 
 task :default => :gemspec
 
-begin
-  require 'bundler'
-  
   begin
-    require 'jeweler'
-    
-    Jeweler::Tasks.new do |gemspec|
-      gemspec.name = "google-geocoder"
-      gemspec.summary = "Simple client for Google Geocode API (Summary)."
-      gemspec.description = "Simple client for Google Geocode API."
-      gemspec.email = "alexander.shvets@gmail.com"
-      gemspec.homepage = "http://github.com/shvets/google-geocoder"
-      gemspec.authors = ["Alexander Shvets"]
-      gemspec.files = FileList["CHANGES", "google-geocoder.gemspec", "Rakefile", "README", "VERSION",
-                               "lib/**/*", "bin/**/*"]
-      gemspec.add_dependency "json_pure", ">= 1.1.4"   
-
-      gemspec.executables = ['geo', 'g']
-      gemspec.requirements = ["none"]
-      gemspec.bindir = "bin"
-    
-      gemspec.add_bundler_dependencies
+    require 'bundler'
+
+    begin
+      require 'jeweler'
+
+      Jeweler::Tasks.new do |gemspec|
+        gemspec.name = "google-geocoder"
+        gemspec.summary = "Simple client for Google Geocode API (Summary)."
+        gemspec.description = "Simple client for Google Geocode API."
+        gemspec.email = "alexander.shvets@gmail.com"
+        gemspec.homepage = "http://github.com/shvets/google-geocoder"
+        gemspec.authors = ["Alexander Shvets"]
+        gemspec.files = FileList["CHANGES", "google-geocoder.gemspec", "Rakefile", "README", "VERSION",
+                                 "lib/**/*", "bin/**/*"]
+
+        gemspec.executables = ['geo', 'g']
+        gemspec.requirements = ["none"]
+        gemspec.bindir = "bin"
+
+        gemspec.add_bundler_dependencies
+      end
+    rescue LoadError
+      puts "Jeweler not available. Install it s with: [sudo] gem install jeweler"
     end
   rescue LoadError
-    puts "Jeweler not available. Install it s with: [sudo] gem install jeweler"
+    puts "Bundler not available. Install it s with: [sudo] gem install bundler"
   end
-rescue LoadError
-  puts "Bundler not available. Install it s with: [sudo] gem install bundler"
+
+desc "Remove temp files"
+task "clean" do
+  `rm pkg`
+  `rm google-geocoder.gemspec`
 end
 
 desc "Release the gem"
@@ -50,14 +55,14 @@ task :"release:gem" do
   puts "Commit message:"  
   message = STDIN.gets
 
-  version = "#{File.open(File::dirname(__FILE__) + "/VERSION").readlines().first}"
+  version = "#{File.open(File::dirname(__FILE__) + "/VERSION").readlines().first.strip}"
 
   %x(
     git commit -m "#{message}"
     
     git push origin master
 
-    gem push pkg/google-geocoder-#{version}.gem      
+    gem push pkg/google-geocoder-#{version}.gem
   )
 end
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/bin/geo

@@ -3,7 +3,7 @@
 $:.unshift(File::join(File::dirname(File::dirname(__FILE__)), "lib"))
 
 require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
-require 'google_geocoder'
+require 'google_geocoder/google_geocoder'
 
 #$KCODE='u'
 
@@ -23,15 +23,17 @@ class Geo
       puts USAGE and return
     end
 
-    query = ARGV.join(' ')
+    cmd_line = ARGV.join(' ')
     
-    case query
-
+    case cmd_line
       when /(-v)|(--version)/ then
         puts "Version: #{File.open(File::dirname(__FILE__) + "/../VERSION").readlines().first}"
+      when /(-open)/ then
+        query = cmd_line[5..-1].strip
+        @geocoder.open_in_browser(query)
       when /(.*)/ then
          begin
-          result = @geocoder.query(query)
+          result = @geocoder.query(cmd_line)
           
           puts "No results." if result.size == 0
         rescue Exception => e

data/google-geocoder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google-geocoder}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Shvets"]
-  s.date = %q{2010-09-29}
+  s.date = %q{2010-10-01}
   s.description = %q{Simple client for Google Geocode API.}
   s.email = %q{alexander.shvets@gmail.com}
   s.executables = ["geo", "g"]
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
      "bin/geo",
      "bin/geo.bat",
      "google-geocoder.gemspec",
-     "lib/google_geocoder.rb"
+     "lib/google_geocoder/google_geocoder.rb"
   ]
   s.homepage = %q{http://github.com/shvets/google-geocoder}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -44,19 +44,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json_pure>, [">= 1.1.4"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
+      s.add_runtime_dependency(%q<json_pure>, ["~> 1.1.4"])
+      s.add_runtime_dependency(%q<launchy>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<gemcutter>, [">= 0"])
     else
-      s.add_dependency(%q<json_pure>, [">= 1.1.4"])
-      s.add_dependency(%q<json_pure>, [">= 0"])
+      s.add_dependency(%q<json_pure>, ["~> 1.1.4"])
+      s.add_dependency(%q<launchy>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<gemcutter>, [">= 0"])
     end
   else
-    s.add_dependency(%q<json_pure>, [">= 1.1.4"])
-    s.add_dependency(%q<json_pure>, [">= 0"])
+    s.add_dependency(%q<json_pure>, ["~> 1.1.4"])
+    s.add_dependency(%q<launchy>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<gemcutter>, [">= 0"])
   end

data/lib/{google_geocoder.rb → google_geocoder/google_geocoder.rb}

@@ -3,30 +3,32 @@
 require 'open-uri'
 require 'cgi'
 require 'json'
+require 'launchy'
 
 # Example:
 # {
 #   "results"=> [
 #          {"address_components"=>
-#               [{"long_name"=>"Paris", "types"=>["locality", "political"], "short_name"=>"Paris"}, 
-#                {"long_name"=>"Paris", "types"=>["administrative_area_level_2", "political" ], "short_name"=>"75"}, 
+#               [{"long_name"=>"Paris", "types"=>["locality", "political"], "short_name"=>"Paris"},
+#                {"long_name"=>"Paris", "types"=>["administrative_area_level_2", "political" ], "short_name"=>"75"},
 #                {"long_name"=>"Ile-de-France", "types"=>["administrative_area_level_1", "political"], "short_name"=>"IDF"},
 #                {"long_name"=>"France", "types"=>["country", "political"], "short_name"=>"FR"}
-#               ], 
+#               ],
 #           "geometry"=>{
-#               "bounds"=>{"northeast"=>{"lng"=>2.4699099, "lat"=>48.9021461}, "southwest"=>{"lng"=>2.2241006, "lat"=>48.8155414}}, 
-#               "location"=>{"lng"=>2.3509871, "lat"=>48.8566667}, 
-#               "location_type"=>"APPROXIMATE", 
+#               "bounds"=>{"northeast"=>{"lng"=>2.4699099, "lat"=>48.9021461}, "southwest"=>{"lng"=>2.2241006, "lat"=>48.8155414}},
+#               "location"=>{"lng"=>2.3509871, "lat"=>48.8566667},
+#               "location_type"=>"APPROXIMATE",
 #               "viewport"=>{"northeast"=>{"lng"=>2.4790465, "lat"=>48.915363}, "southwest"=>{"lng"=>2.2229277, "lat"=>48.7979015}}
 #           },
-#           "types"=>["locality", "political"], 
+#           "types"=>["locality", "political"],
 #           "formatted_address"=>"Paris, France"}
-#   ], 
+#   ],
 #   "status"=>"OK"
 # }
 
 module Google
   class Geocoder
+
     def self.Exception(*names)
       cl = Module === self ? self : Object
       names.each {|n| cl.const_set(n, Class.new(Exception))}
@@ -35,17 +37,18 @@ module Google
     Exception :MissingLocation, :GeocoderServerIsDown, :InvalidResponse
 
     URL_STRING = "http://maps.googleapis.com/maps/api/geocode"
+    MAPS_URL_STRING = "http://maps.google.com/maps?f=q&source=s_q&iwloc=A&hl=en"
 
     def query(location)
-      raise(MissingLocation) if location.nil?      
-      
-      request = "#{URL_STRING}/json?address=#{CGI.escape(location)}&sensor=false" 
-      
+      raise(MissingLocation) if location.nil?
+
+      request = "#{URL_STRING}/json?address=#{CGI.escape(location)}&sensor=false"
+
       begin
         response = call_service(request)
 
         raise(GeocoderServerIsDown) if response.empty?
- 
+
         if response['status'] == "ZERO_RESULTS"
           []
         else
@@ -69,18 +72,26 @@ module Google
           puts "Administrative Area (level 2): #{administrative_area_l2['long_name']} (#{administrative_area_l2['short_name']})" unless administrative_area_l2.nil?
 
           puts "Latitude: #{latitude}"
-          puts "Longitude: #{longitude}" 
+          puts "Longitude: #{longitude}"
 
-          [latitude, longitude]                               
+          [latitude, longitude]
         end
       rescue OpenURI::HTTPError
         raise(GeocoderServerIsDown)
-      end          
+      end
     end
 
+  def open_in_browser q
+    location = q.gsub(/\s/, '+')
+    lng, lat = query(q)
+
+    Launchy::Browser.run("#{MAPS_URL_STRING}&geocode=&q=#{location}&sll=#{lng},#{lat}&hnear=#{location}")
+  end
+
     private
 
     def call_service(request)
+
       response = {}
 
       open(request) do |stream|
@@ -93,14 +104,14 @@ module Google
 
       response
     end
-    
+
     def address_component(parent, type)
       parent.each do |child|
         if child["types"].include? type
           return child
         end
       end
-      
+
       nil
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google-geocoder
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Alexander Shvets
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 -04:00
+date: 2010-10-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
@@ -37,7 +37,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: json_pure
+  name: launchy
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,7 +95,7 @@ files:
 - bin/geo
 - bin/geo.bat
 - google-geocoder.gemspec
-- lib/google_geocoder.rb
+- lib/google_geocoder/google_geocoder.rb
 - spec/geocoder_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true