fiveruns-dash-ruby 0.8.4 → 0.8.5

data/lib/fiveruns/dash/host.rb

@@ -94,17 +94,18 @@ module Fiveruns::Dash
           @architecture = `uname -p`.strip
           @os_version = `uname -r`.strip
         end
-      when /win32|i386-mingw32/
-        require "dl/win32"
-        getVersionEx = Win32API.new("kernel32", "GetVersionExA", ['P'], 'L')
-    
-        lpVersionInfo = [148, 0, 0, 0, 0].pack("LLLLL") + "�0" * 128 
-        getVersionEx.Call lpVersionInfo
-  
-        dwOSVersionInfoSize, dwMajorVersion, dwMinorVersion, dwBuildNumber, dwPlatformId, szCSDVersion = lpVersionInfo.unpack("LLLLLC128")
-        @os_name = ['Windows 3.1/3.11', 'Windows 95/98', 'Windows NT/XP'][dwPlatformId]
-        @os_version = "#{dwMajorVersion}.#{dwMinorVersion}"
-        @architecture = ENV['PROCESSOR_ARCHITECTURE']
+      # when /win32|i386-mingw32/
+      #   require "dl/win32"
+      #   getVersionEx = Win32API.new("kernel32", "GetVersionExA", ['P'], 'L')
+      #     
+      # This line done broke on Ruby 1.9.1:
+      #   lpVersionInfo = [148, 0, 0, 0, 0].pack("LLLLL") + "�0" * 128 
+      #   getVersionEx.Call lpVersionInfo
+      #   
+      #   dwOSVersionInfoSize, dwMajorVersion, dwMinorVersion, dwBuildNumber, dwPlatformId, szCSDVersion = lpVersionInfo.unpack("LLLLLC128")
+      #   @os_name = ['Windows 3.1/3.11', 'Windows 95/98', 'Windows NT/XP'][dwPlatformId]
+      #   @os_version = "#{dwMajorVersion}.#{dwMinorVersion}"
+      #   @architecture = ENV['PROCESSOR_ARCHITECTURE']
       end
 
       @ip_addresses = []

data/lib/fiveruns/json/common.rb

@@ -19,11 +19,11 @@ module Fiveruns::JSON
     attr_reader :parser
 
     # Set the FiverunsJSON parser class _parser_ to be used by FiverunsJSON.
-    # def parser=(parser) # :nodoc:
-    #   @parser = parser
-    #   remove_const :Parser if const_defined? :Parser
-    #   const_set :Parser, parser
-    # end
+    def parser=(parser) # :nodoc:
+      @parser = parser
+      remove_const :Parser if const_defined? :Parser
+      const_set :Parser, parser
+    end
 
     # Return the constant located at _path_. The format of _path_ has to be
     # either ::A::B::C or A::B::C. In any case A has to be located at the top
@@ -116,9 +116,9 @@ module Fiveruns::JSON
   # * *create_additions*: If set to false, the Parser doesn't create
   #   additions even if a matchin class and create_id was found. This option
   #   defaults to true.
-  # def parse(source, opts = {})
-  #   ::Fiveruns::JSON.parser.new(source, opts).parse
-  # end
+  def parse(source, opts = {})
+    ::Fiveruns::JSON.parser.new(source, opts).parse
+  end
 
   # Parse the FiverunsJSON string _source_ into a Ruby data structure and return it.
   # The bang version of the parse method, defaults to the more dangerous values
@@ -135,13 +135,13 @@ module Fiveruns::JSON
   # * *create_additions*: If set to false, the Parser doesn't create
   #   additions even if a matchin class and create_id was found. This option
   #   defaults to true.
-  # def parse!(source, opts = {})
-  #   opts = {
-  #     :max_nesting => false,
-  #     :allow_nan => true
-  #   }.update(opts)
-  #   ::Fiveruns::JSON.parser.new(source, opts).parse
-  # end
+  def parse!(source, opts = {})
+    opts = {
+      :max_nesting => false,
+      :allow_nan => true
+    }.update(opts)
+    ::Fiveruns::JSON.parser.new(source, opts).parse
+  end
 
   # Unparse the Ruby data structure _obj_ into a single line FiverunsJSON string and
   # return it. _state_ is
@@ -333,11 +333,11 @@ module ::Kernel
   # The _opts_ argument is passed through to generate/parse respectively, see
   # generate and parse for their documentation.
   def FJSON(object, opts = {})
-    # if object.respond_to? :to_str
-    #   ::Fiveruns::JSON.parse(object.to_str, opts)
-    # else
+    if object.respond_to? :to_str
+      ::Fiveruns::JSON.parse(object.to_str, opts)
+    else
       ::Fiveruns::JSON.generate(object, opts)
-    # end
+    end
   end
 end
 

data/lib/fiveruns/json/parser.rb

@@ -0,0 +1,259 @@
+require 'strscan'
+
+module Fiveruns::JSON
+  module Pure
+    # This class implements the FiverunsJSON parser that is used to parse a FiverunsJSON string
+    # into a Ruby data structure.
+    class Parser < StringScanner
+      STRING                = /" ((?:[^\x0-\x1f"\\] |
+                                  \\["\\\/bfnrt] |
+                                  \\u[0-9a-fA-F]{4} |
+                                  \\[\x20-\xff])*)
+                              "/nx
+      INTEGER               = /(-?0|-?[1-9]\d*)/
+      FLOAT                 = /(-?
+                                (?:0|[1-9]\d*)
+                                (?:
+                                  \.\d+(?i:e[+-]?\d+) |
+                                  \.\d+ |
+                                  (?i:e[+-]?\d+)
+                                )
+                                )/x
+      NAN                   = /NaN/
+      INFINITY              = /Infinity/
+      MINUS_INFINITY        = /-Infinity/
+      OBJECT_OPEN           = /\{/
+      OBJECT_CLOSE          = /\}/
+      ARRAY_OPEN            = /\[/
+      ARRAY_CLOSE           = /\]/
+      PAIR_DELIMITER        = /:/
+      COLLECTION_DELIMITER  = /,/
+      TRUE                  = /true/
+      FALSE                 = /false/
+      NULL                  = /null/
+      IGNORE                = %r(
+        (?:
+         //[^\n\r]*[\n\r]| # line comments
+         /\*               # c-style comments
+         (?:
+          [^*/]|        # normal chars
+          /[^*]|        # slashes that do not start a nested comment
+          \*[^/]|       # asterisks that do not end this comment
+          /(?=\*/)      # single slash before this comment's end 
+         )*
+           \*/               # the End of this comment
+           |[ \t\r\n]+       # whitespaces: space, horicontal tab, lf, cr
+        )+
+      )mx
+
+      UNPARSED = Object.new
+
+      # Creates a new FiverunsJSON::Pure::Parser instance for the string _source_.
+      #
+      # It will be configured by the _opts_ hash. _opts_ can have the following
+      # keys:
+      # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
+      #   structures. Disable depth checking with :max_nesting => false|nil|0,
+      #   it defaults to 19.
+      # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
+      #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
+      #   to false.
+      # * *create_additions*: If set to false, the Parser doesn't create
+      #   additions even if a matchin class and create_id was found. This option
+      #   defaults to true.
+      def initialize(source, opts = {})
+        super
+        if !opts.key?(:max_nesting) # defaults to 19
+          @max_nesting = 19
+        elsif opts[:max_nesting]
+          @max_nesting = opts[:max_nesting]
+        else
+          @max_nesting = 0
+        end
+        @allow_nan = !!opts[:allow_nan]
+        ca = true
+        ca = opts[:create_additions] if opts.key?(:create_additions)
+        @create_id = ca ? ::Fiveruns::JSON.create_id : nil
+      end
+
+      alias source string
+
+      # Parses the current FiverunsJSON string _source_ and returns the complete data
+      # structure as a result.
+      def parse
+        reset
+        obj = nil
+        until eos?
+          case
+          when scan(OBJECT_OPEN)
+            obj and raise ParserError, "source '#{peek(20)}' not in FiverunsJSON!"
+            @current_nesting = 1
+            obj = parse_object
+          when scan(ARRAY_OPEN)
+            obj and raise ParserError, "source '#{peek(20)}' not in FiverunsJSON!"
+            @current_nesting = 1
+            obj = parse_array
+          when skip(IGNORE)
+            ;
+          else
+            raise ParserError, "source '#{peek(20)}' not in FiverunsJSON!"
+          end
+        end
+        obj or raise ParserError, "source did not contain any FiverunsJSON!"
+        obj
+      end
+
+      private
+
+      # Unescape characters in strings.
+      UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
+      UNESCAPE_MAP.update({
+        ?"  => '"',
+        ?\\ => '\\',
+        ?/  => '/',
+        ?b  => "\b",
+        ?f  => "\f",
+        ?n  => "\n",
+        ?r  => "\r",
+        ?t  => "\t",
+        ?u  => nil, 
+      })
+
+      def parse_string
+        if scan(STRING)
+          return '' if self[1].empty?
+          self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
+            if u = UNESCAPE_MAP[$&[1]]
+              u
+            else # \uXXXX
+              bytes = ''
+              i = 0
+              while c[6 * i] == ?\\ && c[6 * i + 1] == ?u 
+                bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)
+                i += 1
+              end
+              ::Fiveruns::JSON::UTF16toUTF8.iconv(bytes)
+            end
+          end
+        else
+          UNPARSED
+        end
+      rescue Iconv::Failure => e
+        raise GeneratorError, "Caught #{e.class}: #{e}"
+      end
+
+      def parse_value
+        case
+        when scan(FLOAT)
+          Float(self[1])
+        when scan(INTEGER)
+          Integer(self[1])
+        when scan(TRUE)
+          true
+        when scan(FALSE)
+          false
+        when scan(NULL)
+          nil
+        when (string = parse_string) != UNPARSED
+          string
+        when scan(ARRAY_OPEN)
+          @current_nesting += 1
+          ary = parse_array
+          @current_nesting -= 1
+          ary
+        when scan(OBJECT_OPEN)
+          @current_nesting += 1
+          obj = parse_object
+          @current_nesting -= 1
+          obj
+        when @allow_nan && scan(NAN)
+          NaN
+        when @allow_nan && scan(INFINITY)
+          Infinity
+        when @allow_nan && scan(MINUS_INFINITY)
+          MinusInfinity
+        else
+          UNPARSED
+        end
+      end
+
+      def parse_array
+        raise NestingError, "nesting of #@current_nesting is to deep" if
+          @max_nesting.nonzero? && @current_nesting > @max_nesting
+        result = []
+        delim = false
+        until eos?
+          case
+          when (value = parse_value) != UNPARSED
+            delim = false
+            result << value
+            skip(IGNORE)
+            if scan(COLLECTION_DELIMITER)
+              delim = true
+            elsif match?(ARRAY_CLOSE)
+              ;
+            else
+              raise ParserError, "expected ',' or ']' in array at '#{peek(20)}'!"
+            end
+          when scan(ARRAY_CLOSE)
+            if delim
+              raise ParserError, "expected next element in array at '#{peek(20)}'!"
+            end
+            break
+          when skip(IGNORE)
+            ;
+          else
+            raise ParserError, "unexpected token in array at '#{peek(20)}'!"
+          end
+        end
+        result
+      end
+
+      def parse_object
+        raise NestingError, "nesting of #@current_nesting is to deep" if
+          @max_nesting.nonzero? && @current_nesting > @max_nesting
+        result = {}
+        delim = false
+        until eos?
+          case
+          when (string = parse_string) != UNPARSED
+            skip(IGNORE)
+            unless scan(PAIR_DELIMITER)
+              raise ParserError, "expected ':' in object at '#{peek(20)}'!"
+            end
+            skip(IGNORE)
+            unless (value = parse_value).equal? UNPARSED
+              result[string] = value
+              delim = false
+              skip(IGNORE)
+              if scan(COLLECTION_DELIMITER)
+                delim = true
+              elsif match?(OBJECT_CLOSE)
+                ;
+              else
+                raise ParserError, "expected ',' or '}' in object at '#{peek(20)}'!"
+              end
+            else
+              raise ParserError, "expected value in object at '#{peek(20)}'!"
+            end
+          when scan(OBJECT_CLOSE)
+            if delim
+              raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!"
+            end
+            if @create_id and klassname = result[@create_id]
+              klass = ::Fiveruns::JSON.deep_const_get klassname
+              break unless klass and klass.fjson_creatable?
+              result = klass.fjson_create(result)
+            end
+            break
+          when skip(IGNORE)
+            ;
+          else
+            raise ParserError, "unexpected token in object at '#{peek(20)}'!"
+          end
+        end
+        result
+      end
+    end
+  end
+end

data/lib/fiveruns/json/pure.rb

@@ -66,6 +66,7 @@ module Fiveruns::JSON
   # functionality in pure ruby.
   module Pure
     $DEBUG and warn "Using pure library for Fiveruns::JSON."
+    ::Fiveruns::JSON.parser = Parser
     ::Fiveruns::JSON.generator = Generator
   end
 end

data/lib/fiveruns/json.rb

@@ -10,6 +10,7 @@
 require 'fiveruns/json/version'
 require 'fiveruns/json/common'
 require 'fiveruns/json/generator'
+require 'fiveruns/json/parser'
 require 'fiveruns/json/pure'
 require 'fiveruns/json/add/core'
 require 'fiveruns/json/add/rails'

data/test/json_test.rb

@@ -22,12 +22,18 @@ class JsonTest < Test::Unit::TestCase
     end
   end
 
-	def test_serialization
-		xprofile('fjson') do
-			@data.to_fjson
-		end
-		a = Time.now
-		fjson = @data.to_fjson
-#		puts "FJSON: #{Time.now - a}"
-	end
+  def test_parser
+    json = '{"token":"abcxyz","name":"Foo","owner":"John Smith"}'
+    hash = Fiveruns::JSON.load(json)
+    assert_equal 'abcxyz', hash['token']
+  end
+
+  def test_generator
+    xprofile('fjson') do
+      @data.to_fjson
+    end
+    a = Time.now
+    fjson = @data.to_fjson
+#   puts "FJSON: #{Time.now - a}"
+  end
 end

data/version.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 8
-:patch: 4
+:patch: 5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-03-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -19,8 +19,8 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
 - README.rdoc
 - Rakefile
@@ -52,6 +52,7 @@ files:
 - lib/fiveruns/json/add/rails.rb
 - lib/fiveruns/json/common.rb
 - lib/fiveruns/json/generator.rb
+- lib/fiveruns/json/parser.rb
 - lib/fiveruns/json/pure.rb
 - lib/fiveruns/json/version.rb
 - lib/fiveruns/json.rb