docodoco_jp 0.1.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 82afce23e76299aab716e43af06229c7f29512b3
-  data.tar.gz: cc614ab43b7ab0e8889c105faf1f89724fd325d1
+SHA256:
+  metadata.gz: d7ad922934b2a9353c9a9fea4f48b11f5cf28cce8b9a169cc24ee68d1bcb32e2
+  data.tar.gz: 20dda45504df7ef9d5ea60f6b1a168dad5f3514140dc2f037f82d365877a0c7a
 SHA512:
-  metadata.gz: 518ed2cbce62a0e64ca0648b12b653fe8e334dc358a053ed5dcea032338c9a91c6524834387d23c637d26a0c9e8211095c8a0ccfa1f6d9d6e93715ffd5f58897
-  data.tar.gz: 5ef463b8285f573f9bd7349a1d67f65b4ab3ec3520831a8b280290c1f1fb60f3a1799641b7dddda9919b7fb0d9f4fc43d2ab301607155acb5387fddd1f0f22d7
+  metadata.gz: 7c582dc76cfa3fb02f5de0269fb32106e8e2322424b6aaa4151d2835060d6121ce08265beeac5a706ec90c3de43348913ec4114bea3a788d43cb24a0f9c9d414
+  data.tar.gz: 8c479d8e3933c55b2519c16326b0b68c65d7cf6aae585588512134b0c4a3b288648be627b441aefbbe0274fd157d9e1b26da864bd6c13708ab9fbcbb96d23ec8

data/.travis.yml

@@ -1,3 +1,10 @@
+install: ./bin/setup
+script: bundle exec rake test
 language: ruby
 rvm:
   - 2.2.2
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode
+  - rbx-2

data/README.md

@@ -1,3 +1,6 @@
+[![Gem Version](https://badge.fury.io/rb/docodoco_jp.svg)](http://badge.fury.io/rb/docodoco_jp)
+[![Build Status](https://travis-ci.org/magicdrive/ruby-docodoco_jp.svg?branch=master)](https://travis-ci.org/magicdrive/ruby-docodoco_jp)
+
 # DocodocoJp
 
 [www.docodoco.jp](http://www.docodoco.jp) api client library.
@@ -31,19 +34,26 @@ Or install it yourself as:
 
 #### * ruby script
 
-    options = {
-        ssl: false,              # => default: true
-        faraday_log: true,       # => default: false
-        charset: "euc_jp",       # => default: utf-8
-        response_type: :json     # => default: hashie
-      }
+```ruby
+require 'docodoco_jp'
+
+apikey1 = "YOUR_APIKEY_1"
+apikey2 = "YOUR_APIKEY_2"
 
-    ipv4addr = "210.251.250.30"
+options = {
+    ssl: false,              # => default: true
+    faraday_log: true,       # => default: false
+    charset: "euc_jp",       # => default: utf-8
+    response_type: :json     # => default: hashie
+  }
 
-    docodoco_jp = DocodocoJp.new(apikey1, apikey2, options)
-    docodoco_jp.check_user # valid user, apikeys
+ipv4addr = "210.251.250.30"
 
-    result = docodoco_jp.search(ipv4addr)
+docodoco_jp = DocodocoJp.new(apikey1, apikey2, options)
+docodoco_jp.check_user # valid user, apikeys
+
+result = docodoco_jp.search(ipv4addr)
+```
 
 ### enjoy!
 
@@ -55,7 +65,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/docodoco_jp/fork )
+1. Fork it ( https://github.com/magicdrive/docodoco_jp/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`)

data/docodoco_jp.gemspec

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'docodoco_jp/version'
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = '>= 2.6.0'
   spec.name          = "docodoco_jp"
   spec.version       = DocodocoJp::VERSION
   spec.authors       = ["Hiroshi IKEGAMI"]
@@ -14,25 +15,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/magicdrive/ruby-docodoco_jp"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  end
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor", "~> 0.0"
-  spec.add_dependency "faraday", "~> 0.9"
+  spec.add_dependency "faraday", "~> 1.0"
   spec.add_dependency "hashie", "~> 3.0"
 
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "minitest", "~> 5.14"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "bundler", "~> 1.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rack"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
 end

data/fixtures/test_apikey.yml

@@ -0,0 +1,2 @@
+apikey1: "xxxxx"
+apikey2: "yyyyy"

data/lib/docodoco_jp.rb

@@ -13,13 +13,22 @@ require 'rexml/document'
 
 class DocodocoJp
 
-  API_HOST = 'api.docodoco.jp'
+  DEFAULT_API_HOST = 'api.docodoco.jp'
 
   attr_reader :apikey
   attr_reader :config
   attr_reader :user_valid
 
   class << self
+    def api_host=(host)
+      @api_host = host
+    end
+
+    def api_host
+      @api_host = DEFAULT_API_HOST if @api_host.nil?
+      return @api_host
+    end
+
     def default_config
       return {
         ssl: true,
@@ -91,7 +100,7 @@ class DocodocoJp
     return @connection ||= ->() {
       protocol = config[:ssl] ? "https" : "http"
       options  = config[:ssl] ? { ssl: { verify: true } } : {}
-      Faraday.new("#{protocol}://#{API_HOST}", options) do |builder|
+      Faraday.new("#{protocol}://#{DocodocoJp::api_host}", options) do |builder|
         builder.request  :url_encoded
         builder.response :logger if config[:faraday_log]
         builder.adapter  :net_http

data/lib/docodoco_jp/cli.rb

@@ -9,7 +9,7 @@ require 'docodoco_jp'
 class DocodocoJp
   class CLI < Thor
     desc "search [IP_ADDRESS]", "Search target IP_ADDRESS infomation"
-    def search(ipaddr)
+    def search(ipaddr = nil)
       $stdout.puts JSON.pretty_generate(client.search(ipaddr))
     end
 
@@ -21,7 +21,7 @@ class DocodocoJp
       FileUtils.mkdir_p(File.expand_path("~/.docodoco_jp/"))
       File.open(File.expand_path("~/.docodoco_jp/apikey.yml"), "w") { |f| f.print(buf) }
       $stdout.puts "config ok."
-      self.invoke(:show_keys, [], {})
+      self.invoke(:show_key, [], {})
     end
 
     desc "show_key", "Show configred API key"

data/lib/docodoco_jp/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 class DocodocoJp
-  VERSION = "0.1.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docodoco_jp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Hiroshi IKEGAMI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -80,38 +80,53 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: Location service www.docodoco.jp API Client.
 email:
 - hiroshi.ikegami@magicdrive.jp
-executables: []
+executables:
+- docodoco_jp
 extensions: []
 extra_rdoc_files: []
 files:
@@ -123,10 +138,10 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/docodoco_jp
 - bin/setup
 - docodoco_jp.gemspec
-- fixtures/sample_api_key.yml
+- exe/docodoco_jp
+- fixtures/test_apikey.yml
 - lib/docodoco_jp.rb
 - lib/docodoco_jp/api_key_invalid.rb
 - lib/docodoco_jp/cli.rb
@@ -135,8 +150,7 @@ files:
 homepage: https://github.com/magicdrive/ruby-docodoco_jp
 licenses:
 - MIT
-metadata:
-  allowed_push_host: https://rubygems.org
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -145,17 +159,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Location service www.docodoco.jp API Client.
 test_files: []
-has_rdoc: 

data/fixtures/sample_api_key.yml

@@ -1,2 +0,0 @@
-api_key1: "xxxxx"
-api_key2: "yyyyy"