hobby-test 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61cd3a457c60be67607b061852aef03d00d6fcd7
-  data.tar.gz: e9fae2b5ebbc5a727032b715a784323ec3e817c9
+  metadata.gz: 3562fd6babd886a773823d0dc6887b0f2b78a463
+  data.tar.gz: a0c92acd2d1defcbd44503364d7054956e9bad91
 SHA512:
-  metadata.gz: 256a68e3c67766a20b0719e2a23a39d966938bf460f3619e3251755a208d867ba0f1f566f9bb94e04ca614a96b5e42d078757c939357fe929417e3c893cb2494
-  data.tar.gz: 7e0eacc4fb1cbf4a702ab5b0615a44f97e5df84115290ec3f3cab7bf9cf718d165b73930893b370246ec4a6b84dda6cc85c9f38c420855b135a36ea5b9446b84
+  metadata.gz: 569d8473b72c10be990f4da0a0f91a741ea9c348e911980b0fefc2903b6ff9fc91ae60f8b0e7ddf4dd47428a8ab4811dd8435352009dc8a36148768b02b0bc03
+  data.tar.gz: ab16a3283435543d75910cd20107d33e04d40a1cb3546fab85e44b8b05b9a23c45ce24c4d024b50cf9a6b9010f1a81a6b1a3155cf0efa706112e6a5615af3393

data/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+*.gem

data/hobby-test.gemspec

@@ -1,10 +1,11 @@
 Gem::Specification.new do |g|
   g.name    = 'hobby-test'
   g.files   = `git ls-files`.split($/)
-  g.version = '0.0.4'
+  g.version = '0.0.5'
   g.summary = 'A way to test HTTP exchanges via YAML specifications'
   g.authors = ['Anatoly Chernow']
 
   g.add_dependency 'excon'
-  g.add_dependency 'to_proc'
+  g.add_dependency 'to_proc', '>= 0.0.7'
+  g.add_dependency 'include_constants'
 end

data/lib/hobby/test.rb

@@ -1,4 +1,5 @@
 require 'to_proc/all'
+require 'include_constants'
 require 'excon'
 
 require 'yaml'
@@ -6,22 +7,20 @@ require 'json'
 require 'forwardable'
 require 'ostruct'
 
-require 'hobby/test/exchange'
-require 'hobby/test/report'
-require 'hobby/test/env'
-
 module Hobby
   class Test
-    def self.from_file string
-      new YAML.load_file string
+    def self.from_file string, **defaults
+      new (YAML.load_file string), defaults: defaults
     end
 
-    def self.from_string string
-      new YAML.load string
+    def self.from_string string, **defaults
+      new (YAML.load string), defaults: defaults
     end
 
-    def initialize array_of_hashes
-      @exchanges = array_of_hashes.map &Exchange
+    def initialize array_of_hashes, defaults: {}
+      @exchanges = array_of_hashes
+        .map(&[defaults, :merge])
+        .map(&Exchange)
     end
 
     def [] address
@@ -34,5 +33,11 @@ module Hobby
 
       Report.new @exchanges.map &[env]
     end
+
+    include_constants from: ToProc
   end
 end
+
+require 'hobby/test/exchange'
+require 'hobby/test/report'
+require 'hobby/test/env'

data/lib/hobby/test/exchange.rb

@@ -2,9 +2,8 @@ module Hobby
   class Test
     class Exchange
       def initialize hash
-        @request = Request.new hash.find { |key, _|
-          Request::VERBS.include? key
-        }
+        verb, params = hash.find &Key[Request::VERBS, :include?]
+        @request = Request.new [verb, params, *hash[:format]]
         @asserts = (hash['response']&.map &Assert) || []
       end
       attr_reader :request, :asserts

data/lib/hobby/test/exchange/assert.rb

@@ -1,14 +1,12 @@
 class Hobby::Test::Exchange
-  module Assert
-    def self.[] pair
+  class Assert
+    def initialize pair
       key, delimiter, chain = pair[0].partition /\.|\[/
       chain.prepend (delimiter == '[' ? 'self[' : 'self.') unless chain.empty?
-      const_get(key.capitalize).new key, chain, pair[1]
-    end
 
-    def initialize key, chain, value
-      @key, @chain, @specified_value = key, chain, value
+      @key, @chain, @specified_value = key, chain, pair[1]
     end
+    attr_reader :key, :chain, :specified_value, :actual_value
 
     def ok?
       @ok
@@ -18,54 +16,23 @@ class Hobby::Test::Exchange
       dup.assert response
     end
 
-    def compare_chain
-      if chain.end_with? '>', '=', '<'
-        actual_value.instance_eval "#{chain}(#{specified_value})"
-      else
-        (actual_value.instance_eval chain) == specified_value
-      end
-    end
-
-    def assert response
-      @actual_value = response.public_send key
-      compare
-      self
-    end
-
-    attr_reader :actual_value, :specified_value, :chain, :key
-
-    class Status
-      include Assert
-
-      def compare
-        @ok = actual_value == specified_value
+    protected
+      def assert response
+        @actual_value = response.public_send key
+        compare
+        self
       end
-    end
-
-    class Headers
-      include Assert
 
       def compare
         @ok = chain.empty? ? actual_value == specified_value : compare_chain
       end
-    end
 
-    class Body
-      include Assert
-
-      def compare
-        @actual_value = begin
-                          JSON.parse actual_value
-                        rescue JSON::ParserError
-                          actual_value
-                        end
-
-        @ok = if chain.empty?
-                actual_value == specified_value
-              else
-                compare_chain
-              end
+      def compare_chain
+        if chain.end_with? '>', '=', '<'
+          actual_value.instance_eval "#{chain}(#{specified_value})"
+        else
+          (actual_value.instance_eval chain) == specified_value
+        end
       end
-    end
   end
 end

data/lib/hobby/test/exchange/request.rb

@@ -1,35 +1,32 @@
 class Hobby::Test::Exchange
   class Request < OpenStruct
+    include ToProc
     VERBS = %w[delete get head options patch post put]
-    def initialize pair
-      @verb, hash = pair
+    def initialize triple
+      @verb, hash, @format = triple
 
-      template_fields, regular_fields = hash.partition do |key, _|
-        key.start_with? 'template.'
-      end
+      template_fields, regular_fields = hash.partition &Key[:start_with?, 'template.']
       @templates = template_fields.map &Hobby::Test::Template
 
       super regular_fields.to_h
     end
     attr_reader :verb
 
-    def regular_fields body_serializer:
+    def regular_fields
       hash = to_h
 
-      if body && body_serializer
-        hash[:body] = body_serializer.dump body
+      if body && @format
+        hash[:body] = @format.dump body
       end
 
       hash
     end
 
     def perform_in env
-      body_serializer = JSON if body.is_a? Hash
-      params = regular_fields(body_serializer: body_serializer)
-        .merge @templates.map(&[env]).to_h
+      params = regular_fields.merge @templates.map(&[env]).to_h
       
       excon_response = env.connection.public_send verb, **params
-      response = Response.new excon_response, body_serializer: body_serializer
+      response = Response.new excon_response, format: @format
       env.responses << response
     end
   end

data/lib/hobby/test/exchange/response.rb

@@ -1,16 +1,25 @@
 class Hobby::Test::Exchange
   class Response
-    def initialize excon_response, body_serializer:
-      @excon_response, @body_serializer = excon_response, body_serializer
+    def initialize excon_response, format:
+      @excon_response, @format = excon_response, format
     end
-    attr_reader :body_serializer
+    attr_reader :format
 
-    def [] key
-      @serialized ||= JSON.load body
-      @serialized[key]
+    def body
+      @body ||= if format
+                  format.load @excon_response.body
+                else
+                  PlainBody.new @excon_response.body
+                end
+    end
+
+    class PlainBody < String
+      def == expected_response
+        eql? expected_response.to_s
+      end
     end
 
     extend Forwardable
-    delegate [:status, :headers, :body] => :@excon_response
+    delegate [:status, :headers] => :@excon_response
   end
 end

data/spec/apps/main.rb

@@ -2,11 +2,11 @@ require 'hobby'
 require 'hobby/json'
 
 class MainApp
-  include Hobby::App
+  include Hobby
   get { 'root' }
 
   class Counter
-    include Hobby::App
+    include Hobby
     @@counter = 0
     get { @@counter }
     post { @@counter += 1 }
@@ -23,7 +23,7 @@ class MainApp
   get('/echo-with-query') { request.params.to_json }
 
   class Query
-    include Hobby::App
+    include Hobby
     get { request.params['array'].class }
   end
   map('/query') { run Query.new }
@@ -68,7 +68,8 @@ class MainApp
   map('/array') { run ArrayApp.new }
 
   class ForLastResponse
-    include Hobby::App
+    include Hobby
+    include JSON
     post { 42 }
     get '/:id' do my[:id].to_i * 2 end
   end

data/spec/auto_spec.rb

@@ -1,20 +1,23 @@
 require 'helper'
 
 describe 'passing and failing YAML specifications' do
-  Dir["spec/yml/**/*.yml"].each do |path|
+  Dir["spec/yml/json/*.yml"].each do |path|
+    name = path.split('/').last
+    test = Hobby::Test.from_file path, format: JSON
+
+    it "passing #{name}" do
+      report = test[@socket]
+      assert { report.ok? }
+    end
+  end
+
+  Dir["spec/yml/plain/*.yml"].each do |path|
     name = path.split('/').last
     test = Hobby::Test.from_file path
 
-    if path.include? 'passing'
-      it "passing #{name}" do
-        report = test[@socket]
-        assert { report.ok? }
-      end
-    else
-      it "failing #{name}" do
-        report = test[@socket]
-        assert { not report.ok? }
-      end
+    it "passing #{name} plain text" do
+      report = test[@socket]
+      assert { report.ok? }
     end
   end
 end

data/spec/tcp_spec.rb

@@ -21,7 +21,7 @@ describe Hobby::Test do
   end
 
   it 'in case of success' do
-    test = described_class.from_file 'spec/yml/passing/0.yml'
+    test = described_class.from_file 'spec/yml/plain/basic.yml'
     report = test['http://localhost:8080']
     assert { report.ok? }
   end

data/spec/yml/{passing → json}/access_last_response.yml

@@ -2,10 +2,10 @@
     path: /for_last_response
 
   response:
-    body: "42"
+    body: 42
 
 - get:
     template.path: uri 'for_last_response', last_response.body
 
   response:
-    body: "84"
+    body: 84

data/spec/yml/json/referring_to_json_body.yml

@@ -0,0 +1,9 @@
+- get:
+    path: /hash
+
+- get:
+    template.path: uri 'for_last_response', last_response.body['a']
+    
+  response:
+    status: 200
+    body: 2

data/spec/yml/{passing → plain}/counter.yml

@@ -8,4 +8,4 @@
     path: /counter
 
   response:
-    body: "2"
+    body: 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobby-test
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -26,6 +26,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: to_proc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: include_constants
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -64,15 +78,14 @@ files:
 - spec/setup/mutant.rb
 - spec/setup/power_assert.rb
 - spec/tcp_spec.rb
-- spec/yml/failing/0.yml
-- spec/yml/passing/0.yml
-- spec/yml/passing/access_last_response.yml
-- spec/yml/passing/chain_assertions.yml
-- spec/yml/passing/counter.yml
-- spec/yml/passing/echo.yml
-- spec/yml/passing/headers.yml
-- spec/yml/passing/query.yml
-- spec/yml/passing/referring_to_json_body.yml
+- spec/yml/json/access_last_response.yml
+- spec/yml/json/chain_assertions.yml
+- spec/yml/json/echo.yml
+- spec/yml/json/headers.yml
+- spec/yml/json/referring_to_json_body.yml
+- spec/yml/plain/basic.yml
+- spec/yml/plain/counter.yml
+- spec/yml/plain/query.yml
 homepage: 
 licenses: []
 metadata: {}

data/spec/yml/failing/0.yml

@@ -1,12 +0,0 @@
-- get:
-    path: /
-
-  response:
-    status: 200
-    body: root-only app
-
-- get:
-    path: /non-existent
-
-  response:
-    status: 200

data/spec/yml/passing/referring_to_json_body.yml

@@ -1,9 +0,0 @@
-- get:
-    path: /hash
-
-- get:
-    template.path: uri 'for_last_response', last_response['a']
-    
-  response:
-    status: 200
-    body: '2'