storable 0.6.4 → 0.6.5

data/CHANGES.txt

@@ -2,6 +2,12 @@ STORABLE, CHANGES
 
 * TODO: field_types and field_names go out of order when defining some fields with types and others not. The quick fix is to define fields with no type at the end
 
+
+#### 0.6.5 (2010-03-23) #############################
+
+* ADDED: Use Yajl if it's available.
+
+
 #### 0.6.4 (2010-03-10) #############################
 
 * FIXED: Don't pull the first value out of an array if there is only one element.

data/lib/storable.rb

@@ -6,12 +6,20 @@
 
 USE_ORDERED_HASH = (RUBY_VERSION =~ /^1.9/).nil?
 
-begin
-  require 'json'
+YAJL_LOADED = begin   
+  require 'yajl'
+  true
 rescue LoadError
-  # Silently!
+  false
 end
-  
+
+JSON_LOADED = begin
+  require 'json' unless YAJL_LOADED
+  true
+rescue LoadError
+  false
+end
+
 require 'yaml'
 require 'fileutils'
 require 'time'
@@ -40,7 +48,7 @@ class Storable
   
   require 'storable/orderedhash' if USE_ORDERED_HASH
   unless defined?(SUPPORTED_FORMATS) # We can assume all are defined
-    VERSION = "0.6.4"
+    VERSION = "0.6.5"
     NICE_TIME_FORMAT  = "%Y-%m-%d@%H:%M:%S".freeze 
     SUPPORTED_FORMATS = [:tsv, :csv, :yaml, :json, :s, :string].freeze 
   end
@@ -219,7 +227,14 @@ class Storable
   end
   
   def to_json(*from, &blk)
-    to_hash.to_json(*from, &blk)
+    hash = to_hash
+    if YAJL_LOADED
+      Yajl::Encoder.encode(hash)
+    elsif JSON_LOADED
+      hash.to_json(*from, &blk)
+    else 
+      raise "no JSON parser loaded"
+    end
   end
   
   def to_yaml(*from, &blk)
@@ -247,7 +262,13 @@ class Storable
   # +from+ a YAML String or Array (split into by line). 
   def self.from_json(*from)
     from_str = [from].flatten.compact.join('')
-    tmp = JSON::load(from_str)
+    if YAJL_LOADED
+      tmp = Yajl::Parser.parse(from_str)
+    elsif JSON_LOADED
+      tmp = JSON::load(from_str)
+    else
+      raise "JSON parser not loaded"
+    end
     hash_sym = tmp.keys.inject({}) do |hash, key|
        hash[key.to_sym] = tmp[key]
        hash

data/storable.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "storable"
   s.rubyforge_project = "storable"
-  s.version = "0.6.4"
+  s.version = "0.6.5"
   s.summary = "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"
   s.description = s.summary
   s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: storable
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -04:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: []