cornucopia 0.1.49 → 0.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a36c9fc3e3de51328834235d1832c44c078b5c26
-  data.tar.gz: c1e378cde43452e8cc82be9dec1776e7d5e88415
+  metadata.gz: 7462c271c128c488e2b7678c71196f50c0217a42
+  data.tar.gz: 8e5fdc17a806ccb163cbe85ab12bd8258fc11300
 SHA512:
-  metadata.gz: 399af987ba5bbd8bbc5638624b85115ccfe52e40abc4c7987ba398077d0f25816e4293aa5720e06fdcc1dbe029692edbbb81f2a54fb45a3a8d3b9d0578aa6c89
-  data.tar.gz: 10d6382357ce759ed1266fc669ad98958b744e9a9960a806f118c507ed491831b8c1343eb995eeff30cadaa50e0df62a1540edbf17af4be106bef63ecb5e5357
+  metadata.gz: 4b93a7e57f64c87e647c64ed76e23535b8ead4a609e789c380218e356089cfb1aeac47fcc7f297d0386a18eff29cca1286f96556f5a55ae5a0c127f1c690170c
+  data.tar.gz: c0861b302f07518b241277ebb89ae0db9d35c92a91df7309e2ca58ce8428ff16665dcb57f024c0dc671ee3e215c29784ea5a236e7ab716d1da76c3c7128c216f

data/lib/cornucopia/util/pretty_formatter.rb

@@ -34,6 +34,8 @@ module Cornucopia
         end
 
         if do_pretty_print
+          @loop_pos           = [-1, -1]
+          @loop_count         = [0, 0]
           @indent_level       = 0
           @current_state      = :unknown
           @state_stack        = [:unknown]
@@ -43,6 +45,8 @@ module Cornucopia
           @formatted_string   = "".dup
 
           while @current_pos < @unknown_string_len
+            break if in_infinite_loop?
+
             case @current_state
               when :unknown
                 search_pos          = @current_pos
@@ -173,6 +177,9 @@ module Cornucopia
 
                   when :array
                     group_value_end :array_comma, "]"
+
+                  when :group_implied
+                    @current_pos += 1
                 end
 
                 @current_pos -= 1
@@ -577,6 +584,22 @@ module Cornucopia
           end
         end
       end
+
+      private
+
+      def in_infinite_loop?
+        @loop_count[0] += 1
+        @loop_count[1] += 1
+        @loop_count[0] = 0 if @loop_pos[0] != @current_pos
+        @loop_count[1] = 0 if @loop_pos[1] != @start_pos
+        @loop_pos[0]   = @current_pos
+        @loop_pos[1]   = @start_pos
+
+        return false if @loop_count[0] < @unknown_string_len && @loop_count[1] < @unknown_string_len
+
+        @formatted_string += @unknown_string[@start_pos..-1]
+        true
+      end
     end
   end
 end

data/lib/cornucopia/version.rb

@@ -1,3 +1,3 @@
 module Cornucopia
-  VERSION = "0.1.49"
+  VERSION = "0.1.50"
 end

data/spec/lib/util/pretty_formatter_spec.rb

@@ -65,6 +65,12 @@ describe Cornucopia::Util::PrettyFormatter do
     end
   end
 
+  it "formats a string" do
+    pretty = Cornucopia::Util::PrettyFormatter.format_string("#<MetaDataOwnerTestModel _id: 5a3ea06e402cfe50bca1fc6b, >\n".html_safe)
+
+    expect(pretty).to eq "#<MetaDataOwnerTestModel\n  _id: 5a3ea06e402cfe50bca1fc6b,\n>"
+  end
+
   it "formats a simple class" do
     pretty = Cornucopia::Util::PrettyFormatter.format_string(simple_class)
     expect(pretty).to be == simple_class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cornucopia
 version: !ruby/object:Gem::Version
-  version: 0.1.49
+  version: 0.1.50
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport