bazil_client 1.0.2 → 2.0.0

data/ChangeLog.md

@@ -1,3 +1,9 @@
+## Version 2.0.0 (2014-10-10) ##
+
+Feature
+
+- Support api path
+
 ## Version 1.0.2 (2013-04-22) ##
 
 Feature

data/VERSION

@@ -1 +1 @@
-1.0.2
+2.0.0

data/lib/bazil/client.rb

@@ -13,7 +13,7 @@ module Bazil
     extend Forwardable
 
     class Options
-      attr_reader :host, :port, :scheme, :ca_file, :ssl_version, :verify_mode, :api_key, :secret_key
+      attr_reader :host, :port, :scheme, :api_root, :ca_file, :ssl_version, :verify_mode, :api_key, :secret_key
 
       def initialize(options)
         if options.kind_of? String
@@ -36,6 +36,8 @@ module Bazil
         @port = url.port or raise "Failed to obtain port number from given url: url = #{url.to_s}"
         @scheme = url.scheme or raise "Failed to obtain scheme from given url: url = #{url.to_s}"
         raise "Unsupported scheme '#{@scheme}'" unless AVAILABLE_SCHEMA.include? @scheme
+        @api_root = url.path
+        @api_root += '/' unless @api_root.end_with? '/'
       end
 
       def load_ca_file_option(options)
@@ -97,9 +99,9 @@ module Bazil
       DEFAULT_SKIP_VERIFY = false
 
       BAZIL_CONFIG_DIRS = [
-        File::join(ENV['PWD'], '.bazil'),
-        File::join(ENV['HOME'], '.bazil')
-      ]
+        (File::join(ENV['PWD'], '.bazil') if ENV['PWD']),
+        (File::join(ENV['HOME'], '.bazil') if ENV['HOME']),
+      ].compact
 
       API_KEYS_FILE_KEY = :api_keys
       DEFAULT_API_KEYS_FILES = BAZIL_CONFIG_DIRS.map{|dir| File::join(dir, 'api_keys') }
@@ -119,7 +121,7 @@ module Bazil
       http = Net::HTTP.new(opt.host, opt.port)
       set_ssl_options(http,opt)
 
-      @http_cli = REST.new(http)
+      @http_cli = REST.new(http, api_root: opt.api_root)
       set_api_keys(opt.api_key, opt.secret_key)
     end
 

data/lib/bazil/rest.rb

@@ -5,13 +5,16 @@ require 'json'
 require 'time'
 require 'net/http'
 require 'digest/md5'
+require 'pathname'
 
 module Bazil
   class REST
     extend Forwardable
 
-    def initialize(http)
+    def initialize(http, options = {})
       @http = http
+      @api_root = options[:api_root] || '/'
+      @api_root += '/' unless @api_root.end_with? '/'
     end
 
     def_delegators :@http, :read_timeout, :read_timeout=
@@ -23,6 +26,7 @@ module Bazil
     end
 
     def get(uri)
+      uri = gen_path(uri)
       uri, header = add_api_signature(uri, nil)
       @http.get(uri, header)
     rescue Errno::ECONNREFUSED => e
@@ -30,6 +34,7 @@ module Bazil
     end
 
     def put(uri, data, header = {})
+      uri = gen_path(uri)
       uri, header = add_api_signature(uri, data, header)
       @http.put(uri, data, header)
     rescue Errno::ECONNREFUSED => e
@@ -37,6 +42,7 @@ module Bazil
     end
 
     def post(uri, data, header = {})
+      uri = gen_path(uri)
       uri, header = add_api_signature(uri, data, header)
       @http.post(uri, data, header)
     rescue Errno::ECONNREFUSED => e
@@ -44,6 +50,7 @@ module Bazil
     end
 
     def delete(uri)
+      uri = gen_path(uri)
       uri, header = add_api_signature(uri, nil)
       @http.delete(uri, header)
     rescue Errno::ECONNREFUSED => e
@@ -51,6 +58,11 @@ module Bazil
     end
 
     private
+    def gen_path(path)
+      # Pathname#+ cannot append absolute path, so use String#+ then canonicalize it
+      Pathname.new(@api_root + path).cleanpath.to_s
+    end
+
     def add_api_signature(uri, data, header = {})
       return uri, header unless @api_key and @secret_key
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bazil_client
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,10 +102,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -441761299674887890
+      hash: 2357737480406686873
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Ruby client of Bazil