geocoder-olleh 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bff207aab53ada46cdd496289ced480643fe8cc
-  data.tar.gz: 77cc01c199ef17debc4f4eb0b40e2f09a92eded0
+  metadata.gz: 4dc80f269fca7b636c670d2982c0abc0062ba012
+  data.tar.gz: 2beeb582301bed694100c15b7d645db1df8499a2
 SHA512:
-  metadata.gz: d07fb1b4ccee97e4d86ec72ad09793718bf1526542192abe0c913cf24679986a2938b8f6bd0c8a9ac21225a14236f8a344cf43116576062b7603e1d15f5a947c
-  data.tar.gz: f3623860e2fa5ead550fb48d281c96e52891d79b28c20b464ccf2e8060b55aaad4848f3eaac52cd558b4a9bb0af8b1fc8dec0764674adbe941aa3f22b6d52a80
+  metadata.gz: 5d40fd93449d03a737112009d4b5908a2bc9699a89164089ff80bd57b1599aacb6ae3f6ebab411e0149b20ddc19a01e7031991ff519aa18c28917f1fc47b96c4
+  data.tar.gz: 3d14a3ea60fec075ff62fcf48400f06dd5290ccd9e0286f787ea8dea27b0ac3fda2edefe672b9568fe16142cd2f803f0c52f191130fdb9a217d5ded2aaa9fce5

data/.gitignore

@@ -1,12 +1,10 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/coverage/
-/test/geocoder_test.sqlite
-/test/fixtures/dump.rdb
+coverage/*
+pkg/*
+rdoc/*
+*.gem
+.bundle
+Gemfile.lock
+api_keys.yml
+test/geocoder_test.sqlite
+test/fixtures/dump.rdb
+

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 rvm:
-  - 2.2.2
-
-script: 'bundle exec rake'
-
-notifications:
-  email:
-    recipients:
-      - ping@jaigouk.kim
-    on_failure: change
-    on_success: never
+  - 1.9.3
+  - 2.0.0
+  - 2.1.2
+  - 2.2.0
+  - jruby-19mode
+  - rbx-2
+gemfile:
+  - Gemfile

data/Gemfile

@@ -3,43 +3,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in geocoder-olleh.gemspec
 gem 'geocoder'
 group :development, :test do
-  gem 'mongoid', '2.6.0'
-  gem 'bson_ext', platforms: :ruby
-  gem 'geoip'
-  gem 'rubyzip'
-  gem 'rails'
 	gem 'test-unit' # needed for Ruby >=2.2.0
-	gem 'byebug', platforms: :mri
   gem 'guard'
   gem 'guard-test'
   gem 'coveralls'
   gem 'pry'
   gem 'pry-remote'
   gem 'pry-nav'
-	platforms :jruby do
-    gem 'jruby-openssl'
-    gem 'jgeoip'
-  end
-
-  platforms :rbx do
-    gem 'rubysl', '~> 2.0'
-    gem 'rubysl-test-unit'
-  end
-end
-
-group :test do
-  gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
-
-  platforms :ruby do
-    gem 'pg'
-    gem 'mysql2'
-  end
-
-  platforms :jruby do
-    gem 'jdbc-mysql'
-    gem 'jdbc-sqlite3'
-    gem 'activerecord-jdbcpostgresql-adapter'
-  end
 end
-
 gemspec

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2015 GoGoVan
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,29 +1,12 @@
-Geocoder Olleh
-==============
+Geocoder - Olleh
+========
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/geocoder/olleh`. To experiment with that code, run `bin/console` for an interactive prompt.
+This is an extension to the Geocoder gem
+that adds support for Olleh.
 
-TODO: Delete this and the text above, and describe your gem
+#### Olleh (`:olleh`)
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'geocoder-olleh'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install geocoder-olleh
-
-## Olleh (`:olleh`)
-
-* **API key**: required (set `Geocoder.configure(:api_key => [app_id, app_key])`)
+* **API key**: Basic auth (set `Geocoder.configure(:basic_auth => {:user => app_id, :password => app_key})`)
 * **Quota**: Dependant on service plan
 * **Region**: South Korea
 * **SSL support**: no
@@ -31,54 +14,3 @@ Or install it yourself as:
 * **Documentation**: https://www.ollehmap.com/spacedata/
 * **Terms of Service**: https://www.ollehmap.com/spacedata/#이용약관
 * **Limitations**: Only for commercial use. For commercial usage please check https://www.ollehmap.com/guide/
-
-Caching
--------
-
-It's a good idea, when relying on any external service, to cache retrieved data. When implemented correctly it improves your app's response time and stability. It's easy to cache geocoding results with Geocoder, just configure a cache store:
-
-    Geocoder.configure(:cache => Redis.new)
-
-This example uses Redis, but the cache store can be any object that supports these methods:
-
-* `store#[](key)` or `#get` or `#read` - retrieves a value
-* `store#[]=(key, value)` or `#set` or `#write` - stores a value
-* `store#del(url)` - deletes a value
-
-Even a plain Ruby hash will work, though it's not a great choice (cleared out when app is restarted, not shared between app instances, etc).
-
-You can also set a custom prefix to be used for cache keys:
-
-    Geocoder.configure(:cache_prefix => "...")
-
-By default the prefix is `geocoder:`
-
-If you need to expire cached content:
-
-    Geocoder::Lookup.get(Geocoder.config[:lookup]).cache.expire(:all)  # expire cached results for current Lookup
-    Geocoder::Lookup.get(:google).cache.expire("http://...")           # expire cached result for a specific URL
-    Geocoder::Lookup.get(:google).cache.expire(:all)                   # expire cached results for Google Lookup
-    # expire all cached results for all Lookups.
-    # Be aware that this methods spawns a new Lookup object for each Service
-    Geocoder::Lookup.all_services.each{|service| Geocoder::Lookup.get(service).cache.expire(:all)}
-
-Do *not* include the prefix when passing a URL to be expired. Expiring `:all` will only expire keys with the configured prefix (won't kill every entry in your key/value store).
-
-For an example of a cache store with URL expiry please see examples/autoexpire_cache.rb
-
-_Before you implement caching in your app please be sure that doing so does not violate the Terms of Service for your geocoding service._
-
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/geocoder-olleh/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/Rakefile

@@ -1,80 +1,11 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-ACCEPTED_DB_VALUES = %w(sqlite postgres mysql)
-DATABASE_CONFIG_FILE = 'test/database.yml'
-
-def config
-  require 'yaml'
-  YAML.load(File.open(DATABASE_CONFIG_FILE))
-end
-
-namespace :db do
-  task :create do
-    if ACCEPTED_DB_VALUES.include? ENV['DB']
-      Rake::Task["db:#{ENV['DB']}:create"].invoke
-    end
-  end
-
-  task :drop do
-    if ACCEPTED_DB_VALUES.include? ENV['DB']
-      Rake::Task["db:#{ENV['DB']}:drop"].invoke
-    end
-  end
-
-  task :reset => [:drop, :create]
-
-  namespace :mysql do
-    desc 'Create the MySQL test databases'
-    task :create do
-      `mysql --user=#{config['mysql']['username']} -e "create DATABASE #{config['mysql']['database']} DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci "`
-    end
-
-    desc 'Drop the MySQL test databases'
-    task :drop do
-      `mysqladmin --user=#{config['mysql']['username']} -f drop #{config['mysql']['database']}`
-    end
-  end
-
-  namespace :postgres do
-    desc 'Create the PostgreSQL test databases'
-    task :create do
-      `createdb -E UTF8 -T template0 #{config['postgres']['database']}`
-    end
-
-    desc 'Drop the PostgreSQL test databases'
-    task :drop do
-      `dropdb #{config['postgres']['database']}`
-    end
-  end
-
-  namespace :sqlite do
-    task :drop
-    task :create
-  end
-end
-
 require 'rake/testtask'
-desc "Use DB to test with #{ACCEPTED_DB_VALUES}, otherwise test standalone"
 Rake::TestTask.new(:test) do |test|
-  Rake::Task['db:reset'].invoke if ACCEPTED_DB_VALUES.include? ENV['DB']
   test.libs << 'lib' << 'test'
   test.pattern = 'test/unit/**/*_test.rb'
   test.verbose = true
 end
 
-# Rake::TestTask.new(:integration) do |test|
-#   test.libs << 'lib' << 'test'
-#   test.pattern = 'test/integration/*_test.rb'
-#   test.verbose = true
-# end
-
-task :default => [:test]
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "Geocoder #{Geocoder::Olleh::VERSION}"
-  rdoc.rdoc_files.include('*.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => [:test]

data/lib/geocoder/{olleh/lookups → lookups}/olleh.rb

@@ -1,5 +1,5 @@
-require 'geocoder'
-require_relative "../../olleh"
+require 'geocoder/lookups/base'
+require "geocoder/results/olleh"
 require 'base64'
 require 'uri'
 require 'json'
@@ -59,22 +59,14 @@ module Geocoder::Lookup
       'utmk'      => 7
     }
 
-    def initialize
-      super
-      Geocoder.configure(
-        :use_https => true,
-        :http_headers => {"Authorization" => "Basic #{token}"}
-      )
+    def use_ssl?
+      true
     end
 
     def name
       "Olleh"
     end
 
-    def required_api_key_parts
-      ["app_id", "app_key"]
-    end
-
     def query_url(query)
       base_url(query) + url_query_string(query)
     end
@@ -154,17 +146,6 @@ module Geocoder::Lookup
       end
     end
 
-    def make_api_request(query)
-      timeout(configuration.timeout) do
-        uri = URI.parse(query_url(query))
-        Geocoder.log(:debug, "Geocoder: HTTP request being made for #{uri.to_s}")
-        http_client.start(uri.host, uri.port, :use_ssl => true) do |client|
-          req = Net::HTTP::Get.new(uri.request_uri, configuration.http_headers)
-          client.request(req)
-        end
-      end
-    end
-
     def base_url(query)
       case Olleh.check_query_type(query)
       when "route_search"
@@ -240,14 +221,6 @@ module Geocoder::Lookup
       end
     end
 
-    def token
-      if a = configuration.api_key
-        if a.is_a?(Array)
-          return  Base64.encode64("#{a.first}:#{a.last}").strip
-        end
-      end
-    end
-
     def now
       Time.now.strftime("%Y%m%d%H%M%S%L")
     end

data/lib/geocoder/olleh/version.rb

@@ -1,5 +1,5 @@
 module Geocoder
   module Olleh
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/lib/geocoder/olleh.rb

@@ -1,4 +1,11 @@
-require_relative "./olleh/lookup"
-require_relative "./olleh/version"
-require_relative "./olleh/lookups/olleh"
-require_relative "./olleh/results/olleh"
+require 'geocoder'
+require 'geocoder/lookups/olleh'
+require 'geocoder/results/olleh'
+require 'geocoder/olleh/version'
+
+module Geocoder
+  module Olleh
+  end
+end
+
+Geocoder::Lookup.street_services << :olleh

data/lib/geocoder_olleh.rb

@@ -0,0 +1 @@
+require 'geocoder/olleh'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder-olleh
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jaigouk Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,17 +49,18 @@ files:
 - ".travis.yml"
 - Gemfile
 - Guardfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - geocoder-olleh.gemspec
+- lib/geocoder/lookups/olleh.rb
 - lib/geocoder/olleh.rb
 - lib/geocoder/olleh/lookup.rb
-- lib/geocoder/olleh/lookups/olleh.rb
-- lib/geocoder/olleh/results/olleh.rb
 - lib/geocoder/olleh/version.rb
+- lib/geocoder/results/olleh.rb
+- lib/geocoder_olleh.rb
 homepage: https://github.com/jaigouk/geocoder-olleh
 licenses:
 - MIT

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Jaigouk Kim
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.