spinach 0.6.1 → 0.7.0

data/README.markdown

@@ -71,7 +71,7 @@ Spinach will detect your features and generate the following class:
 ## features/steps/test_how_spinach_works.rb
 
 ```ruby
-class TestHowSpinachWorks < Spinach::FeatureSteps
+class Spinach::Features::TestHowSpinachWorks < Spinach::FeatureSteps
   Given 'I have an empty array' do
   end
 
@@ -96,7 +96,7 @@ Then, you can fill it in with your logic - remember, it's just a class, you can
 use private methods, mix in modules or whatever!
 
 ```ruby
-class TestHowSpinachWorks < Spinach::FeatureSteps
+class Spinach::Features::TestHowSpinachWorks < Spinach::FeatureSteps
   Given 'I have an empty array' do
     @array = Array.new
   end
@@ -190,7 +190,7 @@ Using the module (in any feature):
 
 ```ruby
 # ... features/steps/buying_a_widget.rb
-class BuyAWidget < Spinach::FeatureSteps
+class Spinach::Features::BuyAWidget < Spinach::FeatureSteps
   # simply include this module and you are good to go
   include CommonSteps::Login
 end
@@ -299,7 +299,7 @@ Full hook documentation is here:
 Sometimes it feels awkward to add steps into feature file just because you need to do some test setup and cleanup. And it is equally awkward to add a global hooks for this purpose. For example, if you want to add a session timeout feature, to do so, you want to set the session timeout time to 1 second just for this feature, and put the normal timeout back after this feature. It doesn't make sense to add two steps in the feature file just to change the session timeout value. In this scenario, a ```before``` and ```after``` blocks are perfect for this kind of tasks. Below is an example implementation:
 
 ```ruby
-class SessionTimeout < Spinach::FeatureSteps
+class Spinach::Features::SessionTimeout < Spinach::FeatureSteps
   attr_accessor :original_timeout_value
   before do
     self.original_timeout_value = session_timeout_value

data/features/steps/reporting/show_step_source_location.rb

@@ -1,10 +1,7 @@
-class ShowStepSourceLocation < Spinach::FeatureSteps
-
-  feature "Show step source location"
-
+class Spinach::Features::ShowStepSourceLocation < Spinach::FeatureSteps
   include Integration::SpinachRunner
 
