ascii_tree 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b628af28efd7c35a442d17fcf4ad6e8793956f5a
-  data.tar.gz: 6d112ae59e9dc1a4cba3efefdbd25565a1a7264b
+  metadata.gz: 727377cc812889ffd5a12fe02510d31fd8c60046
+  data.tar.gz: 51e1abce380f5c8a587be253e0494d973faecb76
 SHA512:
-  metadata.gz: 05a255d5eb10bbda6fe338e37b6d69a445407fa5db5b020c2bc3ed4baa609da7748f77f81074a3b3d2e53c394e1d91594e837151b836d7857fb44bc4629caa15
-  data.tar.gz: de5fa39ee27988af7eae21d64c6159be886b3b202e581f6b52a659136c9508a4ff80975c9cee9c7db4c6940cf632dfe8188ba0b487b7b4c1bf0799193c42f21c
+  metadata.gz: 6b7032761679fa3c2c9f63647da68e1d284e5b576b99c88539509f715061c012157ff3ed677b02948bd6bbf7e2f3e00a451ebd4cb8cd855d708c97a1d581bd17
+  data.tar.gz: 9d19f645ed89eaa27ad43ad89c7ba550211c2de2cf4da9d561c547620f996af5bd9039bd5b84bbd35af971045b9ce2cdaacf00e8cb3316ea3541fcd390a15b22

data/README.md

@@ -1,5 +1,7 @@
 ## Ascii Tree
 
+[![Build Status](https://travis-ci.org/tuzz/ascii_tree.svg?branch=master)](https://travis-ci.org/tuzz/ascii_tree)
+
 Parses a usable tree from ASCII art.
 
 Ascii Tree turns something humans understand into something computers
@@ -24,14 +26,14 @@ root = AsciiTree.parse('
 
 ')
 
-root.id
+root.identity
 #=> "chestnuts"
 
 root.parent
 #=> nil
 
 root.children
-#=> [#<AsciiTree::Node @id="roasting">, ...]
+#=> [#<AsciiTree::Node @identity="roasting">, ...]
 ```
 
 ## Multiple words
@@ -47,7 +49,7 @@ root = AsciiTree.parse('
 
 ')
 
-root.id
+root.identity
 #=> "single node"
 ```
 

data/lib/ascii_tree/comment_stripper.rb

@@ -1,9 +1,7 @@
 module AsciiTree
   module CommentStripper
-
     def self.strip(string)
       string.gsub(/#[^\n]*/, "").gsub(/\s+\n/, "\n")
     end
-
   end
 end

data/lib/ascii_tree/coordinate.rb

@@ -1,13 +1,14 @@
-class AsciiTree::Coordinate
-
-  attr_reader :x, :y
-
-  def initialize(x:, y:)
-    @x, @y = x, y
+module AsciiTree
+  class Coordinate
+    attr_reader :x, :y
+
+    def initialize(x:, y:)
+      @x = x
+      @y = y
+    end
+
+    def ==(other)
+      x == other.x && y == other.y
+    end
   end
-
-  def ==(other)
-    x == other.x && y == other.y
-  end
-
 end

data/lib/ascii_tree/edge.rb

@@ -1,19 +1,19 @@
-class AsciiTree::Edge
+module AsciiTree
+  class Edge
+    attr_reader :character, :coordinate, :parent_coordinate, :child_coordinate
 
-  attr_reader :character, :coordinate, :parent_coordinate, :child_coordinate
+    def initialize(character:, coordinate:, parent_coordinate:, child_coordinate:)
+      @character         = character
+      @coordinate        = coordinate
+      @parent_coordinate = parent_coordinate
+      @child_coordinate  = child_coordinate
+    end
 
-  def initialize(character:, coordinate:, parent_coordinate:, child_coordinate:)
-    @character         = character
-    @coordinate        = coordinate
-    @parent_coordinate = parent_coordinate
-    @child_coordinate  = child_coordinate
+    def ==(other)
+      character == other.character &&
+        coordinate == other.coordinate &&
+        parent_coordinate == other.parent_coordinate &&
+        child_coordinate == other.child_coordinate
+    end
   end
-
-  def ==(other)
-    character == other.character &&
-      coordinate == other.coordinate &&
-      parent_coordinate == other.parent_coordinate &&
-      child_coordinate == other.child_coordinate
-  end
-
 end

data/lib/ascii_tree/edge_parser.rb

@@ -1,7 +1,6 @@
 module AsciiTree
   module EdgeParser
     class << self
-
       def parse(string)
         edge_chars_with_coordinates(string).map do |char, coordinate|
           offsets = edge_offsets[char]
@@ -36,7 +35,6 @@ module AsciiTree
           edge_offsets.keys.include?(char)
         end
       end
-
     end
   end
 end

data/lib/ascii_tree/node.rb

@@ -1,21 +1,19 @@
 module AsciiTree
   class Node
+    attr_reader :identity, :value, :parent, :children
 
-    attr_reader :id, :value, :parent, :children
-
-    def initialize(id:, value:, parent:, children:)
-      @id       = id
+    def initialize(identity:, value:, parent:, children:)
+      @identity = identity
       @value    = value
       @parent   = parent
       @children = children
     end
 
     def ==(other)
-      id == other.id &&
+      identity == other.identity &&
         value == other.value &&
         parent == other.parent &&
         children == other.children
     end
-
   end
 end

data/lib/ascii_tree/node_builder.rb

@@ -1,6 +1,5 @@
 module AsciiTree
   class NodeBuilder
-
     def self.build(*args)
       new(*args).build
     end
@@ -10,11 +9,7 @@ module AsciiTree
     end
 
     def build
-      if relationships.any?
-        build_for(root_word, nil)
-      else
-        nil
-      end
+      build_for(root_word, nil) if relationships.any?
     end
 
     private
@@ -31,7 +26,7 @@ module AsciiTree
 
     def build_for(word, parent)
       node = Node.new(
-        id: word.id,
+        identity: word.identity,
         value: word.value,
         parent: parent,
         children: []
@@ -53,6 +48,5 @@ module AsciiTree
         build_for(r.child_word, parent)
       end
     end
-
   end
 end

data/lib/ascii_tree/parenthesis_toggle.rb

@@ -1,8 +1,8 @@
 module AsciiTree
   class ParenthesisToggle
-
     def initialize
-      @on, @count = false, 0
+      @on = false
+      @count = 0
     end
 
     def read(char)
@@ -33,6 +33,5 @@ module AsciiTree
     private
 
     attr_reader :on
-
   end
 end

data/lib/ascii_tree/relationship.rb

@@ -1,6 +1,5 @@
 module AsciiTree
   class Relationship
-
     attr_reader :parent_word, :edge, :child_word
 
     def initialize(parent_word:, edge:, child_word:)
@@ -14,6 +13,5 @@ module AsciiTree
         edge == other.edge &&
         child_word == other.child_word
     end
-
   end
 end

data/lib/ascii_tree/relationships_builder.rb

@@ -1,7 +1,6 @@
 module AsciiTree
   module RelationshipsBuilder
     class << self
-
       def build(words, edges)
         relationships = []
 
@@ -24,27 +23,26 @@ module AsciiTree
       private
 
       def root_relationship(words)
-        root_word = words.first
+        return unless words.any?
 
-        if root_word
-          Relationship.new(parent_word: nil, edge: nil, child_word: root_word)
-        end
+        root_word = words.first
+        Relationship.new(parent_word: nil, edge: nil, child_word: root_word)
       end
 
       def validate_presence(parent, child, edge)
         if parent.nil? && child.nil?
           error = "No parent or child"
         elsif parent.nil?
-          error = "No parent for child '#{child.id}'"
+          error = "No parent for child '#{child.identity}'"
         elsif child.nil?
-          error = "No child for parent '#{parent.id}'"
+          error = "No child for parent '#{parent.identity}'"
         end
 
-        if error
-          c = edge.coordinate
-          error += " for edge '#{edge.character}' at line #{c.y}, column #{c.x}"
-          raise ::AsciiTree::RelationshipError, error
-        end
+        return unless error
+
+        c = edge.coordinate
+        error += " for edge '#{edge.character}' at line #{c.y}, column #{c.x}"
+        fail ::AsciiTree::RelationshipError, error
       end
 
       def validate_one_parent(relationships)
@@ -56,11 +54,11 @@ module AsciiTree
           count > 1
         end
 
-        groups = multiple_parents.group_by { |r| r.child_word }
+        groups = multiple_parents.group_by(&:child_word)
 
-        maps = groups.map do |child_word, relationships|
-          parent_words = relationships.map(&:parent_word)
-          [child_word.id, parent_words.map(&:id)]
+        maps = groups.map do |child_word, rels|
+          parent_words = rels.map(&:parent_word)
+          [child_word.identity, parent_words.map(&:identity)]
         end
 
         if maps.any?
@@ -72,10 +70,10 @@ module AsciiTree
           end
         end
 
-        raise ::AsciiTree::RelationshipError, error if error
+        fail ::AsciiTree::RelationshipError, error if error
       end
-
-      class ::AsciiTree::RelationshipError < StandardError; end
     end
   end
+
+  class RelationshipError < StandardError; end
 end

data/lib/ascii_tree/scanner.rb

@@ -1,7 +1,6 @@
 module AsciiTree
   module Scanner
     class << self
-
       def scan(string)
         Enumerator.new do |yielder|
           indexed_lines(string).each do |line, y|
@@ -29,7 +28,6 @@ module AsciiTree
       def chars(line)
         line.split("")
       end
-
     end
   end
 end

data/lib/ascii_tree/word.rb

@@ -1,17 +1,16 @@
 module AsciiTree
   class Word
+    attr_reader :identity, :value, :start_coordinate, :end_coordinate
 
-    attr_reader :id, :value, :start_coordinate, :end_coordinate
-
-    def initialize(id:, value:, start_coordinate:, end_coordinate:)
-      @id               = id
+    def initialize(identity:, value:, start_coordinate:, end_coordinate:)
+      @identity         = identity
       @value            = value
       @start_coordinate = start_coordinate
       @end_coordinate   = end_coordinate
     end
 
     def ==(other)
-      id == other.id &&
+      identity == other.identity &&
         value == other.value &&
         start_coordinate == other.start_coordinate &&
         end_coordinate == other.end_coordinate
@@ -30,6 +29,5 @@ module AsciiTree
     def inside?(x)
       (start_coordinate.x..end_coordinate.x).include?(x)
     end
-
   end
 end

data/lib/ascii_tree/word_parser.rb

@@ -1,14 +1,13 @@
 module AsciiTree
   module WordParser
     class << self
-
       def parse(string)
         chars = word_chars_with_coordinates(string)
         group_contiguous(chars).map do |word_with_coords|
-          id, value = id_value(word_with_coords)
+          identity, value = identity_value(word_with_coords)
 
           Word.new(
-            id: id.strip,
+            identity: identity.strip,
             value: value,
             start_coordinate: word_with_coords.first.last,
             end_coordinate: word_with_coords.last.last
@@ -21,7 +20,7 @@ module AsciiTree
       def word_chars_with_coordinates(string)
         toggle = ParenthesisToggle.new
 
-        Scanner.scan(string).reject do |char, coordinate|
+        Scanner.scan(string).reject do |char, _coordinate|
           toggle.read(char)
           toggle.off? && (edge?(char) || whitespace?(char))
         end
@@ -35,7 +34,7 @@ module AsciiTree
         char.match(/\s/)
       end
 
-      def id_value(word_with_coords)
+      def identity_value(word_with_coords)
         chars = word_with_coords.map(&:first)
         chars = remove_parentheses(chars)
 
@@ -43,10 +42,10 @@ module AsciiTree
         word.strip!
 
         if word.end_with?("}")
-          id, tail = word.split("{", 2)
+          identity, tail = word.split("{", 2)
           expression = tail[0..-2]
           value = eval(expression)
-          [id, value]
+          [identity, value]
         else
           [word, nil]
         end
@@ -61,7 +60,7 @@ module AsciiTree
       end
 
       def group_contiguous(chars)
-        chars.inject([]) do |array, (char, coord)|
+        chars.each_with_object([]) do |(char, coord), array|
           prev = previous_coordinate(array)
 
           if contigous?(prev, coord)
@@ -69,8 +68,6 @@ module AsciiTree
           else
             array << [[char, coord]]
           end
-
-          array
         end
       end
 
@@ -85,7 +82,6 @@ module AsciiTree
           previous_coordinate.y == coordinate.y &&
           previous_coordinate.x == coordinate.x - 1
       end
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascii_tree
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Patuzzo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.31'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.31'
 description: Parses a usable tree from ASCII art.
 email: chris@patuzzo.co.uk
 executables: []