cucumber-expressions 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f6a5e7781e7fc8b3421fef99969e3dd056eb092
-  data.tar.gz: 859b7122cb233520996367499d6b823a6cab1cca
+  metadata.gz: 0b8ed8f5d21a95380e884f0c080d076e2e89d17f
+  data.tar.gz: 7682387d1c85962fb28b6c21683bb48157ef3b49
 SHA512:
-  metadata.gz: ecbdff604192d24ac59d9cf86fa1eb6a7a92116dcac99c6d62213b7e32dd986cfec419d74de38db73565ebfd912f8ddf027251d384f8111f7196f6105b8f6faf
-  data.tar.gz: 1fe832838198c8cc4e2ea48106a15b20fb36a8889c567ce74422b3ed9bd117ecdaafce84a7be5ceaea6e94dfa11ec7c74c31397aa4ae52e2b3bf4d5ac2c3b665
+  metadata.gz: a66f2c66cc3de2a570ac6cc317f54eb4988bc4d99185b8e9649cff3c26b85670cbea82754cf8ad4483f60351494de83890068e3f970e3c7fa870e83d0e23a709
+  data.tar.gz: c34c94c1760c2a8a264c338000a0473b0d557fffe253e6bf1793f0e006d106de1ab59f47b9e2ebed1a4565c05b4715c79fddc103e4e2b26156a8b761252e7051

data/.travis.yml

@@ -1,20 +1,15 @@
-# manyrepo: cucumber/cucumber-expressions-ruby
 language: ruby
-sudo: false
 
 rvm:
-  - 2.3.1
-  - 2.2
-  - 2.1
-  - 2.0
-  - jruby-9.1.2.0
-
-before_install:
-  - gem update bundler
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+  - jruby-9.1.7.0
 
 notifications:
-  email:
-    - cukes-devs@googlegroups.com
   webhooks:
-    urls: # gitter
-      - https://webhooks.gitter.im/e/dc010332f9d40fcc21c4
+    urls:
+      - https://webhooks.gitter.im/e/5373e574ed4e88026838
+    on_success: change
+    on_failure: always
+    on_start: never

data/cucumber-expressions.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'cucumber-expressions'
-  s.version     = '1.0.3'
+  s.version     = '1.0.4'
   s.authors     = ["Aslak Hellesøy"]
   s.description = 'Cucumber Expressions - a simpler alternative to Regular Expressions'
   s.summary     = "cucumber-expressions-#{s.version}"
@@ -11,13 +11,12 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.required_ruby_version = ">= 1.9.3"
 
-  s.add_development_dependency 'bundler',   '>= 1.12.5'
-  s.add_development_dependency 'rake',      '>= 10.5.0'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake',      '~> 10.5'
   s.add_development_dependency 'rspec',     '~> 3.5'
-  s.add_development_dependency 'json',     '~> 2.0.2'
 
   # For coverage reports
-  s.add_development_dependency 'coveralls', '~> 0.7'
+  s.add_development_dependency 'coveralls'
 
   s.rubygems_version = ">= 1.6.1"
   s.files            = `git ls-files`.split("\n").reject {|path| path =~ /\.gitignore$/ }

data/lib/cucumber/cucumber_expressions/cucumber_expression.rb

@@ -45,7 +45,7 @@ module Cucumber
           @transforms.push(transform)
 
           text = expression.slice(match_offset...match.offset(0)[0])
-          capture_regexp = "(#{transform.capture_group_regexps[0]})"
+          capture_regexp = capture_group_regexp(transform.capture_group_regexps)
           match_offset = match.offset(0)[1]
           regexp += text
           regexp += capture_regexp
@@ -58,6 +58,14 @@ module Cucumber
       def match(text)
         ArgumentMatcher.match_arguments(@regexp, text, @transforms)
       end
+
+      private
+
+      def capture_group_regexp(capture_group_regexps)
+        return "(#{capture_group_regexps[0]})" if capture_group_regexps.size == 1
+        capture_groups = capture_group_regexps.map { |group| "(?:#{group})" }
+        "(#{capture_groups.join('|')})"
+      end
     end
   end
 end

data/lib/cucumber/cucumber_expressions/transform.rb

@@ -7,10 +7,7 @@ module Cucumber
       #
       # @param type_name [Array] array of class or type name to use in {arg:type_name}
       # @param capture_group_regexps [Array] list of regexps for capture groups.
-      #   The first one is the primary one, used to convert CucumberExpression instances
-      #   to their internal Regexp representation. They are all used for type conversion
-      #   in RegularExpression instances.
-      # @transformer lambda that transforms a String to another type
+      # @param transformer lambda that transforms a String to another type
       #
       def initialize(type_name, type, capture_group_regexps, transformer)
         @type_name, @type, @transformer = type_name, type, transformer

data/lib/cucumber/cucumber_expressions/transform_lookup.rb

@@ -3,7 +3,7 @@ require 'cucumber/cucumber_expressions/transform'
 module Cucumber
   module CucumberExpressions
     class TransformLookup
-      FIXNUM_REGEXPS = ['-?\d+', '\d+']
+      INTEGER_REGEXPS = ['-?\d+', '\d+']
       FLOATING_POINT_REGEXPS = ['-?\d*\.?\d+']
 
       def initialize
@@ -11,7 +11,7 @@ module Cucumber
         @transforms_by_capture_group_regexp = {}
         @transforms_by_class = {}
 
-        add_transform(Transform.new('int', Fixnum, FIXNUM_REGEXPS, lambda {|s| s.to_i}))
+        add_transform(Transform.new('int', Integer, INTEGER_REGEXPS, lambda {|s| s.to_i}))
         add_transform(Transform.new('float', Float, FLOATING_POINT_REGEXPS, lambda {|s| s.to_f}))
       end
 

data/spec/capture_warnings.rb

@@ -13,7 +13,7 @@ module CaptureWarnings
     end
 
     if other_warnings.any?
-      puts "#{ other_warnings.count } non-cucumber-core warnings detected, set VIEW_OTHER_WARNINGS=true to see them."
+      puts "#{ other_warnings.count } non-cucumber-expressions warnings detected, set VIEW_OTHER_WARNINGS=true to see them."
       print_warnings('other', other_warnings) if ENV['VIEW_OTHER_WARNINGS']
     end
 
@@ -23,9 +23,9 @@ module CaptureWarnings
     end
 
     if project_warnings.any?
-      puts "#{ project_warnings.count } cucumber-core warnings detected"
-      print_warnings('cucumber-core', project_warnings)
-      fail "Please remove all cucumber-core warnings."
+      puts "#{ project_warnings.count } cucumber-expressions warnings detected"
+      print_warnings('cucumber-expressions', project_warnings)
+      fail "Please remove all cucumber-expressions warnings."
     end
 
     ensure_system_exit_if_required

data/spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb

@@ -63,7 +63,7 @@ module Cucumber
       it "exposes transforms in generated expression" do
         expression = @generator.generate_expression("I have 2 cukes and 1.5 euro", true)
         types = expression.transforms.map(&:type)
-        expect(types).to eq([Fixnum, Float])
+        expect(types).to eq([Integer, Float])
       end
 
       def assert_typed_expression(expected, text)

data/spec/cucumber/cucumber_expressions/cucumber_expression_regexp_spec.rb

@@ -27,7 +27,7 @@ module Cucumber
         it "translates three typed arguments" do
           assert_regexp(
             "I have {n:float} cukes in my {bodypart} at {time:int} o'clock",
-            /^I have (-?\d*\.?\d+) cukes in my (.+) at (-?\d+) o'clock$/
+            /^I have (-?\d*\.?\d+) cukes in my (.+) at ((?:-?\d+)|(?:\d+)) o'clock$/
           )
         end
 

data/spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb

@@ -30,8 +30,8 @@ module Cucumber
       end
 
       # Ruby-specific
-      it "transforms to Fixnum by explicit type" do
-        expect( match("{what}", "22", [Fixnum]) ).to eq([22])
+      it "transforms to Integer by explicit type" do
+        expect( match("{what}", "22", [Integer]) ).to eq([22])
       end
 
       it "doesn't match a float to an int" do

data/spec/cucumber/cucumber_expressions/custom_transform_spec.rb

@@ -13,7 +13,7 @@ module Cucumber
       end
       ### [color-constructor]
 
-      def == (other)
+      def ==(other)
         other.is_a?(Color) && other.name == name
       end
     end
@@ -25,19 +25,25 @@ module Cucumber
         @transform_lookup.add_transform(Transform.new(
           'color',
           Color,
-          'red|blue|yellow',
+          ['red|blue|yellow', '(?:dark|light) (?:red|blue|yellow)'],
           lambda { |s| Color.new(s) }
         ))
         ### [add-color-transform]
       end
 
       describe CucumberExpression do
-        it "transforms arguments with expression type" do
+        it "transforms arguments with expression type I" do
           expression = CucumberExpression.new("I have a {color:color} ball", [], @transform_lookup)
           transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
           expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
+        it "transforms arguments with expression type II" do
+          expression = CucumberExpression.new("I have a {color:color} ball", [], @transform_lookup)
+          transformed_argument_value = expression.match("I have a dark red ball")[0].transformed_value
+          expect( transformed_argument_value ).to eq(Color.new('dark red'))
+        end
+
         it "transforms arguments with explicit type" do
           expression = CucumberExpression.new("I have a {color} ball", [Color], @transform_lookup)
           transformed_argument_value = expression.match("I have a red ball")[0].transformed_value

data/spec/cucumber/cucumber_expressions/regular_expression_spec.rb

@@ -51,7 +51,8 @@ module Cucumber
 
       it "fails when type is not type name or class" do
         expect( lambda { match(/(.*)/, "-1.22", [99]) } ).to raise_error(
-          'Type must be string or class, but was 99 of type Fixnum')
+          # Ruby 2.3 and older report Fixnum, 2.4 and newer report Integer
+          /Type must be string or class, but was 99 of type (?:Fixnum)|(?:Integer)/)
       end
 
       it "exposes source" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 description: Cucumber Expressions - a simpler alternative to Regular Expressions
 email: cukes@googlegroups.com
 executables: []
@@ -133,10 +119,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-1.0.3
+summary: cucumber-expressions-1.0.4
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb