yamlt 0.0.24 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54e44a217d69587711be7e1668c9c4ecb95db551
-  data.tar.gz: 6a514cc17e8dca2f3d0c8319dd600592756779e2
+  metadata.gz: 6e9d5d195fac914fea149b3c5a8bcc156d4233c1
+  data.tar.gz: 94ec79d8bb133b7f5e40b88d5526fbef9b73bcf2
 SHA512:
-  metadata.gz: 5591bc1936d2345f63e24f25807af2064d54b6b02c2258a83fdb58735657eb1d1922b8d47b54f315642d411691ee6becfe6c0bd2dbfb278b8b10ed6977208775
-  data.tar.gz: 155ac88c6d3b5ac5e1f436384255c345a61bf7f34cd4d5da97cbea1e80e3f7581ba1a6624f68eed070d6b09d3bac0129dd1cb343a3d06a48130b30a75a079f7e
+  metadata.gz: b0f604b1bed356e30f270f7b07df82e5e715d03950c78f24911213c6c55b3094507c8c41587bebf249a0db2c5c7a0c7e0250f4802718bbcf83b49e0f65e328d8
+  data.tar.gz: 487e0d25bf9aa7b08dec5f1056617a9897d78de24f1e0a98f5bceff60a1b04b3fc21e4f35f1769a8e07d4ab3c8c93b88a745b13d4fc509d040ec4d9a4fd79cf5

data/lib/yamlt/parser/line.rb

@@ -17,6 +17,12 @@ 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)
         serializer.to_s
@@ -32,12 +38,36 @@ module Yamlt
         value.gsub(/\\\"/, "\"")
       end
 
+      def clean_line
+        if CLEAN_LINE === @text
+          @clean = true
+          true
+        end
+      end
+
+      def comment_line
+        if COMMENT_LINE === @text
+          @comment = $~[:comment]
+          @prefix  = $~[:prefix]
+          true
+        end
+      end
+
       def parse
+        # clean_line ||
+        #   comment_line ||
+        #   fragment_without_value ||
+        #   fragment_with_value ||
+        #   fragment_with_multiline_start
+        # # etc.
+
         case @text
-        when /^\s*$/
+        when CLEAN_LINE
           @clean = true
-        when /^(\s*)#(.*)$/; @comment = $~[2]; @prefix = $~[1]
-        when /^(\s*)(\w+):(\s*&\S+)?(\s*)(#(.*))?$/
+        when COMMENT_LINE
+          @comment = $~[:comment]
+          @prefix = $~[:prefix]
+        when FRAGMENT_WITHOUT_VALUE
           if $~[1].length % 2 == 0
             @fragment = $~[2]
             @level = $~[1].length / 2
@@ -45,7 +75,7 @@ module Yamlt
             @prefix = $~[4]
             @comment = $~[6]
           end
-        when /^(\s*)(\w+):(\s*(!\s*)?)([\'\"])(.*)\5((\s*)#(.*))?$/
+        when FRAGMENT_WITH_VALUE
           if $~[1].length % 2 == 0
             @fragment = $~[2]
             @level = $~[1].length / 2
@@ -54,7 +84,7 @@ module Yamlt
             @comment_prefix = $~[8]
             @comment = $~[9]
           end
-        when /^(\s*)(\w+):(\s*)\|(\s*)$/
+        when FRAGMENT_WITH_MULTILINE_START
           if $~[1].length % 2 == 0
             @fragment = $~[2]
             @level = $~[1].length / 2
@@ -68,7 +98,7 @@ module Yamlt
             @anchor = $~[3]
             @comment = $~[5]
           end
-        when /^(\s*)(['"]?)(.*)\2\s*$/
+        when /^(\s*)(['"]?)(.*)\2\s*$/ #
           if $~[1].length % 2 == 0
             @level = $~[1].length / 2
             @value = unescape($~[3])

data/lib/yamlt/parser/state.rb

@@ -10,7 +10,7 @@ module Yamlt
         @lines = []
         @values = {}
 
-        @languate = nil
+        @language = nil
       end
 
       attr_reader :path, :level, :multiline, :line, :lines, :values, :language

data/lib/yamlt/updater.rb

@@ -9,10 +9,11 @@ require "yamlt/translator"
 
 module Yamlt
   class Updater
-    def initialize(source, target, translator_class = Yamlt::Updater.translator_class)
+    def initialize(source, target, translator_class: Yamlt::Updater.translator_class, config_path: "..")
       @source = source
       @target = target
       @translator = translator_class.new(state.language, loader.language)
+      @config_path = config_path
       @config = config
     end
 
@@ -66,7 +67,7 @@ module Yamlt
 
     def config_source
       @config_source ||=
-        File.join(File.dirname(@source), "yamlt.yml")
+        File.join(File.dirname(@source), @config_path, "yamlt.yml")
     end
 
     def original_prefix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yamlt
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.27
 platform: ruby
 authors:
 - Tangerine Cat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec