interface-dsl 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e8e9d4a6a3e4193121aa9810bb856eaa9b4b55f
-  data.tar.gz: b57a5f53fb5f71e1f429d1e2fb29ece754fb93aa
+  metadata.gz: 9b66e4dfaed7be7b755c120bd3cbf66dc7de8887
+  data.tar.gz: b26c5cb82f8e783cb8f3423261bd66b452da8716
 SHA512:
-  metadata.gz: c531aa1457a25afca68e02a7c79ca0abeec3d2d0e3a4fe29d2dcf2932e9934c0bec2197771afd42b4e5a2d23ddc51d48432fa7885bcfdd9a68d3efbefe3ce38f
-  data.tar.gz: 0e140c323d173e97f18fb2df08ef9b8ffcdc678d25986e665183ada64deb3f87a2205011b6690d2e6a60de951bd63fffc26db067d8571550a979f9ceab62ce9f
+  metadata.gz: a14b2f8b4e9182d30ebf9d9c0fd226b0b4ab9da17b0d58bc3d7b4d8df6741aca6a7894d6ccd6fda801777fc35fcd46b26541e0c938e62d6e326362ae1b22c030
+  data.tar.gz: cc0809845b843ab66b1fed39cc0caa76354c22698ef7bbc67b9f6587ac230f2f7609ddd0a0d8dd4f1f19e4d919fb5e650cece73ef72c99cf223584314b61c647

data/lib/interface/default_adapter.rb

@@ -1,10 +1,6 @@
 module Interface
   class DefaultAdapter
-    CallingError   = Class.new(StandardError)
-    InterfaceError = Class.new(StandardError)
-
     extend FactoryMethods
-
     deffactory :call
 
     def initialize(callable)
@@ -13,7 +9,7 @@ module Interface
 
     def call(*args, &block)
       unless callable.respond_to?(:call)
-        fail(InterfaceError("#{callable.class} is not callable!"))
+        fail(Interface::Errors::AdaptationError.new("#{callable.class} is not callable!"))
       end
 
       _call(*args, &block)
@@ -24,14 +20,24 @@ module Interface
     attr_reader :callable
 
     def _call(*args, &block)
-      result = callable.call(*args, &block)
-      if result.is_a?(Array)
-        status, _result = result
-        status == :ok || fail(CallingError("Error while calling #{callable.class}: #{_result}"))
-        _result
-      else
-        result
-      end
+      status, _result = _handle_request(*args, &block)
+
+      # Response.__ok__(_result)
+      # Response.__error__(_result)
+      Response.public_send("__#{status}__", _result)
+    end
+
+    def _handle_request(*args, &block)
+      _wrap(callable.call(*args, &block))
+    rescue => e
+      [:error, e]
+    end
+
+    def _wrap(result)
+      return [:ok, result] unless result.is_a?(Array)
+
+      status, _result = result
+      status == :ok ? [:ok, _result] : [:error, _result]
     end
   end
 end

data/lib/interface/dsl/version.rb

@@ -1,5 +1,5 @@
 module Interface
   module Dsl
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/lib/interface/dsl.rb

@@ -10,6 +10,10 @@ module Interface
       @settings ||= configuration_class
     end
 
+    def returns(result_adapter)
+      @result_adapter = result_adapter
+    end
+
     def interface(name, &block)
       if interfaces.key?(name)
         fail(::Interface::Errors::ImmutableInterfaceError.new("Interface can't be redefined or reopened! Use .extend_api method"))
@@ -20,10 +24,10 @@ module Interface
       end)
     end
 
-    def defpoint(name, &block)
+    def defpoint(_name, &block)
       check_top_level_enpoint_policy
 
-      points.merge!(name => define_entity(name, &block))
+      points.merge!(_name => define_entity(_name, &block))
     end
 
     def method_missing(meth, *args, &block)
@@ -61,6 +65,10 @@ module Interface
       @points ||= Hashie::Mash.new
     end
 
+    def _interface_adapter
+      @result_adapter || _settings.config.response_adapter
+    end
+
     def _settings
       @settings || ::Interface::DefaultSettings
     end
@@ -93,8 +101,8 @@ module Interface
       @print_doc ||= ->(i) { i.doc }
     end
 
-    def define_entity(name, &block)
-      ::Interface::PortEntity.new(name, _settings.config.response_adapter).tap { |port| port.instance_eval(&block) }
+    def define_entity(_name, &block)
+      ::Interface::PortEntity.new(_name, _interface_adapter).tap { |port| port.instance_eval(&block) }
     end
   end
 end

data/lib/interface/errors.rb

@@ -7,5 +7,6 @@ module Interface
     InvalidInputError       = Class.new(BaseError)
     HandlerMissingError     = Class.new(BaseError)
     UnexpectedInstanceError = Class.new(BaseError)
+    AdaptationError         = Class.new(BaseError)
   end
 end

data/lib/interface/port_entity.rb

@@ -1,8 +1,14 @@
 module Interface
-  class PortEntity < Struct.new(:name, :default_adapter)
+  class PortEntity
     N_A = 'N/A'.freeze
     LIM = ('-' * 48).freeze
 
+    attr_reader :name
+
+    def initialize(name, adapter)
+      @name, @adapter = name, adapter
+    end
+
     def describe(text)
       @description = text
     end
@@ -19,16 +25,7 @@ module Interface
         fail(::Interface::Errors::InvalidInputError.new(errors)) if errors.any?
       end
 
-      # this is a decent source of bugs.
-      caller =  if !@adapter.nil?
-                  @adapter.new(@handler)
-                elsif !default_adapter.nil?
-                  default_adapter.new(@handler)
-                else
-                  @handler
-                end
-
-      caller.call(*args, &block)
+      _callee.call(*args, &block)
     end
 
     def handler(klass)
@@ -66,5 +63,13 @@ Returns:
 #{LIM}
       DOC
     end
+
+    private
+
+    def _callee
+      return @handler if @adapter.nil?
+
+      @adapter.new(@handler)
+    end
   end
 end

data/lib/interface.rb

@@ -11,4 +11,6 @@ module Interface
 
   autoload :DefaultSettings, 'interface/default_settings'
   autoload :DefaultAdapter,  'interface/default_adapter'
+  autoload :DirectAdapter,   'interface/direct_adapter'
+  autoload :Response,        'interface/response'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interface-dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Oleksiy Kurnenkov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation