DSON 0.1.0 → 0.2.0

data/lib/DSON/value/array_value.rb

@@ -1,47 +1,49 @@
-# -*- encoding : utf-8 -*-
-require 'DSON/value'
-
-module DSON
-  module Value
-    class ArrayValue
-      include Value
-
-      def self.so_parse(options)
-        word_array = options[:word_array]
-        parent_array = options[:parent_array]
-
-        if word_array[0] == 'many'
-          word_array.shift
-          return parent_array
-        end
-        word_array.shift unless (word_array[0] =~ /and|also/).nil?
-
-        # the next value will be the value
-        parent_array.push(DSON::Value.handle_next(options))
-
-        so_parse(options)
-      end
-
-      POTENTIAL_JOINERS = [' and' , ' also']
-
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-
-      def such_serialize_wow
-        content = value.map do |arr_elem|
-          Value.new(arr_elem).such_serialize_wow
-        end
-        'so ' + reduce(content, POTENTIAL_JOINERS) + 'many'
-      end
-
-      AND_ALSO_REGEX = / and | also /
-
-      def self.parse_value(value, acc_array)
-        acc_array.push DSON.so_parse(value)
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+require 'DSON/value'
+
+module DSON
+  module Value
+    class ArrayValue
+      include Value
+
+      def self.so_parse(options)
+        word_array = options[:word_array]
+        parent_array = options[:parent_array]
+
+        if word_array[0] == 'many'
+          word_array.shift
+          return parent_array
+        end
+        word_array.shift unless (word_array[0] =~ /^(and|also)$/).nil?
+
+        # the next value will be the value
+        parent_array.push(DSON::Value.handle_next(options))
+
+        return parent_array if word_array.empty?
+
+        so_parse(options)
+      end
+
+      POTENTIAL_JOINERS = [' and' , ' also']
+
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def such_serialize_wow
+        content = value.map do |arr_elem|
+          Value.new(arr_elem).such_serialize_wow
+        end
+        'so ' + reduce(content, POTENTIAL_JOINERS) + 'many'
+      end
+
+      AND_ALSO_REGEX = / and | also /
+
+      def self.parse_value(value, acc_array)
+        acc_array.push DSON.so_parse(value)
+      end
+    end
+  end
+end

data/lib/DSON/value/false_value.rb

@@ -1,21 +1,21 @@
-# -*- encoding : utf-8 -*-
-require 'DSON/value'
-
-require 'singleton'
-
-module DSON
-  module Value
-    class FalseValue
-      include Value
-      include Singleton
-
-      def self.so_parse
-        false
-      end
-
-      def such_serialize_wow
-        'no'
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+require 'DSON/value'
+
+require 'singleton'
+
+module DSON
+  module Value
+    class FalseValue
+      include Value
+      include Singleton
+
+      def self.so_parse
+        false
+      end
+
+      def such_serialize_wow
+        'no'
+      end
+    end
+  end
+end

data/lib/DSON/value/hash_value.rb

