saga 0.15.2 → 0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16bfba2b536f86acbe4219034dabf388adfaf10aabe9b291d63c7011cf224d6
-  data.tar.gz: b0f60085a8fa1ec7664a40b17b8a34214601f868ca1d1d4527195a747f22ddf6
+  metadata.gz: 69aaaf9865fd974b99d588d9c98c7ef72e33607aac693f1b516ca5182e551154
+  data.tar.gz: 3319c648841e57fd1f83152405996215ed578fd9a91104741a7a4922f1034080
 SHA512:
-  metadata.gz: cd606c2c9d5872bdf4a5cf6bd3a416dc25c916a357465d6a54cfc84503ec64fc1c987344fc24dc6380ba5c2a4c6da593da8728d1cd75ce3d3a2469e77bb7b363
-  data.tar.gz: 512c06ed05fa15bd83a08440b6212c90f698e503098045129d70a158d58a8615d08353446055d64b49e6efc3a88ab0f34a88eafe1c23938798bb043d66b30f86
+  metadata.gz: a0cd222fd3c66218e101b270989e6be78ebfea8d9e3e99897ab99b39d34d0ce391c85c48b38ce219f5663f1d0271050e11e9e07402cb117a5dcb843928e2ce9c
+  data.tar.gz: 6a0fa9b3d0256178a7b7742eedcb65eacb927da40e3a6e5b84344d9ae8e6023aa06482a38932726c3834346e92af5fcd9098191680ea683172f05d684a23bfeb

data/lib/saga/document.rb

@@ -17,20 +17,8 @@ module Saga
       end; copied
     end
 
-    def flatten_stories(stories)
-      stories_as_flat_list = []
-      stories.flatten.each do |story|
-        if story[:stories]
-          stories_as_flat_list << copy_story(story)
-          stories_as_flat_list.concat(story[:stories])
-        else
-          stories_as_flat_list << story
-        end
-      end; stories_as_flat_list
-    end
-
     def stories_as_flat_list
-      flatten_stories(stories.values)
+      stories.values.flatten
     end
 
     def _binding
@@ -38,16 +26,7 @@ module Saga
     end
 
     def used_ids
-      @stories.values.each_with_object([]) do |stories, ids|
-        stories.each do |story|
-          ids << story[:id]
-          next unless story[:stories]
-
-          story[:stories].each do |nested|
-            ids << nested[:id]
-          end
-        end
-      end.compact
+      stories_as_flat_list.map{ |story| story[:id] }.compact
     end
 
     def unused_ids(limit)

data/lib/saga/parser.rb

@@ -24,16 +24,15 @@ module Saga
     end
 
     def handle_story(story)
+      story[:type] = 'story' unless story[:type]
       self.current_section = :stories
       @document.stories[@current_header] ||= []
       @document.stories[@current_header] << story
     end
 
-    def handle_nested_story(story)
-      self.current_section = :story
-      parent = @document.stories[@current_header][-1]
-      parent[:stories] ||= []
-      parent[:stories] << story
+    def handle_substory(story)
+      story[:type] = 'substory'
+      handle_story(story)
     end
 
     def handle_notes(notes)

data/lib/saga/tokenizer.rb

@@ -20,7 +20,7 @@ module Saga
       elsif input[0, 3] == '|  '
         @parser.handle_notes(input[1..-1].strip)
       elsif input[0, 1] == '|'
-        @parser.handle_nested_story(self.class.tokenize_story(input[1..-1]))
+        @parser.handle_substory(self.class.tokenize_story(input[1..-1]))
       elsif input[0, 1] == '-'
         @parser.handle_author(self.class.tokenize_author(input))
       elsif input =~ RE_DEFINITION

data/lib/saga/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Saga
-  VERSION = '0.15.2'.freeze
+  VERSION = '0.16'.freeze
 end

data/templates/default/document.erb

@@ -118,7 +118,7 @@ div.stories
   margin: 1rem calc(-1 * var(--inset-right)) 1rem calc(-1 * var(--inset-left));
 }
 h3,
