endo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b99d1fdfdb8f0ad10fdbdc2a3e46b9974addee86
-  data.tar.gz: f39abeadde123c22cd9ffc792d2cdde034e34bc4
+  metadata.gz: 90b76cfad1ab5f415e15a9b7f661c451844a8c18
+  data.tar.gz: 4d858870cf13514bec7e1fdc6460def568f6d93b
 SHA512:
-  metadata.gz: 88b0052adb6db8f27c59b2bff2a7d677c5f1d07d73c3a6286564c61431c115236c29bd5684a591cd65ca42db17e975435e01ff4f0e9e0358f154a31e0e4cc555
-  data.tar.gz: 3bdd8f80f063cdd41d3efcdc562572c327077599330dceafec381a0e340b368460137ab2adae73f6293aad43bac991568e4d770d9ff2a8899edeed5d48a3110f
+  metadata.gz: fe230bbd9feb1d12d59eae5ced3de6ffa5011a233336acce5234ada09a66038c2622559fa2e023b07748488325968bfd82a579b72d809879595159b74cfb4279
+  data.tar.gz: 82fb6f79d151d610f39a1a317fca3fd3c55b1b1fe908337ba2c77b8b9d4f9327c5b78b9c75c549c3fde6614373186976b52f859b2b927200ac7689ced7c14db4

data/README.md

@@ -11,30 +11,27 @@ ex. endo/sample.endo
 ```ruby
 set :base_url, 'http://endo-sample.maruware.com'
 
-get '/articles'
+get '/articles' do
+  expect(body: ->{ at(0)[:title] }).to eq 'good'
+end
 
 get '/articles/:article_id' do
-  param 'article_id' do
-    from :get, '/articles' do |articles|
-      articles.first[:id]
-    end
+  param :article_id do
+    from :get, '/articles', ->{ first[:id] }
   end
+
+  expect(header: 'Content-Type').to eq 'application/json; charset=utf-8'
 end
 
-post '/articles' do
-  param 'title', 'hello'
-  param 'text', 'Hello, world!'
+post '/articless' do
+  param :title, 'hello'
+  param :text, 'Hello, world!'
 end
 ```
 
 Exec endo command.
 
-```
-$ endo exec endo/sample.endo
-🍺 /articles [142ms]
-🍺 /articles/1 [31ms]
-🍺 /articles [28ms]
-```
+![2016-03-07 21 24 08](https://cloud.githubusercontent.com/assets/1129887/13569450/7d9a796a-e4ab-11e5-9ab0-e52eef36ea0f.png)
 
 ## Installation
 

data/endo.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
+  spec.add_runtime_dependency "colorize"
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"

data/endo/sample.endo

@@ -1,16 +1,18 @@
 set :base_url, 'http://endo-sample.maruware.com'
 
-get '/articles'
+get '/articles' do
+  expect(body: ->{ at(0)[:title] }).to eq 'good'
+end
 
 get '/articles/:article_id' do
-  param 'article_id' do
-    from :get, '/articles' do |articles|
-      articles.first[:id]
-    end
+  param :article_id do
+    from :get, '/articles', ->{ first[:id] }
   end
+
+  expect(header: 'Content-Type').to eq 'application/json; charset=utf-8'
 end
 
-post '/articles' do
-  param 'title', 'hello'
-  param 'text', 'Hello, world!'
+post '/articless' do
+  param :title, 'hello'
+  param :text, 'Hello, world!'
 end

data/lib/endo.rb

@@ -1,5 +1,7 @@
 require "endo/version"
 require "endo/cli"
+require "endo/matchers"
+require "endo/expectation_target"
 require "endo/core"
 require "endo/error"
 

data/lib/endo/core.rb

@@ -1,12 +1,16 @@
 require 'open-uri'
 require 'json'
 require 'net/http'
+require 'colorize'
 
 module Endo
   class Core
+    include Endo::Matchers
+
     def initialize
       @props = {}
       @responses = {}
+      @expect_alls = {}
     end
 
     def set(key, val)
@@ -28,7 +32,7 @@ module Endo
         raise ArgumentError.new('DupValue')
       end
 
-      @params[key] = if val
+      @params[key.to_s] = if val
         val
       else
         block.call
@@ -37,18 +41,21 @@ module Endo
     end
 
     #TODO: Limit scope
-    def from(method, endpoint, &block)
+    def from(method, endpoint, lmd=nil, &block)
       key = build_response_key(method, endpoint)
       unless @responses.has_key? key
         raise RuntimeError.new("NotFoundKey [#{key}]")
       end
 
-      unless block
+      res = @responses[key]
+      val = if lmd
+        res.instance_exec &lmd
+      elsif block
+        block.call(res)
+      else
         raise ArgumentError.new('UndefinedBlock')
       end
 
-      res = @responses[key]
-      val = block.call(res)
       unless val.is_a?(String) || val.is_a?(Integer) || val.is_a?(Numeric)
         raise RuntimeError.new('BadValueType')
       end
@@ -61,25 +68,31 @@ module Endo
       org_endpoint = endpoint.clone
 
       @params = {}
+      @expects = []
       block.call if block
 
       endpoint = apply_pattern_vars(endpoint, @params)
 
       url = @props[:base_url] + endpoint
 
-      message = begin
+      begin
         t_start = Time.now.instance_eval { self.to_i * 1000 + (usec/1000) }
-        res = http_request_json(url, @params, method: method)
+        res = http_request(url, @params, method: method)
         t_end = Time.now.instance_eval { self.to_i * 1000 + (usec/1000) }
 
-        @responses[build_response_key(method, endpoint)] = res
-        "🍺 #{endpoint} [#{t_end-t_start}ms]"
+        res_data = parse_body_json(res)
+        @responses[build_response_key(method, endpoint)] = res_data
+        validate_expects(res) unless @expect_alls.empty? && @expects.empty?
+        message = "🍺 #{endpoint} [#{t_end-t_start}ms]"
       rescue Error::HttpError=>e
-        "💩 #{endpoint} [code: #{e.code}]"
+        message = "💩 #{endpoint} [code: #{e.code}]".red
+        exit 1
+      rescue Error::ValidationError => e
+        message = "👮 #{endpoint} [expected: \"#{e.expected}\" actual: \"#{e.actual}\"]".yellow
+      ensure
+        puts message
       end
 
-
-      puts message
     end
 
     def apply_pattern_vars(endpoint, params)
@@ -101,33 +114,51 @@ module Endo
       endpoint
     end
 
-    def http_request_json(url, params, method: :get, symbolize_names: true)
-      res = http_request(url, params, method)
-      JSON.parse(res, symbolize_names: symbolize_names)
-    end
-
-    def http_request(url, params, method)
+    def http_request(url, params, method: :get)
       uri = URI.parse url
 
-      if method == :get
+      req = if method == :get
         uri.query = URI.encode_www_form(params)
         req = Net::HTTP::Get.new uri
-      end
-
-      if method == :post
+      elsif method == :post
         req = Net::HTTP::Post.new uri.path
         req.set_form_data(params)
+        req
       end
 
       res = Net::HTTP.start(uri.host, uri.port) {|http| http.request req }
       raise Error::HttpError.new("HTTP Bad Status[#{res.code}] #{res.body}", res.code, res.body) unless /^20[0-8]$/ =~ res.code
 
-      return res.body
+      return res
+    end
+
+    def parse_body_json(res)
+      JSON.parse(res.body, symbolize_names: true)
     end
 
     def build_response_key(method, endpoint)
       "#{method}:#{endpoint}"
     end
 
+    def expect(header: nil, body: nil)
+      expectation = if header
+        ExpectationTarget.new(:header, header)
+      elsif(body)
+        ExpectationTarget.new(:body, body)
+      else
+        raise 'TODO'
+      end
+      @expects << expectation
+      return expectation
+    end
+
+    def validate_expects(res)
+      @expects.each do |expectation|
+        unless expectation.matches?(res)
+          raise Error::ValidationError.new(expectation.expected, expectation.actual)
+        end
+      end
+    end
+
   end
 end

data/lib/endo/error.rb

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

data/lib/endo/error/validation_error.rb

@@ -0,0 +1,15 @@
+
+module Endo
+  module Error
+    class ValidationError < StandardError
+      attr_reader :expected, :actual
+
+      def initialize(expected, actual)
+        super("expected: #{expected}\n actual: #{actual}")
+        @expected = expected
+        @actual = actual
+      end
+
+    end
+  end
+end

data/lib/endo/expectation_target.rb

@@ -0,0 +1,32 @@
+module Endo
+  class ExpectationTarget
+    attr_reader :actual
+
+    def initialize(target, query)
+      @target = target
+      @query = query
+    end
+
+    def to(matcher)
+      @matcher = matcher
+    end
+
+    def matches?(res)
+      @actual = case @target
+      when :header
+        res.header[@query]
+      when :body
+        obj = JSON.parse res.body, symbolize_names: true
+        obj.instance_exec(&@query)
+      end
+      @matcher.matches?(@actual)
+    end
+
+
+    def expected
+      @matcher.expected
+    end
+
+
+  end
+end

data/lib/endo/matchers.rb

@@ -0,0 +1,11 @@
+require 'endo/matchers/base_matcher'
+require 'endo/matchers/eq'
+
+
+module Endo
+  module Matchers
+    def eq(expected)
+      Matchers::Eq.new(expected)
+    end
+  end
+end

data/lib/endo/matchers/base_matcher.rb

@@ -0,0 +1,15 @@
+module Endo
+  module Matchers
+    class BaseMatcher
+      attr_reader :expected
+
+      def initialize(expected)
+        @expected = expected
+      end
+
+      def matches?(actual)
+        match(expected, actual)
+      end
+    end
+  end
+end

data/lib/endo/matchers/eq.rb

@@ -0,0 +1,12 @@
+module Endo
+  module Matchers
+    class Eq < BaseMatcher
+      attr_reader :expected
+
+      private
+        def match(expected, actual)
+          actual == expected
+        end
+    end
+  end
+end

data/lib/endo/version.rb

@@ -1,3 +1,3 @@
 module Endo
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: endo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - maruware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,11 @@ files:
 - lib/endo/core.rb
 - lib/endo/error.rb
 - lib/endo/error/http_error.rb
+- lib/endo/error/validation_error.rb
+- lib/endo/expectation_target.rb
+- lib/endo/matchers.rb
+- lib/endo/matchers/base_matcher.rb
+- lib/endo/matchers/eq.rb
 - lib/endo/version.rb
 homepage: https://github.com/maruware/endo
 licenses: []
@@ -106,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Testing api endpoints tool