endo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b76cfad1ab5f415e15a9b7f661c451844a8c18
-  data.tar.gz: 4d858870cf13514bec7e1fdc6460def568f6d93b
+  metadata.gz: 7a6e0eb3c683feb92b2e6b18a1a76ff6354a99e3
+  data.tar.gz: 2f97c729f144198dc2cb4d840415c746ac19ae83
 SHA512:
-  metadata.gz: fe230bbd9feb1d12d59eae5ced3de6ffa5011a233336acce5234ada09a66038c2622559fa2e023b07748488325968bfd82a579b72d809879595159b74cfb4279
-  data.tar.gz: 82fb6f79d151d610f39a1a317fca3fd3c55b1b1fe908337ba2c77b8b9d4f9327c5b78b9c75c549c3fde6614373186976b52f859b2b927200ac7689ced7c14db4
+  metadata.gz: c79bbe2c0263bb186da2dfc9f603d97fae2e7db20de7a5185508fdc2dc389b393ac8da50422c71eefcac213db2da59177853aafcf6d5d1f5d39989c4d3671e82
+  data.tar.gz: 9c1520a0698c7191fdb64e05a0549f2fafee9d570a8639084d0048efaa16327bef551429685c156f872dd936f769b084d2844129ca389fce1975ad4b5a5b0854

data/endo/sample.rb

@@ -0,0 +1,50 @@
+set :base_url, 'http://localhost:3000'
+basic_auth 'user', 'pass'
+
+get '/articles' do
+  expect(header: 'Content-Type').to eq 'application/json; charset=utf-8'
+end
+
+post '/articles.json' do
+  param 'article[title]', 'hello'
+  param 'article[content]', 'Hello, world!'
+end
+
+get '/articles/:article_id' do
+  param :article_id do
+    from :post, '/articles.json', ->{ self[:id] }
+  end
+
+  expect(header: 'Content-Type').to eq 'application/json; charset=utf-8'
+  expect(body: ->{ self[:title] }).to eq 'hello'
+end
+
+patch '/articles/:article_id.json' do
+  param :article_id do
+    from :post, '/articles.json', ->{ self[:id] }
+  end
+
+  param 'article[title]', 'こんにちは'
+end
+
+get '/articles/:article_id' do
+  param :article_id do
+    from :post, '/articles.json', ->{ self[:id] }
+  end
+
+  expect(body: ->{ self[:title] }).to eq 'こんにちは'
+end
+
+put '/articles/:article_id.json' do
+  param :article_id do
+    from :post, '/articles.json', ->{ self[:id] }
+  end
+
+  param 'article[title]', 'bonjour'
+end
+
+delete '/articles/:article_id.json' do
+  param :article_id do
+    from :post, '/articles.json', ->{ self[:id] }
+  end
+end

data/lib/endo/cli.rb

@@ -8,7 +8,7 @@ module Endo
     desc "exec usage", "exec desc"
     def exec(endo_file=nil)
       if endo_file.nil?
-        Dir.glob('endo/*.endo').each do |f|
+        Dir.glob('endo/*.rb').each do |f|
           exec_proc(f)
         end
       else
@@ -27,4 +27,4 @@ module Endo
       executor.instance_eval File.read(file_path)
     end
   end
-end
+end

data/lib/endo/core.rb

@@ -26,6 +26,18 @@ module Endo
       request(endpoint, :post, &block)
     end
 
+    def delete(endpoint, &block)
+      request(endpoint, :delete, &block)
+    end
+
+    def patch(endpoint, &block)
+      request(endpoint, :patch, &block)
+    end
+
+    def put(endpoint, &block)
+      request(endpoint, :put, &block)
+    end
+
     #TODO: 制限
     def param(key, val=nil, &block)
       unless (!val.nil?) ^ (!block.nil?) # Only either one
@@ -63,6 +75,12 @@ module Endo
       val
     end
 
+    def basic_auth(user, pass)
+      @basic_auth = {
+        user: user, pass: pass
+      }
+    end
+
     private
     def request(endpoint, method, &block)
       org_endpoint = endpoint.clone
@@ -83,12 +101,12 @@ module Endo
         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]"
+        message = "🍺 #{method.upcase} #{endpoint} [#{t_end-t_start}ms]"
       rescue Error::HttpError=>e
-        message = "💩 #{endpoint} [code: #{e.code}]".red
+        message = "💩 #{method.upcase} #{endpoint} [code: #{e.code}]".red
         exit 1
       rescue Error::ValidationError => e
-        message = "👮 #{endpoint} [expected: \"#{e.expected}\" actual: \"#{e.actual}\"]".yellow
+        message = "👮 #{method.upcase} #{endpoint} [expected: \"#{e.expected}\" actual: \"#{e.actual}\"]".yellow
       ensure
         puts message
       end
@@ -117,13 +135,27 @@ module Endo
     def http_request(url, params, method: :get)
       uri = URI.parse url
 
-      req = if method == :get
+      req = case method
+      when :get
         uri.query = URI.encode_www_form(params)
-        req = Net::HTTP::Get.new uri
-      elsif method == :post
+        Net::HTTP::Get.new uri
+      when :post
         req = Net::HTTP::Post.new uri.path
         req.set_form_data(params)
         req
+      when :delete
+        uri.query = URI.encode_www_form(params)
+        req = Net::HTTP::Delete.new uri
+      when :patch
+        uri.query = URI.encode_www_form(params)
+        req = Net::HTTP::Patch.new uri
+      when :put
+        uri.query = URI.encode_www_form(params)
+        req = Net::HTTP::Put.new uri
+      end
+
+      if @basic_auth
+        req.basic_auth @basic_auth[:user], @basic_auth[:pass]
       end
 
       res = Net::HTTP.start(uri.host, uri.port) {|http| http.request req }
@@ -133,7 +165,7 @@ module Endo
     end
 
     def parse_body_json(res)
-      JSON.parse(res.body, symbolize_names: true)
+      JSON.parse(res.body, symbolize_names: true) if res.body
     end
 
     def build_response_key(method, endpoint)

data/lib/endo/matchers/include.rb

@@ -0,0 +1,16 @@
+module Endo
+  module Matchers
+    class Include < BaseMatcher
+      attr_reader :expected
+
+      private
+        def match(expected, actual)
+          if actual.respond_to? :include?
+            actual.include? expected
+          else
+            raise 'NotSupported'
+          end
+        end
+    end
+  end
+end

data/lib/endo/matchers.rb

@@ -1,5 +1,6 @@
 require 'endo/matchers/base_matcher'
 require 'endo/matchers/eq'
+require 'endo/matchers/include'
 
 
 module Endo
@@ -7,5 +8,9 @@ module Endo
     def eq(expected)
       Matchers::Eq.new(expected)
     end
+
+    def include(expected)
+      Matchers::Include.new(expected)
+    end
   end
 end

data/lib/endo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: endo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - maruware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,7 +94,7 @@ files:
 - Rakefile
 - bin/endo
 - endo.gemspec
-- endo/sample.endo
+- endo/sample.rb
 - lib/endo.rb
 - lib/endo/cli.rb
 - lib/endo/core.rb
@@ -105,6 +105,7 @@ files:
 - lib/endo/matchers.rb
 - lib/endo/matchers/base_matcher.rb
 - lib/endo/matchers/eq.rb
+- lib/endo/matchers/include.rb
 - lib/endo/version.rb
 homepage: https://github.com/maruware/endo
 licenses: []

data/endo/sample.endo

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