watson-api-client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fec45c50b850da9cd802179d152e89d98891076
-  data.tar.gz: 773b646ed640000c56789f6d07083274b1e40ded
+  metadata.gz: 2853333b50372507056bf65468d99248c3c8fc02
+  data.tar.gz: 37206172f43a2f9d38d5e121ea697d3fba10edda
 SHA512:
-  metadata.gz: 28a9d5c4e20a7eb5bf088a1a075883165958dd4df037e5d3d1268fcc0eafbef9efa10b23e916ce50164262b0efe47272368b66112818a3936da788e1ba6b056d
-  data.tar.gz: 8a17361402286dffe07a2c34724ba537c68fe37b1aeb528b0111b2164293d7a4c109b478039af3f072aebfe425a1546b2eb7bcc40890035eeb49550c55e57695
+  metadata.gz: d7111a654d49c0314c20ce32f541613a8db16bd6fd1ca4a51628cfe55ac247dece5903cf34bc95827de58b6afa82028581976ac9c8c4fe5aa8f3d5eba9b99800
+  data.tar.gz: 4d6dfe01b59a98402a86e65d98671f4135a08e69c58cae13275a492dc59381842731fa4e2a31dcc2055948a6ba13c1d10fd184f20212ca0fff26d1fec94fa115

data/README.md

@@ -1,4 +1,4 @@
-watson-api-client - An IBM Watson™ API client
+watson-api-client - An IBM Watson™ API client
 ================================================================
 
 [![Gem Version](https://badge.fury.io/rb/watson-api-client.svg)](http://badge.fury.io/rb/watson-api-client)
@@ -24,8 +24,14 @@ Documentation
 The simple API documentation for the watson-api-client is available on [RubyDoc.info](http://rubydoc.info/gems/watson-api-client).
 
 However, most of the classes and methods of this gem are not described in the above document because they are dynamically defined.
-Instead, you can output to the standard output the actual those list of classes and methods when you run the lib/watson-api-client.rb directly.
+Instead, you can output to the standard output the actual those list of classes and methods when you run the lib/watson-api-client.rb directly, or
+you can also use the following method to view a list of known APIs:
 
+```
+require 'watson-api-client'
+
+puts WatsonAPIClient::AvailableAPIs
+```
 
 Source Code
 -----------
@@ -102,7 +108,7 @@ Next, let's use 'Personality Insights'.
 The class name, the method name, and the argument setting rules are the same as that of the case of 'Relationship Extraction' almost.
 The rest-client and the watson-api-client judge which of path, query, header, body each argument is used for automatically.
 
-More
+Additional note at the release of the version 0.0.3
 -------
 The documents which 'watson-api-client' referred to have changed in [February 2016](https://github.com/suchowan/watson-api-client/issues/1).
 

data/lib/watson-api-client.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'json'
 require 'openssl'
 require 'open-uri'
 require 'rest-client'
@@ -6,7 +6,7 @@ require 'pp' if __FILE__ == $PROGRAM_NAME
 
 class WatsonAPIClient
 
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   class << self
 
@@ -17,17 +17,17 @@ class WatsonAPIClient
 
       # Watson API Explorer
       host1 = doc_urls[:doc_base1][/^https?:\/\/[^\/]+/]
-      open(doc_urls[:doc_base1], Options, &:read).scan(/<p>\s*<a href="\/(.+?)".*?>\s*(.+?)\s*<\/a><\/p>/i) do
+      open(doc_urls[:doc_base1], Options, &:read).scan(/<a class="swagger-list--item-link" href="\/(.+?)".*?>\s*(.+?)\s*<\/a>/i) do
         api = {'path'=>doc_urls[:doc_base1] + $1, 'title'=>$2.sub(/\s*\(.+?\)$/,'')}
         open(api['path'], Options, &:read).scan(/url:\s*'(.+?)'/) do
           api['path'] = host1 + $1
         end
         apis[api['title']] = api
       end
-
+      
       # Watson Developercloud
       host2 = doc_urls[:doc_base2][/^https?:\/\/[^\/]+/]
-      open(doc_urls[:doc_base2], Options, &:read).scan(/<li>\s*<img src=.+?>\s*<h2><a href="(.+?)".*?>\s*(.+?)\s*<\/a><\/h2>\s*<p>(.+?)<\/p>\s*<\/li>/im) do
+      open(doc_urls[:doc_base2], Options, &:read).scan(/<li>\s*<img.+data-src=.+?>\s*<h2><a href="(.+?)".*?>\s*(.+?)\s*<\/a><\/h2>\s*<p>(.+?)<\/p>\s*<\/li>/) do
         api = {'path'=>$1, 'title'=>$2, 'description'=>$3}
         next if api['path'] =~ /\.\./
         if apis.key?(api['title'])
@@ -59,7 +59,11 @@ class WatsonAPIClient
             body = parameter['name']
             break
           end
-          nickname = operation['operationId'].sub(/(.)/) {$1.downcase}
+          if operation['operationId'].nil?
+            nickname = path
+          else  
+            nickname = operation['operationId'].sub(/(.)/) {$1.downcase}
+          end
           methods[nickname] = {'method'=>method, 'path'=>path, 'operation'=>operation, 'body'=>body}
           digest[nickname]  = {'method'=>method, 'path'=>path, 'summary'=>operation['summary']}
         end
@@ -71,7 +75,7 @@ class WatsonAPIClient
   api_docs = {
     :gateway   => 'https://gateway.watsonplatform.net',
     :doc_base1 => 'https://watson-api-explorer.mybluemix.net/',
-    :doc_base2 => 'https://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/',
+    :doc_base2 => 'http://www.ibm.com/watson/developercloud/doc/',
     :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE
   }
   JSON.parse(ENV['WATSON_API_DOCS'] || '{}').each_pair do |key, value|
@@ -85,8 +89,10 @@ class WatsonAPIClient
   Gateway  = api_docs.delete(:gateway)
   Options  = api_docs
   Services = JSON.parse(ENV['VCAP_SERVICES'] || '{}')
+  AvailableAPIs = []
 
   retrieve_doc(doc_urls).each_value do |list|
+    AvailableAPIs << list['title'].gsub(/\s+(.)/) {$1.upcase}
     module_eval %Q{
       class #{list['title'].gsub(/\s+(.)/) {$1.upcase}} < self
         Service = superclass::Services['#{list['title'].sub(/\s+/,'_').downcase}']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watson-api-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Takashi SUGA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client