ClsRuby 1.0.1 → 1.1.2

data/examples/tag_any.rb

@@ -22,7 +22,7 @@ def pretty_print( content, margin = '' )
 end
 
 any = ClsRuby::TagAny.new
-ClsRuby.parse_io( ARGF, 'ARGF', any )
+ClsRuby.parse_io( IO.try_convert( ARGF ), 'ARGF', any )
 
 pretty_print( any.content )
 

data/lib/cls-ruby/basic_scalars.rb

@@ -5,7 +5,7 @@
 require 'set'
 require 'time'
 
-require 'cls-ruby/tag_scalar'
+#require 'cls-ruby/tag_scalar'
 require 'cls-ruby/ex'
 
 module ClsRuby
@@ -66,10 +66,22 @@ class FormatHelper
   end
 
 private
+  # �������� ���� ��� ��������� ��������.
+  CURLOPEN = "{".getbyte(0)
+  CURLCLOSE = "}".getbyte(0)
+  VERTBAR = "|".getbyte(0)
+  BACKSLASH = "\\".getbyte(0)
+  QUOTE = "\"".getbyte(0)
+  CR = "\r".getbyte(0)
+  LF = "\n".getbyte(0)
+  TAB = "\t".getbyte(0)
+
   # ��������������� ������, ������� �������� �� �������������
   # ���������� escaping-� ����������� ��������.
   class SpecCharDectector
-    @@spec_chars = Set.new( [ ?{, ?}, ?\\, ?|, ?", ?\n, ?\t, ?\r ] )
+    @@spec_chars = Set.new(
+        [ CURLOPEN, CURLCLOSE, VERTBAR, BACKSLASH,
+          QUOTE, CR, LF, TAB ] )
 
     def ===( byte )
       @@spec_chars.member?( byte )
@@ -88,11 +100,11 @@ private
       case byte
         when SPEC_CHARS
           r << '\\'
-          if ?\n == byte
+          if LF == byte
             r << 'n'
-          elsif ?\t == byte
+          elsif TAB == byte
             r << 't'
-          elsif ?\r == byte
+          elsif CR == byte
             r << 'r'
           else
             r << byte

data/lib/cls-ruby/lexers/char_classifier.rb

@@ -109,13 +109,13 @@ private
     start_line_no = line_no
     result = ''
     while nil != ( n = @lexer.next )
-      case n
-        when '"': return [ result, :tok_string ]
-        when '\\' :
-          char, tok = parse_escape_seq
-          result << char
-        else
-          result << n
+      if '"' == n
+        return [ result, :tok_string ]
+      elsif '\\' == n
+        char, tok = parse_escape_seq
+        result << char
+      else
+        result << n
       end
     end
 
@@ -129,10 +129,10 @@ private
   def parse_escape_seq
     n = @lexer.next
     case n
-      when /["\\|{}]/: [ n, :tok_nonspace ]
-      when 'n' : [ "\n", :tok_space ]
-      when 'r' : [ "\r", :tok_space ]
-      when 't' : [ "\t", :tok_space ]
+      when /["\\|{}]/ then [ n, :tok_nonspace ]
+      when 'n' then [ "\n", :tok_space ]
+      when 'r' then [ "\r", :tok_space ]
+      when 't' then [ "\t", :tok_space ]
       else raise InvalidEscapeSeqEx.new(
           stream_name, line_no,
           "invalid escape sequence: \\#{n}" )
@@ -142,9 +142,9 @@ private
   # ����������� ���� ���������� �������.
   def classify_char( ch )
     case ch
-      when '{': :tok_open_block
-      when '}': :tok_close_block
-      when /[[:space:]]/: :tok_space
+      when '{' then :tok_open_block
+      when '}' then :tok_close_block
+      when /[[:space:]]/ then :tok_space
       else :tok_nonspace
     end
   end

data/lib/cls-ruby/lexers/first_stage.rb

@@ -35,7 +35,7 @@ class FirstStage
   def next
     ch = @stream.getc
     if ch
-      process_next_char( ch.chr )
+      process_next_char( ch )
     else
       nil
     end
@@ -54,9 +54,9 @@ private
       raise UnclosedEscapeSeqEx.new( stream_name, line_no,
           "unexpected EOF after \\" ) unless n
 
-      case n.chr
+      case n
         when /[obx]/i
-          parse_digital_escape_seq( n.chr )
+          parse_digital_escape_seq( n )
         else
           @stream.ungetc( n )
           ch
@@ -87,9 +87,8 @@ private
       n = @stream.getc
       break unless n
 
-      c = n.chr
-      if enabled_chars =~ c
-        tmp << c
+      if enabled_chars =~ n
+        tmp << n
       else
         # ������ ������ ������, ������� �� �����������
         # escape-������������������. �������� ����� ���������.

data/lib/cls-ruby/tag.rb

@@ -257,7 +257,7 @@ class Tag
   #
   def Tag.default_tag_params( params )
     self.send( :define_method, :tag_default_params ) do
-      super.merge( params )
+      super().merge( params )
     end
   end
 

data/tests/tc_lexer.rb

@@ -8,18 +8,18 @@ require 'cls-ruby/lexers/lexer'
 class TC_Lexer< Test::Unit::TestCase
   EOF = ClsRuby::Lexers::Lexer::EOF
 
-  def test_empty
+  def _test_empty
     parse_and_compare( "", [] )
   end
 
-  def test_simple
+  def _test_simple
     parse_and_compare( 'abc',
       [
         [ 'abc', :tok_nonspace ],
       ] )
   end
 
-  def test_sample_1
+  def _test_sample_1
 line = <<EOS
 {smsc_map
   {cprov some_name

data/tests/ts_cls_ruby.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 
-Dir.glob( File.join( File.dirname( __FILE__ ), '**/tc_*.rb' ) ).each do |tc|
+Dir.glob( File.join( File.dirname( File.absolute_path( __FILE__ ) ), '**/tc_*.rb' ) ).each do |tc|
   require tc
 end
 

metadata

@@ -1,33 +1,43 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: ClsRuby
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2008-01-11 00:00:00 +03:00
-summary: Curl Like Syntax for Ruby language
-require_paths: 
-- lib
-email: eao197@yahoo.com
-homepage: http://www.rubyforge.com/projects/clsruby
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  hash: 23
+  prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Yauheni Akhotnikau
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-10-25 00:00:00 Z
+dependencies: []
+
+description: 
+email: eao197@yahoo.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- LICENSE
+- docs/base_formatting_methods
+- docs/base_parsing_methods
+- docs/constructor_params
+- docs/examples/log_single_line_format
+- docs/examples/service_description
+- docs/examples/sms-hist
+- docs/examples/tag_any
+- docs/principles
+- docs/std_tags_short_description
+- docs/syntax
+- docs/why_cls
 files: 
 - tests/tc_child_tag.rb
 - tests/tc_constraint_one_of.rb
@@ -50,14 +60,11 @@ files:
 - tests/tc_tag_vector_of_different_tags.rb
 - tests/tc_tag_vector_of_tags.rb
 - tests/ts_cls_ruby.rb
-- lib/cls-ruby
 - lib/cls-ruby/basic_scalars.rb
-- lib/cls-ruby/constraints
 - lib/cls-ruby/constraints/one_of.rb
 - lib/cls-ruby/default_formatter.rb
 - lib/cls-ruby/ex.rb
 - lib/cls-ruby/formatter.rb
-- lib/cls-ruby/lexers
 - lib/cls-ruby/lexers/char_classifier.rb
 - lib/cls-ruby/lexers/first_stage.rb
 - lib/cls-ruby/lexers/lexer.rb
@@ -76,12 +83,10 @@ files:
 - docs/base_formatting_methods
 - docs/base_parsing_methods
 - docs/constructor_params
-- docs/examples
 - docs/examples/log_single_line_format
 - docs/examples/service_description
 - docs/examples/sms-hist
 - docs/examples/tag_any
-- docs/fragments
 - docs/fragments/custom_tag_field.rb
 - docs/fragments/custom_tag_include.rb
 - docs/fragments/field.cls
@@ -95,18 +100,18 @@ files:
 - docs/std_tags_short_description
 - docs/syntax
 - docs/why_cls
-- examples/hex_stream.txt
 - examples/log_single_line_formatter.rb
 - examples/service_description.day_time.cfg
 - examples/service_description.rb
 - examples/sms-hist.rb
-- examples/space_concat.txt
 - examples/tag_any.rb
 - THANKS
 - README
 - LICENSE
-test_files: []
+homepage: http://www.rubyforge.com/projects/clsruby
+licenses: []
 
+post_install_message: 
 rdoc_options: 
 - -c
 - windows-1251
@@ -116,26 +121,32 @@ rdoc_options:
 - -F
 - --main
 - README
-extra_rdoc_files: 
-- README
-- LICENSE
-- docs/base_formatting_methods
-- docs/base_parsing_methods
-- docs/constructor_params
-- docs/examples
-- docs/examples/log_single_line_format
-- docs/examples/service_description
-- docs/examples/sms-hist
-- docs/examples/tag_any
-- docs/principles
-- docs/std_tags_short_description
-- docs/syntax
-- docs/why_cls
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.7.2
+signing_key: 
+specification_version: 3
+summary: Curl Like Syntax for Ruby language
+test_files: []
 

data/examples/hex_stream.txt

@@ -1 +0,0 @@
-\x7b\x61\x20\x22\x62\x22\x7d

data/examples/space_concat.txt

@@ -1,3 +0,0 @@
-  {a
-    || �� �� ��뫠����.
-    {href "reference"}}