-div.story
+div.stories > div
 {
   grid-column-start: 1;
   grid-column-end: 6;
@@ -131,77 +131,69 @@ div.stories > h3:first-child
 {
   margin-top: 0;
 }
-div.story
+div.stories > div
 {
   display: grid;
   grid-template-columns: subgrid;
   border-top: 1px solid var(--border);
-  padding: 0.5rem;
+  padding: 0.5rem calc(var(--inset-right) - 0.5rem) 0.5rem calc(var(--inset-left) - 0.5rem);
 }
-div.story:not(:has(+ div.story))
+div.stories > div:not(:has(+ div.stories > div))
 {
   border-bottom: 1px solid var(--border);
 }
-div.story.done
+div.stories > div.done
 {
   background: var(--done-background);
   border-color: var(--background) !important;
 }
-div.story.dropped
+div.stories > div.dropped
 {
   color: var(--dropped);
 }
-div.story.dropped > div.content
+div.stories > div.dropped > div.content
 {
   text-decoration: line-through;
 }
-div.story:target
+div.stories > div:target
 {
   background: var(--target-background);
 }
-div.story > *
+div.stories > div > *
 {
   padding: 0 0.5rem;
 }
-div.story > *:first-child
-{
-  padding-left: calc(var(--inset-right) - 0.5rem);
-}
-div.story > *:last-child
-{
-  padding-right: calc(var(--inset-left) - 0.5rem);
-}
-div.story > a.id
+div.stories > div > a.id
 {
   grid-column: 1;
   color: inherit;
   text-decoration: none;
 }
-div.story > div.content
+div.stories > div > div.content
 {
   grid-column: 2;
 }
-div.story > div.estimate
+div.stories > div > div.estimate
 {
   grid-column: 3;
 }
-div.story > div.iteration
+div.stories > div > div.iteration
 {
   grid-column: 4;
   font-variant-numeric: tabular-nums;
 }
-div.story > div.status
+div.stories > div > div.status
 {
   grid-column: 5;
 }
 @media (max-width: 25rem) {
-  div.story > div.content
+  div.stories > div > div.content
   {
     grid-column: 2 / span 4;
   }
-  div.story > div.estimate,
-  div.story > div.iteration,
-  div.story > div.status
+  div.stories > div > div.estimate,
+  div.stories > div > div.iteration,
+  div.stories > div > div.status
   {
     padding-top: 0.25rem;
   }
@@ -211,7 +203,7 @@ div.content p:not(:first-of-type)
   font-style: italic;
   margin-top: 0.25rem;
 }
-div.story.nested div.content
+div.stories > div.substory div.content p
 {
   padding-left: 2rem;
 }
@@ -251,7 +243,7 @@ div.iteration
       <% end %>
 
       <% stories.each do |story| %>
-        <div class="story <%= story[:status] %>" id="<%= dom_story_id(story[:id]) %>">
+        <div class="<%= [story[:type], story[:status]].compact.join(' ') %>" id="<%= dom_story_id(story[:id]) %>">
           <%= id(story[:id]) %>
           <div class="content">
             <p><%= h story[:description] %></p>
@@ -263,22 +255,6 @@ div.iteration
           <%= iteration(story[:iteration]) %>
           <%= status(story[:status]) %>
         </div>
-        <% if story[:stories] %>
-          <% story[:stories].each do |nested| %>
-            <div class="story nested <%= nested[:status] %>" id="<%= dom_story_id(nested[:id]) %>">
-              <%= id(nested[:id]) %>
-              <div class="content">
-                <p><%= h nested[:description] %></p>
-                <% if nested[:notes] %>
-                  <p><%= h nested[:notes] %></p>
-                <% end %>
-              </div>
-              <%= estimate(*nested[:estimate]) %>
-              <%= iteration(nested[:iteration]) %>
-              <%= status(nested[:status]) %>
-            </div>
-          <% end %>
-        <% end %>
       <% end %>
     <% end %>
   </div>

data/templates/saga/document.erb

@@ -25,4 +25,4 @@ USER STORIES
 <% definitions.each do |definition| -%>
 <%= format_definition(definition) %>
 <% end -%>
-<% end %>
+<% end %>

data/templates/saga/helpers.rb

@@ -15,23 +15,18 @@ def format_estimate(cardinality, interval)
   end
 end
 
-def format_story(story, kind = :regular)
+def format_story(story)
   story_attributes = []
   story_attributes << "##{story[:id]}" if story[:id]
   story_attributes << story[:status] if story[:status]
   story_attributes << format_estimate(*story[:estimate]) if story[:estimate]
   story_attributes << "i#{story[:iteration]}" if story[:iteration]
 
-  prefix = kind == :nested ? '| ' : ''
+  prefix = story[:type] == 'substory' ? '| ' : ''
   formatted = "#{prefix}#{story[:description]}"
   formatted << " - #{story_attributes.join(' ')}" unless story_attributes.empty?
   formatted << "\n"
   formatted << "#{prefix}  #{story[:notes]}\n" if story[:notes]
-  if story[:stories]
-    story[:stories].each do |nested|
-      formatted << format_story(nested, :nested)
-    end
-  end
   formatted
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saga
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: '0.16'
 platform: ruby
 authors:
 - Manfred Stienstra