triglav-client 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84618d5362c94e2a5901caa06faa32873efaf8f5
-  data.tar.gz: 3dc1c426ea6c63822e57295e8bc7b202b415d9b5
+  metadata.gz: 14662b554060777f54dab37a22d441fe7ea9bba7
+  data.tar.gz: f85e283ffdcfc2ef761f12770868bd53c11df00c
 SHA512:
-  metadata.gz: c0f651b23f3e937feb59c41005c337b2c0f6eb00b022d8fa62979e7fd9b14c93dc7fb2f12b9ba879a5aa950086dffd1d18efc484b4bf49533ab3a07d8a46a2d6
-  data.tar.gz: dc511c694af9e897f72b18f0a63a33edeb98df43d1485ddcf7f5757269db5e7f512525755a911237812acd8cec5bd621661e54d75715a8c3c28cfcca3cc3bbc6
+  metadata.gz: 5ddbb667794fd3a12200a1d5a594b080a4781ad763b6c3db34b167cd416d0845dedd739994ecd0c3e29efc906540715ad207195150820f5d044c7307aa9526d2
+  data.tar.gz: 3aa1ce743de1e37a0efbd7a1e87550769c80915a1901a7f94ebd417a6ecd1059fa13de301797773ba0647944057b407c8458eae797e31e99dca1c4c8e045c04e

data/README.md

@@ -15,10 +15,18 @@ client = Triglav::Client.new(
 # Services
 client.services                      #=> Returns all the services registered on Triglav
 
+# Get service information
+service = client.services.first      #=> Triglav::Model::Service instance
+service.info.name                    #=> "sqale"
+
 # Roles
 client.roles                         #=> Returns all the roles registered on Triglav
 client.roles_in('sqale')             #=> Only roles in the service
 
+# Get role information
+role = client.roles_in('sqale').first   #=> Triglav::Model::Role instance
+role.info.name                          #=> "app"
+
 # Active hosts (default behaviour)
 client.hosts                         #=> Returns all the hosts registered on Triglav
 client.hosts_in('sqale')             #=> Only hosts in the service
@@ -28,6 +36,10 @@ client.hosts_in('sqale', 'users')    #=> Only hosts in the service and which hav
 client.hosts(with_inactive: true)
 client.hosts_in('sqale',     nil, with_inactive: true)
 client.hosts_in('sqale', 'users', with_inactive: true)
+
+# Get host information
+host = client.hosts_in('sqale').first   #=> Triglav::Model::Host instance
+host.info.name                          #=> "app001.sqale.jp"
 ```
 
 ## Installation

data/lib/triglav/client/version.rb

@@ -1,5 +1,5 @@
 module Triglav
   class Client
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/triglav/client.rb

@@ -64,32 +64,32 @@ module Triglav
     def services
       endpoint = endpoint_for(:services)
       response = dispatch_request(endpoint[:method], endpoint[:path])
-      response.map do |e|
-        Model::Service.new(client: self, info: e['service'])
+      response.map do |info|
+        Model::Service.new(client: self, info: info)
       end
     end
 
     def roles
       endpoint = endpoint_for(:roles)
       response = dispatch_request(endpoint[:method], endpoint[:path])
-      response.map do |e|
-        Model::Role.new(client: self, info: e['role'])
+      response.map do |info|
+        Model::Role.new(client: self, info: info)
       end
     end
 
     def roles_in (service)
       endpoint = endpoint_for(:roles_in, service)
       response = dispatch_request(endpoint[:method], endpoint[:path])
-      response.map do |e|
-        Model::Role.new(client: self, info: e['role'])
+      response.map do |info|
+        Model::Role.new(client: self, info: info)
       end
     end
 
     def hosts (options = {})
       endpoint = endpoint_for(:hosts)
       response = dispatch_request(endpoint[:method], endpoint[:path])
-      response.map do |e|
-        Model::Host.new(client: self, info: e['host'])
+      response.map do |info|
+        Model::Host.new(client: self, info: info)
       end.select do |h|
         if options[:with_inactive]
           true
@@ -114,8 +114,8 @@ module Triglav
         response = dispatch_request(endpoint[:method], endpoint[:path])
       end
 
-      response.map do |e|
-        Model::Host.new(client: self, info: e['host'])
+      response.map do |info|
+        Model::Host.new(client: self, info: info)
       end.select do |h|
         if options[:with_inactive]
           true
@@ -130,8 +130,8 @@ module Triglav
         raise ArgumentError.new("Both `method` and `path` are required.")
       end
 
-      json = do_request(method, path, params)
-      JSON.parse(json)
+      response = do_request(method, path, params)
+      handle_response(response)
     end
 
     private
@@ -153,10 +153,14 @@ module Triglav
       end
 
       if response.code.to_i >= 300
-        raise Error.new("#{response.code}: #{response.message}")
+        raise Error.new(handle_response(response))
       end
 
-      response.body
+      response
+    end
+
+    def handle_response(response)
+      JSON.parse(response.body)
     end
   end
 end

data/lib/triglav/model.rb

@@ -51,7 +51,7 @@ module Triglav
       def show
         endpoint = self.class.endpoint_for(:show, info.name)
         result   = client.dispatch_request(endpoint[:method], endpoint[:path])
-        self.class.new(client: client, info: result[self.class.param])
+        self.class.new(client: client, info: result)
       end
 
       def update(params = {})
@@ -61,19 +61,19 @@ module Triglav
           endpoint[:path],
           self.class.build_params(params),
         )
-        self.class.new(client: client, info: result[self.class.param])
+        self.class.new(client: client, info: result)
       end
 
       def destroy
         endpoint = self.class.endpoint_for(:destroy, info.name)
         result   = client.dispatch_request(endpoint[:method], endpoint[:path])
-        self.class.new(client: client, info: result[self.class.param])
+        self.class.new(client: client, info: result)
       end
 
       def revert
         endpoint = self.class.endpoint_for(:revert, info.name)
         result   = client.dispatch_request(endpoint[:method], endpoint[:path])
-        self.class.new(client: client, info: result[self.class.param])
+        self.class.new(client: client, info: result)
       end
     end
 

data/spec/client_spec.rb

@@ -84,7 +84,7 @@ describe Triglav::Client do
 
     context 'when model is successfully created' do
       it {
-        result = client.create(:service, name: fixture['service']['name'])
+        result = client.create(:service, name: fixture['name'])
         expect(result).to be_an_instance_of(Triglav::Model::Service)
       }
     end
@@ -226,7 +226,8 @@ describe Triglav::Client do
     context 'when arguments are passed correctly' do
       context 'and request is successfully dispatched' do
         before {
-          subject.stub(:do_request).and_return('{ "result": "ok" }')
+          subject.stub(:do_request).and_return(true)
+          subject.stub(:handle_response).and_return("result" => "ok")
         }
 
         it {

data/spec/model_spec.rb

@@ -19,7 +19,7 @@ require 'spec_helper'
         let(:res_body) { fixture.to_json }
 
         it {
-          result = klass_name.create(client, name: fixture[model_name]['name'])
+          result = klass_name.create(client, name: fixture['name'])
           expect(result).to be_an_instance_of(klass)
         }
       end
@@ -47,7 +47,7 @@ require 'spec_helper'
         let(:res_body) { fixture.to_json }
 
         it {
-          result = model.update(name: fixture[model_name]['name'])
+          result = model.update(name: fixture['name'])
           expect(result).to be_an_instance_of(klass)
         }
       end

data/spec/spec_helper.rb

@@ -39,23 +39,23 @@ shared_context 'initialize client with fixtures' do
 
   let(:services) {
     [
-      { 'service' => { 'id' => 1 } },
-      { 'service' => { 'id' => 2 } },
+      { 'id' => 1 },
+      { 'id' => 2 },
     ]
   }
 
   let(:roles) {
     [
-      { 'role' => { 'id' => 1 } },
-      { 'role' => { 'id' => 2 } },
+      { 'id' => 1 },
+      { 'id' => 2 },
     ]
   }
 
   let(:hosts) {
     [
-      { 'host' => { 'id' => 1, 'active' => true }  },
-      { 'host' => { 'id' => 2, 'active' => false } },
-      { 'host' => { 'id' => 2, 'active' => true }  },
+      { 'id' => 1, 'active' => true  },
+      { 'id' => 2, 'active' => false },
+      { 'id' => 2, 'active' => true  },
     ]
   }
 end
@@ -65,7 +65,7 @@ shared_context 'initialize client with model fixtures' do
   include_context 'setup request'
 
   let(:model) {
-    info = fixture_for(model_name)[model_name]
+    info = fixture_for(model_name)
 
     klass_name.new(
       client: client,
@@ -96,14 +96,14 @@ shared_context 'initialize client with model fixtures' do
   end
 
   let(:service) {
-    { 'service' => { 'id' => 1, 'name' => 'test service' } }
+    { 'id' => 1, 'name' => 'test service' }
   }
 
   let(:role) {
-    { 'role' => { 'id' => 1, 'name' => 'test role' } }
+    { 'id' => 1, 'name' => 'test role' }
   }
 
   let(:host) {
-    { 'host' => { 'id' => 1, 'name' => 'test host', 'active' => true }  }
+    { 'id' => 1, 'name' => 'test host', 'active' => true }
   }
 end

data/triglav-client.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triglav-client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kentaro Kuribayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 description: A Ruby interface to Triglav API.
 email:
 - kentarok@gmail.com