kvn 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 832c9ff0fe7496bfe3c6f5a93cc7b959e8889cb2
-  data.tar.gz: 05dd1ba7428b883dc2fe7669ae70fa180f14c383
+  metadata.gz: f60f237fab1696948ebeffb4f1a54b9a97cd1504
+  data.tar.gz: b9a098956d24fd5264e4d3511420f4fbd8a434b1
 SHA512:
-  metadata.gz: 2ec2564e05c43f19bd5897d58cf7bda7392817ce7bcb738e44abec846deccc332893d292565b9855605385462383d7309164ee52729f3060ccd7808cdfbbf28c
-  data.tar.gz: 2f00b76e616acf6177ca67558004c89545fb9adb0a616fac958f3eabc9c28db556ac626cb36bc563bc02f12fb0d37dffa6ec2d5d7f09c4fcdd7e3b176fd9a761
+  metadata.gz: 579bbe99256d64811ccf7101c3323e1fa48d1be0586084913e5a5cce7338b95dc146c375284418f8f9132512e9ba788e0e00a5da4fd6023d073f4ca9872c1f05
+  data.tar.gz: 51fd08a474ea5e563d669364ccaffec6c3ed84efd62395e666ca485d88c36a36c3b891c8ab53a8c02492059a7a6166e7f129ebc13b432628fcc6d1b37b1a3d49

data/Gemfile.lock

@@ -11,18 +11,25 @@ GEM
       debug_inspector (>= 0.0.1)
     byebug (8.2.2)
     coderay (1.1.1)
-    coveralls (0.8.13)
+    coveralls (0.8.10)
       json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
     debug_inspector (0.0.2)
     docile (1.1.5)
+    domain_name (0.5.20160128)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     interception (0.5)
     json (1.8.3)
     lex (0.1.0)
     method_source (0.8.2)
+    mime-types (2.99.1)
+    netrc (0.11.0)
     os (0.9.6)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -44,6 +51,10 @@ GEM
       pry-rescue
       pry-stack_explorer
     rake (10.5.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -54,6 +65,9 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     tins (1.6.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,4 +1,4 @@
-[![Lines of Code](http://img.shields.io/badge/lines_of_code-145-brightgreen.svg?style=flat)](http://blog.codinghorror.com/the-best-code-is-no-code-at-all/)
+[![Lines of Code](http://img.shields.io/badge/lines_of_code-147-brightgreen.svg?style=flat)](http://blog.codinghorror.com/the-best-code-is-no-code-at-all/)
 [![Code Status](http://img.shields.io/codeclimate/github/hopsoft/kvn.svg?style=flat)](https://codeclimate.com/github/hopsoft/kvn)
 [![Dependency Status](http://img.shields.io/gemnasium/hopsoft/kvn.svg?style=flat)](https://gemnasium.com/hopsoft/kvn)
 [![Build Status](http://img.shields.io/travis/hopsoft/kvn.svg?style=flat)](https://travis-ci.org/hopsoft/kvn)
@@ -45,3 +45,4 @@ value = "a:true; b:1; c:example; d:example with whitespace; e:null;"
 Kvn::Parser.new(value).parse
 # => {"a"=>true, "b"=>1, "c"=>"example", "d"=>"example with whitespace", "e"=>nil}
 ```
+

data/lib/kvn.rb

@@ -1,3 +1,4 @@
+require "lex"
 require "kvn/version"
 require "kvn/unsupported_hash_error"
 require "kvn/value_lexer"

data/lib/kvn/lexer.rb

@@ -1,5 +1,3 @@
-require "lex"
-
 module Kvn
   class Lexer < Lex::Lexer
     tokens(

data/lib/kvn/parser.rb

@@ -4,10 +4,11 @@ module Kvn
 
     def initialize(value)
       @value = value.to_s.strip
+      @lexer = Kvn::Lexer.new
+      @value_lexer = Kvn::ValueLexer.new
     end
 
     def parse
-      lexer = Kvn::Lexer.new
       output = lexer.lex(value)
       {}.tap do |parsed|
         begin
@@ -24,7 +25,8 @@ module Kvn
 
             if token.name == :VALUE
               raise SyntaxError.new("Empty key detected for value! <#{token.value}>") unless key_found
-              parsed[key] = parse_value(token.value)
+              value_output = value_lexer.lex(token.value)
+              parsed[key] = value_output.next.value
               value_found = true
               key_found = false
             end
@@ -40,18 +42,7 @@ module Kvn
 
     private
 
-    def parse_value(value)
-      lexer = Kvn::ValueLexer.new
-      token = lexer.lex(value).next
-      case token.name
-      when :NIL then value = nil
-      when :TRUE then value = true
-      when :FALSE then value = false
-      when :FLOAT then value = value.to_f
-      when :INTEGER then value = value.to_i
-      else value.to_s
-      end
-    end
+    attr_reader :lexer, :value_lexer
 
   end
 end

data/lib/kvn/value_lexer.rb

@@ -1,5 +1,3 @@
-require "lex"
-
 module Kvn
   class ValueLexer < Lex::Lexer
     tokens(
@@ -11,11 +9,28 @@ module Kvn
       :STRING
     )
 
-    rule :NIL, /null/
-    rule :TRUE, /true/
-    rule :FALSE, /false/
-    rule :FLOAT, /\d+\.\d+/
-    rule :INTEGER, /\d+/
-    rule :STRING, /.*/
+    rule :NIL, /null/ do |lexer, token|
+      token.tap { |t| t.value = nil }
+    end
+
+    rule :TRUE, /true/ do |lexer, token|
+      token.tap { |t| t.value = true }
+    end
+
+    rule :FALSE, /false/ do |lexer, token|
+      token.tap { |t| t.value = false }
+    end
+
+    rule :FLOAT, /\d+\.\d+/ do |lexer, token|
+      token.tap { |t| t.value = t.value.to_f }
+    end
+
+    rule :INTEGER, /\d+/ do |lexer, token|
+      token.tap { |t| t.value = t.value.to_i }
+    end
+
+    rule :STRING, /.*/ do |lexer, token|
+      token.tap { |t| t.value = t.value.to_s }
+    end
   end
 end

data/lib/kvn/version.rb

@@ -1,3 +1,3 @@
 module Kvn
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kvn
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nathan Hopkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lex