nrser 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5311c0d4f62623e09b45060dfdfb067649b17335
-  data.tar.gz: e0081ada45abd36fab607fbf9971700a94456df0
+  metadata.gz: a6738d85c4a157986e23fb51cac830faf2998666
+  data.tar.gz: b8a22cdcdd8b36a3ae2026440b8b4844d28fb9af
 SHA512:
-  metadata.gz: bde6122d23a49148589971a45ffbe9a55d0e5f703d72032eea32195d8d4da40f0f188b1e901532ec8c15b457fadacfee011f83eaa9a4b5bbd3198977ceee891b
-  data.tar.gz: ca3036819080f5fd335dbcb93dbaae77be968873f44945e9138a92f9779b88fdbe510073b664130c2a274937a26a8f361347919081cd4478f5cafa3c99f40f24
+  metadata.gz: 1cc98bc014b43e51379d2efb4e51bc50268f97db230fdc3c606e350e27b4666398069c07a35fd2efcfbd52b96097a2e3d82de4ab7ac63273276db5b1293b1482
+  data.tar.gz: 6fa17fd7b7f57e24da23e2807a3d25c0cff307f84e9c7f793b3ece06eff5f92e7b5592aa5a630525890163c75860f13c96946d21f8180edf981ca546320a3483

data/lib/nrser/mean_streak/document.rb

@@ -32,6 +32,16 @@ class NRSER::MeanStreak::Document
   # ======================================================================
   
   
+  # Classes
+  # ============================================================================
+  
+  # A position in a source.
+  # 
+  class SourcePosition
+    # def initialize source,
+  end
+  
+  
   # Class Methods
   # ======================================================================
   
@@ -56,7 +66,6 @@ class NRSER::MeanStreak::Document
   singleton_class.send :alias_method, :from_s, :parse
   
   
-  
   # Attributes
   # ======================================================================
   
@@ -114,17 +123,35 @@ class NRSER::MeanStreak::Document
   end
   
   
+  # @return [Hash<Symbol, Hash<Symbol, Integer>>]
+  #   Looks like:
+  #   
+  #       {
+  #          first_byte: {
+  #            line: Non-negative Integer,
+  #            column: Non-negative Integer,
+  #            index: Non-negative Integer,
+  #          },
+  #          last_byte: {
+  #            line: Non-negative Integer,
+  #            column: Non-negative Integer,
+  #            index: Non-negative Integer,
+  #          },
+  #       }
+  # 
+  # All integers are zero-indexed byte array indexes.
+  # 
   def source_byte_indexes node
     pos = node.sourcepos
     
     indexes = {
       first_byte: {
-        line: pos[:start_line] - 1,
-        column: pos[:start_column] - 1,
+        line: [0, pos[:start_line] - 1].max,
+        column: [0, pos[:start_column] - 1].max,
       },
       last_byte: {
-        line: pos[:end_line] - 1,
-        column: pos[:end_column] - 1,
+        line: [0, pos[:end_line] - 1].max,
+        column: [0, pos[:end_column] - 1].max,
       },
     }
     
@@ -136,7 +163,15 @@ class NRSER::MeanStreak::Document
   end
   
   
+  # Computes the *byte* index for a `line` and `column` in the source, both
+  # of which *are in bytes*.
+  # 
+  # @param [Integer] line:
+  #   
+  # 
   def source_byte_index line:, column:
+    t.hash_(keys: t.sym, values: t.non_neg_int?).check( line: line, column: column)
+    
     # source_lines[0...line].map( &:bytesize ).reduce( column, :+ )
     byte_index = column
     if line > 0

data/lib/nrser/mean_streak.rb

@@ -106,14 +106,34 @@ class NRSER::MeanStreak
   end # #parse
   
   
+  # Render a {NRSER::MeanStreak::Document} or a source string.
+  # 
+  # @param [NRSER::MeanStreak::Document | String] doc_or_source
+  #   Document or source to render.
+  # 
+  # @return [String]
+  #   Rendered string.
+  # 
   def render doc_or_source
-    doc = if doc_or_source.is_a? NRSER::MeanStreak::Document
-      doc_or_source
+    case doc_or_source
+    when NRSER::MeanStreak::Document
+      doc_or_source.render
+      
+    when ''
+      # Short-circuit for empty strings because CommonMark's document
+      # node for empty strings returns a weird `#sourcepos` that ends before it
+      # begins (start: line 1, column 1; end: line 0, column 0).
+      # 
+      # Going to protect against line 0 / column 0 in
+      # {NRSER::MeanStreak::Document#source_byte_indexes} too but since the
+      # empty strings just renders the empty string we can just return that
+      # here.
+      # 
+      ''
+    
     else
-      parse doc_or_source
+      parse( doc_or_source ).render
     end
-    
-    doc.render
   end
   
   

data/lib/nrser/rspex/example_group/describe_called_with.rb

@@ -25,7 +25,7 @@ module NRSER::RSpex::ExampleGroup
   # @return [void]
   # 
   def describe_called_with *args, &body
-    describe_x_type List(*args),
+    describe_x Args(*args),
       type: :called_with,
       subject_block: -> { super().call *args },
       &body

data/lib/nrser/rspex.rb

@@ -248,6 +248,8 @@ module NRSER::RSpex
   
   class Args < List
     def to_desc max = nil
+      return '()' if empty?
+      
       if last.is_a?( Hash )
         [
           List.new( self[0..-2] ).to_desc,

data/lib/nrser/version.rb

@@ -18,7 +18,7 @@ module NRSER
   # 
   # @return [String]
   # 
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'
   
   
   module Version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nrser
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - nrser