fix 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f19dfa7434852c7c1d926d17e866c7c2deca0409
-  data.tar.gz: c1a32d2eaec17157c061936e473231f5da7e8090
+  metadata.gz: 31c51a42cf1817594ac8acded17fe569bca8fbc5
+  data.tar.gz: 9e4fd8700a2c41a7420ed048b520fb802e485c34
 SHA512:
-  metadata.gz: 94436f147c902c8e170e3c7897b158bff5bab6c49af1365678559621833e8e548f2931b9e0c798a6d056a649c35145012eca97afc2f4bdcbf7498ca29b7a777d
-  data.tar.gz: 25921c2ae0b3a8904c5d5d74d36df83adc14f26b7ee8873c94019be00f79bc4d6a607976724b7557ec74897c1c2ea5d8cac9ef39fb259491b477d94c39ecb598
+  metadata.gz: d95d05cc3ba74fb316d61df20fd2519b52c3a3b52f3c8025d9cfe96c12fd05b6ba120118ab1d9ef09becb878c09eb703b6d69bfca3a3d5d5650d013027dfd53c
+  data.tar.gz: d1ee4975f7eac819051d464a83dfee7b617bf9cdd8bd6f26b68fb5210d0a7d4f34e16692e1f46402e4c98fc30181b8ec121986a82ddaed28abf1402c703936f3

data.tar.gz.sig

@@ -1,4 +1 @@
-����=�7M�z���w�r'��hقq�/�:�i}��7�������XK*i|膦���
-F;ߤhA�j������2f���sX4�`�4ժ׌,p8�E4l��SO���d�aټ"e�u���¿�%�����P���3�e
-��ـ��D1ܴ&�ί?̮$[f�U�E��Gm2Ùk�=�9E���Qy�&��I
-����4������~����
+F!��c3Va�M�[k�X�;
{�|��m�����"q�e��Q�Gݐ���iJ㹡��Bd�s�9m�P��@UOГc�����C7�^�A`��@y�T��A��(�"#�j�$�X��"���Н#~Ĉ��,4&v�Q�H֋ܔ|��,Q-]�α%��Z��z@��BCG ������-��0���[;R�xAV�;�ǦI��Xj�^�a-�#�UH��2�$'�q$�T��r�hƄ���t�!x[��;1�%x�8G��

data/README.md

@@ -76,47 +76,38 @@ class Duck
 end
 
 @bird = Duck.new
-```
-
-> When I see a `#<Duck:0x007f96b285d6d0>` that ...
 
-```ruby
 require 'fix'
 
-@duck_spec = Fix::Spec.new :duck do
-  on :swims do
-    it { SHALL eql: "Swoosh..." }
-    it { MAY capture_stdout: " ...\n" }
-  end
+extend Fix::DSL
 
-  on :quacks do
-    it { SHOULD capture_stdout: "Quaaaaaack!\n" }
-  end
+subject @bird
 
-  on :speaks do
-    it { MUST raise_exception: NoMethodError }
-  end
+on :swims do
+  it { SHALL eql: "Swoosh..." }
+  it { MAY capture_stdout: " ...\n" }
+end
 
-  on :sings do
-    it { MAY eql: "♪... ♫..." }
-  end
+on :quacks do
+  it { SHOULD capture_stdout: "Quaaaaaack!\n" }
+end
+
+on :speaks do
+  it { MUST raise_exception: NoMethodError }
 end
 
-case @duck_spec.valid? @bird
-  when true then puts "I call that #{@bird} a duck."
-  else warn 'WAT?'
+on :sings do
+  it { MAY eql: "♪... ♫..." }
 end
 ```
 
 ```bash
-ruby test.rb
-# Run options: --seed 241686681690348892099960370893524466040
-# .....
-# Finished in 0.001033 seconds.
-# 5 tests, 0 failures, 0 errors
+ruby duck_spec.rb
 ```
 
-> I call that `#<Duck:0x007f96b285d6d0>` a duck.
+    .....
+    Finished in 0.001033 seconds.
+    5 tests, 0 failures, 0 errors
 
 ## Contributing
 

data/VERSION.semver

@@ -1 +1 @@
-0.2.0
+0.3.0

data/example/duck/README.md

@@ -2,7 +2,6 @@
 
 ```bash
 $ ./test.rb
-Run options: --seed 122743552393459455928023127107893880649
 ......
 Finished in 0.001181 seconds.
 6 tests, 0 failures, 0 errors

data/example/duck/test.rb

@@ -1,6 +1,36 @@
 #!/usr/bin/env ruby -w
 
 require_relative 'app'
-require_relative 'spec'
+require 'fix'
 
-@spec.test @app
+extend Fix::DSL
+
+subject @app
+
+let(:word) { "Quaaa" }
+
+on :swims do
+  it { MUST capture_stderr: " ...\n" }
+end
+
+on :quacks do
+  let(:quaaaaaack) { word + "aaack!\n" }
+
+  it { SHOULD capture_stdout: quaaaaaack }
+end
+
+its(:speaks) { MUST raise_exception: NoMethodError }
+
+on :sings do
+  it { MAY eql: "♪... ♫..." }
+end
+
+on :walks do
+  let(:walks) { "#{word}... Klop klop!" }
+
+  it { MUST eql: walks }
+
+  on :split, '... ' do
+    its(:last) { MUST eql: "Klop klop!" }
+  end
+end

data/lib/fix.rb

@@ -1,4 +1,4 @@
-require_relative File.join 'fix', 'spec'
+require_relative File.join 'fix', 'dsl'
 require_relative File.join 'fix', 'version'
 
 # Namespace for the Fix framework.

data/lib/fix/{expectation_set.rb → db.rb}

@@ -1,8 +1,11 @@
-require 'set'
 require 'singleton'
 
 module Fix
-  class ExpectationSet < Set
+  class DB < Hash
     include Singleton
+
+    def random
+      Random.new
+    end
   end
 end

data/lib/fix/dsl.rb

@@ -1,10 +1,17 @@
 require_relative File.join 'helper', 'its_helper'
 require_relative File.join 'helper', 'on_helper'
+require_relative 'test'
 
 module Fix
   module DSL
     include Helper::ItsHelper
     include Helper::LetWriterHelper
     include Helper::OnHelper
+
+    def subject object
+      @object = object
+    end
+
+    at_exit { Test.new }
   end
 end

data/lib/fix/expectation.rb

@@ -1,18 +1,27 @@
-require_relative File.join 'expectation_set'
+require 'set'
 require 'spectus'
+require_relative 'db'
 
 module Fix
   class Expectation
     include Spectus::DSL
 
-    def initialize positive, definition, *args
+    attr_reader :priority
+
+    def initialize object, positive, definition, *args
       @positive           = positive
       @matcher, @expected = definition.to_a.flatten 1
       @args               = args
+      @priority           = DB.instance.random.rand
 
       freeze
 
-      ExpectationSet.instance.add self
+      DB.instance.update(object => SortedSet[]) unless DB.instance.key? object
+      DB.instance.fetch(object).add self
+    end
+
+    def <=> other
+      self.priority <=> other.priority
     end
 
     private

data/lib/fix/expectation_high.rb

@@ -1,5 +1,5 @@
-require_relative File.join 'expectation'
-require_relative File.join 'subject'
+require_relative 'expectation'
+require_relative 'subject'
 
 module Fix
   class ExpectationHigh < Expectation

data/lib/fix/expectation_low.rb

@@ -1,4 +1,4 @@
-require_relative File.join 'expectation_medium'
+require_relative 'expectation_medium'
 
 module Fix
   class ExpectationLow < ExpectationMedium

data/lib/fix/expectation_medium.rb

@@ -1,4 +1,4 @@
-require_relative File.join 'expectation_high'
+require_relative 'expectation_high'
 
 module Fix
   class ExpectationMedium < ExpectationHigh

data/lib/fix/helper/it_helper.rb

@@ -1,12 +1,12 @@
 module Fix
   module Helper
-    module ItsHelper
-      def its attribute, *args, &block
-        i = Its.new @defs, *(@args + [[attribute] + args])
+    module ItHelper
+      def it &block
+        i = It.new @object, @defs, *@args
         i.instance_eval(&block)
       end
     end
   end
 end
 
-require_relative File.join '..', 'its'
+require_relative File.join '..', 'it'

data/lib/fix/helper/its_helper.rb

@@ -1,12 +1,21 @@
 module Fix
   module Helper
-    module ItHelper
-      def it &block
-        i = It.new @defs, *@args
+    module ItsHelper
+      def its attribute, *args, &block
+        unless instance_variable_defined? :@object
+          raise MissingSubjectError,  "Incomplete specifications.  " \
+                                      "Please specify a `subject` on the top."
+        end
+
+        @defs = {} unless instance_variable_defined? :@defs
+        @args = [] unless instance_variable_defined? :@args
+
+        i = Its.new @object, @defs, *(@args + [[attribute] + args])
         i.instance_eval(&block)
       end
     end
   end
 end
 
-require_relative File.join '..', 'it'
+require_relative File.join '..', 'its'
+require_relative File.join '..', 'missing_subject_error'

data/lib/fix/helper/let_accessor_helper.rb

@@ -1,5 +1,5 @@
-require_relative File.join 'let_reader_helper'
-require_relative File.join 'let_writer_helper'
+require_relative 'let_reader_helper'
+require_relative 'let_writer_helper'
 
 module Fix
   module Helper

data/lib/fix/helper/let_reader_helper.rb

@@ -2,7 +2,7 @@ module Fix
   module Helper
     module LetReaderHelper
       def method_missing name, *args, &block
-        @defs.has_key?(name) ? @defs.fetch(name).call : super
+        @defs.key?(name) ? @defs.fetch(name).call : super
       end
     end
   end

data/lib/fix/helper/let_writer_helper.rb

@@ -2,7 +2,9 @@ module Fix
   module Helper
     module LetWriterHelper
       def let name, &block
-        if @defs.has_key? name
+        @defs = {} unless instance_variable_defined? :@defs
+
+        if @defs.key? name
           raise IndexError, 'the given key is already present.'
         else
           @defs.update name => block

data/lib/fix/helper/on_helper.rb

@@ -2,11 +2,20 @@ module Fix
   module Helper
     module OnHelper
       def on attribute, *args, &block
-        i = On.new @defs, *(@args + [[attribute] + args])
+        unless instance_variable_defined? :@object
+          raise MissingSubjectError,  "Incomplete specifications.  " \
+                                      "Please specify a `subject` on the top."
+        end
+
+        @defs = {} unless instance_variable_defined? :@defs
+        @args = [] unless instance_variable_defined? :@args
+
+        i = On.new @object, @defs, *(@args + [[attribute] + args])
         i.instance_eval(&block)
       end
     end
   end
 end
 
+require_relative File.join '..', 'missing_subject_error'
 require_relative File.join '..', 'on'

data/lib/fix/helper/requirement_helper.rb

@@ -1,4 +1,4 @@
-require_relative File.join 'let_reader_helper'
+require_relative 'let_reader_helper'
 
 module Fix
   module Helper
@@ -6,32 +6,32 @@ module Fix
       include Helper::LetReaderHelper
 
       def MUST definition
-        ExpectationHigh.new true, definition, *@args
+        ExpectationHigh.new @object, true, definition, *@args
       end
 
       alias_method :is_REQUIRED_to, :MUST
       alias_method :SHALL,          :MUST
 
       def MUST_NOT definition
-        ExpectationHigh.new false, definition, *@args
+        ExpectationHigh.new @object, false, definition, *@args
       end
 
       alias_method :SHALL_NOT, :MUST_NOT
 
       def SHOULD definition
-        ExpectationMedium.new true, definition, *@args
+        ExpectationMedium.new @object, true, definition, *@args
       end
 
       alias_method :is_RECOMMENDED_to, :SHOULD
 
       def SHOULD_NOT definition
-        ExpectationMedium.new false, definition, *@args
+        ExpectationMedium.new @object, false, definition, *@args
       end
 
       alias_method :is_NOT_RECOMMENDED_to, :SHOULD_NOT
 
       def MAY definition
-        ExpectationLow.new true, definition, *@args
+        ExpectationLow.new @object, true, definition, *@args
       end
 
       alias_method :is_OPTIONAL_to, :MAY

data/lib/fix/it.rb

@@ -4,9 +4,10 @@ module Fix
   class It
     include Helper::RequirementHelper
 
-    def initialize defs, *args
-      @defs = defs
-      @args = args
+    def initialize object, defs, *args
+      @object = object
+      @defs   = defs
+      @args   = args
 
       freeze
     end

data/lib/fix/its.rb

@@ -4,9 +4,10 @@ module Fix
   class Its
     include Helper::RequirementHelper
 
-    def initialize defs, *args
-      @defs = defs
-      @args = args
+    def initialize object, defs, *args
+      @object = object
+      @defs   = defs
+      @args   = args
 
       freeze
     end

data/lib/fix/missing_subject_error.rb

@@ -0,0 +1,7 @@
+module Fix
+  # Missing subject error
+  #
+  # This is raised at the runtime when loading specs.
+  class MissingSubjectError < ::StandardError
+  end
+end

data/lib/fix/on.rb

@@ -10,9 +10,10 @@ module Fix
     include Helper::LetAccessorHelper
     include Helper::OnHelper
 
-    def initialize defs, *args
-      @defs = defs
-      @args = args
+    def initialize object, defs, *args
+      @object = object
+      @defs   = defs
+      @args   = args
 
       freeze
     end

data/lib/fix/test.rb

@@ -1,20 +1,18 @@
-require_relative File.join 'expectation_set'
+require_relative 'db'
 
 module Fix
   class Test
     attr_reader :total_time
 
-    def initialize front_object, seed: Random.new_seed, color: true, stdout: STDOUT, stderr: STDERR
+    def initialize color: true, stdout: STDOUT, stderr: STDERR
       @options = { color: color, stdout: stdout, stderr: stderr }
-      @options.fetch(:stdout).puts about "Run options: --seed #{seed}"
-
-      random = Random.new seed
-      expectations = ExpectationSet.instance.to_a.shuffle(random: random)
 
       start_time = Time.now
-      @results = expectations.map do |expectation|
-        log expectation.evaluate front_object
-      end
+      @results = DB.instance.map do |object, expectations|
+        expectations.map do |expectation|
+          log expectation.evaluate object
+        end
+      end.flatten 1
       @total_time = Time.now - start_time
 
       @options.fetch(:stdout).puts about "\nFinished in #{@total_time} seconds."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fix
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Cyril Wack
@@ -30,7 +30,7 @@ cert_chain:
   sQCgS9KCAyZ+aWNO1bUJcE3Bx1XXkMO3JEyVR1CoEcexg5Ci03/lAm7lL84DmlKR
   3I7UWtomapPFbzC0J/5jzQ==
   -----END CERTIFICATE-----
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spectus
@@ -120,17 +120,16 @@ files:
 - example/duck/README.md
 - example/duck/app.rb
 - example/duck/lib.rb
-- example/duck/spec.rb
 - example/duck/test.rb
 - fix.gemspec
 - fix.pem
 - lib/fix.rb
+- lib/fix/db.rb
 - lib/fix/dsl.rb
 - lib/fix/expectation.rb
 - lib/fix/expectation_high.rb
 - lib/fix/expectation_low.rb
 - lib/fix/expectation_medium.rb
-- lib/fix/expectation_set.rb
 - lib/fix/helper/it_helper.rb
 - lib/fix/helper/its_helper.rb
 - lib/fix/helper/let_accessor_helper.rb
@@ -140,8 +139,8 @@ files:
 - lib/fix/helper/requirement_helper.rb
 - lib/fix/it.rb
 - lib/fix/its.rb
+- lib/fix/missing_subject_error.rb
 - lib/fix/on.rb
-- lib/fix/spec.rb
 - lib/fix/subject.rb
 - lib/fix/test.rb
 - lib/fix/version.rb

data/example/duck/spec.rb

@@ -1,31 +0,0 @@
-require 'fix'
-
-@spec = Fix::Spec.new :duck do
-  let(:word) { "Quaaa" }
-
-  on :swims do
-    it { MUST capture_stderr: " ...\n" }
-  end
-
-  on :quacks do
-    let(:quaaaaaack) { word + "aaack!\n" }
-
-    it { SHOULD capture_stdout: quaaaaaack }
-  end
-
-  its(:speaks) { MUST raise_exception: NoMethodError }
-
-  on :sings do
-    it { MAY eql: "♪... ♫..." }
-  end
-
-  on :walks do
-    let(:walks) { "#{word}... Klop klop!" }
-
-    it { MUST eql: walks }
-
-    on :split, '... ' do
-      its(:last) { MUST eql: "Klop klop!" }
-    end
-  end
-end

data/lib/fix/spec.rb

@@ -1,26 +0,0 @@
-require_relative File.join 'dsl'
-require_relative File.join 'test'
-
-module Fix
-  class Spec
-    include DSL
-
-    def initialize title = nil, &block
-      @title  = title
-      @defs   = {}
-      @args   = []
-
-      instance_eval(&block)
-
-      freeze
-    end
-
-    def test front_object, seed: Random.new_seed, color: true, stdout: STDOUT, stderr: STDERR
-      Test.new front_object, seed: Random.new_seed, color: true, stdout: STDOUT, stderr: STDERR
-    end
-
-    def valid? front_object
-      Test.new(front_object).pass?
-    end
-  end
-end