macros4cuke 0.3.37 → 0.3.38

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGI3ZmQ3ZjBhZjE1MjY0ZTNkNmQ3YzVlZDdiZGUxMzJmZGViNzVhNA==
+    YTdkMzhjY2JkYzQ0MGE1YTMyNWVkZDZiYzliMTUxYzY1ZTU3OTdjZA==
   data.tar.gz: !binary |-
-    OGM1ZTRjNzUyNGZmYTNhYmMxZDYwM2ViNGYxNDc3NTA1YWYzZDMzMA==
+    YmFlNzQ0ODQ1MTQ0MjY0MjkxN2JjNTRlOTFlN2E0ZTRkNWI0YmE2OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmQ3MjM3ZWU4MjVmZjg0NmMwOWQyYWRkMjBiNjMxYmYyZjdhNDI1NzhlMzRk
-    ODAyMDdlM2NkOGZmZjVjM2YwMDE4NDMyNjVmNzNiMTAwMDMxNDM3NjZjZjQz
-    YTFhZWRkZTFiZDlkNTQwNjhhYjVlYjJjYzg4YTUxMzc2MjA4OWY=
+    M2I5ZWJhNTRhMTU0MjM5ZmQ3YzcyNWEwZjMyYTliZmI3YmU5MmEwNjY4OWUz
+    MGM4NzE0MTMyNWQ4OGJjNjUyYzgzYWFlNTM2NzlhZjQ4YzM2NjNlMWMyMjA3
+    NjVhNmMwOWYxYzQ0ZWM5ZGE0MmZmMzQ2NmVhYmNhNTQ0MjUzNjA=
   data.tar.gz: !binary |-
-    YWZjMWJkOThhMjIxMDVjNzYyNmI3ZTM0NzM1ZTQwYmQ1Nzk3ZmY4YWE3M2Y0
-    ODQzMzk0YjZmZjM0MzJhNTU1MTQ3MmM4NWMxMzc4MDgzY2QyOWE4N2IwYmYz
-    ZjRkZjE1ZTNmZTMyOTIzOTQxMWFhMTU2MDM3M2Q5OTlkNTU3ZTE=
+    NTI4MmIyN2UyMDgxODYxMmZlMWIzMzk5M2JlZDJkMTQzNDQzNThmNDhmYmU3
+    YzdhMmQzZGRmOGY3MGIwMDc1ZmNjM2ZmOTJmMDE5ZDIzYzNhYzYwNjRkMTU4
+    MjE5MjU2N2Q3NmE5YWYwNjhiZDAwZDhkOTUyODllY2JjNjc3YTk=

data/.rubocop.yml

