yamlt 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb7ea61c423e478497132fc64e8737f388f69354
-  data.tar.gz: 8501760b1869a164f4f0fea670b018c437535043
+  metadata.gz: 6cbc2b20f7623fd3a4a04ab255d8b7839b250caa
+  data.tar.gz: 45e89e9d7b113a8cbf666fb37822a99501d775c8
 SHA512:
-  metadata.gz: e6d0e974b023f3674fc2bdb95b880970bed80e24324d137cb12f1bfe77f195b64a97656c84d5fcd35f3d4ea49f4db849a2d6280404f884067a9840328d41f2aa
-  data.tar.gz: 096d2aeb0c68046a79f02009b171cd0823a646d797b542b0352dc4f31afbba70c108b1155fcb0159de0bf4ad682508cc3ea3a081bc31d74ce5984d8b48b9ad08
+  metadata.gz: abeac73e1d7b005141b668bd06b8f74b20a3edc9ee70d3286e6a769aeb09eb9014eaffdab1452008d5696d7bf473b467d09683ec62dcbff9bf705f0f10f4828d
+  data.tar.gz: db8fc1c19fb33012af8326af4cd6d23357cc79dc8633d82f4cbb5d71918bb544a59083de2838bbff831463921e4ee598277cc13794e1f4fc80ed70cf12220f33

data/lib/yamlt/parser/line.rb

@@ -17,11 +17,6 @@ module Yamlt
       attr_reader :comment_prefix
       attr_accessor :full_path, :value
 
-      CLEAN_LINE = /^\s*$/
-      COMMENT_LINE = /^(?<prefix>\s*)#(?<comment>.*)$/
-      FRAGMENT_WITHOUT_VALUE = /^(\s*)(\w+):(\s*&\S+)?(\s*)(#(.*))?$/
-      FRAGMENT_WITH_VALUE = /^(\s*)(\w+):(\s*(!\s*)?)([\'\"])(.*)\5((\s*)#(.*))?$/
-      FRAGMENT_WITH_MULTILINE_START = /^(\s*)(\w+):(\s*)\|(\s*)$/
 
       def as_text(opts={})
         serializer = Serializer.new(self, opts)
@@ -38,6 +33,9 @@ module Yamlt
         value.gsub(/\\\"/, "\"")
       end
 
+
+      CLEAN_LINE = /^\s*$/
+
       def clean_line
         if CLEAN_LINE === @text
           @clean = true
@@ -45,6 +43,15 @@ module Yamlt
         end
       end
 
+
+      COMMENT_LINE = /
+         ^
+         (?<prefix>\s*)
+         \#
+         (?<comment>.*)
+         $
+      /x
+
       def comment_line
         if COMMENT_LINE === @text
           @comment = $~[:comment]
@@ -53,59 +60,137 @@ module Yamlt
         end
       end
 
-      def parse
-        # clean_line ||
-        #   comment_line ||
-        #   fragment_without_value ||
-        #   fragment_with_value ||
-        #   fragment_with_multiline_start
-        # # etc.
-
-        case @text
-        when CLEAN_LINE
-          @clean = true
-        when COMMENT_LINE
+
+      FRAGMENT_WITHOUT_VALUE = /
+        ^
+        (?<indent>\s*)
+        (?<fragment>\w+)
+        :
+        (?<anchor>\s*&\S+)?
+        (?<prefix>\s*)
+        (?<comment_wrapper>
+           \#
+           (?<comment>.*)
+        )?
+        $
+      /x
+
+      def fragment_without_value
+        if FRAGMENT_WITHOUT_VALUE === @text && $~[:indent].length % 2 == 0
+          @fragment = $~[:fragment]
+          @level = $~[:indent].length / 2
+          @anchor = $~[:anchor]
+          @prefix = $~[:prefix]
           @comment = $~[:comment]
+
+          true
+        end
+      end
+
+
+      FRAGMENT_WITH_VALUE = /
+        ^
+        (?<indent>\s*)
+        (?<fragment>\w+)
+        :
+        (?<prefix>\s*(?<escaped_prefix>!\s*)?)
+        (?<quote>[\'\"])
+        (?<value>.*?)
+        \k<quote>
+        (?<comment_content>(?<comment_prefix>\s*)\#(?<comment>.*))?
+        $
+      /x
+
+      def fragment_with_value
+        if FRAGMENT_WITH_VALUE === @text && $~[:indent].length % 2 == 0
+          @fragment = $~[:fragment]
+          @level = $~[:indent].length / 2
           @prefix = $~[:prefix]
-        when FRAGMENT_WITHOUT_VALUE
-          if $~[1].length % 2 == 0
-            @fragment = $~[2]
-            @level = $~[1].length / 2
-            @anchor = $~[3]
-            @prefix = $~[4]
-            @comment = $~[6]
-          end
-        when FRAGMENT_WITH_VALUE
-          if $~[1].length % 2 == 0
-            @fragment = $~[2]
-            @level = $~[1].length / 2
-            @prefix = $~[3]
-            @value = unescape($~[6])
-            @comment_prefix = $~[8]
-            @comment = $~[9]
-          end
-        when FRAGMENT_WITH_MULTILINE_START
-          if $~[1].length % 2 == 0
-            @fragment = $~[2]
-            @level = $~[1].length / 2
-            @prefix = $~[3] || $~[4]
-            @multiline = true
-          end
-        when /^(\s*)(\<\<:(\s+\*\w+\s*))(#(.*))?$/
-          if $~[1].length % 2 == 0
-            @fragment = "<<"
-            @level = $~[1].length / 2
-            @anchor = $~[3]
-            @comment = $~[5]
-          end
-        when /^(\s*)(['"]?)(.*)\2\s*$/ #
-          if $~[1].length % 2 == 0
-            @level = $~[1].length / 2
-            @value = unescape($~[3])
-            @multiline = true
-          end
+          @value = unescape($~[:value])
+          @comment_prefix = $~[:comment_prefix]
+          @comment = $~[:comment]
+
+          true
         end
       end
+
+
+      FRAGMENT_WITH_MULTILINE_START = /
+        ^
+        (?<indent>\s*)
+        (?<fragment>\w+)
+        :
+        (?<left_prefix>\s*)
+        \|
+        (?<right_prefix>\s*)
+        $
+      /x
+
+      def fragment_with_multiline_start
+        if FRAGMENT_WITH_MULTILINE_START === @text && $~[:indent].length % 2 == 0
+          @fragment = $~[:fragment]
+          @level = $~[:indent].length / 2
+          @prefix = $~[:left_prefix] || $~[:right_prefix]
+          @multiline = true
+
+          true
+        end
+      end
+
+
+      FRAGMENT_WITH_REFERENCE = /
+        ^
+        (?<indent>\s*)
+        (?<x0>\<\<:
+          (?<anchor>\s+\*\w+\s*)
+        )
+        (?<x1>
+          \#
+          (?<comment>.*)
+        )?
+        $
+      /x
+
+      def fragment_with_reference
+        if FRAGMENT_WITH_REFERENCE === @text && $~[:indent].length % 2 == 0
+          @fragment = "<<"
+          @level = $~[:indent].length / 2
+          @anchor = $~[:anchor]
+          @comment = $~[:comment]
+
+          true
+        end
+      end
+
+
+      MULTILINE_VALUE = /
+        ^
+        (?<indent>\s*)
+        (?<quote>['"]?) # '
+        (?<value>.*)
+        \k<quote>
+        \s*
+        $
+      /x
+
+      def multiline_value
+        if MULTILINE_VALUE === @text && $~[:indent].length % 2 == 0
+          @level = $~[:indent].length / 2
+          @value = unescape($~[:value])
+          @multiline = true
+        end
+      end
+
+
+      def parse
+        clean_line ||
+          comment_line ||
+          fragment_without_value ||
+          fragment_with_value ||
+          fragment_with_multiline_start ||
+          fragment_with_reference ||
+          multiline_value
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yamlt
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Tangerine Cat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -69,3 +69,4 @@ signing_key:
 specification_version: 4
 summary: Take yaml structure from locale file and apply to another one
 test_files: []
+has_rdoc: