endo 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac22efa794a76374a866f7c8f19ee7b7a261efda
-  data.tar.gz: 25f3b904a025040605012eb92327951ea8b87310
+  metadata.gz: 30a81727bcc13e0b820d605e38a94e5de3efc804
+  data.tar.gz: 26ee7de9bacac40fc237f6a32d5f790f3976d9e9
 SHA512:
-  metadata.gz: 727908b09dfa7314bd86b96ed4a6afda60dede68beb0de41f0bd9bb715850a9979f74a72835211dcf537c0705271f861459f8370c6e83a645d40ce361ad32603
-  data.tar.gz: 5f501ccbfc7ec6f91a07d480cef5f120dfde0bc9b47c0d33325af782b213a6f6254473295c3f1d7ebb6512c7a953d6378ceab0e6ad7f24e3b95dabde1b126a6c
+  metadata.gz: b2a5f170105a8bbf39b851ffa613c0d89341b55ff4ff6113e1b328fdd8c89ce30532d399baba383a9122272bf826de39c232d2de6e33f915eb85b6b3128bd85e
+  data.tar.gz: 7db7ace6ca42dcacf4cc16a68e23af76adab5ff0f95abb0cc0417420bfca69087a9a773d291b0e3d3d1691ebd8c0c82a4843832212cc5bef330568f665f6e019

data/lib/endo/cli.rb

@@ -25,7 +25,7 @@ module Endo
 
     def exec_proc(file_path)
       executor = Endo::Core.new
-      executor.instance_eval File.read(file_path)
+      executor.instance_eval(File.read(file_path), file_path)
     end
   end
 end

data/lib/endo/core.rb

@@ -9,7 +9,16 @@ module Endo
 
     def initialize
       @responses = {}
-      @expect_alls = {}
+    end
+
+    def base_url(url)
+      @base_url = url
+    end
+
+    def basic_auth(user, pass)
+      @basic_auth = {
+        user: user, pass: pass
+      }
     end
 
     def get(endpoint, &block)
@@ -32,17 +41,16 @@ module Endo
       request(endpoint, :put, &block)
     end
 
-    # TODO: 制限
+    # TODO: Limit scope
     def param(key, val = nil)
       raise ArgumentError, 'DupValue' unless !val.nil? ^ block_given?
-
       @params[key.to_s] = val ? val : yield
     end
 
     # TODO: Limit scope
     def from(method, endpoint, lmd = nil, &_block)
       key = build_response_key(method, endpoint)
-      raise RuntimeError "NotFoundKey [#{key}]" unless @responses.key? key
+      raise "NotFoundKey [#{key}]" unless @responses.key? key
 
       res = @responses[key]
       val = nil
@@ -61,32 +69,15 @@ module Endo
       val
     end
 
-    def base_url(url)
-      @base_url = url
-    end
-
-    def basic_auth(user, pass)
-      @basic_auth = {
-        user: user, pass: pass
-      }
-    end
-
     private
 
-    def request(endpoint, method, &_block)
-      @params = {}
-      @expects = []
-      yield if block_given?
-
-      endpoint = apply_pattern_vars(endpoint, @params)
-      url = @base_url + endpoint
-
+    def request(endpoint, method, &block)
       begin
-        res, time_ms = request_with_timer(url, method, @params)
-        validate_expects(res) unless @expect_alls.empty? && @expects.empty?
-        @responses[build_response_key(method, endpoint)] = parse_body_json(res)
-
-        message = "🍺 #{method.upcase} #{endpoint} [#{time_ms}ms]"
+        res_obj, duration_ms = request_proc(endpoint, method, &block)
+        message = "🍺 #{method.upcase} #{endpoint} [#{duration_ms}ms]"
+      rescue Errno::ECONNREFUSED => e
+        message = "💀 #{e.message}".red
+        exit 1
       rescue Error::HttpError => e
         message = "💩 #{method.upcase} #{endpoint} [code: #{e.code}]".red
         exit 1
@@ -97,21 +88,21 @@ module Endo
       end
     end
 
-    def apply_pattern_vars(endpoint, params)
-      patterns = endpoint.scan(/:(\w+)/)
-      if patterns.any?
-        patterns.flatten!
-        patterns.each do |pattern|
-          raise "NotFoundPattern #{pattern}" unless params.key? pattern
+    def request_proc(endpoint, method, &_block)
+      @params = {}
+      @expects = []
+      yield if block_given?
 
-          endpoint.sub!(/:#{pattern}/, params[pattern].to_s)
-        end
+      endpoint = apply_params_to_pattern(endpoint, @params)
+      url = @base_url + endpoint
 
-        patterns.uniq.each do |pattern|
-          params.delete(pattern)
-        end
-      end
-      endpoint
+      res, duration_ms = request_with_timer(url, method, @params)
+      validate_expects(res) if @expects.any?
+
+      res_obj = parse_body_json(res)
+      @responses[build_response_key(method, endpoint)] = parse_body_json(res)
+
+      [res_obj, duration_ms]
     end
 
     def request_with_timer(url, method, params)
@@ -163,13 +154,31 @@ module Endo
       "#{method}:#{endpoint}"
     end
 
+    def apply_params_to_pattern(endpoint, params)
+      patterns = endpoint.scan(/:(\w+)/)
+      if patterns.any?
+        patterns.flatten!
+        patterns.each do |pattern|
+          raise "NotFoundPattern #{pattern}" unless params.key? pattern
+          endpoint.sub!(/:#{pattern}/, params[pattern].to_s)
+        end
+
+        patterns.uniq.each do |pattern|
+          params.delete(pattern)
+        end
+      end
+      endpoint
+    end
+
     def expect(header: nil, body: nil)
+      unless !header.nil? ^ !body.nil?
+        raise ArgumentError, '"expect" must be called with header or body'
+      end
+
       if header
         expectation = ExpectationTarget.new(:header, header)
       elsif body
         expectation = ExpectationTarget.new(:body, body)
-      else
-        raise 'TODO'
       end
       @expects << expectation
       expectation

data/lib/endo/error.rb

@@ -1,2 +1,2 @@
 require 'endo/error/http_error'
-require 'endo/error/validation_error'
+require 'endo/error/validation_error'

data/lib/endo/expectation_target.rb

@@ -12,21 +12,18 @@ module Endo
     end
 
     def matches?(res)
-      @actual = case @target
+      case @target
       when :header
-        res.header[@query]
+        @actual = res.header[@query]
       when :body
         obj = JSON.parse res.body, symbolize_names: true
-        obj.instance_exec(&@query)
+        @actual = obj.instance_exec(&@query)
       end
       @matcher.matches?(@actual)
     end
 
-
     def expected
       @matcher.expected
     end
-
-
   end
-end
+end

data/lib/endo/matchers.rb

@@ -2,7 +2,6 @@ require 'endo/matchers/base_matcher'
 require 'endo/matchers/eq'
 require 'endo/matchers/include'
 
-
 module Endo
   module Matchers
     def eq(expected)
@@ -13,4 +12,4 @@ module Endo
       Matchers::Include.new(expected)
     end
   end
-end
+end

data/lib/endo/matchers/base_matcher.rb

@@ -12,4 +12,4 @@ module Endo
       end
     end
   end
-end
+end

data/lib/endo/matchers/eq.rb

@@ -4,9 +4,10 @@ module Endo
       attr_reader :expected
 
       private
-        def match(expected, actual)
-          actual == expected
-        end
+
+      def match(expected, actual)
+        actual == expected
+      end
     end
   end
-end
+end

data/lib/endo/version.rb

@@ -1,3 +1,3 @@
 module Endo
-  VERSION = "0.4.0"
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: endo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - maruware