@@ -1,3 +1,9 @@
+AllCops:
+  Excludes:
+    - examples/**
+    - spec/**
+
+
 AccessControl:
   Enabled: false
 
@@ -28,4 +34,5 @@ SpaceInsideBrackets:
   Enabled: false
 
 TrailingWhitespace:
-  Enabled: false
+  Enabled: false
+  

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.3.38 / 2013-07-15
+* [FIX] In method AmbiguousArgumentValue#initialize: An method argument was not string-interpolated in the error message.
+* [CHANGE] File 'macro-step_spec.rb' Test updated to cope with the previous fix.
+* [CHANGE] Minor changes in code to please Rubocop 0.9.1
+* [CHANGE] File `.rubocop.yml` : exclude /examples and /spec folders from Rubocop checks.
+
 ### 0.3.37 / 2013-06-27
 * [FIX] File `macros4cuke.gemspec`: added README.md in extra_rdoc_files option.
 * [CHANGE] File `README.md`: Re-formatting so that it is better rendered with darkfish (from YARD).

data/features/demo04.feature

@@ -19,7 +19,7 @@ Scenario: Defining a macro to be used with multiple arguments in a table
   And I click "Submit"
   """
 
-Scenario: # Let's use the macro we created above
+Scenario: Let's use the macro we created above
   # Here the macro is invoked. Actual value for the argument are passed in a table argument.
   When I [enter my credentials as]:
   |userid|guest|

data/features/demo05.feature

@@ -18,7 +18,7 @@ Scenario: Defining a macro to be used with multiple arguments in a table
   And I click "Save"
   """
 
-Scenario: # Let's use the macro we created above
+Scenario: Let's use the macro we created above
   # Here the macro is invoked. Actual value for the argument are passed in a table argument.
   When I [enter my profile as]:
   |location|Nowhere-City|

data/features/demo06.feature

@@ -28,7 +28,7 @@ Scenario: An exception is forced by invoking the above macro with a triple quote
   When I generate a DataTableNotFound exception  
 
   
-Scenario: # Let's use the macro-step WITHOUT the optional argument values.
+Scenario: Let's use the macro-step WITHOUT the optional argument values.
   When I [fill in the form with]:
   |firstname|Alice|
   |lastname| Inn |
@@ -51,7 +51,7 @@ Scenario: # Let's use the macro-step WITHOUT the optional argument values.
   """
   
   
-Scenario: # Let's use the macro-step WITH the optional argument values.  
+Scenario: Let's use the macro-step WITH the optional argument values.  
   # Redo, now with e-mail and comment
   When I [fill in the form with]:
   |firstname|Alice|

data/lib/macros4cuke/constants.rb

@@ -3,7 +3,7 @@
 
 module Macros4Cuke # Module used as a namespace
   # The version number of the gem.
-  Version = '0.3.37'
+  Version = '0.3.38'
 
   # Brief description of the gem.
   Description = 'Macros for Cucumber'
@@ -17,8 +17,8 @@ module Macros4Cuke # Module used as a namespace
     # The root folder of Macros4Cuke.
     RootDir = begin
       require 'pathname'	# Load Pathname class from standard library
-      rootdir = Pathname(__FILE__).dirname.parent.parent.expand_path()
-      rootdir.to_s() + '/'	# Append trailing slash character to it
+      rootdir = Pathname(__FILE__).dirname.parent.parent.expand_path
+      rootdir.to_s + '/'	# Append trailing slash character to it
     end
   end
 end # module

data/lib/macros4cuke/exceptions.rb

@@ -40,8 +40,9 @@ end # class
 # and that argument name does not appear in any sub-step.
 class AmbiguousArgumentValue < Macros4CukeError
   def initialize(anArgName, valuePhrase, valueTable)
-    msg = "The macro argument '#{anArgName}' has value '#{valuePhrase}' and 'valueTable'."
-    super(msg)
+    msg1 = "The macro argument '#{anArgName}' has value "
+    msg2 = "'#{valuePhrase}' and '#{valueTable}'."
+    super(msg1 + msg2)
   end
 end # class
 

data/lib/macros4cuke/macro-collection.rb

@@ -60,7 +60,7 @@ public
   # Post-condition: we are back to the same situation as 
   # no macro was ever defined.
   def clear()
-    macro_steps.clear()
+    macro_steps.clear
   end
 
   

data/lib/macros4cuke/macro-step-support.rb

@@ -37,7 +37,7 @@ public
   # Multiple rows with same argument name are acceptable.  
   def invoke_macro(aPhraseInstance, rawData = nil)
     # Generate a text rendition of the step to be executed.
-    collection = MacroCollection.instance()
+    collection = MacroCollection.instance
     rendered_steps = collection.render_steps(aPhraseInstance, rawData)
     
     # Let Cucumber execute the sub-steps
@@ -49,7 +49,7 @@ public
   # After this, we are in the same situation when no macro-step 
   # was ever defined.
   def clear_macros()
-    MacroCollection.instance.clear()
+    MacroCollection.instance.clear
   end
 
 end # module

data/lib/macros4cuke/macro-step.rb

@@ -162,12 +162,12 @@ private
   # Return the validated row.
   # @param a_row [Array] A 2-elements Array (i.e. a couple) of the form: 
   # [macro argument name, a value].
-  # @param value [Hash] The pairs phrase argument name => value
-  def validate_row(a_row, phrase_params)
+  # @param params [Hash] The pairs phrase argument name => value
+  def validate_row(a_row, params)
     (a_key, value) = a_row
     raise UnknownArgumentError.new(a_key) unless args.include? a_key
-    if (phrase_args.include? a_key) && (phrase_params[a_key] != value)
-      raise AmbiguousArgumentValue.new(a_key, phrase_params[a_key], value)        
+    if (phrase_args.include? a_key) && (params[a_key] != value)
+      raise AmbiguousArgumentValue.new(a_key, params[a_key], value)        
     end 
     
     return a_row
@@ -236,7 +236,7 @@ private
       end      
     end
   
-    return thePhraseArgs.dup()
+    return thePhraseArgs.dup
   end
   
   

data/lib/macros4cuke/templating/engine.rb

@@ -107,7 +107,7 @@ public
       when String
         actual_value
       else
-        actual_value.to_s()
+        actual_value.to_s
     end
         
     return result
@@ -231,7 +231,7 @@ class Engine
     # Use concatenation (+) to work around Ruby bug!
     forbidden =  ' !"#' + "$%&'()*+,-./:;<=>?[\\]^`{|}~" 
     all_escaped = [] 
-    forbidden.each_char() { |ch| all_escaped << Regexp.escape(ch) }
+    forbidden.each_char { |ch| all_escaped << Regexp.escape(ch) }
     pattern = all_escaped.join('|')
     Regexp.new(pattern)
   end
@@ -363,7 +363,7 @@ private
     end
     
     compiled_lines = raw_lines.map { |line| compile_line(line) }
-    return compile_sections(compiled_lines.flatten())
+    return compile_sections(compiled_lines.flatten)
   end
   
   # Convert the array of raw entries (per line) 
@@ -405,7 +405,7 @@ private
   # Otherwise, end the line with a eoline marker.  
   def line_rep_ending(theLineRep)
     if theLineRep.last.is_a?(SectionEndMarker)
-      section_end = theLineRep.pop()
+      section_end = theLineRep.pop
       theLineRep << EOLine.new
       theLineRep << section_end
     else
@@ -464,7 +464,7 @@ private
       
       when SectionEndMarker           
         validate_section_end(element, open_sections)
-        subResult << open_sections.pop()
+        subResult << open_sections.pop
        
       else
         if open_sections.empty?
@@ -483,15 +483,18 @@ private
     return compiled
   end
   
-  # Validate the given end of section marker taking into account the open sections.
+  # Validate the given end of section marker taking into account 
+  # the open sections.
   def validate_section_end(marker, sections)
+    msg_prefix = "End of section</#{marker.name}> "
+    
     if sections.empty?
-      msg = "End of section</#{marker.name}> found while no corresponding section is open."
-      raise StandardError, msg
+      msg = 'found while no corresponding section is open.'
+      raise StandardError, msg_prefix + msg
     end
     if marker.name != sections.last.name
-      msg = "End of section</#{marker.name}> doesn't match current section '#{sections.last.name}'."
-      raise StandardError, msg
+      msg = "doesn't match current section '#{sections.last.name}'."
+      raise StandardError, msg_prefix + msg
     end
   end
  

data/spec/macros4cuke/macro-step_spec.rb

@@ -120,7 +120,7 @@ SNIPPET
     it 'should complain when argument gets a value from phrase and table' do
       # Error case: there is no macro argument called <unknown>
       phrase = %Q|enter my credentials as "nobody"|
-      msg = "The macro argument 'userid' has value 'nobody' and 'valueTable'."
+      msg = "The macro argument 'userid' has value 'nobody' and 'someone'."
       args = [ %w(userid someone), %w(password no-secret) ]
        expect { subject.expand(phrase, args) }.to raise_error(
         AmbiguousArgumentValue, msg)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macros4cuke
 version: !ruby/object:Gem::Version
-  version: 0.3.37
+  version: 0.3.38
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -80,7 +80,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-description: Create your own macro-steps directly in Cucumber scenarios.
+description: Expand Cucumber with macro-steps.
 email: famished.tiger@yahoo.com
 executables: []
 extensions: []