sdl4r 0.9.4 → 0.9.5

data/lib/sdl4r/parser.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.
@@ -637,11 +640,6 @@ module SDL4R
       seconds = seconds.to_i
 			
       return SDLTimeSpan.new(days, hours, minutes, seconds, milliseconds)
-			
-      raise ArgumentError,
-        "Malformed time span <#{literal}>. Time spans must use the format " +
-        "(d:)hh:mm:ss(.xxx) Note: if the day component is " +
-        "included it must be suffixed with lower case \"d\""
     end
 
     # Close the reader and throw a SdlParseError using the format

data/lib/sdl4r/parser/reader.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.
@@ -24,9 +27,6 @@ module SDL4R
     # Parser class from these problems.
     class Reader # :nodoc: all
 
-      RUBY_1_8_OR_LESS = require 'jcode'
-
-
       # +io+  an open IO from which the characters are read.
       def initialize(io)
         raise ArgumentError, "io == nil" if io.nil?

data/lib/sdl4r/parser/time_span_with_zone.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.

data/lib/sdl4r/parser/token.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.

data/lib/sdl4r/parser/tokenizer.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.

data/lib/sdl4r/sdl4r.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.
@@ -15,7 +18,6 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #++
 
-require 'jcode'
 require 'base64'
 require 'bigdecimal'
 require 'date'
@@ -100,7 +102,7 @@ module SDL4R
     # Below, we use "#{o.year}" instead of "%Y" because "%Y" always emit 4 chars at least even if
     # the date is before 1000.
     elsif o.is_a?(DateTime) || o.is_a?(Time)
-      milliseconds = o.is_a?(DateTime) ? get_date_milliseconds(o) : (o.usec / 10).to_i
+      milliseconds = get_datetime_milliseconds(o)
 
       if milliseconds == 0
         if o.zone
@@ -341,12 +343,22 @@ module SDL4R
       return escaped_s
     end
 
-    # Returns the milliseonds part of a DateTime (by translating the +sec_fraction+ part) as an
-    # integer.
-    def get_date_milliseconds(date)
-      sec_fraction = date.sec_fraction() # in days
-      # 86400000 is the number of milliseconds in a day
-      return (sec_fraction * 86400000).round()
+    # Returns the microseconds component of the given DateTime or Time.
+    # DateTime and Time having vastly different behaviors between themselves or in Ruby 1.8 and 1.9,
+    # this method makes an attemps at getting this component out of the specified object.
+    # 
+    # In particular, DateTime.sec_fraction() (which I used before) returns incorrect values in, at
+    # least, some revisions of Ruby 1.9.
+    #
+    def get_datetime_milliseconds(datetime)
+      if defined?(datetime.usec)
+        return (datetime.usec / 1000).round
+      else
+        # Here don't believe that we could use '%3N' to get the milliseconds directly: the "3" is
+        # ignored for DateTime.strftime() in Ruby 1.8.
+        nanoseconds = Integer(datetime.strftime("%N"))
+        return (nanoseconds / 1000000).round
+      end
     end
 
   end

data/lib/sdl4r/sdl_binary.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.

data/lib/sdl4r/sdl_parse_error.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.

data/lib/sdl4r/sdl_time_span.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.

data/lib/sdl4r/tag.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.
@@ -201,6 +204,7 @@ module SDL4R
     #
     def clear_children
       @children = []
+      nil
     end
     
     #
@@ -208,10 +212,14 @@ module SDL4R
     # {@link #addValue(Object)} for legal types.
     # 
     # +value+:: The value to be set.
-    # @throws IllegalArgumentException if the value is not a legal SDL type
+    #
+    # === Raises
+    #
+    # +ArgumentError+:: if the value is not a legal SDL type
     #
     def value=(value)
       @values[0] = SDL4R.coerce_or_fail(value)
+      nil
     end
     
     #
@@ -255,10 +263,11 @@ module SDL4R
 
       if block_given?
         each_child(recursive, namespace, name, &block)
+        return nil
         
       else
         unless recursive or name or namespace
-          @children
+          return @children
           
         else
           result = []
@@ -399,6 +408,7 @@ module SDL4R
     #
     def add_value(v)
       @values.push(SDL4R::coerce_or_fail(v))
+      return nil
     end
 
     # Returns true if +v+ is a value of this Tag's.
@@ -426,6 +436,7 @@ module SDL4R
     #
     def clear_values
       @values = []
+      nil
     end
     
     # Returns an Array of the values of this Tag or enumerates them.
@@ -436,12 +447,12 @@ module SDL4R
     def values # :yields: value
       if block_given?
         @values.each { |v| yield v }
+        nil
       else
         return @values
       end
     end
     
-    #
     # Set the values for this tag.  See {@link #addValue(Object)} for legal
     # value types.
     # 
@@ -455,6 +466,7 @@ module SDL4R
         # this is required to ensure validation of types
         add_value(v)
       }
+      nil
     end
   
     #   set_attribute(key, value)
@@ -680,7 +692,7 @@ module SDL4R
         read_from_io(true) { StringIO.new(input) }
 
       elsif input.is_a? Pathname
-        read_from_io(true) { input.open("r") }
+        read_from_io(true) { input.open("r:UTF-8") }
 
       elsif input.is_a? URI
         read_from_io(true) { input.open }
@@ -729,6 +741,8 @@ module SDL4R
       end
       
       io.close()
+
+      nil
     end
   
     #

data/test/sdl4r/parser_test.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.
@@ -22,10 +25,12 @@ module SDL4R
   require 'test/unit'
   
   require File.dirname(__FILE__) + '/../../lib/sdl4r/tag'
-  require File.dirname(__FILE__) + '/../../lib/sdl4r/sdl_binary'
 
   class ParserTest < Test::Unit::TestCase
 
+    @@zone_offset = Rational(Time.now.utc_offset,  24 * 60 * 60)
+
+
     public
 
     def test_empty
@@ -341,7 +346,7 @@ EOF
     # Creates and returns a DateTime where an unspecified +zone_offset+ means 'the local zone
     # offset' (contrarily to DateTime#civil())
     def local_civil_date(year, month, day, hour = 0, min = 0, sec = 0, zone_offset = nil)
-      zone_offset = Rational(Time.now.utc_offset,  24 * 60 * 60) if zone_offset.nil?
+      zone_offset ||= @@zone_offset
       return DateTime.civil(year, month, day, hour, min, sec, zone_offset)
     end
 

data/test/sdl4r/sdl4r_test.rb

@@ -1,4 +1,8 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
+#
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.
 #
@@ -139,8 +143,8 @@ module SDL4R
 
       write_parse_root = Tag.new("test").read(root.to_s).child("root");
 
-      File.open("d:\\dev\\tmp\\root.sdl", "w") { |io| io.write(root.to_string) }
-      File.open("d:\\dev\\tmp\\root_reparsed.sdl", "w") { |io| io.write(write_parse_root.to_string) }
+#      File.open("d:\\dev\\tmp\\root.sdl", "w") { |io| io.write(root.to_string) }
+#      File.open("d:\\dev\\tmp\\root_reparsed.sdl", "w") { |io| io.write(write_parse_root.to_string) }
 
       assert_tags_equal(root, write_parse_root, "write/parse")
     end

data/test/sdl4r/sdl_test.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.

data/test/sdl4r/tag_test.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
 #--
 # Simple Declarative Language (SDL) for Ruby
 # Copyright 2005 Ikayzo, inc.

metadata

@@ -3,19 +3,19 @@ name: sdl4r
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-    - 0
-    - 9
-    - 4
-  version: 0.9.4
+  - 0
+  - 9
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
-  - Philippe Vosges
-  - Daniel Leuck
+- Philippe Vosges
+- Daniel Leuck
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 +09:00
+date: 2010-08-08 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -28,54 +28,54 @@ 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/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
-  - TODO.txt
-  - Rakefile
-  - LICENSE
-  - CHANGELOG
-  - 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/sdl_parse_error_rb.html
-  - doc/files/lib/sdl4r/tag_rb.html
-  - doc/files/lib/sdl4r/parser_rb.html
-  - doc/files/lib/sdl4r/sdl_binary_rb.html
-  - doc/files/lib/sdl4r/sdl4r_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/lib/sdl4r/parser/time_span_with_zone_rb.html
-  - doc/classes/SDL4R.html
-  - doc/classes/SDL4R/Parser.html
-  - doc/classes/SDL4R/Tag.html
-  - doc/classes/SDL4R/SdlBinary.html
-  - doc/classes/SDL4R/SdlParseError.html
-  - doc/classes/SDL4R/SdlTimeSpan.html
+- 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_time_span_rb.html
+- doc/files/lib/sdl4r/sdl_parse_error_rb.html
+- doc/files/lib/sdl4r/tag_rb.html
+- doc/files/lib/sdl4r/parser_rb.html
+- doc/files/lib/sdl4r/sdl_binary_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/lib/sdl4r/parser/time_span_with_zone_rb.html
+- doc/files/lib/sdl4r/sdl4r_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/SdlBinary.html
+- doc/fr_file_index.html
+- doc/fr_class_index.html
+- doc/fr_method_index.html
+- doc/index.html
+- doc/created.rid
 has_rdoc: true
 homepage: http://www.ikayzo.org/confluence/display/SDL/Home
 licenses: []
@@ -84,32 +84,30 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   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.7
+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