angus-remote 0.0.7 → 0.0.8

data/lib/angus-remote.rb

@@ -1,5 +1,6 @@
 require 'angus/remote/client'
 require 'angus/remote/builder'
-require 'angus/remote/service_directory'
+require 'angus/remote/proxy_client'
 require 'angus/remote/response/serializer'
+require 'angus/remote/service_directory'
 require 'angus/remote/settings'

data/lib/angus/remote/builder.rb

@@ -37,11 +37,9 @@ module Angus
           end
         end
 
-        service_definition.proxy_operations.each do |namespace, operations|
-          operations.each do |operation|
-            self.define_proxy_operation(remote_service_class, namespace, operation, code_name,
-                                        service_definition)
-          end
+        service_definition.proxy_operations.each do |operation|
+          self.define_proxy_operation(remote_service_class, operation.service_name, operation,
+                                      code_name, service_definition)
         end
 
         remote_service_class.new(api_url, self.default_timeout, options)
@@ -81,7 +79,9 @@ module Angus
                                                                   path_params = nil,
                                                                   request_params = nil|
 
-          service_definition = Angus::Remote::ServiceDirectory.join_proxy(
+          require 'picasso-remote'
+
+          service_definition = Picasso::Remote::ServiceDirectory.join_proxy(
             service_code_name,
             service_definition.version,
             operation.service_name
@@ -89,22 +89,21 @@ module Angus
 
           args = [encode_as_json, path_params, request_params]
 
-          request_params = Angus::Remote::Builder.extract_var_arg!(args, Hash) || {}
-          path_params = Angus::Remote::Builder.extract_var_arg!(args, Array) || []
-          encode_as_json = Angus::Remote::Builder.extract_var_arg!(args, TrueClass) || false
+          request_params = Picasso::Remote::Builder.extract_var_arg!(args, Hash) || {}
+          path_params = Picasso::Remote::Builder.extract_var_arg!(args, Array) || []
+          encode_as_json = Picasso::Remote::Builder.extract_var_arg!(args, TrueClass) || false
 
-          request_params = Angus::Remote::Builder.apply_glossary(service_definition.glossary,
+          request_params = Picasso::Remote::Builder.apply_glossary(service_definition.glossary,
                                                                    request_params)
 
-          request_params = Angus::Remote::Builder.escape_request_params(request_params)
+          request_params = Picasso::Remote::Builder.escape_request_params(request_params)
 
           response = make_request(operation.path, operation.http_method, encode_as_json,
                                   path_params, request_params)
 
-          Angus::Remote::Response::Builder.build_from_remote_response(response,
+          Picasso::Remote::Response::Builder.build_from_remote_response(response,
                                                                         service_code_name,
                                                                         service_definition.version,
-                                                                        namespace,
                                                                         operation.code_name)
         end
       end

data/lib/angus/remote/version.rb

@@ -1,7 +1,7 @@
 module Angus
   module Remote
 
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
 
   end
 end

data/spec/angus/remote/builder_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 require 'angus/remote/client'
 require 'angus/remote/builder'
 
+require 'picasso-remote'
+
 describe Angus::Remote::Builder do
 
   subject(:builder) { Angus::Remote::Builder }
@@ -14,7 +16,7 @@ describe Angus::Remote::Builder do
     let(:proxy_operation) { double(:proxy_operation, :code_name=> 'get_users_proxy', :service_name => 'vpos', :path => '/users', :http_method => :get) }
     let(:glossary) { double(:glossary, :terms_hash_with_long_names => {}) }
     let(:service_definition) { double(:vpos, :name => 'Vpos', :operations => { 'users' => [operation] },
-                                      :proxy_operations => { 'users' => [proxy_operation] }, :version => '0.1', :glossary => glossary) }
+                                      :proxy_operations => [proxy_operation], :version => '0.1', :glossary => glossary) }
 
     let(:api_url) { 'http://localhost:8085/vpos/api/0.1/' }
 
@@ -62,8 +64,9 @@ describe Angus::Remote::Builder do
         describe 'the generated proxy operation' do
 
           before do
-            Angus::Remote::ServiceDirectory.stub(:service_configuration => { 'v0.1' => { 'doc_url' => 'some_url/doc', 'api_url' => 'some_url/api' } })
-            Angus::Remote::ServiceDirectory.stub(:fetch_remote_service_definition => { 'service' => { 'service' => 'vpos'  }, 'code_name' => 'vpos', 'version' => '0.1', 'operations' => { 'users' => { 'get_users_proxy' => { 'name' => 'Obtener usuarios' } } } })
+            Picasso::Remote::ServiceDirectory.stub(:service_configuration => { 'v0.1' => { 'doc_url' => 'some_url/doc', 'api_url' => 'some_url/api' } })
+            Picasso::Remote::ServiceDirectory.stub(:fetch_remote_service_definition => { 'service' => { 'service' => 'vpos'  }, 'code_name' => 'vpos', 'version' => '0.1', 'operations' => { 'users' => { 'get_users_proxy' => { 'name' => 'Obtener usuarios' } } } })
+            Picasso::Remote::Response::Builder.stub(:build_from_remote_response)
           end
 
           it 'makes a request to the remote service' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angus-remote
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angus-sdoc