sdl4r 0.9.7 → 0.9.8

data/lib/sdl4r/parser.rb

@@ -139,7 +139,7 @@ module SDL4R
 			
       first_token = tokens.first
       if first_token.literal?
-        first_token = Token.new("content")
+        first_token = Token.new(ANONYMOUS_TAG_NAME)
         tokens.insert(0, first_token)
 				
       elsif first_token.type != :IDENTIFIER
@@ -186,8 +186,7 @@ module SDL4R
       return tag
     end
 		
-    #
-    # @return The position at the end of the value list
+    # Return the position at the end of the value list
     #
     def add_tag_values(tag, tokens, start)
       size = tokens.size()
@@ -648,5 +647,10 @@ module SDL4R
     def expecting_but_got(expecting, got, line, position)
       @tokenizer.expecting_but_got(expecting, got, line, position)
     end
+
+    # Raises a SdlParseError.
+    def parse_error(description, line_no, position)
+      @tokenizer.parse_error(description, line_no, position)
+    end
   end
 end

data/lib/sdl4r/parser/tokenizer.rb

@@ -58,7 +58,8 @@ module SDL4R
       # Raises a SdlParseError.
       def parse_error(description, line_no = nil, position = nil)
         line_no = @reader.line_no unless line_no
-        position = @reader.pos - 1 unless position # @reader.pos points to the *next* position
+        # @reader.pos points to the *next* position (thence the "pos - 1")
+        position = @reader.pos - 1 unless position and position >= 0
 
         # We add one because editors typically start with line 1 rather than 0...
         raise SdlParseError.new(description, line_no + 1, position + 1, @reader.line)

data/lib/sdl4r/sdl4r.rb

@@ -34,6 +34,9 @@ module SDL4R
 
   BASE64_WRAP_LINE_LENGTH = 72
 
+  ANONYMOUS_TAG_NAME = "content"
+  ROOT_TAG_NAME = "root"
+
   # Creates an SDL string representation for a given object and returns it.
   # 
   # +o+:: the object to format
@@ -105,16 +108,18 @@ module SDL4R
       milliseconds = get_datetime_milliseconds(o)
 
       if milliseconds == 0
-        if o.zone
-          return o.strftime("#{o.year}/%m/%d %H:%M:%S%Z")
+        zone_part = o.strftime("%:z")
+        if zone_part and zone_part != "+00:00"
+          return o.strftime("#{o.year}/%m/%d %H:%M:%S#{zone_part}")
         else
           return o.strftime("#{o.year}/%m/%d %H:%M:%S")
         end
       else
-        if o.zone
-          return o.strftime("#{o.year}/%m/%d %H:%M:%S." + milliseconds.to_s.ljust(3, '0') + "%Z")
+        ms_part = milliseconds.to_s.ljust(3, '0')
+        if zone_part and zone_part != "+00:00"
+          return o.strftime("#{o.year}/%m/%d %H:%M:%S." + ms_part + zone_part)
         else
-          return o.strftime("#{o.year}/%m/%d %H:%M:%S." + milliseconds.to_s.ljust(3, '0'))
+          return o.strftime("#{o.year}/%m/%d %H:%M:%S." + ms_part)
         end
       end
 
@@ -174,7 +179,7 @@ module SDL4R
   
   # Validates an SDL identifier String.  SDL Identifiers must start with a
   # Unicode letter or underscore (_) and contain only unicode letters,
-  # digits, underscores (_), dashes(-) and periods (.).
+  # digits, underscores (_), dashes(-), periods (.) and dollar signs ($).
   # 
   # == Raises
   # ArgumentError if the identifier is not legal
@@ -195,15 +200,15 @@ module SDL4R
         "an underscore (_)."
     end
     
-    unless identifier.length == 1 or identifier =~ /^[a-zA-Z_][a-zA-Z_0-9\-\.]*$/
+    unless identifier.length == 1 or identifier =~ /^[a-zA-Z_][a-zA-Z_0-9\-\.\$]*$/
       for i in 1..identifier.length
-        unless identifier[i..i] =~ /^[a-zA-Z_0-9\-]$/
+        unless identifier[i..i] =~ /^[a-zA-Z_0-9\-\.\$]$/
           raise ArgumentError,
             "'" + identifier[i..i] + 
             "' is not a legal character for an SDL identifier. " +
             "SDL Identifiers must start with a unicode letter or " +
             "underscore (_) followed by 0 or more unicode " +
-            "letters, digits, underscores (_), or dashes (-)"
+            "letters, digits, underscores (_), dashes (-), periodss (.) and dollar signs ($)"
         end
       end
     end
@@ -230,7 +235,7 @@ module SDL4R
   #   root = SDL4R::read(URI.new("http://my_site/my_file.sdl"))
   #
   def self.read(input)
-    Tag.new("root").read(input)
+    Tag.new(ROOT_TAG_NAME).read(input)
   end
 
   # Parses and returns the value corresponding with the specified SDL literal.

data/lib/sdl4r/sdl_parse_error.rb

@@ -37,7 +37,7 @@ module SDL4R
 			super(
 				"#{description} Line " + ((line_no.nil? or line_no < 0)? "unknown" : line_no.to_s) +
 					", Position " + ((position.nil? or position < 0)? "unknown" : position.to_s) + $/ +
-          (line ? line + (position ? " " * (position - 1) : "") + "^" : ""))
+          ((line and position >= 0)? line + (position ? " " * (position - 1) : "") + "^" : ""))
           
 			@line = line_no
 			@position = position

data/lib/sdl4r/tag.rb

@@ -209,7 +209,7 @@ module SDL4R
       elsif o.is_a? Enumerable
         o.each { |item|
           if item.is_a? Enumerable and not item.is_a? String
-            anonymous = new_child("content")
+            anonymous = new_child(ANONYMOUS_TAG_NAME)
             anonymous << item
           else
             self << item
@@ -772,8 +772,11 @@ module SDL4R
       else
         first = true
         children do |child|
-          io << $/ unless first
-          first = false
+          if first
+            first = false
+          else
+            io << $/
+          end
           io << child.to_s
         end
       end
@@ -803,7 +806,7 @@ module SDL4R
       s = ""
       s << line_prefix
       
-      if name == "content" && namespace.empty?
+      if name == ANONYMOUS_TAG_NAME && namespace.empty?
         skip_value_space = true
       else
         skip_value_space = false

data/test/sdl4r/parser_test.rb

@@ -18,13 +18,15 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #++
 
+# Work-around a bug in NetBeans (http://netbeans.org/bugzilla/show_bug.cgi?id=188653)
+# $:[0] = File.join(File.dirname(__FILE__),'../../lib') if ENV["NB_EXEC_EXTEXECUTION_PROCESS_UUID"]
 
 module SDL4R
-  
+
   require 'bigdecimal'
   require 'test/unit'
-  
-  require File.dirname(__FILE__) + '/../../lib/sdl4r/tag'
+
+  require "sdl4r/tag"
 
   class ParserTest < Test::Unit::TestCase
 
@@ -195,6 +197,10 @@ EOS
         local_civil_date(1807, 11, 11, 22, 28, Rational(13888, 1000), Rational(-85, 240)),
         tag1.attribute("date6"),
         "date6");
+
+      tag1 = parse_one_tag1("tag1 2008/06/01 5d:12:34") # not a datetime: a date + a timespan
+      assert_equal Date.civil(2008, 6, 1), tag1.values[0]
+      assert_equal SdlTimeSpan.new(5, 12, 34), tag1.values[1]
     end
 
     def test_numbers
@@ -380,6 +386,40 @@ EOS
       assert_equal expected, root
     end
 
+    def test_identifiers
+      root = SDL4R::read("my_ns:my_tag my_ns2:my_attr=-13.8")
+      assert_equal "my_ns", root.child.namespace
+      assert_equal "my_tag", root.child.name
+      assert_equal({ "my_ns2:my_attr" => -13.8 }, root.child.attributes)
+
+      root = SDL4R::read("_my_ns:_my_tag _my_ns2:_my_attr=-13.8")
+      assert_equal "_my_ns", root.child.namespace
+      assert_equal "_my_tag", root.child.name
+      assert_equal({ "_my_ns2:_my_attr" => -13.8 }, root.child.attributes)
+
+      root = SDL4R::read("my.ns:my.tag my.ns2:my.attr=-13.8")
+      assert_equal "my.ns", root.child.namespace
+      assert_equal "my.tag", root.child.name
+      assert_equal({ "my.ns2:my.attr" => -13.8 }, root.child.attributes)
+
+      root = SDL4R::read("my$ns:my$tag my$ns2:my$attr=-13.8")
+      assert_equal "my$ns", root.child.namespace
+      assert_equal "my$tag", root.child.name
+      assert_equal({ "my$ns2:my$attr" => -13.8 }, root.child.attributes)
+    end
+
+    def test_empty_block
+      tag1 = parse_one_tag1("tag1 {\n}")
+      assert_equal [], tag1.values
+      assert_equal({}, tag1.attributes)
+      assert_equal [], tag1.children
+
+#      tag1 = parse_one_tag1("tag1 {}")
+#      assert_equal [], tag1.values
+#      assert_equal({}, tag1.attributes)
+#      assert_equal [], tag1.children
+    end
+
     def test_parse_error
       # WARNING: the line and col of an error is not accurate science. The goal here is to point to
       # coordinates that are useful to the user.

data/test/sdl4r/sdl4r_test.rb

@@ -32,7 +32,7 @@ module SDL4R
   require 'date'
 
   require 'test/unit'
-  require File.dirname(__FILE__) + '/../../lib/sdl4r'
+  require 'sdl4r'
 
   # SDL unit tests.
   #
@@ -126,17 +126,17 @@ module SDL4R
     end
 
     def test_tag_write_parse_basic_types
-      test_tag_write_parse @@root_basic_types
+      check_tag_write_parse @@root_basic_types
     end
 
     def test_tag_write_parse_structures
-      test_tag_write_parse @@root_structures
+      check_tag_write_parse @@root_structures
     end
 
     #
     # Does a to_s/parse test on the specified Tag (+root+)
     #
-    def test_tag_write_parse(root)
+    def check_tag_write_parse(root)
 #      puts '========================================'
 #      puts root.to_s
 #      puts '========================================'

data/test/sdl4r/sdl_test.rb

@@ -23,7 +23,7 @@ module SDL4R
   require 'test/unit'
   require "rexml/document"
 
-  require File.dirname(__FILE__) + '/../../lib/sdl4r/tag'
+  require 'sdl4r/tag'
 
   class SDLTest < Test::Unit::TestCase
 

data/test/sdl4r/tag_test.rb

@@ -23,7 +23,7 @@ module SDL4R
   require 'test/unit'
   require "rexml/document"
 
-  require File.dirname(__FILE__) + '/../../lib/sdl4r/tag'
+  require 'sdl4r/tag'
   
 
   class TagTest < Test::Unit::TestCase
@@ -566,6 +566,7 @@ EOF
 
     def test_write
       root = Tag.new("root")
+      root << 999
 
       output = ""
       root.write(output)
@@ -573,7 +574,7 @@ EOF
 
       output = ""
       root.write(output, true)
-      assert_equal "root", output
+      assert_equal "root 999", output
 
       child1 = root.new_child "child1"
       child1 << 123
@@ -585,7 +586,7 @@ EOF
       output = ""
       root.write(output, true)
       assert_equal(
-        "root {\n" +
+        "root 999 {\n" +
         "\tchild1 123\n" +
         "}",
         output)
@@ -600,11 +601,25 @@ EOF
       output = ""
       root.write(output, true)
       assert_equal(
-        "root {\n" +
+        "root 999 {\n" +
         "\tchild1 123\n" +
         "\tchild2 \"abc\"\n" +
         "}",
         output)
+
+      output = ""
+      root.clear_children
+      root.clear_values
+      root << Date.civil(1876, 7, 1)
+      root << DateTime.civil(1592, 9, 13, 9, 5, 0, 0)
+      root << DateTime.civil(1592, 9, 13, 9, 5, 7, 0)
+      root << DateTime.civil(-98, 6, 15, 13, 47, 1234.to_r/100, 0)
+      root << DateTime.civil(3112, 1, 10, 0, 0, 0, 1.to_r/24)
+      root.write(output, true)
+      assert_equal(
+        "root 1876/07/01 1592/09/13 09:05:00 1592/09/13 09:05:07" +
+          " -98/06/15 13:47:12.340 3112/01/10 00:00:00+01:00",
+        output)
    end
 
   end

metadata

@@ -3,19 +3,19 @@ name: sdl4r
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 9
-  - 7
-  version: 0.9.7
+    - 0
+    - 9
+    - 8
+  version: 0.9.8
 platform: ruby
 authors: 
-- Philippe Vosges
-- Daniel Leuck
+  - Philippe Vosges
+  - Daniel Leuck
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +09:00
+date: 2010-09-16 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -28,62 +28,62 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/sdl4r.rb
-- lib/sdl4r/sdl_time_span.rb
-- lib/sdl4r/sdl_parse_error.rb
-- lib/sdl4r/tag.rb
-- lib/sdl4r/parser.rb
-- lib/sdl4r/sdl_binary.rb
-- lib/sdl4r/parser/reader.rb
-- lib/sdl4r/parser/tokenizer.rb
-- lib/sdl4r/parser/token.rb
-- lib/sdl4r/parser/time_span_with_zone.rb
-- lib/sdl4r/sdl4r.rb
-- README
-- Rakefile
-- LICENSE
-- CHANGELOG
-- TODO
-- test/sdl4r/parser_test.rb
-- test/sdl4r/tag_test.rb
-- test/sdl4r/sdl_test.rb
-- test/sdl4r/test_structures.sdl
-- test/sdl4r/test_basic_types.sdl
-- test/sdl4r/sdl4r_test.rb
-- doc/rdoc-style.css
-- doc/files/README.html
-- doc/files/LICENSE.html
-- doc/files/CHANGELOG.html
-- doc/files/lib/sdl4r_rb.html
-- doc/files/lib/sdl4r/sdl_parse_error_rb.html
-- doc/files/lib/sdl4r/tag_rb.html
-- doc/files/lib/sdl4r/sdl_time_span_rb.html
-- doc/files/lib/sdl4r/parser_rb.html
-- doc/files/lib/sdl4r/sdl4r_rb.html
-- doc/files/lib/sdl4r/sdl_binary_rb.html
-- doc/files/lib/sdl4r/parser/reader_rb.html
-- doc/files/lib/sdl4r/parser/time_span_with_zone_rb.html
-- doc/files/lib/sdl4r/parser/tokenizer_rb.html
-- doc/files/lib/sdl4r/parser/token_rb.html
-- doc/files/test/sdl4r/parser_test_rb.html
-- doc/files/test/sdl4r/sdl_test_rb.html
-- doc/files/test/sdl4r/tag_test_rb.html
-- doc/files/test/sdl4r/sdl4r_test_rb.html
-- doc/classes/SDL4R.html
-- doc/classes/SDL4R/SdlTimeSpan.html
-- doc/classes/SDL4R/SdlParseError.html
-- doc/classes/SDL4R/Tag.html
-- doc/classes/SDL4R/Parser.html
-- doc/classes/SDL4R/SDLTest.html
-- doc/classes/SDL4R/TagTest.html
-- doc/classes/SDL4R/SdlBinary.html
-- doc/classes/SDL4R/ParserTest.html
-- doc/classes/SDL4R/SDL4RTest.html
-- doc/fr_file_index.html
-- doc/fr_class_index.html
-- doc/fr_method_index.html
-- doc/index.html
-- doc/created.rid
+  - lib/sdl4r.rb
+  - lib/sdl4r/sdl_time_span.rb
+  - lib/sdl4r/sdl_parse_error.rb
+  - lib/sdl4r/tag.rb
+  - lib/sdl4r/parser.rb
+  - lib/sdl4r/sdl_binary.rb
+  - lib/sdl4r/sdl4r.rb
+  - lib/sdl4r/parser/reader.rb
+  - lib/sdl4r/parser/tokenizer.rb
+  - lib/sdl4r/parser/token.rb
+  - lib/sdl4r/parser/time_span_with_zone.rb
+  - README
+  - Rakefile
+  - LICENSE
+  - CHANGELOG
+  - TODO
+  - test/sdl4r/parser_test.rb
+  - test/sdl4r/tag_test.rb
+  - test/sdl4r/sdl_test.rb
+  - test/sdl4r/test_structures.sdl
+  - test/sdl4r/test_basic_types.sdl
+  - test/sdl4r/sdl4r_test.rb
+  - doc/rdoc-style.css
+  - doc/fr_file_index.html
+  - doc/fr_class_index.html
+  - doc/fr_method_index.html
+  - doc/index.html
+  - doc/created.rid
+  - doc/files/README.html
+  - doc/files/LICENSE.html
+  - doc/files/CHANGELOG.html
+  - doc/files/lib/sdl4r_rb.html
+  - doc/files/lib/sdl4r/sdl_time_span_rb.html
+  - doc/files/lib/sdl4r/tag_rb.html
+  - doc/files/lib/sdl4r/sdl_parse_error_rb.html
+  - doc/files/lib/sdl4r/parser_rb.html
+  - doc/files/lib/sdl4r/sdl4r_rb.html
+  - doc/files/lib/sdl4r/sdl_binary_rb.html
+  - doc/files/lib/sdl4r/parser/time_span_with_zone_rb.html
+  - doc/files/lib/sdl4r/parser/reader_rb.html
+  - doc/files/lib/sdl4r/parser/tokenizer_rb.html
+  - doc/files/lib/sdl4r/parser/token_rb.html
+  - doc/files/test/sdl4r/tag_test_rb.html
+  - doc/files/test/sdl4r/sdl_test_rb.html
+  - doc/files/test/sdl4r/parser_test_rb.html
+  - doc/files/test/sdl4r/sdl4r_test_rb.html
+  - doc/classes/SDL4R.html
+  - doc/classes/SDL4R/SdlTimeSpan.html
+  - doc/classes/SDL4R/SdlParseError.html
+  - doc/classes/SDL4R/Tag.html
+  - doc/classes/SDL4R/Parser.html
+  - doc/classes/SDL4R/SDLTest.html
+  - doc/classes/SDL4R/TagTest.html
+  - doc/classes/SDL4R/SdlBinary.html
+  - doc/classes/SDL4R/ParserTest.html
+  - doc/classes/SDL4R/SDL4RTest.html
 has_rdoc: true
 homepage: http://www.ikayzo.org/confluence/display/SDL/Home
 licenses: []
@@ -92,30 +92,30 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: 
-- none
+  - none
 rubyforge_project: sdl4r
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple Declarative Language for Ruby library
 test_files: 
-- test/sdl4r/parser_test.rb
-- test/sdl4r/tag_test.rb
-- test/sdl4r/sdl_test.rb
-- test/sdl4r/sdl4r_test.rb
+  - test/sdl4r/parser_test.rb
+  - test/sdl4r/tag_test.rb
+  - test/sdl4r/sdl_test.rb
+  - test/sdl4r/sdl4r_test.rb