nodifier 0.1.4 → 0.1.5

data/lib/formatter_state.rb

@@ -0,0 +1,13 @@
+class FormatterState
+  def initialize
+    @formatted_children = false
+  end
+
+  def children_are_formatted!
+    @formatted_children = true
+  end
+
+  def formatted_children?
+    @formatted_children
+  end
+end

data/lib/node.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/indentation'
-require File.dirname(__FILE__) + '/stopper'
+require File.dirname(__FILE__) + '/nodes'
+require File.dirname(__FILE__) + '/formatter_state'
 require File.dirname(__FILE__) + '/xml_node_formatter'
 
 class Node
@@ -12,7 +13,7 @@ class Node
 
   def initialize(label)
     @label = label
-    @children = []
+    @children = Nodes.new
   end
 
   def to_s(indent_level = 0, &formatter_block)
@@ -20,19 +21,17 @@ class Node
       return to_s(indent_level) { |node| node.label }
     end
 
-    stopper = Stopper.new
+    state = FormatterState.new
     case formatter_block.arity
-    when 1:
+    when 1
       s = indent(formatter_block.call(self), indent_level)
-    when 2:
-      s = indent(formatter_block.call([self, stopper]), indent_level)
+    when 2
+      s = indent(formatter_block.call([self, state]), indent_level)
     end
 
-    unless stopper.stopped?
-      @children.each do |child|
-        s << "\n"
-        s << child.to_s(indent_level + 1, &formatter_block)
-      end
+    unless state.formatted_children?
+      s << "\n" unless @children.empty?
+      s << @children.to_s(indent_level + 1, &formatter_block)
     end
 
     s

data/lib/nodes.rb

@@ -0,0 +1,12 @@
+class Nodes < Array
+  def to_s(indent_level = 0, &formatter_block)
+    s = ''
+
+    each do |node|
+      s << "\n" unless s.empty?
+      s << node.to_s(indent_level, &formatter_block)
+    end
+
+    s
+  end
+end

data/lib/nodifier.rb

@@ -10,7 +10,7 @@ class Nodifier
   end
 
   def nodify(content)
-    nodes = []
+    nodes = Nodes.new
     current_node = nil
     child_content = ''
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: nodifier
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Daniel Tao
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 -07:00
-default_executable: 
+date: 2011-11-03 00:00:00 Z
 dependencies: []
 
 description: A simple Ruby library for parsing plain text into a node-based structure
@@ -28,13 +22,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/formatter_state.rb
 - lib/indentation.rb
 - lib/node.rb
 - lib/node_parser.rb
+- lib/nodes.rb
 - lib/nodifier.rb
-- lib/stopper.rb
 - lib/xml_node_formatter.rb
-has_rdoc: true
 homepage: http://github.com/dtao/nodifier
 licenses: []
 
@@ -48,23 +42,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Nodifier, for parsing text into nodes

data/lib/stopper.rb

@@ -1,13 +0,0 @@
-class Stopper
-  def initialize
-    @stopped = false
-  end
-
-  def stop!
-    @stopped = true
-  end
-
-  def stopped?
-    @stopped
-  end
-end