docodoco_jp 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab1cf9ade58f1a21aa7cb09fe29b12416f4fb32
-  data.tar.gz: 09345ebbf6c5f403e8d7139a3b5739b98991b976
+  metadata.gz: c46a71ef87c49fdf19d8c7f61f4faefb92b58c98
+  data.tar.gz: 5eb81b51e8b6b3a56038afdd9039429daa09f8fe
 SHA512:
-  metadata.gz: 2c931b442cd87638ad344d4e4c81eb83f335b8d369340dc933c4578947e51f3ec27eadc3fe453e68a8b50154f1d8920a0c725ed04073a7033c29294b1c51be4e
-  data.tar.gz: 17e8026f63976b381a40adcfce6c7f07fd650eb11bd7a08ffb7fceefc7beac969047a266fe87d8e38ced6e378a0b9b8c582daccc5d92f08ad7df4e18b1836a8c
+  metadata.gz: 8028d83db86d072f6745b77b6465883e11ccfc4c76bd2249871ab5472eb44360fdd6eb57f9629421e5245f4a80163d8640a6261d6a89788740220bf589f80b99
+  data.tar.gz: b447edd31b665545a3b768b0462698f4008bc5b8cdd8df5c9ca5938b55d8009dfd058c08bba31cb8f5a64b54a6d02d14b7e45cac9a204ba288ca5df324c2e844

data/lib/docodoco_jp.rb

@@ -1,6 +1,8 @@
 # coding: utf-8
 
 require "docodoco_jp/version"
+require "docodoco_jp/ipv4_validation_error"
+require "docodoco_jp/api_key_invalid"
 
 require "faraday"
 require "hashie"
@@ -45,11 +47,6 @@ class DocodocoJp
     end
   end
 
-  def valid?
-    return check_user unless @user_valid
-    return @user_valid
-  end
-
   def search(ipadr = nil)
     result = hash_nomalize(JSON.parse(search_api(ipadr).body))
     if config[:response_type] == :hashie
@@ -67,13 +64,19 @@ class DocodocoJp
     return result, {status: status, message: message}
   end
 
+  def check_user!()
+    result, json = check_user
+    raise DocodocoJp::ApiKeyInvalid unless result
+    return result, json
+  end
+
   private
   def check_user_api()
     return api_request "/v4/user_info", api_params
   end
 
   def search_api(ipadr = nil)
-    raise "arg: ipadr is not IP ADDRESS." unless ipadr.nil? || Resolv::IPv4::Regex =~ ipadr
+    raise DocodocoJp::IPv4ValidationError unless ipadr.nil? || Resolv::IPv4::Regex =~ ipadr
     return api_request "/v4/search", api_params(format: :json, charset: config[:charset], ipadr: ipadr)
   end
 
@@ -86,11 +89,11 @@ class DocodocoJp
 
   def connection
     return @connection ||= ->() {
-      protocol = config[:ssl] ? "https:" : "http"
+      protocol = config[:ssl] ? "https" : "http"
       options  = config[:ssl] ? { ssl: { verify: true } } : {}
-      Faraday.new("#{protocol}//#{API_HOST}", options) do |builder|
+      Faraday.new("#{protocol}://#{API_HOST}", options) do |builder|
         builder.request  :url_encoded
-        builder.response :logger if config[:debug]
+        builder.response :logger if config[:faraday_log]
         builder.adapter  :net_http
       end
     }.call()

data/lib/docodoco_jp/api_key_invalid.rb

@@ -0,0 +1,6 @@
+# coding: utf-8
+
+class DocodocoJp
+  class ApiKeyInvalid < StandardError
+  end
+end

data/lib/docodoco_jp/ipv4_validation_error.rb

@@ -0,0 +1,6 @@
+# coding: utf-8
+
+class DocodocoJp
+  class IPv4ValidationError < StandardError
+  end
+end

data/lib/docodoco_jp/version.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 class DocodocoJp
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docodoco_jp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Hiroshi IKEGAMI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -113,6 +113,8 @@ files:
 - docodoco_jp.gemspec
 - fixtures/sample_api_key.yml
 - lib/docodoco_jp.rb
+- lib/docodoco_jp/api_key_invalid.rb
+- lib/docodoco_jp/ipv4_validation_error.rb
 - lib/docodoco_jp/version.rb
 homepage: https://github.com/magicdrive/ruby-docodoco_jp
 licenses: