hjson 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a9dccdbbdf54033ab8704f7155633b6e646a70
-  data.tar.gz: 54d9147a318ef371f91d61fe4c0e30bd6e26d2ef
+  metadata.gz: ef1d3978c6f14b96499ee3ac407d6d0aa65452b4
+  data.tar.gz: 6611915a855a148c8e96e5eae25f3ea136308614
 SHA512:
-  metadata.gz: 5db57fcc6a3d2410af1c8def6b1f4bee8cbdb6a65277a444bedc982ccb85bce9f57e8f3834e85316e337ef1afe9e13a949f0084e4ab6bb19b0306b7dad5298f7
-  data.tar.gz: 08c3eb7ab497ab4ff5798ffa4ad6d745e9dafca6ea13fa8c0cb0357c1e86912306a70234e50be57ed65fa2efd643361495cad2e0d1f03b811afd46ac7d91d15c
+  metadata.gz: 3a4a92bf9a476644019b090ac3b7ddcfa36d4ab8f856511d4810fd58a3c10577b6a6aaa574e0f79b37d86066e3193ca792e35e5fc26ad0c2b95778acd77a74b3
+  data.tar.gz: 79a9cac58c75fde7de8850fc84938bf0b969bbe6e956db171953973a3f66e17286dee65296c68fe7ecd580d77d015bcbe6383c1ce38b47b95009b1b4ca095d2e

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 2.0
+  - 2.1.5
+  - 2.2.5
+  - 2.3.1
+before_install: gem install bundler -v 1.12.5
+install: true
+script:
+  - bundle install
+  - bundle exec rake

data/README.md

@@ -1,5 +1,9 @@
 # Hjson, the Human JSON written in Ruby
 
+[![Build Status](https://img.shields.io/travis/hjson/hjson-rb.svg?style=flat-square)](http://travis-ci.org/hjson/hjson-rb)
+[![gem](https://img.shields.io/gem/v/hjson.svg?style=flat-square)](https://rubygems.org/gems/hjson)
+[![License](https://img.shields.io/github/license/hjson/hjson-rb.svg?style=flat-square)](https://github.com/hjson/hjson-rb/blob/master/LICENSE.txt)
+
 A configuration file format for humans. Relaxed syntax, fewer mistakes, more comments for Ruby.
 
 ## Installation

data/lib/hjson/ast/node.rb

@@ -9,13 +9,12 @@ module Hjson
         @names[type] ||= begin
           namespace  = name.split(/::/).slice(0..-2).join('::')
           const_name = parser_name(type, namespace)
-          Object.const_get(const_name) if Object.const_defined?(const_name)
+          AST.const_get(const_name) if AST.const_defined?(const_name)
         end
       end
 
       def self.parser_name(type, namespace)
-				type = type.to_s.split(?_).map(&:capitalize).join
-        "#{namespace}::#{type}"
+        type.to_s.split(?_).map(&:capitalize).join
       end
 
       def with_whitespaces

data/lib/hjson/ast/nodes/keyname.rb

@@ -16,14 +16,14 @@ module Hjson
         until eos?
           if colon?
             fail SyntaxError if payload.empty?
-            if space.positive? && space != payload.length
+            if positive?(space) && space != payload.length
               buffer.pos = start + space
               fail SyntaxError
             end
             halt(payload)
           elsif char <= ' '
             fail SyntaxError if eos?
-            self.space = payload.length if space.negative?
+            self.space = payload.length if negative?(space)
           elsif punctuator?
             fail SyntaxError
           else
@@ -32,6 +32,16 @@ module Hjson
           read
         end
       end
+
+      private
+
+      def positive?(number)
+        number.respond_to?(:positive?) ? number.positive? : (number > 0)
+      end
+
+      def negative?(number)
+        number.respond_to?(:negative?) ? number.negative? : (number < 0)
+      end
     end
   end
 end

data/lib/hjson/ast/nodes/string.rb

@@ -16,6 +16,7 @@ module Hjson
       rule(:escaped)      { |c| c == ?\\ }
       rule(:unicode)      { |c| c == ?u }
       rule(:escapee)      { |c| !!ESCAPEE[c] }
+      rule(:hex)          { |c| [(?0..?9),(?a..?f),(?A..?F)].include?(c) }
 
       declare :payload, ''
 
@@ -45,11 +46,12 @@ module Hjson
       end
 
       def read_unicode
-        uffff = 4.times.reduce(0) do |uffff, _|
+        uffff = 4.times.reduce(0) do |i, _|
           read
+          fail SyntaxError unless hex?
           hex = char.to_i(16)
           break if hex.infinite?
-          uffff * 16 + hex
+          i * 16 + hex
         end
         uffff.chr(Encoding::UTF_8)
       end

data/lib/hjson/ast/parser.rb

@@ -53,7 +53,7 @@ module Hjson
             case val
             when Proc   then instance_eval(&val)
             when Symbol then send(val)
-            when Fixnum then val
+            when Integer then val
             else val.dup
             end
           instance_variable_set(:"@#{var}", val)

data/lib/hjson/version.rb

@@ -1,3 +1,3 @@
 module Hjson
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hjson
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - namusyaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Human JSON (Hjson) implementation for Ruby