osmn 0.1.1 → 0.1.2

data/lib/osmn.rb

@@ -1,8 +1,8 @@
+require 'osmn/structs'
 require 'osmn/base'
 require 'osmn/search'
 require 'osmn/reverse'
 require 'osmn/version'
-require 'osmn/hash'
 
 module OSMN
 

data/lib/osmn/base.rb

@@ -5,7 +5,37 @@ require 'json'
 module OSMN
   class Base
 
+    def initialize(params)
+      @params = {}
+      self.params = params
+    end
+
+    def params=(value)
+      if value.is_a? Hash
+        value.each do |k,v|
+          @params[k.to_sym] = v
+        end
+      end
+
+      # We override the format because we expect a JSON response
+      @params[:format] = :json
+    end
+
+    def params
+      @params
+    end
+
   private
+    def request(action)
+      query = build_query(@params)
+
+      uri = URI("http://nominatim.openstreetmap.org/#{action.to_s}?#{query}")
+      request = Net::HTTP::Get.new(uri.request_uri, initheader = {'Content-Type' => 'application/json'})
+      response = Net::HTTP.start(uri.host, uri.port) {|http| http.request(request)}
+
+      results = build_results(response.body) if response.code == '200'
+    end
+
     def build_query(params)
       query = params.map do |key, value|
         "#{key.to_s}=#{URI.escape(value.to_s)}" if value
@@ -23,9 +53,12 @@ module OSMN
 
     def build_place(place)
       if place.is_a? Hash
-        result = place.to_struct('Result')
-        if result.respond_to?('address')
-          result.address = result.address.to_struct('Address')
+        result = Result.new
+        place.each {|k,v| result[k] = v }
+
+        if place["address"].is_a? Hash
+          result.address = Address.new
+          place["address"].each{|k,v| result.address[k] = v }
         end
 
         result

data/lib/osmn/reverse.rb

@@ -1,36 +1,8 @@
 module OSMN
   class Reverse < OSMN::Base
 
-    def initialize(params)
-      @params = {}
-      self.params = params
-    end
-
     def reverse_geocode
-      if @params[:lat] && @params[:lon]
-        query = build_query(@params)
-
-        uri = URI("http://nominatim.openstreetmap.org/reverse?#{query}")
-        request = Net::HTTP::Get.new(uri.request_uri, initheader = {'Content-Type' => 'application/json'})
-        response = Net::HTTP.start(uri.host, uri.port) {|http| http.request(request)}
-
-        results = build_results(response.body) if response.code == '200'
-      end
-    end
-
-    def params=(value)
-      if value.is_a? Hash
-        value.each do |k,v|
-          @params[k.to_sym] = v
-        end
-      end
-
-      # We override the format because we expect a JSON response
-      @params[:format] = :json
-    end
-
-    def params
-      @params
+      request(:reverse) if @params[:lat] && @params[:lon]
     end
   end
 end

data/lib/osmn/search.rb

@@ -1,36 +1,8 @@
 module OSMN
   class Search < OSMN::Base
 
-    def initialize(params)
-      @params = {}
-      self.params = params
-    end
-
     def search
-      if @params[:q]
-        query = build_query(@params)
-
-        uri = URI("http://nominatim.openstreetmap.org/search?#{query}")
-        request = Net::HTTP::Get.new(uri.request_uri, initheader = {'Content-Type' => 'application/json'})
-        response = Net::HTTP.start(uri.host, uri.port) {|http| http.request(request)}
-
-        results = build_results(response.body) if response.code == '200'
-      end
-    end
-
-    def params=(value)
-      if value.is_a? Hash
-        value.each do |k,v|
-          @params[k.to_sym] = v
-        end
-      end
-
-      # We override the format because we expect a JSON response
-      @params[:format] = :json
-    end
-
-    def params
-      @params
+      request(:search) if @params[:q]
     end
   end
 end

data/lib/osmn/structs.rb

@@ -0,0 +1,26 @@
+module OSMN
+  Result = Struct.new(
+    :place_id, 
+    :licence, 
+    :osm_type, 
+    :osm_id, 
+    :boundingbox,
+    :lat, 
+    :lon, 
+    :display_name, 
+    :class,
+    :type,
+    :address)
+
+  Address = Struct.new(
+    :house_number, 
+    :road, 
+    :suburb, 
+    :city, 
+    :county, 
+    :state_district, 
+    :state, 
+    :postcode, 
+    :country, 
+    :country_code)
+end

data/lib/osmn/version.rb

@@ -1,3 +1,3 @@
 module OSMN
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/test_osmn.rb

@@ -42,7 +42,7 @@ class Tests < Test::Unit::TestCase
     assert_respond_to(response, :type)
 
     assert_raise NoMethodError do
-      response.address
+      response.address.house_number
     end
   end
 
@@ -86,7 +86,7 @@ class Tests < Test::Unit::TestCase
     assert_respond_to(response, :display_name)
 
     assert_raise NoMethodError do
-      response.address
+      response.address.house_number
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osmn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -53,10 +53,10 @@ files:
 - LICENSE
 - Rakefile
 - lib/osmn.rb
+- lib/osmn/structs.rb
 - lib/osmn/base.rb
 - lib/osmn/search.rb
 - lib/osmn/reverse.rb
-- lib/osmn/hash.rb
 - lib/osmn/version.rb
 - test/test_osmn.rb
 homepage: http://github.com/kalmbach/osmn

data/lib/osmn/hash.rb

@@ -1,5 +0,0 @@
-class Hash
-  def to_struct(name)
-    Struct.new(name, *keys).new(*values)
-  end
-end