jsonify 0.3.1 → 0.4.0

data/jsonify.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'multi_json', '~>1.0'
+  s.add_runtime_dependency 'multi_json', '~>1.3'
   
   s.add_development_dependency 'json' unless RUBY_VERSION =~ /^1.9/
   s.add_development_dependency 'bundler'

data/lib/jsonify/builder.rb

@@ -57,16 +57,16 @@ module Jsonify
     end
     
     # Compiles the JSON objects into a string representation. 
-    # If initialized with +:verify => true+, the compiled result will be verified by attempting to re-parse it using +MultiJson.decode+.
-    # If initialized with +:format => :pretty+, the compiled result will be parsed and encoded via +MultiJson.encode(<json>, :pretty => true)+
+    # If initialized with +:verify => true+, the compiled result will be verified by attempting to re-parse it using +MultiJson.load+.
+    # If initialized with +:format => :pretty+, the compiled result will be parsed and encoded via +MultiJson.dump(<json>, :pretty => true)+
     # This method can be called without any side effects. You can call +compile!+ at any time, and multiple times if desired.
     #
     # @raise [TypeError] only if +:verify+ is set to true
     # @raise [JSON::ParseError] only if +:verify+ is set to true
     def compile!
       result = (@stack[0] || {}).encode_as_json
-      MultiJson.decode(result) if @verify
-      result = MultiJson.encode(MultiJson.decode(result), :pretty => true) if @pretty
+      MultiJson.load(result) if @verify
+      result = MultiJson.dump(MultiJson.load(result), :pretty => true) if @pretty
       result
     end
     
@@ -187,7 +187,7 @@ module Jsonify
     # @param [String] json_string a full JSON string (e.g. from a rendered partial)
     def ingest!(json_string)
       return if json_string.empty?
-      res = Jsonify::Generate.value(MultiJson.decode(json_string))
+      res = Jsonify::Generate.value(MultiJson.load(json_string))
       current = @stack[@level]
       if current.nil?
         @stack[@level] = res

data/lib/jsonify/json_value.rb

@@ -1,6 +1,6 @@
 class Object
   def encode_as_json
-    MultiJson.encode self
+    MultiJson.dump self
   end
 end
 

data/lib/jsonify/version.rb

@@ -1,3 +1,3 @@
 module Jsonify
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/builder_spec.rb

@@ -108,7 +108,7 @@ PRETTY_JSON
       end
       it 'should support the store! message' do
         json.store!( "foo", "bar" ).store!( 'no',  "whar" )
-        MultiJson.decode(json.compile!).should == MultiJson.decode('{"foo":"bar","no":"whar"}')
+        MultiJson.load(json.compile!).should == MultiJson.load('{"foo":"bar","no":"whar"}')
       end
     end
   end
@@ -137,12 +137,12 @@ PRETTY_JSON
       json.foo :bar
       json.go :far
       expected = '{"foo":"bar","go":"far"}'
-      MultiJson.decode(json.compile!).should ==  MultiJson.decode(expected)
+      MultiJson.load(json.compile!).should ==  MultiJson.load(expected)
     end
     it 'should handle arrays' do
       json[1] = [2, 3]
       json[4] = 5
-      MultiJson.decode(json.compile!).should ==  MultiJson.decode('{"1":[2,3],"4":5}')
+      MultiJson.load(json.compile!).should ==  MultiJson.load('{"1":[2,3],"4":5}')
     end
   end
   
@@ -155,7 +155,7 @@ PRETTY_JSON
         end
       end
       expected = '{"foo foo":{"bar bar":{"buzz buzz":"goo goo"}}}'
-      MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
+      MultiJson.load(json.compile!).should == MultiJson.load(expected)
     end
 
     it 'complex hash' do
@@ -216,7 +216,7 @@ PRETTY_JSON
         end
       end
       expected = "{\"foo\":{\"bar\":{\"baz\":\"goo\",\"years\":[2011,2012]}}}"
-      MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
+      MultiJson.load(json.compile!).should == MultiJson.load(expected)
     end
   end
   
@@ -226,7 +226,7 @@ PRETTY_JSON
       it 'should work' do
         json.bar [1,2,{:foo => 'goo'}]
         expected = "{\"bar\":[1,2,{\"foo\":\"goo\"}]}"
-        MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
+        MultiJson.load(json.compile!).should == MultiJson.load(expected)
       end
     end
 
@@ -259,7 +259,7 @@ PRETTY_JSON
         end
       end
       expected = "{\"result\":{\"person\":{\"fname\":\"George\",\"lname\":\"Burdell\"},\"links\":[{\"href\":\"example.com\",\"rel\":\"self\"},{\"href\":\"foo.com\",\"rel\":\"parent\"}]}}"
