deadfire 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b22d5497d512927d87bb9f0d4166b055281e8c684188b14b2c03b4052256fe0
-  data.tar.gz: c50413354b6e0504777d2111bf83a9f5e39a97f64f2fa14b292fd0277128f7be
+  metadata.gz: 681339c949e040e68156a6f391c2a0cb87a50fa84e7cff27e3d8dfe7e746b61a
+  data.tar.gz: 952f7522e6034261f9dd2b7912deea46fa92e43a068fa53b6ff2658db8e0cd36
 SHA512:
-  metadata.gz: 922f9283b553c8c6f92d4e8de65362f1d75b29e028b5a18ab3444e2727cbc09295c176ec5b0359d879dd11a5f942e626ab9256d1cb2f4c0f39c9c13200aca06f
-  data.tar.gz: 1bb7bbae48bd1e170c036ad176d3f0dd22b5546b87b2ec874f1fa9d0820b1ba23c7cdd2096caac8673be42d32be4e14063ae44d79d7fc66134d670b41ccc56e7
+  metadata.gz: 7b72cecd27d13dfbcb84f1c06b19b4a0ef615df59d5cba0a4ffa544e423660dc24f8b445e9b92ef06f58fc71ef12140867e5c0fd4e45d9cbf28dd9fae15b64f6
+  data.tar.gz: 4c81de35669b3e560d8ee5103cd94a2ba45f703b27c64b1c5a26dc46dfefd35ac1f0825c26667b7d8c3e76ee27df0764dad571ddc0c4d652e88228cd494921d1

data/.github/workflows/ci.yml

@@ -6,9 +6,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [head, 3, 2.7]
+        ruby: [head, 3.1, 3.0, 2.7]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deadfire (0.1.0)
+    deadfire (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/deadfire/css_buffer.rb

@@ -2,9 +2,36 @@
 require "stringio"
 
 module Deadfire
-  class CssBuffer < StringIO
+  class CssBuffer
+    attr_reader :lineno, :buffer
+
     def initialize(content)
-      super(content)
+      @content = StringIO.new(content)
+      @buffer = []
+      @lineno = 0
+    end
+
+    def gets(skip_buffer: false)
+      output = content.gets
+      if output && !skip_buffer
+        buffer << output
+      end
+      @lineno += 1
+      output
+    end
+
+    def peek
+      output = content.gets
+      content.ungetc(output)
+      output
     end
+
+    def eof?
+      content.eof?
+    end
+
+    private
+
+    attr_reader :content
   end
-end
+end

data/lib/deadfire/parser.rb

@@ -202,21 +202,29 @@ module Deadfire
         line = content.dup.strip
         @block_names << find_block_name(@output, @lineno)
         tmp = []
-        
-        add_end_block_when_no_end_block_on_prev_line(arr: tmp)
+
         while @nested_level > 0 || !@buffer.eof?
           spaces = calculate_spaces_to_add(line)
+
           if line.start_with?(NEST_SELECTOR)
-            add_end_block_when_no_end_block_on_prev_line(arr: tmp) if @nested_level > 0
+            add_end_block_when_no_end_block_on_prev_line(arr: tmp)
             add_selector_to_block_name(line)
             @nested_level += 1
             tmp << rewrite_line(spaces, line, @block_names[0...-1].join(" "))
-            remove_last_block_name_entry if line.end_with?(END_BLOCK_CHAR)
           else
-            remove_last_block_name_entry if line.end_with?(END_BLOCK_CHAR)
             tmp << "#{spaces}#{line.lstrip}"
           end
 
+          remove_last_block_name_entry if line.end_with?(END_BLOCK_CHAR)
+
+          if line.end_with?(END_BLOCK_CHAR)
+            result = @buffer.peek
+            if result.strip == END_BLOCK_CHAR
+              @buffer.gets(skip_buffer: true)
+              break
+            end
+          end
+
           line = @buffer.gets
 
           if line.nil? || @buffer.eof? || line.empty?
@@ -226,8 +234,7 @@ module Deadfire
           end
         end
 
-        tmp.pop if tmp[-1] == END_BLOCK_CHAR
-        tmp.join("\n")
+        tmp.join("\n").concat("\n")
       end
 
       private
@@ -270,7 +277,7 @@ module Deadfire
         when 0
           line
         when 1
-          "#{spaces}#{line.lstrip.gsub("&", selector)}"
+          "#{spaces}#{line.strip.gsub("&", selector)}"
         else
           line.strip.each_char.map do |s|
             if s == NEST_SELECTOR
@@ -307,7 +314,7 @@ module Deadfire
 
     def parse
       while ! buffer.eof?
-        process_line(buffer.readline)
+        process_line(buffer.gets)
       end
 
       @output << NEWLINE

data/lib/deadfire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deadfire
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deadfire
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Haroon Ahmed
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email: