blood_contracts 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a3374d5e7af34959e56cb4f31d22cd807fe84f3ee1f74e9446646b7d4b49f27
-  data.tar.gz: 48907e94554abde9079f25e8a657fc24dbda9fac02468f239c547031eff0df0e
+  metadata.gz: 28ac2afbaaff105357ceefb2e96e4812f5689ceca47fecc4eeffd5c51c45d3a9
+  data.tar.gz: 3d14390aa3ea943b3ad53495b3855c673d2c87da925b3230071d22c555de506c
 SHA512:
-  metadata.gz: 9fc96fb5b769b22fb747573dd4ae5bf8da1cf2a40e429ddde58f82d78263aba3e9957d31183c0c5b0af3206abe0172e511d10e312d9624c0533cef030c502d84
-  data.tar.gz: c22e684f33f0d4f4ab37a5e08174c4dcefae73afa09079250eb1b158c2e03d572be92a40a202a2724f8bf0026e91fd8b89308cb1843de2f8f6ceff0d9fa4ff92
+  metadata.gz: 8850f7821e11d0b3ed3acf837569b7ada9b45f0844fb8491a9e212bda1e1599035635f849e28acb0f7966933fe5cb0e4d865266012ce0148a37a2d6afe3679e9
+  data.tar.gz: 8e7e070351a3dc36d63bf6f0817176489350c0ea361dc3deb8cc48f5e578909bb2b62379e421d82b3d27267c9892d5965f788648a64f8b0bb86db10421d37ffc

data/lib/blood_contracts.rb

@@ -6,7 +6,6 @@ require "hashie/mash"
 
 require_relative "blood_contracts/suite"
 require_relative "blood_contracts/storage"
-require_relative "blood_contracts/statistics"
 require_relative "blood_contracts/runner"
 require_relative "blood_contracts/debugger"
 require_relative "blood_contracts/base_contract"

data/lib/blood_contracts/contracts/iterator.rb

@@ -0,0 +1,34 @@
+module BloodContracts
+  module Contracts
+    class Iterator
+      extend Dry::Initializer
+
+      param :iterations, ->(v) do
+        v = ENV["iterations"] if ENV["iterations"]
+        v.to_i.positive? ? v.to_i : 1
+      end
+      param :time_to_run, ->(v) do
+        v = ENV["duration"] if ENV["duration"]
+        v.to_f if v.to_f.positive?
+      end, optional: true
+
+      def next
+        return iterations.times { yield } unless time_to_run
+
+        @iterations = iterations_from_time_to_run { yield }
+        [iterations - 1, 0].max.times { yield }
+      end
+
+      def count
+        @iterations
+      end
+
+      protected
+
+      def iterations_from_time_to_run
+        time_per_action = Benchmark.measure { yield }
+        (time_to_run / time_per_action.real).ceil
+      end
+    end
+  end
+end

data/lib/blood_contracts/contracts/statistics.rb

@@ -0,0 +1,34 @@
+module BloodContracts
+  module Contracts
+    class Statistics
+      extend Dry::Initializer
+      param :iterator
+      option :storage, default: -> { Hash.new(0) }
+
+      def store(rule)
+        storage[rule] += 1
+      end
+
+      def to_h
+        Hash[storage.map { |rule_name, times| [rule_name, rule_stats(times)] }]
+      end
+
+      def to_s
+        to_h.map do |name, occasions|
+          " - '#{name}' happened #{occasions.times} time(s) "\
+          "(#{(occasions.percent * 100).round(2)}% of the time)"
+        end.join("; \n")
+      end
+
+      def found_unexpected_behavior?
+        storage.key?(Storage::UNDEFINED_RULE)
+      end
+
+      private
+
+      def rule_stats(times)
+        Hashie::Mash.new(times: times, percent: (times.to_f / iterator.count))
+      end
+    end
+  end
+end

data/lib/blood_contracts/runner.rb

@@ -1,6 +1,8 @@
 require_relative "contracts/validator"
 require_relative "contracts/matcher"
 require_relative "contracts/description"
+require_relative "contracts/iterator"
+require_relative "contracts/statistics"
 
 module BloodContracts
   class Runner
@@ -11,19 +13,16 @@ module BloodContracts
     option :suite
     option :storage, default: -> { suite.storage }
 
