rocking_chair 0.4.2 → 0.4.5

data/Gemfile.lock

@@ -1,13 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.9)
-    builder (2.1.2)
-    couch_potato (0.5.7)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    bcrypt-ruby (3.0.0)
+    builder (3.0.0)
+    couch_potato (0.5.7.3)
       activemodel
       couchrest (>= 1.0.1)
       json
@@ -21,15 +24,16 @@ GEM
       couchrest (>= 1.0.0)
       mime-types (>= 1.15)
     git (1.2.5)
-    i18n (0.5.0)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.3)
+    json (1.5.4)
     mattmatt-validatable (1.8.4)
     mime-types (1.16)
     mocha (0.9.12)
+    multi_json (1.0.3)
     rake (0.9.2)
     rest-client (1.6.1)
       mime-types (>= 1.16)
@@ -38,10 +42,11 @@ GEM
     right_http_connection (1.3.0)
     shoulda (2.11.3)
     shoulda-addons (0.2.3)
-    simply_stored (0.6.8)
+    simply_stored (0.7.0rc2)
+      activemodel (~> 3.1.0)
       activesupport
-      activesupport (~> 3)
-      couch_potato (= 0.5.7)
+      activesupport (~> 3.1.0)
+      couch_potato (= 0.5.7.3)
       couch_potato (>= 0.2.15)
       couchrest (= 1.0.1)
       mattmatt-validatable (= 1.8.4)
@@ -59,10 +64,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  couch_potato (= 0.5.7)
+  couch_potato (= 0.5.7.3)
   couchrest_extended_document
   jeweler
   mocha
   shoulda
-  simply_stored (= 0.6.8)
+  simply_stored (= 0.7.0rc2)
   uuidtools

data/lib/rocking_chair/helper.rb

@@ -2,16 +2,36 @@
 
 module RockingChair
   module Helper
-    
+
     def self.jsonfy_options(options, *keys)
       keys.each do |key|
-        options[key] = ActiveSupport::JSON.decode(options[key]) if options[key]
+        options[key] = json_content(options[key]) if options[key]
       end
     end
-    
+
     def self.access(attr_name, doc)
       doc.respond_to?(:_document) ? doc._document[attr_name] : doc[attr_name]
     end
-    
+
+    def self.json_content(string)
+      if string && string.size < 2 # just one character --> only hashes and arrays are valid root objects
+        fixed_json_content(string)
+      elsif string == 'null'
+        nil
+      elsif string
+        ActiveSupport::JSON.decode(string)
+      else
+        nil
+      end
+    rescue JSON::ParserError, MultiJson::DecodeError
+      # probably: only hashes and arrays are valid root objects --> try to fix
+      fixed_json_content(string)
+    end
+
+    def self.fixed_json_content(string)
+      # wrap content in array, then parse and return first value
+      ActiveSupport::JSON.decode("[#{string}]")[0]
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rocking_chair
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Jonathan Weiss
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -37,12 +37,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15424097
         segments: 
         - 0
-        - 6
-        - 8
-        version: 0.6.8
+        - 7
+        - 0
+        - rc
+        - 2
+        version: 0.7.0rc2
   name: simply_stored
   prerelease: false
   type: :runtime
@@ -53,12 +55,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 125
         segments: 
         - 0
         - 5
         - 7
-        version: 0.5.7
+        - 3
+        version: 0.5.7.3
   name: couch_potato
   prerelease: false
   type: :runtime
@@ -175,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: In-memory CouchDB for Couchrest and SimplyStored