endo 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a81727bcc13e0b820d605e38a94e5de3efc804
-  data.tar.gz: 26ee7de9bacac40fc237f6a32d5f790f3976d9e9
+  metadata.gz: 978a8802a583f38f85e7ccbfeb7b2604bd9baaf6
+  data.tar.gz: 188ba02ef58b0c08d8cb49ec2efb0b8d6e9ac5d9
 SHA512:
-  metadata.gz: b2a5f170105a8bbf39b851ffa613c0d89341b55ff4ff6113e1b328fdd8c89ce30532d399baba383a9122272bf826de39c232d2de6e33f915eb85b6b3128bd85e
-  data.tar.gz: 7db7ace6ca42dcacf4cc16a68e23af76adab5ff0f95abb0cc0417420bfca69087a9a773d291b0e3d3d1691ebd8c0c82a4843832212cc5bef330568f665f6e019
+  metadata.gz: fb819ea3b6f22b72a456916c21a781b254887628bcc97efe5a83c9581abcf44076501effc2bc311e1ce18ad7e6188552de730c9c5e428ab712e09f5a0ab3dd69
+  data.tar.gz: 91b47b79321e6a38022b8a162945856b1aa396b90980f4c1b4b8c1ea4a189dc014ce7af9438b861ad46bc352ecf29e2b43f108729082ddd3d82abd56e63ec81c

data/README.md

@@ -12,7 +12,7 @@ base_url 'http://localhost:3000'
 basic_auth 'user', 'pass'
 
 get '/articles' do
-  expect(header: 'Content-Type').to eq 'application/json; charset=utf-8'
+  expect(header: 'Content-Type').to equal 'application/json; charset=utf-8'
 end
 
 post '/articles.json' do
@@ -22,11 +22,11 @@ end
 
 get '/articles/:article_id' do
   param :article_id do
-    from :post, '/articles.json', -> { self[:id] }
+    from :post, '/articles.json', 'id'
   end
 
-  expect(header: 'Content-Type').to eq 'application/json'
-  expect(body: -> { self[:title] }).to eq 'hello'
+  expect(header: 'Content-Type').to equal 'application/json'
+  expect(body: 'title' }).to equal 'hello'
 end
 ```
 

data/endo.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "colorize"
+  spec.add_runtime_dependency "ruby_dig"
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"

data/endo/sample.rb

@@ -2,7 +2,7 @@ base_url 'http://localhost:3000'
 basic_auth 'user', 'pass'
 
 get '/articles' do
-  expect(header: 'Content-Type').to eq 'application/json; charset=utf-8'
+  expect(header: 'Content-Type').to equal 'application/json; charset=utf-8'
 end
 
 post '/articles.json' do
@@ -11,33 +11,40 @@ post '/articles.json' do
 end
 
 get '/articles/:article_id' do
-  param :article_id do
-    from :post, '/articles.json', -> { self[:id] }
+  param 'article_id' do
+    from 'post', '/articles.json', 'id'
+    # or
+    # from :post, '/articles.json', -> { self['id'] }
+
+    # or
+    # from :post, '/articles.json' do |r|
+    #   r['id']
+    # end
   end
 
-  expect(header: 'Content-Type').to eq 'application/json; charset=utf-8'
-  expect(body: -> { self[:title] }).to eq 'hello'
+  expect(header: 'Content-Type').to equal 'application/json; charset=utf-8'
+  expect(body: 'title').to equal 'hello'
 end
 
 patch '/articles/:article_id.json' do
-  param :article_id do
-    from :post, '/articles.json', -> { self[:id] }
+  param 'article_id' do
+    from :post, '/articles.json', 'id'
   end
 
   param 'article[title]', 'こんにちは'
 end
 
 get '/articles/:article_id' do
-  param :article_id do
-    from :post, '/articles.json', -> { self[:id] }
+  param 'article_id' do
+    from :post, '/articles.json', 'id'
   end
 
-  expect(body: -> { self[:title] }).to eq 'こんにちは'
+  expect(body: 'title').to equal 'こんにちは'
 end
 
 put '/articles/:article_id.json' do
-  param :article_id do
-    from :post, '/articles.json', -> { self[:id] }
+  param 'article_id' do
+    from :post, '/articles.json', 'id'
   end
 
   param 'article[title]', 'bonjour'
@@ -45,6 +52,6 @@ end
 
 delete '/articles/:article_id.json' do
   param :article_id do
-    from :post, '/articles.json', -> { self[:id] }
+    from :post, '/articles.json', 'id'
   end
 end

data/lib/endo/core.rb

@@ -2,6 +2,7 @@ require 'open-uri'
 require 'json'
 require 'net/http'
 require 'colorize'
+require 'ruby_dig'
 
 module Endo
   class Core
@@ -48,19 +49,27 @@ module Endo
     end
 
     # TODO: Limit scope
-    def from(method, endpoint, lmd = nil, &_block)
+    def from(method, endpoint, prop = nil, &_block)
       key = build_response_key(method, endpoint)
       raise "NotFoundKey [#{key}]" unless @responses.key? key
 
       res = @responses[key]
-      val = nil
-      if !lmd.nil?
-        val = res.instance_exec(&lmd)
-      elsif block_given?
-        val = yield res
-      else
-        raise ArgumentError, 'UndefinedBlock'
-      end
+
+      val = if !prop.nil?
+              if prop.is_a?(String)
+                res[prop]
+              elsif prop.is_a?(Array)
+                res.dig(*prop)
+              elsif prop.is_a?(Proc)
+                res.instance_exec(&prop)
+              else
+                raise ArgumentError, 'BadPropType'
+              end
+            elsif block_given?
+              yield res
+            else
+              raise ArgumentError, 'UndefinedBlock'
+            end
 
       unless val.is_a?(String) || val.is_a?(Integer) || val.is_a?(Numeric)
         raise 'BadValueType'
@@ -147,7 +156,7 @@ module Endo
     end
 
     def parse_body_json(res)
-      JSON.parse(res.body, symbolize_names: true) if res.body
+      JSON.parse(res.body) if res.body
     end
 
     def build_response_key(method, endpoint)

data/lib/endo/expectation_target.rb

@@ -16,8 +16,12 @@ module Endo
       when :header
         @actual = res.header[@query]
       when :body
-        obj = JSON.parse res.body, symbolize_names: true
-        @actual = obj.instance_exec(&@query)
+        obj = JSON.parse res.body
+        @actual = if @query.is_a? Proc
+                    obj.instance_exec(&@query)
+                  else
+                    obj[@query]
+                  end
       end
       @matcher.matches?(@actual)
     end

data/lib/endo/matchers.rb

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

data/lib/endo/matchers/{eq.rb → equal.rb}

@@ -1,6 +1,6 @@
 module Endo
   module Matchers
-    class Eq < BaseMatcher
+    class Equal < BaseMatcher
       attr_reader :expected
 
       private

data/lib/endo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: endo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - maruware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_dig
+  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
@@ -106,7 +120,7 @@ files:
 - lib/endo/expectation_target.rb
 - lib/endo/matchers.rb
 - lib/endo/matchers/base_matcher.rb
-- lib/endo/matchers/eq.rb
+- lib/endo/matchers/equal.rb
 - lib/endo/matchers/include.rb
 - lib/endo/version.rb
 homepage: https://github.com/maruware/endo