-      MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
+      MultiJson.load(json.compile!).should == MultiJson.load(expected)
     end
   end
   
@@ -269,20 +269,20 @@ PRETTY_JSON
       context 'into' do
         it 'nothing -- should replace it' do
           json.ingest! json_string
-          MultiJson.decode(json.compile!).should == MultiJson.decode(json_string)
+          MultiJson.load(json.compile!).should == MultiJson.load(json_string)
         end
         it 'json object -- should merge' do
           json["my boy"] = "Monday"
           json["my girl"] = "Sunday"
           json.ingest! json_string
           expected = '{"my boy":"Monday","my girl":"Friday","my daughter":"Wednesday"}'
-          MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
+          MultiJson.load(json.compile!).should == MultiJson.load(expected)
         end
         it 'json array -- should add' do
           json << 1 << 2
           json.ingest! json_string
           expected = '[1,2,{"my girl":"Friday","my daughter":"Wednesday"}]'
-          MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
+          MultiJson.load(json.compile!).should == MultiJson.load(expected)
         end
       end
     end
@@ -291,7 +291,7 @@ PRETTY_JSON
       context 'into' do
         it 'nothing -- should replace it' do
           json.ingest! json_string
-          MultiJson.decode(json.compile!).should == MultiJson.decode(json_string)
+          MultiJson.load(json.compile!).should == MultiJson.load(json_string)
         end
         it 'json object -- should raise error' do
           json["my boy"] = "Monday"
@@ -302,7 +302,7 @@ PRETTY_JSON
           json << 1 << 2
           json.ingest! json_string
           expected = '[1,2,[1,2,3]]'
-          MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
+          MultiJson.load(json.compile!).should == MultiJson.load(expected)
         end
       end
     end
@@ -323,14 +323,14 @@ PRETTY_JSON
       end
       
       expected = '{"results":[{"id":1,"children":[{"id":"a"},{"id":"b"}]},{"id":2,"children":[{"id":"c"},{"id":"d"}]}]}'
-      MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
+      MultiJson.load(json.compile!).should == MultiJson.load(expected)
     end
     it 'simple append' do
       json.letters('a'..'c') do |letter|
         json << letter.upcase
       end
       expected = '{"letters":["A","B","C"]}'
-      MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
+      MultiJson.load(json.compile!).should == MultiJson.load(expected)
     end
     
   end

data/spec/generate_spec.rb

@@ -13,7 +13,7 @@ describe Jsonify::Generate do
     json = Jsonify::Generate
     result = json.value links
     expected = '{"links":[{"rel":"foo","href":"goo"},{"rel":"bar","href":"baz"}]}'
-    MultiJson.decode(result.encode_as_json).should == MultiJson.decode(expected)
+    MultiJson.load(result.encode_as_json).should == MultiJson.load(expected)
   end
 
   describe 'complex example' do
@@ -29,7 +29,7 @@ describe Jsonify::Generate do
         }
       )
       expected = "{\"links\":[{\"rel\":\"foo\",\"href\":\"goo\"},{\"rel\":\"bar\",\"href\":\"baz\"}]}"
-      MultiJson.decode(json.encode_as_json).should == MultiJson.decode(expected)
+      MultiJson.load(json.encode_as_json).should == MultiJson.load(expected)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonify
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000Z
+date: 2012-04-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70241058026120 !ruby/object:Gem::Requirement
+  requirement: &70346540134460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70241058026120
+  version_requirements: *70346540134460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70241058013240 !ruby/object:Gem::Requirement
+  requirement: &70346540133240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241058013240
+  version_requirements: *70346540133240
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70241058011740 !ruby/object:Gem::Requirement
+  requirement: &70346540130780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70241058011740
+  version_requirements: *70346540130780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70241058010960 !ruby/object:Gem::Requirement
+  requirement: &70346540076500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241058010960
+  version_requirements: *70346540076500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70241058010220 !ruby/object:Gem::Requirement
+  requirement: &70346540069140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241058010220
+  version_requirements: *70346540069140
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70241058009520 !ruby/object:Gem::Requirement
+  requirement: &70346540065620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241058009520
+  version_requirements: *70346540065620
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70241058008820 !ruby/object:Gem::Requirement
+  requirement: &70346540059620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241058008820
+  version_requirements: *70346540059620
 description: Turn Ruby objects into JSON -- correctly!
 email:
 - bsiggelkow@me.com
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3823914982470155210
+      hash: -3853900993041975354
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3823914982470155210
+      hash: -3853900993041975354
 requirements: []
 rubyforge_project: jsonify
 rubygems_version: 1.8.6