archieml 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38f795c262135209607462aaf552bad7daec3bc0
-  data.tar.gz: 44fe6ad8971f1232b65dfb34caded74fd947f8bb
+  metadata.gz: 20d1f2ce2e413edb046e36127d145f97d467b723
+  data.tar.gz: 6f84f4940d148c1e5d01e7e73e1b7f71ae514659
 SHA512:
-  metadata.gz: e3895fd7157bca39da81dab19a4998b31a9ac6f6aa3b4c5e792fe6b9e68f3a22a41b6b8745ec94dddc77db48fccc35a081652bbbcf822ac6ad1321c9749b2390
-  data.tar.gz: d0a2d979cb5cd1600f5e82b851e38c3fb39adee415641d757fad44ab8a38ce04cbb883cab26c6e5b290c6b2f74297cd159009c3cad79f827612bb79c22e64a61
+  metadata.gz: 98ebe6f5d69d8bc03fb564b1f19b7d54fb2b70eb08526ba3d6d1165d8cd7ef2f7f8995d5ce87637b674265f2589c5cec8bfe6a9221ff21754399e14d54a6cebb
+  data.tar.gz: 94414bb4b8a3fd0d43d516fa130a4c39ec471d0dad7e2f3cb828405fb3344cedc8cba64aafd0fbc43a8906ba05953b95e7284cac89f573ca5159aa6f2182bfbe

data/README.md

@@ -4,7 +4,7 @@ Parse Archie Markup Language (ArchieML) documents into Ruby Hashes.
 
 Read about the ArchieML specification at [archieml.org](http://archieml.org).
 
-The current version is `v0.1.0`.
+The current version is `v0.1.1`.
 
 ## Installation
 
@@ -167,6 +167,11 @@ end
 aml = Archieml.load(html_aml)
 ```
 
+## Tests
+
+There is a full test suite using rspec. `bundle install`, and then `rspec` to execute them.
+
 ## Changelog
 
+* `0.1.1` - More consistent handling of newlines. Fixed bugs around detecting the scope of multi-line values.
 * `0.1.0` - Initial release supporting the first version of the ArchieML spec, published [2015-03-06](http://archieml.org/spec/1.0/CR-20150306.html).

data/lib/archieml/loader.rb

@@ -3,9 +3,9 @@ module Archieml
 
     NEXT_LINE     = /.*((\r|\n)+)/
     START_KEY     = /^\s*([A-Za-z0-9\-_\.]+)[ \t\r]*:[ \t\r]*(.*(?:\n|\r|$))/
-    COMMAND_KEY   = /^\s*:[ \t\r]*(endskip|ignore|skip|end)/i
+    COMMAND_KEY   = /^\s*:[ \t\r]*(endskip|ignore|skip|end)(.*(?:\n|\r|$))/i
     ARRAY_ELEMENT = /^\s*\*[ \t\r]*(.*(?:\n|\r|$))/
-    SCOPE_PATTERN = /^\s*(\[|\{)[ \t\r]*([A-Za-z0-9\-_\.]*)[ \t\r]*(?:\]|\})[ \t\r]*.*?(\n|\r|$)/
+    SCOPE_PATTERN = /^\s*(\[|\{)[ \t\r]*([A-Za-z0-9\-_\.]*)[ \t\r]*(?:\]|\}).*?(\n|\r|$)/
 
     def initialize
       @data = @scope = {}
@@ -99,8 +99,6 @@ module Archieml
       when "endskip"
         @is_skipping = false
       end
-
-      self.flush_buffer!
     end
 
     def parse_scope(scope_type, scope_key)
@@ -119,6 +117,7 @@ module Archieml
 
         if scope_type == '['
           @array = key_scope[key_bits.last] ||= []
+          @array = key_scope[key_bits.last] = [] if @array.class == String
 
           if @array.length > 0
             @array_type = @array.first.class == String ? 'simple' : 'complex'
@@ -165,7 +164,7 @@ module Archieml
     end
 
     def flush_scope!
-      @array = @array_type = @array_first_key = nil
+      @array = @array_type = @array_first_key = @buffer_key = nil
     end
 
     # type can be either :replace or :append.

data/lib/archieml/version.rb

@@ -1,3 +1,3 @@
 module Archieml
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/lib/archieml/loader_spec.rb

@@ -56,10 +56,10 @@ describe Archieml::Loader do
       @loader.load("scope.key:value\nscope.otherkey:value")['scope']['key'].should == 'value'
       @loader.load("scope.key:value\nscope.otherkey:value")['scope']['otherkey'].should == 'value'
     end
-    it "the value of key that used to be a parent object should be replaced with a string if necessary" do
+    it "the value of key that used to be a string should be replaced with an object if necessary" do
       @loader.load("scope.level:value\nscope.level.level:value")['scope']['level']['level'].should == 'value'
     end
-    it "the value of key that used to be a string object should be replaced with an object if necessary" do
+    it "the value of key that used to be a parent object should be replaced with a string if necessary" do
       @loader.load("scope.level.level:value\nscope.level:value")['scope']['level'].should == 'value'
     end
 
@@ -257,12 +257,27 @@ describe Archieml::Loader do
       @loader.load("key:value\n\\[comment]\n:end")['key'].should == "value"
       @loader.load("key:value\n\\[[array]]\n:end")['key'].should == "value\n[array]"
     end
+    it "arrays within a multi-line value breaks up the value" do
+      @loader.load("key:value\ntext\n[array]\nmore text\n:end")['key'].should == "value"
+    end
+    it "objects within a multi-line value breaks up the value" do
+      @loader.load("key:value\ntext\n{scope}\nmore text\n:end")['key'].should == "value"
+    end
+    it "bullets within a multi-line value do not break up the value" do
+      @loader.load("key:value\ntext\n* value\nmore text\n:end")['key'].should == "value\ntext\n* value\nmore text"
+    end
+    it "skips within a multi-line value do not break up the value" do
+      @loader.load("key:value\ntext\n:skip\n:endskip\nmore text\n:end")['key'].should == "value\ntext\nmore text"
+    end
     it "allows escaping initial backslash at the beginning of lines" do
       @loader.load("key:value\n\\\\:end\n:end")['key'].should == "value\n\\:end"
     end
     it "escapes only one initial backslash" do
       @loader.load("key:value\n\\\\\\:end\n:end")['key'].should == "value\n\\\\:end"
     end
+    it "allows escaping multiple lines in a value" do
+      @loader.load("key:value\n\\:end\n\\:ignore\n\\:endskip\n\\:skip\n:end'")['key'].should == "value\n:end\n:ignore\n:endskip\n:skip"
+    end
     it "doesn't escape colons after beginning of lines" do
       @loader.load("key:value\nLorem key2\\:value\n:end")['key'].should == "value\nLorem key2\\:value"
     end
@@ -427,12 +442,30 @@ describe Archieml::Loader do
     it "does not allow escaping of colons not at the beginning of lines" do
       @loader.load("[array]\n*Value\nword key\\:value\n:end")['array'].first.should == "Value\nword key\\:value"
     end
+    it "arrays within a multi-line value breaks up the value" do
+      @loader.load("[array]\n* value\n[array]\nmore text\n:end")['array'].first.should == "value"
+    end
+    it "objects within a multi-line value breaks up the value" do
+      @loader.load("[array]\n* value\n{scope}\nmore text\n:end")['array'].first.should == "value"
+    end
+    it "key/values within a multi-line value do not break up the value" do
+      @loader.load("[array]\n* value\nkey: value\nmore text\n:end")['array'].first.should == "value\nkey: value\nmore text"
+    end
+    it "bullets within a multi-line value break up the value" do
+      @loader.load("[array]\n* value\n* value\nmore text\n:end")['array'].first.should == "value"
+    end
+    it "skips within a multi-line value do not break up the value" do
+      @loader.load("[array]\n* value\n:skip\n:endskip\nmore text\n:end")['array'].first.should == "value\nmore text"
+    end
     it "arrays that are reopened add to existing array" do
       @loader.load("[array]\n*Value\n[]\n[array]\n*Value")['array'].should == ['Value', 'Value']
     end
     it "simple arrays that are reopened remain simple" do
       @loader.load("[array]\n*Value\n[]\n[array]\nkey:value")['array'].should == ['Value']
     end
+    it "simple arrays overwrite existing keys" do
+      @loader.load("a.b:complex value\n[a.b]\n*simple value")['a']['b'][0].should == 'simple value'
+    end
 
   end
 
@@ -455,12 +488,30 @@ describe Archieml::Loader do
     it "duplicate keys must match on dot-notation scope" do
       @loader.load("[array]\nscope.key:value\nkey:value\notherscope.key:value")['array'].length.should == 1
     end
+    it "arrays within a multi-line value breaks up the value" do
+      @loader.load("[array]\nkey:value\n[array]\nmore text\n:end")['array'].first['key'].should == "value"
+    end
+    it "objects within a multi-line value breaks up the value" do
+      @loader.load("[array]\nkey:value\n{scope}\nmore text\n:end")['array'].first['key'].should == "value"
+    end
+    it "key/values within a multi-line value break up the value" do
+      @loader.load("[array]\nkey:value\nother: value\nmore text\n:end")['array'].first['key'].should == "value"
+    end
+    it "bullets within a multi-line value do not break up the value" do
+      @loader.load("[array]\nkey:value\n* value\nmore text\n:end")['array'].first['key'].should == "value\n* value\nmore text"
+    end
+    it "skips within a multi-line value do not break up the value" do
+      @loader.load("[array]\nkey:value\n:skip\n:endskip\nmore text\n:end")['array'].first['key'].should == "value\nmore text"
+    end
     it "arrays that are reopened add to existing array" do
       @loader.load("[array]\nkey:value\n[]\n[array]\nkey:value")['array'].length.should == 2
     end
     it "complex arrays that are reopened remain complex" do
       @loader.load("[array]\nkey:value\n[]\n[array]\n*Value")['array'].should == [{'key' => 'value'}]
     end
+    it "complex arrays overwrite existing keys" do
+      @loader.load("a.b:complex value\n[a.b]\nkey:value")['a']['b'][0]['key'].should == 'value'
+    end
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archieml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Strickland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies: []
 description: Parse Archie Markup Language documents
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -38,12 +38,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []