rspec-action-check 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 967953381471880b8427bb3adadb704427830126
-  data.tar.gz: 82d0573fd11281074e7a394b167bd66fe183bb46
+  metadata.gz: a121b48c55174e651803170283633801b7de78f7
+  data.tar.gz: eb763340fc204484bd0a552e856af20be6a231c6
 SHA512:
-  metadata.gz: 12218bb7d85491b4a42fc12be48a468e4a88c9c1a9dd530e10b6f794bc51111aa415250cd7e3d1510e43d66d025a8b2427052135c3c15df09efa4b7c154fdda7
-  data.tar.gz: fdc602c65dd0aff25d65ed6ec295512eaa354aec2120618c6813d06ca7b114a69d9da0b89ae89ba8094499b8bd983c1ade3f7b6dac0744af5efd87d34379ea8a
+  metadata.gz: 580488ae10ad6259793c37a4da027d13f336adce5f1c568331c062c68bd18b456bde1c7ee81fdace88a30cb902f2f5cd8746571c187b984a815cfb4260933278
+  data.tar.gz: 86fb40720dd778ab9b622b122e63f5d8d1ec6a424e020a13c72d077a439c11a54e89df6e4a5384d50a38af4b0f3980bcc4637cf87279341547a2904373522657

data/README.md

@@ -21,6 +21,24 @@ Or install it yourself as:
 
 ## Usage
 
+### How to use your projects
+
+#### Rails
+
+Please add spec/rails_helper.rb
+
+```ruby
+require 'rspec/actioncheck'
+```
+
+#### Other
+
+Please add spec/spec_helper.rb
+
+```ruby
+require 'rspec/actioncheck'
+```
+
 ### Simple case
 
 You can write that code in spec.
@@ -41,7 +59,7 @@ RSpec.describe 'First Example' do
       expect(@some_state1).to eq 100
     end
 
-    action 'set some_state2 = 100' do
+    action 'set some_state2 = 200' do
       @some_state2 = 200
     end
 
@@ -59,7 +77,7 @@ First Example
   some actions like a scenario test story
     action:set some_state1 = 100
       check:some_state1 = 100
-      action:set some_state2 = 100
+      action:set some_state2 = 200
         check:some_state2 = 200
 ```
 
@@ -165,22 +183,96 @@ It output that when It run
 Branch Example
   some actions like a scenario test story with branching
     action:set some_state1 = 100
-      action:branch1
+      branch:branch1
         check:some_state1 = 100
         action:set some_state2 = 200
           check:some_state1 = 100 and some_state2 == 200
-          action:branch in branch1
+          branch:branch in branch1
             action:set some_state3 = 300
               check:some_state1 = 100 and some_state2 == 200 and some_state3 == 300
-          action:branch` in branch1
+          branch:branch` in branch1
             check:some_state1 = 100 and some_state2 == 200 and some_state3 is nil
-      action:branch2
+      branch:branch2
         check:some_state1 = 100 and some_state2 is nil
 ```
 
 It same as ... That code as too long. I will write it when I feel like it.
 
-Both examples contain in `spec/rspec/example/`
+### Meger branches
+
+```ruby
+RSpec.describe 'Action after branch' do
+  before do
+    @some_state1 = nil
+    @some_state2 = nil
+    @some_state3 = nil
+  end
+
+  actions 'some actions like a scenario test story' do
+    action 'start' do
+    end
+
+    branch 'branch1' do
+      action 'set some_state1 = 100' do
+        @some_state1 = 100
+      end
+
+      action 'set some_state2 = 200' do
+        @some_state2 = 200
+      end
+    end
+
+    branch 'branch2' do
+      action 'set some_state1 = 200' do
+        @some_state1 = 200
+      end
+
+      action 'set some_state2 = 100' do
+        @some_state2 = 100
+      end
+    end
+
+    check 'both state is not nil' do
+      expect(@some_state1).not_to be_nil
+      expect(@some_state2).not_to be_nil
+    end
+
+    action 'set some_state3 = 300' do
+      @some_state3 = 300
+    end
+
+    check 'some_state3 = 300' do
+      expect(@some_state3).to eq 300
+    end
+  end
+end
+```
+
+It output that when It run
+
+```
+Action after branch
+  some actions like a scenario test story
+    action:start
+      branch:branch1
+        action:set some_state1 = 100
+          action:set some_state2 = 200
+            check:both state is not nil
+            action:set some_state3 = 300
+              check:some_state3 = 300
+      branch:branch2
+        action:set some_state1 = 200
+          action:set some_state2 = 100
+            check:both state is not nil
+            action:set some_state3 = 300
+              check:some_state3 = 300
+```
+
+In the figure
+
+![img/action_after_branch.png](img/action_after_branch.png)
+
+All examples contain in `spec/rspec/example/`
 
 ## Development
 

data/img/action_after_branch.dot

@@ -0,0 +1,23 @@
+// The Round Table
+digraph {
+        S [label=start]
+        A1 [label=branch1]
+        A2 [label="action:set some_state1 = 100"]
+        A3 [label="action:set some_state2 = 200"]
+        B1 [label=branch2]
+        B2 [label="action:set some_state1 = 200"]
+        B3 [label="action:set some_state2 = 100"]
+        C [label="check:both state is not nil"]
+        D [label="action:set some_state3 = 300"]
+        E [label="check:some_state3 = 300"]
+        S -> A1
+        S -> B1
+        A1 -> A2
+        A2 -> A3
+        B1 -> B2
+        B2 -> B3
+        A3 -> C
+        B3 -> C
+        C -> D
+        D -> E
+}

data/lib/rspec/actioncheck/helpers.rb

@@ -2,13 +2,6 @@ module RSpec
   module ActionCheck
     module Helpers
       module ClassMethods
-        def __before_action_name
-          :root
-        end
-        def __action_dags
-          {}
-        end
-
         def create_from_dag(node)
           Proc.new do ||
             node[:forwards].each do |next_node_name|
@@ -27,7 +20,14 @@ module RSpec
 
         def actions(description, &actions_block)
           context description do
-            before_action_name = __before_action_name
+            self.define_singleton_method(:__action_dags) do ||
+              {}
+            end
+          self.define_singleton_method(:__branch_tail_actions) do ||
+            []
+          end
+            _update_before_action_names([:root])
+            before_action_name = __before_action_names[0]
             self.module_exec(&actions_block)
             if __action_dags.empty?
               pending 'actions is empty'
@@ -41,39 +41,54 @@ module RSpec
 
         def branch(description, &branch_block)
           name = "#{description.gsub(/ /, "_")}_#{__action_dags.size}".to_sym
-          before_action_name = __before_action_name
+          before_action_names = __before_action_names
 
-          _update_action_dags(name, description, before_action_name, Proc.new{})
+          _update_action_dags(name, description, before_action_names, Proc.new{}, 'branch')
 
+          tail_before_action_names = nil
           context do
-            _update_before_action_name(name)
+            _update_before_action_names([name])
+            self.define_singleton_method(:__branch_tail_actions) do ||
+              []
+            end
             self.module_exec(&branch_block)
+            tail_before_action_names = __before_action_names
+          end
+          _update_before_action_names(__before_action_names)
+          t = __branch_tail_actions
+          self.define_singleton_method(:__branch_tail_actions) do ||
+            t + tail_before_action_names
           end
         end
 
         def action(description, &action_block)
-          before_action_name = __before_action_name
+          before_action_names = (not __branch_tail_actions.empty?) ? __branch_tail_actions : __before_action_names
           name = "#{description.gsub(/ /, "_")}_#{__action_dags.size}".to_sym
 
-          _update_before_action_name(name)
+          _update_before_action_names([name])
 
-          _update_action_dags(name, description, before_action_name, action_block)
+          _update_action_dags(name, description, before_action_names, action_block)
+          self.define_singleton_method(:__branch_tail_actions) do ||
+            []
+          end
         end
 
         def check(description, &action_block)
-          check_action_name =  __before_action_name
+          check_action_names = (not __branch_tail_actions.empty?) ? __branch_tail_actions : __before_action_names
 
-          _action_dags = __action_dags
-          _action_dags[check_action_name][:examples] << {
-            description: description,
-            block: action_block,
-          }
-          define_singleton_method(:__action_dags) do ||
-            _action_dags
+          check_action_names.each do |check_action_name|
+            _action_dags = __action_dags
+            _action_dags[check_action_name][:examples] << {
+              description: description,
+              block: action_block,
+            }
+            define_singleton_method(:__action_dags) do ||
+              _action_dags
+            end
           end
         end
 
-        def _update_action_dags(name, action_description, before_action_name, action_block)
+        def _update_action_dags(name, action_description, before_action_names, action_block, prefix='action')
 
           _action_dags = __action_dags
           _action_dags[name] = {
@@ -81,30 +96,32 @@ module RSpec
             backwards: [],
             examples: [],
           } if _action_dags[name].nil?
-          _action_dags[before_action_name] = {
-            forwards: [],
-            backwards: [],
-            examples: [],
-          } if _action_dags[before_action_name].nil?
-          _action_dags[name].merge!({
-            forwards: _action_dags[name][:forwards],
-            backwards: _action_dags[name][:backwards] | [before_action_name],
-            action: {description: "action:#{action_description}", block: action_block},
-          })
-          _action_dags[before_action_name].merge!({
-            forwards: _action_dags[before_action_name][:forwards] | [name],
-            backwards: _action_dags[before_action_name][:backwards],
-          })
-          self.define_singleton_method(:__action_dags) do ||
-            _action_dags
+
+          before_action_names.each do |before_action_name|
+            _action_dags[before_action_name] = {
+              forwards: [],
+              backwards: [],
+              examples: [],
+            } if _action_dags[before_action_name].nil?
+            _action_dags[name].merge!({
+              forwards: _action_dags[name][:forwards],
+              backwards: _action_dags[name][:backwards] | [before_action_name],
+              action: {description: "#{prefix}:#{action_description}", block: action_block},
+            })
+            _action_dags[before_action_name].merge!({
+              forwards: _action_dags[before_action_name][:forwards] | [name],
+              backwards: _action_dags[before_action_name][:backwards],
+            })
+            self.define_singleton_method(:__action_dags) do ||
+              _action_dags
+            end
           end
         end
 
-        def _update_before_action_name(name)
-          define_singleton_method(:__before_action_name) do ||
-            name
+        def _update_before_action_names(names)
+          define_singleton_method(:__before_action_names) do ||
+            names
           end
-
         end
       end
     end

data/lib/rspec/actioncheck/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module ActionCheck
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-action-check
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuta Hinokuma
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- img/action_after_branch.dot
+- img/action_after_branch.png
 - lib/rspec/actioncheck.rb
 - lib/rspec/actioncheck/helpers.rb
 - lib/rspec/actioncheck/proxy.rb