rspec-action 0.0.1 → 1.0.0

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm: 1.9.3
+script: bundle exec rspec spec

data/CHANGELOG

@@ -0,0 +1,8 @@
+#v0.0.1
+
+* Initial release, works with rspec 2.6
+
+
+#v1.0.0
+
+* rspec 2.11 support, tested with 2.0, 2.6, 2.11

data/README.markdown

@@ -1,3 +1,6 @@
+[![Build Status](https://secure.travis-ci.org/cutalion/rspec-action.png)](http://travis-ci.org/#!/cutalion/rspec-action)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/cutalion/rspec-action)
+
 # rspec-action
 
 An extension to rspec, which provides an `action` command to rspec examples

data/lib/rspec-action.rb

@@ -1,14 +1,30 @@
+require "rubygems"
+require "rspec"
 require "rspec-action/version"
 
 module RSpec
   module Core
     module Hooks
       def action(&block)
-        before { self.class.before(&block) unless self.class.action_added?(&block) }
+        around do |ex|
+          self.class.remove_previous_action &block
+          self.class.before &block unless self.class.action_added?(&block)
+          self.class.hooks[:before][:each].last.instance_eval do
+            def action_hook?; true; end
+          end
+          ex.run
+        end
+      end
+
+      def remove_previous_action(&block)
+        ancestors.each do |ancestor|
+          ancestor.hooks[:before][:each].delete_if {|hook| hook.respond_to?(:action_hook?)}
+        end
       end
 
       def action_added?(&block)
-        hooks[:before][:each].map(&:to_proc).include? block
+        ancestors_hooks = ancestors.reverse.map { |ancestor| ancestor.hooks[:before][:each] }.flatten
+        ancestors_hooks.map(&:to_proc).include? block
       end
     end
   end

data/lib/rspec-action/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Action
-    VERSION = "0.0.1"
+    VERSION = "1.0.0"
   end
 end

data/rspec-action.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "rake"
 end

data/spec/lib/rspec-action_spec.rb

@@ -32,7 +32,7 @@ describe RSpec::Core::Hooks do
         before { str << "4" }
         before { str << "5" }
 
-        specify { str.should == "123453" }
+        specify { str.should == "12453" }
       end
     end
   end
@@ -50,4 +50,28 @@ describe RSpec::Core::Hooks do
       specify { str.should == "543" }
     end
   end
+
+  describe "rewrite action" do
+    context "on the same level" do
+      before { str << "1" }
+      action { str << "3" }
+      action { str << "4" }
+      before { str << "2" }
+
+      specify { str.should == "124" }
+    end
+
+    context "on the deeper level" do
+      before { str << "1" }
+      action { str << "3" }
+      before { str << "2" }
+
+      specify { str.should == "123" }
+
+      context "second level" do
+        action { str << "4" }
+        specify { str.should == "124" }
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-action
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Alexander Glushkov
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 Z
+date: 2012-09-01 00:00:00 +03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,8 +31,22 @@ dependencies:
         - 2
         - 0
         version: "2.0"
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  type: :development
 description: "Adds an \"action\" method to rspec examples, which is a last \"before\" in fact "
 email: 
 - cutalion@gmail.com
@@ -43,6 +58,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
+- CHANGELOG
 - Gemfile
 - README.markdown
 - Rakefile
@@ -51,6 +68,7 @@ files:
 - rspec-action.gemspec
 - spec/lib/rspec-action_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -80,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec-action
-rubygems_version: 1.8.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Adds an "action" method to rspec examples