rmtools 1.2.10b → 1.2.10

data/README.txt

@@ -12,6 +12,7 @@ Methods for basic classes addon collection.
 
 * Update String#parse:caller to parse ruby 1.9 "block level". Now block level processes in RMLogger and RMTools.format_trace
 * lib/dev/traceback.rb now applies to ruby > 1.9 as well
+* Support of Yajl or (if not installed) JSON for #to_json and #from_json. Overwrites ActiveSupport's ::encode and ::decode since they're so damn slow.
 
 == Version 1.2.8
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'lib/rmtools/install'
 compile_manifest
 
-RMTOOLS_VERSION = '1.2.10b'
+RMTOOLS_VERSION = '1.2.10'
 begin
     require 'hoe'
     config = Hoe.spec 'rmtools' do

data/lib/rmtools/conversions/json.rb

@@ -1,49 +1,68 @@
-<<-original
-[Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].each do |klass|
-  klass.class_eval do
-    # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info.
-    def to_json(options = nil)
-      ActiveSupport::JSON.encode(self, options)
-    end
-  end
-end
-original
-# Overwrites slow ActiveSupport ActiveSupport::JSON.encode by faster 1.9 stdlib JSON library
-if RUBY_VERSION > '1.9'
-  [Array, Hash].each do |klass|
+# Overwrites slow ActiveSupport ActiveSupport::JSON.encode by faster Yajl or JSON libraries
+require 'active_support/core_ext/object/to_json'
+begin
+  require 'yajl' 
+  
+  [Array, Hash, String].each do |klass|
     klass.class_eval do
-      def to_json(options=nil)
-        JSON.unparse(self, options)
+      def to_json(*)
+        Yajl::Encoder.encode self
       end
     end
   end
   
-  class ActiveSupport::OrderedHash
-      # nothing lost here since javascript engines (at least Webkit) doesn't order objects
-    def to_json(options=nil)
-      JSON.unparse({}.merge!(self), options)
-    end
-  end
-  
-  class String
+  class String    
     # the opposite of #to_json
-    def from_json
-      JSON.parse self
+    def from_json(options={}) # :symbolize_keys
+      Yajl::Parser.parse self, options
     end
-  end
-  
-else
-  
-  def from_json
-    ActiveSupport::JSON.decode self
   end    
   
-end
+rescue LoadError
+  if defined? JSON
+    
+    [Array, Hash].each do |klass|
+      klass.class_eval do
+        def to_json(options=nil)
+          JSON.unparse self, options
+        end
+      end
+    end
+    
+    # This is only case where JSON.unparse does not work (and for only few versions of json stdlib)
+    begin
+      JSON.unparse ActiveSupport::OrderedHash
+    rescue
+      class ActiveSupport::OrderedHash
+        # nothing lost here since javascript engines (at least Webkit) doesn't order objects      
+        def to_json(options=nil)
+          JSON.unparse({}.merge!(self))#, options)
+        end
+      end
+    end
+    
+    class String
+      # the opposite of #to_json
+      def from_json
+        JSON.parse self
+      end
+    end
+    
+  else
+    
+    class String
+      # the opposite of #to_json
+      def from_json
+        ActiveSupport::JSON.decode self
+      end
+    end
   
-class Object
+  end
+end
   
+class Object  
+  # handy when data may not be encodable (active_record objects, recursive structures, etc)
   def to_json_safe(options=nil)
     timeout(10) {to_json(options)}
-  end
-  
+  end  
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmtools
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 6
+  hash: 11
+  prerelease: 
   segments: 
   - 1
   - 2
   - 10
-  - b
-  version: 1.2.10b
+  version: 1.2.10
 platform: ruby
 authors: 
 - Sergey Baev
@@ -195,14 +194,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rmtools