@@ -1,59 +1,56 @@
-# -*- encoding : utf-8 -*-
-require 'DSON/value'
-
-module DSON
-  module Value
-    class HashValue
-      include Value
-
-      def self.so_parse(options)
-        word_array = options[:word_array]
-        parent_hash = options[:parent_hash]
-
-        if word_array[0] == 'wow'
-          word_array.shift
-          return parent_hash
-        end
-        word_array.shift unless (word_array[0] =~ (/\?|\.|,|!/)).nil?
-
-        string_hash = options[:string_hash]
-
-        # The next value will be a key
-        numeric_key = word_array.shift
-        key = string_hash[numeric_key.to_i]
-
-        # remove is
-        word_array.shift
-
-        value = DSON::Value.handle_next(options)
-        parent_hash[key] = value
-
-        so_parse(options)
-      end
-
-      POTENTIAL_PUNCTUATION = %w(, . ! ?)
-
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-
-      def such_serialize_wow
-        strings = value.keys.map do |key|
-          key_str = StringValue.new(key).such_serialize_wow
-          value_str = Value.new(value[key]).such_serialize_wow
-
-          %Q(#{key_str} is #{value_str})
-        end
-        'such ' + reduce(strings, POTENTIAL_PUNCTUATION) + 'wow'
-      end
-
-      def self.parse_pair(string, acc_hash)
-        results = string.scan(/"(.*)" is (.*)/)
-        acc_hash[results[0][0]] = DSON::Value.so_parse(results[0][1])
-        acc_hash
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+require 'DSON/value'
+
+module DSON
+  module Value
+    class HashValue
+      include Value
+
+      def self.so_parse(options)
+        word_array = options[:word_array]
+        parent_hash = options[:parent_hash]
+        return parent_hash if word_array.empty?
+
+        if word_array[0] == 'wow'
+          word_array.shift
+          return parent_hash
+        end
+
+        # The next value will be a key
+        key = word_array.shift[1..-2]
+
+        # remove is
+        word_array.shift
+
+        value = DSON::Value.handle_next(options)
+        parent_hash[key] = value
+
+        so_parse(options)
+      end
+
+      POTENTIAL_PUNCTUATION = %w(, . ! ?)
+
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def such_serialize_wow
+        strings = value.keys.map do |key|
+          key_str = StringValue.new(key).such_serialize_wow
+          value_str = Value.new(value[key]).such_serialize_wow
+
+          %Q(#{key_str} is #{value_str})
+        end
+        'such ' + reduce(strings, POTENTIAL_PUNCTUATION) + 'wow'
+      end
+
+      def self.parse_pair(string, acc_hash)
+        results = string.scan(/"(.*)" is (.*)/)
+        acc_hash[results[0][0]] = DSON::Value.so_parse(results[0][1])
+        acc_hash
+      end
+    end
+  end
+end

data/lib/DSON/value/nil_value.rb

@@ -1,21 +1,21 @@
-# -*- encoding : utf-8 -*-
-require 'DSON/value'
-
-require 'singleton'
-
-module DSON
-  module Value
-    class NilValue
-      include Value
-      include Singleton
-
-      def self.so_parse
-        nil
-      end
-
-      def such_serialize_wow
-        'empty'
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+require 'DSON/value'
+
+require 'singleton'
+
+module DSON
+  module Value
+    class NilValue
+      include Value
+      include Singleton
+
+      def self.so_parse
+        nil
+      end
+
+      def such_serialize_wow
+        'empty'
+      end
+    end
+  end
+end

data/lib/DSON/value/numeric_value.rb

@@ -1,20 +1,40 @@
-# -*- encoding : utf-8 -*-
-require 'DSON/value'
-
-module DSON
-  module Value
-    class NumericValue
-      include Value
-
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-
-      def such_serialize_wow
-        value
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+require 'DSON/value'
+
+module DSON
+  module Value
+    class NumericValue
+      include Value
+
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def self.so_parse(value)
+        if value.include?('very') || value.include?('VERY')
+          parts = value.downcase.split('very')
+          octal_string_to_numeric(parts[0]) * 8 ** octal_string_to_numeric(parts[1])
+        else
+          octal_string_to_numeric(value)
+        end
+      end
+
+      def such_serialize_wow
+        value.b(8).to_s
+      end
+
+      private
+
+      def self.octal_string_to_numeric(value)
+        value = value.b(8)
+        if value.kind_of?(Radix::Float)
+          value.to_f
+        else
+          value.to_i
+        end
+      end
+    end
+  end
+end

data/lib/DSON/value/object_value.rb

@@ -1,37 +1,37 @@
-# -*- encoding : utf-8 -*-
-require 'DSON/value'
-
-module DSON
-  module Value
-    class ObjectValue
-      include Value
-
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-
-      def such_serialize_wow
-        # Construct a hash of the instance variables
-        object_hash = Hash[
-          value.instance_variables.map do |variable|
-            [
-              remove_at_from_attribute_name(variable),
-              value.instance_variable_get(variable)
-            ]
-          end
-        ]
-
-        value = DSON::Value.new(object_hash)
-        value.such_serialize_wow
-      end
-
-      private
-
-      def remove_at_from_attribute_name(attribute_name)
-        attribute_name[1..-1]
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+require 'DSON/value'
+
+module DSON
+  module Value
+    class ObjectValue
+      include Value
+
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def such_serialize_wow
+        # Construct a hash of the instance variables
+        object_hash = Hash[
+          value.instance_variables.map do |variable|
+            [
+              remove_at_from_attribute_name(variable),
+              value.instance_variable_get(variable)
+            ]
+          end
+        ]
+
+        value = DSON::Value.new(object_hash)
+        value.such_serialize_wow
+      end
+
+      private
+
+      def remove_at_from_attribute_name(attribute_name)
+        attribute_name[1..-1]
+      end
+    end
+  end
+end

data/lib/DSON/value/string_value.rb

@@ -1,25 +1,26 @@
-# -*- encoding : utf-8 -*-
-require 'DSON/value'
-
-module DSON
-  module Value
-    class StringValue
-      include Value
-
-      attr_reader :value
-
-      def self.so_parse(options)
-        numeric_identifier = options[:first_word]
-        options[:string_hash][numeric_identifier.to_i]
-      end
-
-      def initialize(value)
-        @value = value
-      end
-
-      def such_serialize_wow
-        "\"#{value}\""
-      end
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+require 'DSON/value'
+
+module DSON
+  module Value
+    class StringValue
+      include Value
+
+      attr_reader :value
+
+      def self.so_parse(value)
+        start_index = value.index('"') + 1
+        end_index = value.rindex('"') - 1
+        value[start_index..end_index]
+      end
+
+      def initialize(value)
+        @value = value
+      end
+
+      def such_serialize_wow
+        "\"#{value}\""
+      end
+    end
+  end
+end