geocoder-olleh 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3106f1f1023396f24cf1c43863d6f46fdba421f
-  data.tar.gz: 0b038e9aeafe6c6b74688dce24076a624ddaf751
+  metadata.gz: ed52247a3bb4d999c891c3338c437a9957f1e1a0
+  data.tar.gz: 64f9a1d5615bfdb20bb2ebee3e58c3186cb4576b
 SHA512:
-  metadata.gz: 7b403277915f10c6603088afd8ee4c7c881b3dccce670217c2bb37555786d0d857949540de44e29e06bf42a43eed4a2dd0ce0fe354385b87642d270e8ae714d7
-  data.tar.gz: 88b31eab6433c41eaed3d03c4d31468e9c2607b84496fe024d793d188a2d5c7c4ccca9c3ea4ccfb2eea714cd1edfecdc0304fefa59a4371a7812154c0b0c4d14
+  metadata.gz: bfb5a48b1600df4f4ddcd1d0e0bd530ff61b33fa2c860f02548f7e991bfdeb6a3eedd607da212271161bdfde3e5c8ef813815623e6118c6f6cbbb2985689f18a
+  data.tar.gz: 777e017630613477530ed7190e263fe9458d4805fb717422eebfdbf62f5baa006e8383b7c99082fc5c976044772119ce8c290af219d414a67609e7e128cfe049

data/Gemfile

@@ -3,12 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in geocoder-olleh.gemspec
 gem 'geocoder'
 group :development, :test do
-	gem 'test-unit' # needed for Ruby >=2.2.0
+  gem 'test-unit' # needed for Ruby >=2.2.0
   gem 'guard'
   gem 'guard-test'
   gem 'coveralls'
   gem 'pry'
   gem 'pry-remote'
   gem 'pry-nav'
+  gem 'vcr'
+  gem 'webmock'
 end
 gemspec

data/lib/geocoder/lookups/olleh.rb

@@ -100,21 +100,27 @@ module Geocoder::Lookup
     end
 
     def self.check_query_type(query)
-      if !query.options.empty? && query.options.include?(:priority)
-        query.options[:query_type] || query.options[:query_type] = "route_search"
-      elsif query.reverse_geocode? && query.options.include?(:include_jibun)
-        query.options[:query_type] || query.options[:query_type] = "reverse_geocoding"
-      elsif !query.options.empty? && query.options.include?(:coord_in)
-        query.options[:query_type] || query.options[:query_type] = "convert_coord"
-      elsif !query.options.empty? && query.options.include?(:l_code)
-        query.options[:query_type] || query.options[:query_type] = "addr_step_search"
-      elsif !query.options.empty? && query.options.include?(:radius)
-        query.options[:query_type] || query.options[:query_type] = "addr_nearest_position_search"
+
+      options = query.options
+      return options[:query_type] if options[:query_type]
+
+      query_type = case
+      when options.include?(:priority)
+        'route_search'
+      when query.reverse_geocode? && options.include?(:include_jibun)
+        'reverse_geocoding'
+      when options.include?(:coord_in)
+        'convert_coord'
+      when options.include?(:l_code)
+        'addr_step_search'
+      when options.include?(:radius)
+        'addr_nearest_position_search'
       else
-        query.options[:query_type] || query.options[:query_type] = "geocoding"
+        'geocoding'
       end
-    end
 
+      options[:query_type] = query_type
+    end
 
     private # ----------------------------------------------
 
@@ -129,7 +135,10 @@ module Geocoder::Lookup
       end
 
       case Olleh.check_query_type(query)
-      when "geocoding" || "reverse_geocoding"
+      when "geocoding"
+        return [] if doc['RESDATA']['COUNT'] == 0
+        return doc['RESDATA']["ADDRS"]
+      when "reverse_geocoding"
         return [] if doc['RESDATA']['COUNT'] == 0
         return doc['RESDATA']["ADDRS"]
       when "route_search"
@@ -158,12 +167,11 @@ module Geocoder::Lookup
         "https://openapi.kt.com/maps/search/AddrStepSearch?params="
       when "addr_nearest_position_search"
         "https://openapi.kt.com/maps/search/AddrNearestPosSearch?params="
-      else
+      else #geocoding
         "https://openapi.kt.com/maps/geocode/GetGeocodeByAddr?params="
       end
     end
 
-
     def query_url_params(query)
       case Olleh.check_query_type(query)
       when "route_search"
@@ -238,4 +246,4 @@ module Geocoder::Lookup
       Geocoder.config[:cache_prefix] + query_url(query).split('timestamp')[0]
     end
   end
-end
+end

data/lib/geocoder/olleh/version.rb

@@ -1,5 +1,5 @@
 module Geocoder
   module Olleh
-    VERSION = "0.1.9"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder-olleh
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Jaigouk Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler