DSON 0.1.0 → 0.2.0

data/.gitignore

@@ -1,22 +1,22 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1

data/DSON.gemspec

@@ -1,25 +1,29 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'DSON/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "DSON"
-  spec.version       = DSON::VERSION
-  spec.authors       = ["ishakir"]
-  spec.email         = ["imran.pshakir@gmail.com"]
-  spec.summary       = %q{A pure-ruby DSON Serializer}
-  spec.homepage      = ""
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "magic_encoding"
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'DSON/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "DSON"
+  spec.version       = DSON::VERSION
+  spec.authors       = ["ishakir"]
+  spec.email         = ["imran.pshakir@gmail.com"]
+  spec.summary       = %q{A pure-ruby DSON Parser and Serializer}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = '>= 1.9.2'
+
+  spec.add_dependency "radix", "~> 2.2"
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "magic_encoding"
 end

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in DSON.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in DSON.gemspec
+gemspec

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2014 ishakir
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2014 ishakir
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,62 +1,61 @@
-# DSON
-
-Such serialization now also parsing! Totally pure-ruby also completely DSON. Wow!
-
-Currently known deficiencies:
-* Number handling (needs to be octal, currently treated as string)
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'DSON'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install DSON
-
-## Usage
-
-*Serialization*
-
-Currently supports a ruby object, hash and array data structure and outputs it's representation in DSON ([Doge Serialized Object notation](http://dogeon.org/)). By way of an example, try:
-
-    require 'DSON'
-
-    puts DSON.such_serialize_wow({
-      ruby: 'pure',
-      supports: [
-        'hash',
-        'array'
-      ]
-    })
-
-This should output:
-
-    such "ruby" is "pure", "supports" is so "hash" also "array" many wow
-
-Correct to the DSON spec.
-
-Try it out with custom ruby objects too!
-
-*Parsing*
-
-Surrently should parse a DSON object given as a string. Not the world's best put together parse but should function reasonably with general DSON strings. Try
-
-    require 'DSON'
-
-    puts DSON.so_parse(
-      'such "ruby" is "pure", "supports" is so "hash" also "array" many wow'
-    )
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/DSON/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+[![Build Status](https://travis-ci.org/ishakir/DSON.svg)](https://travis-ci.org/ishakir/DSON)
+[![Code Climate](https://codeclimate.com/github/ishakir/DSON.png)](https://codeclimate.com/github/ishakir/DSON)
+# DSON
+
+Such serialization now also parsing! Totally pure-ruby also completely DSON. Wow!
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'DSON'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install DSON
+
+## Usage
+
+**Serialization**
+
+Currently supports a ruby object, hash and array data structure and outputs it's representation in DSON ([Doge Serialized Object notation](http://dogeon.org/)). By way of an example, try:
+
+    require 'DSON'
+
+    puts DSON.such_serialize_wow({
+      ruby: 'pure',
+      supports: [
+        'hash',
+        'array'
+      ]
+    })
+
+This should output:
+
+    such "ruby" is "pure", "supports" is so "hash" also "array" many wow
+
+Correct to the DSON spec.
+
+Try it out with custom ruby objects too!
+
+**Parsing**
+
+Currently should parse a DSON object given as a string. Not the world's best put together parser but should function reasonably with general DSON strings. Try:
+
+    require 'DSON'
+
+    puts DSON.so_parse(
+      'such "ruby" is "pure", "supports" is so "hash" also "array" many wow'
+    )
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/DSON/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/Rakefile

@@ -1,2 +1,6 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/DSON.rb

@@ -1,13 +1,14 @@
-# -*- encoding : utf-8 -*-
-require 'DSON/version'
-require 'DSON/value'
-
-module DSON
-  def self.such_serialize_wow(subject)
-    DSON::Value.new(subject).such_serialize_wow
-  end
-
-  def self.so_parse(string)
-    DSON::Value.so_parse(string)
-  end
-end
+# -*- encoding : utf-8 -*-
+require 'radix'
+require 'DSON/version'
+require 'DSON/value'
+
+module DSON
+  def self.such_serialize_wow(subject)
+    DSON::Value.new(subject).such_serialize_wow
+  end
+
+  def self.so_parse(string)
+    DSON::Value.so_parse(string)
+  end
+end

data/lib/DSON/value.rb

@@ -1,98 +1,94 @@
-# -*- encoding : utf-8 -*-
-  # -*- encoding : utf-8 -*-
-require 'DSON/value/hash_value'
-require 'DSON/value/array_value'
-require 'DSON/value/string_value'
-require 'DSON/value/nil_value'
-require 'DSON/value/true_value'
-require 'DSON/value/false_value'
-require 'DSON/value/numeric_value'
-require 'DSON/value/object_value'
-
-module DSON
-  module Value
-    SPACE = %q( )
-
-    def self.new(value)
-      return HashValue.new(value)    if value.respond_to? :keys
-      return ArrayValue.new(value)   if value.respond_to? :each
-      return NilValue.instance       if value.nil?
-      return TrueValue.instance      if value.is_a? TrueClass
-      return FalseValue.instance     if value.is_a? FalseClass
-      # return NumericValue.new(value) if value.is_a? Fixnum
-      return StringValue.new(value)  if value.is_a? String
-      ObjectValue.new(value)
-    end
-
-    def self.so_parse(dson_string)
-      string_hash, replaced_string = remove_all_strings(dson_string)
-      handle_next(
-        word_array: replaced_string.gsub(/,|\?|!|\./, ' ,').split(' '),
-        string_hash: string_hash
-      )
-    end
-
-    def self.handle_next(options)
-      word_array = options[:word_array]
-
-      fail 'An error has occurred, this could be either user error or a bug. Please check your DSON is valid, and if it is, please raise a GitHub issue' if word_array.empty?
-
-      first_word = word_array.shift
-
-      if first_word == 'such'
-        return HashValue.so_parse(
-          word_array: word_array,
-          parent_hash: {},
-          string_hash: options[:string_hash]
-        )
-      end
-      if first_word == 'so'
-        return ArrayValue.so_parse(
-          word_array: word_array,
-          parent_array: [],
-          string_hash: options[:string_hash]
-        )
-      end
-      return TrueValue.so_parse           if first_word == 'yes'
-      return FalseValue.so_parse          if first_word == 'no'
-      return NilValue.so_parse            if first_word == 'empty'
-
-      options[:first_word] = first_word
-      StringValue.so_parse(options)
-    end
-
-    # Class methods can't be accessed from subclasses if protected...
-    # Find better way if possible
-    def self.remove_first_and_last_words(string)
-      non_whitespace_elements = string.split(' ')
-      non_whitespace_elements.pop
-      non_whitespace_elements.shift
-      non_whitespace_elements.join(' ')
-    end
-
-    def self.remove_first_and_last_elements(array)
-      array.pop
-      array.shift
-    end
-
-    protected
-
-    def self.remove_all_strings(dson_string)
-      string_hash = {}
-      replaced_string = dson_string.gsub(/"(.*?)"/).with_index do |match, index|
-        string_hash[index] = match[1..-2]
-        index
-      end
-      [string_hash, replaced_string]
-    end
-
-    def reduce(list, potential_joiners)
-      list.each_with_index.reduce('') do |acc, (element, index)|
-        is_last = (index == list.size - 1)
-
-        formed_string = is_last ? element : element + potential_joiners.sample
-        acc + formed_string + SPACE
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+  # -*- encoding : utf-8 -*-
+require 'DSON/value/hash_value'
+require 'DSON/value/array_value'
+require 'DSON/value/string_value'
+require 'DSON/value/nil_value'
+require 'DSON/value/true_value'
+require 'DSON/value/false_value'
+require 'DSON/value/numeric_value'
+require 'DSON/value/object_value'
+
+module DSON
+  module Value
+    SPACE = %q( )
+
+    def self.new(value)
+      return HashValue.new(value)    if value.respond_to? :keys
+      return ArrayValue.new(value)   if value.respond_to? :each
+      return NilValue.instance       if value.nil?
+      return TrueValue.instance      if value.is_a? TrueClass
+      return FalseValue.instance     if value.is_a? FalseClass
+      return NumericValue.new(value) if value.is_a? Integer or value.is_a? Float
+      return StringValue.new(value)  if value.is_a? String
+      ObjectValue.new(value)
+    end
+
+    def self.so_parse(dson_string)
+      handle_next(
+        word_array: dson_string.scan(/(?:"(?:\\.|[^"])*"|[^" ,!\?])+|\.(?!\d)+/),
+      )
+    end
+
+    def self.handle_next(options)
+      word_array = options[:word_array]
+
+      fail 'An error has occurred, this could be either user error or a bug. Please check your DSON is valid, and if it is, please raise a GitHub issue' if word_array.empty?
+
+      first_word = word_array.shift
+
+      if first_word == 'such'
+        return HashValue.so_parse(
+          word_array: word_array,
+          parent_hash: {}
+        )
+      end
+      if first_word == 'so'
+        return ArrayValue.so_parse(
+          word_array: word_array,
+          parent_array: []
+        )
+      end
+      return TrueValue.so_parse           if first_word == 'yes'
+      return FalseValue.so_parse          if first_word == 'no'
+      return NilValue.so_parse            if first_word == 'empty'
+      return NumericValue.so_parse(first_word) unless first_word.start_with? '"'
+
+      StringValue.so_parse(first_word)
+    end
+
+    # Class methods can't be accessed from subclasses if protected...
+    # Find better way if possible
+    def self.remove_first_and_last_words(string)
+      non_whitespace_elements = string.split(' ')
+      non_whitespace_elements.pop
+      non_whitespace_elements.shift
+      non_whitespace_elements.join(' ')
+    end
+
+    def self.remove_first_and_last_elements(array)
+      array.pop
+      array.shift
+    end
+
+    protected
+
+    def self.remove_all_strings(dson_string)
+      string_hash = {}
+      replaced_string = dson_string.gsub(/"(.*?)"/).with_index do |match, index|
+        string_hash[index] = match[1..-2]
+        index
+      end
+      [string_hash, replaced_string]
+    end
+
+    def reduce(list, potential_joiners)
+      list.each_with_index.reduce('') do |acc, (element, index)|
+        is_last = (index == list.size - 1)
+
+        formed_string = is_last ? element : element + potential_joiners.sample
+        acc + formed_string + SPACE
+      end
+    end
+  end
+end