multiconnect 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 982d7e46c526c7ecaf2cc6338cfc132d21708500
-  data.tar.gz: 173e9f83db38b1eeab4ae87323395116bf4618e5
+  metadata.gz: 333b43e952689988a4e0d2cdd741ae0bd70527f5
+  data.tar.gz: 374ee1846bc9181dfb572c14eca7fe50e73d98f2
 SHA512:
-  metadata.gz: 08c24753cfb9b98c271d8c7195717d6e4b33fc1e1cf60c52c06f30075d409806e164747e3c4669ef3dca965ecb0b2aea6d8ebdd2f936546b5161a23941315c71
-  data.tar.gz: 37b42b22474463876f4f98c3b34ce137e7f1aa0c58585d4e1d6cebcca4dfc5bcb4cfe79c45f7c22c5a297460988fbe2301e1086e9db8192f2a1327164fa4d81e
+  metadata.gz: bad26cf1719c35130ceee33b1b8d204ca355e5e1d441dadfe217ea76615f63db4eef23b4622da016529015efb0077490333dd0e15fe458527e838534d065cdb0
+  data.tar.gz: 2f57e806733e7f5ff31d95b425f33fa11df56d72ee0ad41f36050a841ecd33626d31f1050b2671392b3963aaf62e90d53cc578bae6e7e3f1990ce876fb257959

data/lib/multiconnect.rb

@@ -3,6 +3,7 @@ require 'active_support'
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/blank'
 
 module Multiconnect
   autoload :Connection,     'multiconnect/connection'

data/lib/multiconnect/connectable.rb

@@ -15,13 +15,13 @@ module Multiconnect
           self._connections = [connection_class.new(options)] + _connections
         end
 
-        def request(action, *args, &default)
+        def request(action, *args)
           self._connections.each do |connection|
             result = connection.execute(action, *args)
             return result if result.success?
           end
 
-          raise Multiconnect::Error::UnsuccessfulRequestError.new( class: self, action: action )
+          raise Multiconnect::Error::UnsuccessfulRequest.new( class: self, action: action )
         end
       end
     end

data/lib/multiconnect/connection/base.rb

@@ -6,7 +6,8 @@ module Multiconnect
 
       def initialize(options = {})
         self.client = options.fetch :client, nil
-        @except = Array(options.fetch :except, [])
+        @except     = Array(options.fetch :except, []).map(&:to_sym)
+        @only       = Array(options.fetch :only, []).map(&:to_sym)
       end
 
       def request(action, *args)
@@ -18,16 +19,26 @@ module Multiconnect
       end
 
       def execute(action, *args)
-        if @except.include? action
-          Result.new 
-        else
+        if allowed?(action)
           Result.new status: Result::SUCCESS, data: request(action, *args), connection: self.class
+        else
+          Result.new 
         end
 
       rescue => e
         report_error(e)
         Result.new
       end
+
+      private
+
+      def allowed?(action)
+        action = action.to_sym
+        allowed_by_only   = @only.blank? || ( @only.present? && @only.include?( action ) )
+        allowed_by_except = !@except.include?(action)
+
+        allowed_by_only && allowed_by_except 
+      end
     end
   end
 end

data/lib/multiconnect/error.rb

@@ -1,5 +1,5 @@
 module Multiconnect
   module Error
-    autoload :UnsuccessfulRequestError, 'multiconnect/error/unsuccessful_request_error'
+    autoload :UnsuccessfulRequest, 'multiconnect/error/unsuccessful_request'
   end
 end

data/lib/multiconnect/error/{unsuccessful_request_error.rb → unsuccessful_request.rb}

@@ -1,6 +1,6 @@
 module Multiconnect
   module Error
-    class UnsuccessfulRequestError < StandardError
+    class UnsuccessfulRequest < StandardError
       def initialize(opts = {})
         @class    = opts.fetch :class, nil
         @action   = opts.fetch :action, nil

data/lib/multiconnect/version.rb

@@ -1,3 +1,3 @@
 module Multiconnect
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiconnect
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Greg Orlov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,7 +116,7 @@ files:
 - lib/multiconnect/connection/base.rb
 - lib/multiconnect/connection/result.rb
 - lib/multiconnect/error.rb
-- lib/multiconnect/error/unsuccessful_request_error.rb
+- lib/multiconnect/error/unsuccessful_request.rb
 - lib/multiconnect/version.rb
 - multiconnect.gemspec
 homepage: https://github.com/gaorlov/multiconnect