-  Given "I have a feature that has no error or failure" do
+  step "I have a feature that has no error or failure" do
     write_file('features/success_feature.feature', """
 Feature: A success feature
 
@@ -13,25 +10,25 @@ Feature: A success feature
 """)
 
     write_file('features/steps/success_feature.rb',
-    'class ASuccessFeature < Spinach::FeatureSteps
+    'class Spinach::Features::ASuccessFeature < Spinach::FeatureSteps
       feature "A success feature"
-      Then "I succeed" do
+      step "I succeed" do
       end
      end')
     @feature = "features/success_feature.feature"
   end
 
-  When "I run it" do
+  step "I run it" do
     run_feature @feature
   end
 
-  Then "I should see the source location of each step of every scenario" do
+  step "I should see the source location of each step of every scenario" do
     @stdout.must_match(
       /I succeed.*features\/steps\/success_feature\.rb.*3/
     )
   end
 
-  Given "I have a feature that has no error or failure and use external steps" do
+  step "I have a feature that has no error or failure and use external steps" do
     write_file('features/success_feature.feature', """
 Feature: A feature that uses external steps
 
@@ -40,26 +37,26 @@ Feature: A feature that uses external steps
 """)
 
     write_file('features/steps/success_feature.rb',
-    'class AFeatureThatUsesExternalSteps < Spinach::FeatureSteps
+    'class Spinach::Features::AFeatureThatUsesExternalSteps < Spinach::FeatureSteps
       feature "A feature that uses external steps"
       include ExternalSteps
      end')
     write_file('features/support/external_steps.rb',
     'module ExternalSteps
       include Spinach::DSL
-      Given "this is a external step" do
+      step "this is a external step" do
       end
     end')
     @feature = "features/success_feature.feature"
   end
 
-  Then "I should see the source location of each step, even external ones" do
+  step "I should see the source location of each step, even external ones" do
     @stdout.must_match(
       /this is a external step.*features\/support\/external_steps\.rb.*3/
     )
   end
 
-  Given "I have a feature that has an error" do
+  step "I have a feature that has an error" do
     write_file('features/error_feature.feature', """
 Feature: An error feature
 
@@ -68,22 +65,22 @@ Feature: An error feature
 """)
 
     write_file('features/steps/error_feature.rb',
-    'class AnErrorFeature < Spinach::FeatureSteps
+    'class Spinach::Features::AnErrorFeature < Spinach::FeatureSteps
       feature "An error feature"
-      Then "I do not succeed" do
+      step "I do not succeed" do
         i_do_not_exist.must_be_equal "Your Mumma"
       end
      end')
     @feature = "features/error_feature.feature"
   end
 
-  Then "I should see the source location of each step, even ones with errors" do
+  step "I should see the source location of each step, even ones with errors" do
     @stdout.must_match(
       /I do not succeed.*features\/steps\/error_feature\.rb.*3/
     )
   end
 
-  Given "I have a feature that has a failure" do
+  step "I have a feature that has a failure" do
     write_file('features/failure_feature.feature', """
 Feature: A failure feature
 
@@ -92,9 +89,9 @@ Feature: A failure feature
 """)
 
     write_file('features/steps/failure_feature.rb',
-    'class AFailureFeature < Spinach::FeatureSteps
+    'class Spinach::Features::AFailureFeature < Spinach::FeatureSteps
       feature "A failure feature"
-      Then "I do not succeed" do
+      step "I do not succeed" do
         i_exist = "Your Pappa"
         i_exist.must_be_equal "Your Mumma"
       end
@@ -102,7 +99,7 @@ Feature: A failure feature
     @feature = "features/failure_feature.feature"
   end
 
-  Then "I should see the source location of each step, even ones with failures" do
+  step "I should see the source location of each step, even ones with failures" do
     @stdout.must_match(
       /I do not succeed.*features\/steps\/failure_feature\.rb.*3/
     )

data/lib/spinach.rb

@@ -15,6 +15,7 @@ require_relative 'spinach/generators'
 
 require_relative 'spinach/background'
 require_relative 'spinach/feature'
+require_relative 'spinach/features'
 require_relative 'spinach/scenario'
 require_relative 'spinach/step'
 
@@ -67,9 +68,11 @@ module Spinach
   # @api public
   def self.find_step_definitions(name)
     klass = Spinach::Support.camelize(name)
+    scoped_klass = Spinach::Support.scoped_camelize(name)
     feature_steps.detect do |feature|
-      feature.feature_name.to_s == name.to_s ||
-        feature.name == klass
+        feature.name == klass ||
+        feature.name == scoped_klass ||
+        feature.feature_name.to_s == name.to_s
     end
   end
 end

data/lib/spinach/features.rb

@@ -0,0 +1,6 @@
+module Spinach
+  # This module provides scoping to user genereated features, so they won't
+  # conflict with the application code.
+  module Features
+  end
+end

data/lib/spinach/generators/feature_generator.rb

@@ -34,7 +34,7 @@ module Spinach
       #   an example feature steps definition
       def generate
         result = StringIO.new
-        result.puts "class #{Spinach::Support.camelize name} < Spinach::FeatureSteps"
+        result.puts "class #{Spinach::Support.scoped_camelize name} < Spinach::FeatureSteps"
         generated_steps = steps.map do |step|
           step_generator = Generators::StepGenerator.new(step)
           step_generator.generate.split("\n").map do |line|
@@ -49,7 +49,7 @@ module Spinach
       # @return [String]
       #   an example filename for this feature steps
       def filename
-        Spinach::Support.underscore (
+        Spinach::Support.underscore(
           Spinach::Support.camelize name
         ) + ".rb"
       end
@@ -83,6 +83,5 @@ module Spinach
     end
 
     class FeatureGeneratorException < Exception; end;
-
   end
 end

data/lib/spinach/generators/step_generator.rb

@@ -14,7 +14,7 @@ module Spinach
     #   an example step definition
     def generate
       result = StringIO.new
-      result.puts "#{@step.keyword} '#{Spinach::Support.escape_single_commas @step.name}' do"
+      result.puts "step '#{Spinach::Support.escape_single_commas @step.name}' do"
       result.puts "  pending 'step not implemented'"
       result.puts "end"
       result.string

data/lib/spinach/support.rb

@@ -17,6 +17,21 @@ module Spinach
       name.to_s.strip.split(/[^a-z0-9]/i).map{|w| w.capitalize}.join
     end
 
+    # @param [String] name
+    #   The name to camelize.
+    #
+    # @return [String]
+    #   The +name+ in camel case scoped to Spinach::Features.
+    #
+    # @example
+    #   Spinach::Support.scoped_camelize('User authentication')
+    #   => 'Spinach::Features::UserAuthentication'
+    #
+    # @api public
+    def self.scoped_camelize(name)
+      "Spinach::Features::#{camelize(name)}"
+    end
+
     # Makes an underscored, lowercase form from the expression in the string.
     #
     # Changes '::' to '/' to convert namespaces to paths.

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/spinach.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'minitest', "4.1.0"
+  gem.add_development_dependency 'minitest', "4.3.3"
   gem.add_development_dependency 'turn'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/test/spinach/generators/feature_generator_test.rb

@@ -37,8 +37,13 @@ Feature: Cheezburger can I has
     describe "#generate" do
       it "generates an entire feature_steps class definition" do
         result = subject.generate
-        result.must_match /Given 'I haz a sad' do/
-        result.must_match /pending 'step not implemented'/
+        result.must_match(/step 'I haz a sad' do/)
+        result.must_match(/pending 'step not implemented'/)
+      end
+
+      it 'scopes the generated class to prevent conflicts' do
+        result = subject.generate
+        result.must_match(/class Spinach::Features::CheezburgerCanIHas < Spinach::FeatureSteps/)
       end
     end
 

data/test/spinach/generators/step_generator_test.rb

@@ -13,7 +13,7 @@ module Spinach::Generators
 
     describe "#generate" do
       it "generates a step" do
-        subject.generate.must_match /Given.*I has a sad/
+        subject.generate.must_match /step.*I has a sad/
       end
 
       it "generates a pending step" do

data/test/spinach/support_test.rb

@@ -23,6 +23,12 @@ describe Spinach::Support do
     end
   end
 
+  describe '#scoped_camelize' do
+    it 'prepends a scope to the class' do
+      Spinach::Support.scoped_camelize('feature name').must_equal 'Spinach::Features::FeatureName'
+    end
+  end
+
   describe '#underscore' do
     it 'changes dashes to underscores' do
       Spinach::Support.underscore('feature-name').must_equal 'feature_name'

data/test/spinach_test.rb

@@ -6,8 +6,9 @@ describe Spinach do
     @feature_steps2 = OpenStruct.new(feature_name: 'Slip management')
     @feature_steps3 = OpenStruct.new(feature_name: 'File attachments')
     @feature_steps4 = OpenStruct.new(name: 'UserSendsAMessage')
+    @feature_steps5 = OpenStruct.new(name: 'Spinach::Features::ScopedFeature')
     [@feature_steps1, @feature_steps2,
-      @feature_steps3, @feature_steps4].each do |feature|
+      @feature_steps3, @feature_steps4, @feature_steps5].each do |feature|
       Spinach.feature_steps << feature
     end
   end
@@ -41,6 +42,10 @@ describe Spinach do
         Spinach.find_step_definitions('User sends a message').must_equal @feature_steps4
       end
 
+      it 'finds scoped features' do
+        Spinach.find_step_definitions('Scoped feature').must_equal @feature_steps5
+      end
+
       it 'returns nil when it cannot find the class' do
         Spinach.find_step_definitions('This feature does not exist').must_equal nil
       end

data/test/test_helper.rb

@@ -11,7 +11,7 @@ end
 
 require 'minitest/spec'
 require 'minitest/autorun'
-require 'mocha'
+require 'mocha/setup'
 require 'ostruct'
 require 'stringio'
 require 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,184 +12,184 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: colorize
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rake
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: mocha
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: sinatra
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: capybara
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: pry
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: simplecov
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rspec
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: minitest
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.3.3
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.3.3
+    none: false
 - !ruby/object:Gem::Dependency
   name: turn
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -250,6 +250,7 @@ files:
 - lib/spinach/exceptions.rb
 - lib/spinach/feature.rb
 - lib/spinach/feature_steps.rb
+- lib/spinach/features.rb
 - lib/spinach/frameworks.rb
 - lib/spinach/frameworks/minitest.rb
 - lib/spinach/frameworks/rspec.rb
@@ -309,26 +310,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2192107922436848750
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2192107922436848750
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Spinach is a BDD framework on top of gherkin