-    option :iterations, ->(v) do
-      v = ENV["iterations"] if ENV["iterations"]
-      v.to_i.positive? ? v.to_i : 1
-    end, default: -> { 1 }
-    option :time_to_run, ->(v) do
-      v = ENV["duration"] if ENV["duration"]
-      v.to_f if v.to_f.positive?
-    end, optional: true
+    option :iterations, default: -> { 1 }
+    option :time_to_run, optional: true
+    option :stop_on_unexpected, default: -> { false }
+    option :iterator, default: -> do
+      Contracts::Iterator.new(iterations, time_to_run)
+    end
 
     option :context, optional: true
-    option :stop_on_unexpected, default: -> { false }
 
-    option :statistics, default: -> { Statistics.new(iterations) }
+    option :statistics, default: -> { Contracts::Statistics.new(iterator) }
     option :matcher,   default: -> { Contracts::Matcher.new(suite.contract) }
     option :validator, default: -> { Contracts::Validator.new(suite.contract) }
     option :contract_description, default: -> do
@@ -31,15 +30,15 @@ module BloodContracts
     end
 
     def call
-      iterate do
-        next if match_rules?(matches_storage: statistics) do
-          input = suite.data_generator.call
-          [input, checking_proc.call(input)]
+      return false if :halt == catch(:unexpected_behavior) do
+        iterator.next do
+          next if match_rules?(matches_storage: statistics) do
+            input = suite.data_generator.call
+            [input, checking_proc.call(input)]
+          end
+          throw :unexpected_behavior, :halt if stop_on_unexpected
         end
-        throw :unexpected_behavior, :stop if stop_on_unexpected
       end
-      return if stopped_by_unexpected_behavior?
-
       validator.valid?(statistics)
     end
 
@@ -47,21 +46,21 @@ module BloodContracts
     def failure_message
       intro = "expected that given Proc would meet the contract:"
 
-      if validator.expected_behavior?
+      if stats.unexpected_behavior?
         "#{intro}\n#{contract_description}\n"\
-          " during #{iterations} run(s) but got:\n#{statistics}\n\n"\
-          "For further investigations open: #{storage.suggestion}"
+        " during #{iterator.count} run(s) but got unexpected behavior.\n\n"\
+        "For further investigations open: #{storage.unexpected_suggestion}"
       else
         "#{intro}\n#{contract_description}\n"\
-        " during #{iterations} run(s) but got unexpected behavior.\n\n"\
-        "For further investigations open: #{storage.unexpected_suggestion}"
+          " during #{iterator.count} run(s) but got:\n#{statistics}\n\n"\
+          "For further investigations open: #{storage.suggestion}"
       end
     end
 
     # FIXME: Move to locales
     def description
       "meet the contract:\n#{contract_description} \n"\
-      " during #{iterations} run(s). Stats:\n#{statistics}\n\n"\
+      " during #{iterator.count} run(s). Stats:\n#{statistics}\n\n"\
       "For further investigations open: #{storage.suggestion}\n"
     end
 
@@ -78,28 +77,6 @@ module BloodContracts
       raise
     end
 
-    def stopped_by_unexpected_behavior?
-      @_stopped_by_unexpected_behavior == :stop
-    end
-
-    def iterate
-      run_iterations ||= iterations
-
-      if time_to_run
-        run_iterations = iterations_count_from_time_to_run { yield }
-        @iterations = run_iterations + 1
-      end
-
-      @_stopped_by_unexpected_behavior = catch(:unexpected_behavior) do
-        run_iterations.times { yield }
-      end
-    end
-
-    def iterations_count_from_time_to_run
-      time_per_action = Benchmark.measure { yield }
-      (time_to_run / time_per_action.real).ceil
-    end
-
     def store_exception(error, input, output, context)
       storage.store(
         options: {

data/lib/blood_contracts/storage.rb

@@ -67,7 +67,6 @@ module BloodContracts
       { load: Oj.method(:load), dump: Oj.method(:dump) }
     end
 
-    # Quick open: `vim -O tmp/contract_tests/<tstamp>/<tag>/<tstamp>.*`
     def store(options:, rules:, context:)
       options = Hashie::Mash.new(options)
 

data/lib/blood_contracts/storages/file_backend.rb

@@ -103,30 +103,6 @@ module BloodContracts
           f << write(dump_proc, context, data)
         end
       end
-      #
-      # def serialize_input(tag, options, context)
-      #   return unless (dump_proc = input_serializer[:dump])
-      #   name = sample_name(tag)
-      #   File.open("#{name}.input.dump", "w+") do |f|
-      #     f << write(dump_proc, context, options.input)
-      #   end
-      # end
-      #
-      # def serialize_output(tag, options, context)
-      #   return unless (dump_proc = output_serializer[:dump])
-      #   name = sample_name(tag)
-      #   File.open("#{name}.output.dump", "w+") do |f|
-      #     f << write(dump_proc, context, options.output)
-      #   end
-      # end
-      #
-      # def serialize_meta(tag, options, context)
-      #   return unless (dump_proc = meta_serializer[:dump])
-      #   name = sample_name(tag)
-      #   File.open("#{name}.meta.dump", "w+") do |f|
-      #     f << write(dump_proc, context, options.meta)
-      #   end
-      # end
     end
   end
 end

data/lib/blood_contracts/suite.rb

@@ -2,14 +2,15 @@ module BloodContracts
   class Suite
     extend Dry::Initializer
 
+    option :contract, ->(v) { Hashie::Mash.new(v) }
     option :data_generator, optional: true
-    option :contract, ->(v) { Hashie::Mash.new(v) }, default: -> { Hash.new }
 
     option :input_writer,  optional: true
     option :output_writer, optional: true
 
-    option :input_serializer,  ->(v) { parse_serializer(v) }, optional: true
-    option :output_serializer, ->(v) { parse_serializer(v) }, optional: true
+    option :input_serializer,  optional: true
+    option :output_serializer, optional: true
+    option :meta_serializer, optional: true
 
     option :storage_backend, optional: true
     option :storage, default: -> { default_storage }
@@ -19,11 +20,6 @@ module BloodContracts
       @data_generator = generator
     end
 
-    def contract=(contract)
-      raise ArgumentError unless contract.respond_to?(:to_h)
-      @contract = Hashie::Mash.new(contract.to_h)
-    end
-
     def input_writer=(writer)
       storage.input_writer = writer
     end
@@ -34,10 +30,11 @@ module BloodContracts
 
     def default_storage
       Storage.new(
-        input_writer: input_writer,
+        input_writer:  input_writer,
         output_writer: output_writer,
-        input_serializer: input_serializer,
+        input_serializer:  input_serializer,
         output_serializer: output_serializer,
+        meta_serializer:   meta_serializer,
       )
     end
   end

data/lib/blood_contracts/version.rb

@@ -1,3 +1,3 @@
 module BloodContracts
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/lib/rspec/meet_contract_matcher.rb

@@ -23,9 +23,11 @@ module RSpec
         suite = nil
         if args.respond_to?(:to_contract_suite)
           suite = args.to_contract_suite(name: _example_name_to_path)
-        elsif args.respond_to?(:to_hash) && args.fetch(:contract) { false }
-          suite = ::BloodContracts::Suite.new(storage: new_storage)
-          suite.contract = args[:contract]
+        elsif args.respond_to?(:to_h) && args.to_h.fetch(:contract) { false }
+          ::BloodContracts::Suite.new(
+            storage: new_storage,
+            contract: args[:contract]
+          )
         else
           raise "Matcher arguments is not a Blood Contract"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blood_contracts
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sergey Dolganov
@@ -128,11 +128,12 @@ files:
 - lib/blood_contracts.rb
 - lib/blood_contracts/base_contract.rb
 - lib/blood_contracts/contracts/description.rb
+- lib/blood_contracts/contracts/iterator.rb
 - lib/blood_contracts/contracts/matcher.rb
+- lib/blood_contracts/contracts/statistics.rb
 - lib/blood_contracts/contracts/validator.rb
 - lib/blood_contracts/debugger.rb
 - lib/blood_contracts/runner.rb
-- lib/blood_contracts/statistics.rb
 - lib/blood_contracts/storage.rb
 - lib/blood_contracts/storages/base_backend.rb
 - lib/blood_contracts/storages/file_backend.rb

data/lib/blood_contracts/statistics.rb

@@ -1,32 +0,0 @@
-module BloodContracts
-  class Statistics
-    extend Dry::Initializer
-    param :iterations
-    option :storage, default: -> { Hash.new(0) }
-
-    def store(rule)
-      storage[rule] += 1
-    end
-
-    def to_h
-      Hash[storage.map { |rule_name, times| [rule_name, rule_stats(times)] }]
-    end
-
-    def to_s
-      to_h.map do |name, occasions|
-        " - '#{name}' happened #{occasions.times} time(s) "\
-        "(#{(occasions.percent * 100).round(2)}% of the time)"
-      end.join("; \n")
-    end
-
-    def found_unexpected_behavior?
-      storage.key?(Storage::UNDEFINED_RULE)
-    end
-
-    private
-
-    def rule_stats(times)
-      Hashie::Mash.new(times: times, percent: (times.to_f / iterations))
-    end
-  end
-end