vidibus-service 0.2.0 → 0.3.0

data/README.md

@@ -1,4 +1,4 @@
-# Vidibus::Service [![](http://travis-ci.org/vidibus/vidibus-service.png)](http://travis-ci.org/vidibus/vidibus-service)
+# Vidibus::Service [![Build Status](https://travis-ci.org/vidibus/vidibus-service.png)](https://travis-ci.org/vidibus/vidibus-service)
 
 DESCRIBE
 

data/Rakefile

@@ -10,7 +10,7 @@ require "vidibus/service/version"
 
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "vidibus-sysinfo #{Vidibus::Service::VERSION}"
+  rdoc.title = "vidibus-service #{Vidibus::Service::VERSION}"
   rdoc.rdoc_files.include("README*")
   rdoc.rdoc_files.include("lib/**/*.rb")
   rdoc.options << "--charset=utf-8"

data/lib/vidibus/service/client.rb

@@ -7,15 +7,21 @@ module Vidibus
       format :json
 
       class ServiceError < Error; end
+      class RequestError < Error; end
 
       attr_accessor :base_uri, :service, :this
 
       # Initializes a new client for given service.
       def initialize(service)
-        raise ServiceError.new("Service required") unless service and service.is_a?(::Service)
+        unless service && service.is_a?(::Service)
+          raise(ServiceError, 'Service required')
+        end
+        unless service.url
+          raise(ServiceError, 'URL of service required')
+        end
         self.service = service
         self.this = ::Service.this
-        self.base_uri = service.url or raise(ServiceError.new("URL of service required"))
+        self.base_uri = service.url
       end
 
       # Sends a GET request to given path.
@@ -46,13 +52,19 @@ module Vidibus
         options[options_type] = {:realm => service.realm_uuid, :service => this.uuid}.merge(options[options_type] || {})
         uri = build_uri(path)
         Vidibus::Secure.sign_request(verb, uri, options[options_type], secret)
-        self.class.send(verb, uri, options)
+        begin
+          self.class.send(verb, uri, options)
+        rescue StandardError, Exception => e
+          raise(RequestError, e.message, e.backtrace)
+        end
       end
 
       # Builds URI from base URI of service and given path.
       def build_uri(path)
         path = path.to_s
-        raise("Expected path, got #{path}") unless path.match(/^\//)
+        unless path.match(/^\//)
+          path = "/#{path}"
+        end
         base_uri + path
       end
 

data/lib/vidibus/service/errors.rb

@@ -1,5 +1,7 @@
 module Vidibus # :nodoc
   module Service # :nodoc
     class Error < StandardError; end
+    class ConfigurationError < Error; end
+    class ConnectorError < Error; end
   end
 end

data/lib/vidibus/service/mongoid.rb

@@ -4,15 +4,12 @@ module Vidibus
       extend ActiveSupport::Concern
       include Vidibus::Secure::Mongoid
 
-      class ConfigurationError < Error; end
-      class ConnectorError < Error; end
-
       included do
         field :url
         field :uuid
         field :function
         field :realm_uuid
-        field :this, :type => ::Mongoid::Boolean
+        field :this, :type => Boolean, :default => false
 
         attr_accessor :nonce
         attr_encrypted :secret
@@ -22,7 +19,7 @@ module Vidibus
         validates :realm_uuid, :uuid => {:allow_blank => true}
         validates :function, :presence => true
         validates :secret, :presence => true, :unless => :connector?
-        validates :realm_uuid, :presence => true, :unless => Proc.new {|s| s.connector? or s.this?}
+        validates :realm_uuid, :presence => true, :if => :realm_required?
 
         validate :dont_allow_secret_for_connector, :if => :connector?
 
@@ -70,6 +67,10 @@ module Vidibus
             errors.add(:secret, :secret_not_allowed_for_connector)
           end
         end
+
+        def realm_required?
+          !connector? && !this?
+        end
       end
 
       module ClassMethods
@@ -89,10 +90,7 @@ module Vidibus
         # Returns best service by function or UUID within given realm.
         # If a service can be found in stored, it will be fetched from Connector.
         def discover(wanted, realm = nil)
-          unless service = local(wanted, realm)
-            service = remote(wanted, realm)
-          end
-          service
+          local(wanted, realm) || remote(wanted, realm)
         end
 
         # Returns stored service by function or UUID within given realm.
@@ -106,15 +104,21 @@ module Vidibus
         # This method should not be called directly. Use #discover to avoid unneccessary lookups.
         def remote(wanted, realm)
           unless realm
-            raise ArgumentError.new("Please provide a valid realm to discover an appropriate service.")
+            fail(ArgumentError, 'Please provide a valid realm to discover an appropriate service.')
           end
-          if response = connector.client.get("/services/#{wanted}", :query => {:realm => realm})
-            secret = response["secret"] || raise(ConnectorError.new("The Connector did not return a secret for #{wanted}. Response was: #{response.parsed_response.inspect}"))
+          response = connector.client.
+            get("/services/#{wanted}", :query => {:realm => realm})
+          if response
+            secret = response["secret"]
+            unless secret
+              fail(ConnectorError, "The Connector did not return a secret for #{wanted}. Response was: #{response.parsed_response.inspect}")
+            end
             secret = Vidibus::Secure.decrypt(secret, this.secret)
-            attributes = response.only(%w[uuid function url]).merge(:realm_uuid => realm, :secret => secret)
+            attributes = response.only(%w[uuid function url]).
+              merge(:realm_uuid => realm, :secret => secret)
             create!(attributes)
           else
-            raise "no service found"
+            fail('no service found')
           end
         end
       end

data/lib/vidibus/service/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Service
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidibus-service
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -286,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -240109756340464642
+      hash: 2662895653579897609
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: