crabfarm 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: decb87d9ee1082ce675625f82fdb1dce0dd20d5c
-  data.tar.gz: ac81524ae0eb2fb78e3a7a5396523762a10d70c1
+  metadata.gz: f600db691271c0d7dd78a27f7f633898a214a5d4
+  data.tar.gz: ba15471d773a513f6c85c95c82a714440d6e0889
 SHA512:
-  metadata.gz: f5b6e947935dae0b5d45a671bbc81cfd56382bd478155e7ca7c5b9a7fd7499b08c801207167984ec749586dadedd5324f7b4e27c2e8965263ab2e6159450a73d
-  data.tar.gz: fd65c4389e29b14daeeff2f1014da06eca70cce791e92660127bbbd07332b12b5d3a6defffae3480c40a539f6b91f157aa021a6bfd777921045655a7774435a5
+  metadata.gz: 0db51d81848f11823fa281b75910e0cb9a80ce85fa5f8a40582790aaf3b934790f8fd16a80490924939965d6bb0c54285883763ac170b780881b1db729682293
+  data.tar.gz: ab93f4e66087874952817102521a95e3df8229dfb518a6daa12b19bb0f58b9b48aebc8014e25f61773351511b105290afa9480758bae0826072d1953487c9f4c

data/lib/crabfarm/assertion/validations.rb

@@ -17,10 +17,12 @@ module Crabfarm
 
       def validate_string _value, _options={}
         fail_with "#{_value} does not match expression" if _options.key? :matches and not _options[:matches] === _value
+        fail_with "#{_value} does not contain substring" if _options.key? :contains and !_value.include? _options[:contains]
       end
 
-      def validate_general _value, _options={}
+      def validate_general _value, _options={}, &_block
         fail_with "#{_value} is not recognized" if _options.key? :in and not _options[:in].include? _value
+        fail_with "#{_value} is not valid" if _block and !_block.call(_value)
       end
 
     end

data/lib/crabfarm/assertion/wrapper.rb

@@ -15,48 +15,49 @@ module Crabfarm
         @context = _context
       end
 
-      def is_integer(_options={})
+      def is_integer(_options={}, &_block)
         perform_assertion(_options) {
           @value = parse_integer @value, _options
           validate_number @value, _options
-          validate_general @value, _options
+          validate_general @value, _options, &_block
         }
       end
 
       alias :is_i :is_integer
 
-      def is_float(_options={})
+      def is_float(_options={}, &_block)
         perform_assertion(_options) {
           @value = parse_float @value, _options
           validate_number @value, _options
-          validate_general @value, _options
+          validate_general @value, _options, &_block
         }
       end
 
       alias :is_f :is_float
 
-      def is_word(_options={})
+      def is_word(_options={}, &_block)
         perform_assertion(_options) {
           @value = parse_phrase @value, _options
           validate_word @value, _options
-          validate_general @value, _options
+          validate_general @value, _options, &_block
         }
       end
 
       alias :is_w :is_word
-      def is_string(_options={})
+
+      def is_string(_options={}, &_block)
         perform_assertion(_options) {
           @value = parse_phrase @value, _options
           validate_string @value, _options
-          validate_general @value, _options
+          validate_general @value, _options, &_block
         }
       end
 
       alias :is_s :is_string
 
-      def is_boolean(_options={})
+      def is_boolean(_options={}, &_block)
         perform_assertion(_options) {
-          @value = parse_boolean @value, _options
+          @value = parse_boolean @value, _options, &_block
         }
       end
 

data/lib/crabfarm/templates/Gemfile.erb

@@ -4,12 +4,12 @@ gem "crabfarm", '<%= version %>'
 gem "pincers", '~> 0.7'
 
 # Comment this if not using a nokogiri based parser or browser
-gem 'nokogiri', "~> 1.6.6"
+gem 'nokogiri', "~> 1.6"
 
 # Comment this if not using a selenium webdriver based driver
 gem "selenium-webdriver", "~> 2.47"
 
 group :test do
-  gem "rspec", "~> 3.3.0"
+  gem "rspec", "~> 3.3"
   gem "rspec-nc"
 end

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport