argspec 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa42c2bea6a6433b6a114cf621d2f47e9b22fe4
-  data.tar.gz: e0a02ac0188c8b9b600e9b20f51009fb06de8bb7
+  metadata.gz: 7530a54443a31a3935f593dffe2e9db9c060e755
+  data.tar.gz: 0a6107f1acdea055a2e7d9c6607182b813a157ee
 SHA512:
-  metadata.gz: 1d39fd2603deb79d5d8b07dce6db47b076fafb9847d2d85ab904ffda0d33b5332ed545ac4f5dc025ec9df01c2b47395796d06ae9ce66a4713af0c21f6e04c85f
-  data.tar.gz: 4917375026c94b0e4655b5f515067903cf4aa623d68b9739b29c6bb637ca30d7345e8fbc26b9847755ed21db96554cf02db590cf5b39d68ef6b6568d4bda865b
+  metadata.gz: e57e5047bbd137788c73f328b3ecb0500665f170437d098964f167267f49b1643f5661be9d890f092b2630a0866ba4eab46916ed6048f6897881aa9f466a6ae8
+  data.tar.gz: 4096f8daefcee69e639386786583bebe921c8d67ff68eca21f6a068cfd109ce918c519ebf029eaad591b9aa35c634ae8c18c6d2a89b2d46c07ec8b826e379eab

data/lib/argspec/argument.rb

@@ -27,6 +27,7 @@ module ArgumentSpecification
     #
     # Arguments:
     #   matcher: (Matchers::BaseMatcher)
+    #   block: (Block)
     #
     # Example:
     #   >> should be_a(Symbol)
@@ -35,10 +36,11 @@ module ArgumentSpecification
     # Raises:
     #   ArgumentError: When the argument does not match
     #
-    def should(matcher)
+    def should(matcher, &block)
       return self unless matcher.is_a?(Matchers::BaseMatcher)
 
       matcher.send(:actual=, @actual)
+      matcher.send(:block=, block) if block_given?
 
       return self if matcher.matches?
 
@@ -49,6 +51,7 @@ module ArgumentSpecification
     #
     # Arguments:
     #   matcher: (Matchers::BaseMatcher)
+    #   block: (Block)
     #
     # Example:
     #   >> should_not be_a(Symbol)
@@ -57,10 +60,11 @@ module ArgumentSpecification
     # Raises:
     #   ArgumentError: When the argument matches
     #
-    def should_not(matcher)
+    def should_not(matcher, &block)
       return self unless matcher.is_a?(Matchers::BaseMatcher)
 
       matcher.send(:actual=, @actual)
+      matcher.send(:block=, block) if block_given?
 
       return self unless matcher.matches?
 
@@ -73,8 +77,8 @@ module ArgumentSpecification
     #   >> and be_a(Symbol)
     #   => #<Argument:0x00000000000000 @actual=:test>
     #
-    def and(*args)
-      should(*args)
+    def and(*args, &block)
+      should(*args, &block)
     end
 
     # Alias for should_not
@@ -83,8 +87,8 @@ module ArgumentSpecification
     #   >> and_not be_a(Symbol)
     #   => #<Argument:0x00000000000000 @actual=:test>
     #
-    def and_not(*args)
-      should_not(*args)
+    def and_not(*args, &block)
+      should_not(*args, &block)
     end
   end
 end

data/lib/argspec/constants.rb

@@ -1,3 +1,3 @@
 module ArgumentSpecification
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

data/lib/argspec/dsl/matchers.rb

@@ -18,8 +18,9 @@ module ArgumentSpecification
 
           module_eval <<-EOS
             def #{name}(*args, &block)
-              instance = #{klass}.new(*args, &block)
+              instance = #{klass}.new(*args)
               instance.send(:setup, '#{name}'.to_sym, args)
+              instance.send(:block=, block) if block_given?
               instance
             end
           EOS

data/lib/argspec/matchers/all.rb

@@ -71,6 +71,7 @@ module ArgumentSpecification
         actual = @actual.is_a?(Array) ? @actual : [@actual]
         actual.each do |value|
           @expected.send(:actual=, value)
+          @expected.send(:block=, @block) if @block
 
           return false unless @expected.matches?
         end

data/lib/argspec/matchers/base_matcher.rb

@@ -22,7 +22,7 @@ module ArgumentSpecification
         end
       end
 
-      attr_reader :actual, :metadata
+      attr_reader :actual, :block, :metadata
 
       # The failure message when using 'should'
       #
@@ -102,6 +102,19 @@ module ArgumentSpecification
         @actual = actual
       end
 
+      # Set the block
+      #
+      # Arguments:
+      #   block: (Proc)
+      #
+      # Example:
+      #   >> matcher.block = Proc.new {}
+      #   => #<Proc:0x00000000000000>
+      #
+      def block=(block)
+        @block = block
+      end
+
       # Prettify a matcher
       #
       # Arguments:

data/lib/argspec/matchers/satisfy.rb

@@ -3,21 +3,19 @@ module ArgumentSpecification
     class Satisfy < BaseMatcher
       matcher_name :satisfy
 
-      attr_reader :description, :block
+      attr_reader :description
 
       # Create a new matcher instance
       #
       # Arguments:
       #   description: (String)
-      #   block: (Block)
       #
       # Example:
-      #   >> ArgumentSpecification::Matchers::Satisfy.new('always pass') { true }
+      #   >> ArgumentSpecification::Matchers::Satisfy.new('always pass')
       #   => #<ArgumentSpecification::Matchers::Satisfy:0x00000000000000 @block=#<Proc:0x00000000000000>>
       #
-      def initialize(description, &block)
+      def initialize(description)
         @description = description
-        @block = block
       end
 
       # The failure message when using 'should'
@@ -59,7 +57,9 @@ module ArgumentSpecification
       #   => true
       #
       def matches?
-        @block.call(@actual)
+        return @block.call(@actual) if @block
+
+        false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argspec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Nialto Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler