angus-remote 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjE0YTVkY2ZmYzYxNjZjMWU5MTFmMTRhYTk2ODRiNzRhNDlkOGFiNg==
+  data.tar.gz: !binary |-
+    MzM4NTVkMzljY2QwN2Q3MTJiOWMwODI1MWNmYjJhYWI0ODVlYTMzNA==
+SHA512:
+  metadata.gz: !binary |-
+    NWVhYWFjMWY2NzA2NGI1Nzc5ZTEzNDBiNzVmOTYwYzhlMTdkOGJjOGFmMGZl
+    ZTM2MTg5MTdjOGIyZjc2NmU5YTUxMTg4ODAzZjIwYWJiMTYwZjM4OTJjNjhk
+    MzhkMzQ1ZGFjZWUzNzU1NTI1NDQzMDY2YzZiYWQyZjVmMTRjY2M=
+  data.tar.gz: !binary |-
+    ZDYwZWJiNDY2YzI2MjYzYjQ3NWI4OGNlZTBkOTMyZWZkODY0NjMwYzI4Nzc3
+    YzZhZjZlZmFiYjYzMTRmMmNhNTgyMDQwNTI1NzRmMTMxYzdhMzNiNTZmNGU4
+    Yzg4NjRjOWI3ZjEzOWZiYWE5NjMyNGYyOTU5NDQ0OTliYmJiOGM=

data/lib/angus/remote/builder.rb

@@ -2,14 +2,13 @@ require 'uri'
 
 require_relative 'client'
 require_relative 'response/builder'
+require_relative 'settings'
 
 module Angus
   module Remote
 
     module Builder
 
-      DEFAULT_TIMEOUT = 60
-
       # Builds a client for a specific service.
       #
       # @param [String] code_name The service's name known to the service directory
@@ -42,7 +41,7 @@ module Angus
                                       code_name, service_definition)
         end
 
-        remote_service_class.new(api_url, self.default_timeout, options)
+        remote_service_class.new(api_url, Settings.default_timeout, options)
       end
 
       def self.define_operation(client_class, namespace, operation, service_code_name,
@@ -192,14 +191,6 @@ module Angus
         encoded
       end
 
-      def self.default_timeout
-        @default_timeout || DEFAULT_TIMEOUT
-      end
-
-      def self.default_timeout=(default_timeout)
-        @default_timeout = default_timeout
-      end
-
     end
 
   end

data/lib/angus/remote/client.rb

@@ -22,8 +22,10 @@ module Angus
           :force_retry  => false,
           :url          => api_url,
 
+          :keep_alive   => timeout,
           :read_timeout => timeout,
-          :open_timeout => timeout
+          :open_timeout => timeout,
+          :idle_timeout => timeout
         )
 
         @api_base_path = @connection.default_path

data/lib/angus/remote/service_directory.rb

@@ -13,12 +13,17 @@ module Angus
 
     module ServiceDirectory
 
-      # Path to the configuration file that has the information about the
-      # doc_url and api_url
-      SERVICES_CONFIGURATION_FILE = 'config/services.yml'
-
       # Builds and returns a Client object for the service and version received
-      def self.lookup(code_name, version = nil)
+      def self.lookup(*args)
+        if args.length == 1
+          definition = args.first
+          code_name = definition.delete(:code_name)
+          version = definition.delete(:version)
+          set_service_configuration(code_name, version, definition)
+        else
+          code_name, version = args
+        end
+
         version ||= service_version(code_name)
 
         @clients_cache ||= {}
@@ -252,14 +257,34 @@ module Angus
       #
       # @raise [ServiceConfigurationNotFound] When no configuration for the given service
       def self.service_configuration(code_name)
-        @services_configuration ||= YAML.load_file(SERVICES_CONFIGURATION_FILE)
+        @services_configuration ||= load_services_configuration_file
 
         @services_configuration[code_name] or
           raise ServiceConfigurationNotFound.new(code_name)
       end
       private_class_method :service_configuration
 
-    end
+      def self.set_service_configuration(code_name, version, configuration)
+        @services_configuration ||= load_services_configuration_file
+        @services_configuration[code_name] ||= {}
 
+        @services_configuration[code_name]["v#{version}"] = configuration.inject({}) do |config, entry|
+          k, v = entry
+          config.merge!({ k.to_s => v })
+        end
+      end
+      private_class_method :set_service_configuration
+
+      def self.load_services_configuration_file
+        return {} unless File.exists?(Settings.configuration_file)
+        configuration = YAML.load_file(Settings.configuration_file)
+
+        configuration = {} unless configuration.is_a?(Hash)
+
+        configuration
+      end
+      private_class_method :load_services_configuration_file
+
+    end
   end
 end

data/lib/angus/remote/settings.rb

@@ -19,9 +19,11 @@ module Angus
       end
 
       DEFAULT_TIMEOUT = 60
+      DEFAULT_CONFIGURATION_FILE = 'config/services.yml'
 
       add_option(:default_timeout, DEFAULT_TIMEOUT)
       add_option(:redis, {})
+      add_option(:configuration_file, DEFAULT_CONFIGURATION_FILE)
 
     end
 

data/lib/angus/remote/version.rb

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

data/spec/angus/remote/service_directory_spec.rb

@@ -8,8 +8,8 @@ describe Angus::Remote::ServiceDirectory do
 
   let(:code_name) { 'vpos' }
   let(:version) { '0.1' }
-  let(:doc_url) { 'some_url/doc' }
-  let(:api_url) { 'some_url/api' }
+  let(:doc_url) { 'http://example.com/some_url/doc' }
+  let(:api_url) { 'http://example.com/some_url/api' }
 
   before do
     Angus::Remote::ServiceDirectory.stub(:service_configuration => { "v#{version}" => {
@@ -17,9 +17,33 @@ describe Angus::Remote::ServiceDirectory do
     })
   end
 
+  describe '.lookup' do
+
+    context 'when a definition hash is given' do
+      before do
+        service_directory.stub(:fetch_remote_service_definition => {})
+        service_definition = Angus::SDoc::Definitions::Service.new
+        Angus::SDoc::DefinitionsReader.stub(:build_service_definition => service_definition)
+      end
+
+      it 'returns the service definition' do
+        service_directory.lookup(
+          { :code_name => code_name, :version => version, :doc_url => version, :api_url => version}
+        ).should be_kind_of(Angus::Remote::Client)
+      end
+    end
+
+    context 'when the code name and version are given' do
+      it 'returns the service definition' do
+        service_directory.lookup(code_name, version).should be_kind_of(Angus::Remote::Client)
+      end
+    end
+
+  end
+
   describe '.get_service_definition' do
 
-    let(:service_definition){ double(:service_definition)}
+    let(:service_definition) { Angus::SDoc::Definitions::Service.new }
 
     context 'when a file url' do
       let(:doc_url) { 'file://path/to/doc' }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angus-remote
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Adrian Gomez
@@ -10,34 +9,31 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angus-sdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: persistent_http
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -45,7 +41,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -53,7 +48,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -61,7 +55,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,7 +62,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -77,7 +69,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -85,7 +76,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -93,7 +83,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -101,7 +90,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -109,7 +97,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -117,7 +104,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,7 +111,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -133,7 +118,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mock_redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -141,7 +125,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -149,7 +132,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -157,7 +139,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -165,7 +146,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -173,7 +153,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -181,7 +160,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov-text
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -189,7 +167,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -197,7 +174,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -205,7 +181,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -221,62 +196,61 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/angus-remote.rb
-- lib/angus/unmarshalling.rb
-- lib/angus/remote/representation.rb
-- lib/angus/remote/version.rb
-- lib/angus/remote/http/query_params.rb
-- lib/angus/remote/http/multipart_methods/multipart_put.rb
+- lib/angus/authentication/client.rb
+- lib/angus/authentication/redis_client.rb
+- lib/angus/remote/builder.rb
+- lib/angus/remote/client.rb
+- lib/angus/remote/exceptions.rb
+- lib/angus/remote/http/multipart.rb
 - lib/angus/remote/http/multipart_methods/multipart_base.rb
 - lib/angus/remote/http/multipart_methods/multipart_post.rb
-- lib/angus/remote/http/multipart.rb
+- lib/angus/remote/http/multipart_methods/multipart_put.rb
+- lib/angus/remote/http/query_params.rb
 - lib/angus/remote/message.rb
-- lib/angus/remote/settings.rb
-- lib/angus/remote/builder.rb
+- lib/angus/remote/proxy_client.rb
 - lib/angus/remote/proxy_client_utils.rb
+- lib/angus/remote/remote_response.rb
+- lib/angus/remote/representation.rb
 - lib/angus/remote/response/builder.rb
-- lib/angus/remote/response/serializer.rb
 - lib/angus/remote/response/hash.rb
+- lib/angus/remote/response/serializer.rb
 - lib/angus/remote/service_directory.rb
-- lib/angus/remote/remote_response.rb
-- lib/angus/remote/exceptions.rb
-- lib/angus/remote/client.rb
-- lib/angus/remote/proxy_client.rb
+- lib/angus/remote/settings.rb
 - lib/angus/remote/utils.rb
-- lib/angus/authentication/redis_client.rb
-- lib/angus/authentication/client.rb
-- spec/angus/remote/service_directory_spec.rb
-- spec/angus/remote/proxy_client_utils_spec.rb
-- spec/angus/remote/http/query_params_spec.rb
-- spec/angus/remote/http/multipart_spec.rb
+- lib/angus/remote/version.rb
+- lib/angus/unmarshalling.rb
+- spec/angus/remote/builder_spec.rb
+- spec/angus/remote/client_spec.rb
 - spec/angus/remote/http/multipart_methods/multipart_base_spec.rb
-- spec/angus/remote/utils_spec.rb
+- spec/angus/remote/http/multipart_spec.rb
+- spec/angus/remote/http/query_params_spec.rb
+- spec/angus/remote/proxy_client_utils_spec.rb
 - spec/angus/remote/response/builder_spec.rb
-- spec/angus/remote/client_spec.rb
-- spec/angus/remote/builder_spec.rb
+- spec/angus/remote/service_directory_spec.rb
+- spec/angus/remote/utils_spec.rb
 homepage: http://mooveit.github.io/angus-remote
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client for building service objects.
 test_files:
 - spec/angus/remote/service_directory_spec.rb