jsonify 0.2.0 → 0.3.0

data/.travis.yml

@@ -3,6 +3,6 @@ rvm:
   - 1.9.2
   - 1.8.7
   - ree
-  - rbx-2.0
+  - rbx
   - jruby
 

data/README.md

@@ -39,7 +39,7 @@ want to show this format). The default format, `plain`, dictates no special form
 
 ### Compatibility Warning
 
-Starting with version 0.2.0, the handling of arrays has changed to provide a more natural feel. As a consequence, however, code written using earlier versions of Jsonify may not work correctly. The example that follows demonstrates the changes you will need to be make.
+Starting with version 0.2.0, the handling of arrays has changed to provide a more natural feel. As a consequence, however, code written using earlier versions of Jsonify may not work correctly. The example that follows demonstrates the changes you need to make.
 
 Previously, when arrays were processed, you had to put away the builder-style, and use more conventional Rubyisms.
 
@@ -153,7 +153,7 @@ Let's assume this this is your main template, `index.jsonify`:
     json.ingest! (render :partial=>'my_partial')
 
 From the first line, you can tell that an array will be created as this line uses the append operator.
-On the second line, a partial is being added to the builder. Note that you cannot simply place `render :parial ...` on a line by itself as you can do with other templates like `erb` and `haml`. You have to explicitly tell Jsonify to add it to the builder.
+On the second line, a partial is being added to the builder. Note that you cannot simply place `render :partial ...` on a line by itself as you can do with other templates like `erb` and `haml`. You have to explicitly tell Jsonify to add it to the builder.
 
 Let's say that the partial file, `_my_partial.jsonify`, is as follows:
 

data/jsonify.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # 1.9 JSON library built-in
+  s.add_runtime_dependency 'multi_json', '~>1.0.4'
+  
   s.add_development_dependency 'json' unless RUBY_VERSION =~ /^1.9/
-
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'tilt', '~>1.3.2'
   s.add_development_dependency 'rake'

data/lib/jsonify.rb

@@ -1,8 +1,4 @@
-begin
-  require 'json'
-rescue LoadError
-  raise "No JSON implementation found. Please install a JSON library of your choosing."
-end
+require 'multi_json'
 require 'jsonify/blank_slate'
 require 'jsonify/version'
 require 'jsonify/json_value'

data/lib/jsonify/builder.rb

@@ -57,16 +57,17 @@ 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 +JSON.parse+.
-    # If initialized with +:format => :pretty+, the compiled result will be parsed and regenerated via +JSON.pretty_generate+.
+    # 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)+
     # 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] || {}).to_json
-      JSON.parse(result) if @verify
-      @pretty ? JSON.pretty_generate(JSON.parse(result)) : result
+      result = (@stack[0] || {}).encode_as_json
+      MultiJson.decode(result) if @verify
+      result = MultiJson.encode(MultiJson.decode(result), :pretty => true) if @pretty
+      result
     end
     
     # Stores the key and value into a JSON object
@@ -186,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(JSON.parse(json_string))
+      res = Jsonify::Generate.value(MultiJson.decode(json_string))
       current = @stack[@level]
       if current.nil?
         @stack[@level] = res

data/lib/jsonify/json_value.rb

@@ -1,3 +1,9 @@
+class Object
+  def encode_as_json
+    MultiJson.encode self
+  end
+end
+
 module Jsonify
   class JsonValue
     attr_accessor :values
@@ -6,8 +12,8 @@ module Jsonify
       @values = values || []
     end
     
-    def to_json
-      wrap values.map {|v| v.to_json}.join(',')
+    def encode_as_json
+      wrap values.map {|v| v.encode_as_json}.join(',')
     end
     
     def add(jsonValue)
@@ -69,25 +75,25 @@ module Jsonify
       @key = key.to_s
       @value = Generate.value(value)
     end
-    def to_json
-      %Q{#{key.to_json}:#{value.to_json}}
+    def encode_as_json
+      %Q{#{key.encode_as_json}:#{value.encode_as_json}}
     end
   end
 
   class JsonTrue < JsonValue
-    def to_json
+    def encode_as_json
       'true'
     end
   end
   
   class JsonFalse < JsonValue
-    def to_json
+    def encode_as_json
       'false'
     end
   end
   
   class JsonNull < JsonValue
-    def to_json
+    def encode_as_json
       'null'
     end
   end

data/lib/jsonify/version.rb

@@ -1,3 +1,3 @@
 module Jsonify
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/builder_spec.rb

@@ -50,14 +50,14 @@ PRETTY_JSON
           attr_accessor :stack
         end
         class FooBar
-          def to_json
+          def encode_as_json
             "foobar"
           end
         end
 
         json = TestBuilder.new(:verify => true)
         json.stack << FooBar.new
-        lambda{ json.compile! }.should raise_error(JSON::ParserError)
+        lambda{ json.compile! }.should raise_error(MultiJson::DecodeError)
       end
     end
     describe 'unicode characters' do
@@ -108,7 +108,7 @@ PRETTY_JSON
       end
       it 'should support the store! message' do
         json.store!( "foo", "bar" ).store!( 'no',  "whar" )
-        JSON.parse(json.compile!).should == JSON.parse('{"foo":"bar","no":"whar"}')
+        MultiJson.decode(json.compile!).should == MultiJson.decode('{"foo":"bar","no":"whar"}')
       end
     end
   end
@@ -137,12 +137,12 @@ PRETTY_JSON
       json.foo :bar
       json.go :far
       expected = '{"foo":"bar","go":"far"}'
-      JSON.parse(json.compile!).should ==  JSON.parse(expected)
+      MultiJson.decode(json.compile!).should ==  MultiJson.decode(expected)
     end
     it 'should handle arrays' do
       json[1] = [2, 3]
       json[4] = 5
-      JSON.parse(json.compile!).should ==  JSON.parse('{"1":[2,3],"4":5}')
+      MultiJson.decode(json.compile!).should ==  MultiJson.decode('{"1":[2,3],"4":5}')
     end
   end
   
@@ -155,7 +155,7 @@ PRETTY_JSON
         end
       end
       expected = '{"foo foo":{"bar bar":{"buzz buzz":"goo goo"}}}'
-      JSON.parse(json.compile!).should == JSON.parse(expected)
+      MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
     end
 
     it 'complex hash' do
@@ -216,7 +216,7 @@ PRETTY_JSON
         end
       end
       expected = "{\"foo\":{\"bar\":{\"baz\":\"goo\",\"years\":[2011,2012]}}}"
-      JSON.parse(json.compile!).should == JSON.parse(expected)
+      MultiJson.decode(json.compile!).should == MultiJson.decode(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\"}]}"
-        JSON.parse(json.compile!).should == JSON.parse(expected)
+        MultiJson.decode(json.compile!).should == MultiJson.decode(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\"}]}}"
-      JSON.parse(json.compile!).should == JSON.parse(expected)
+      MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
     end
   end
   
@@ -269,20 +269,20 @@ PRETTY_JSON
       context 'into' do
         it 'nothing -- should replace it' do
           json.ingest! json_string
-          JSON.parse(json.compile!).should == JSON.parse(json_string)
+          MultiJson.decode(json.compile!).should == MultiJson.decode(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"}'
-          JSON.parse(json.compile!).should == JSON.parse(expected)
+          MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
         end
         it 'json array -- should add' do
           json << 1 << 2
           json.ingest! json_string
           expected = '[1,2,{"my girl":"Friday","my daughter":"Wednesday"}]'
-          JSON.parse(json.compile!).should == JSON.parse(expected)
+          MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
         end
       end
     end
@@ -291,7 +291,7 @@ PRETTY_JSON
       context 'into' do
         it 'nothing -- should replace it' do
           json.ingest! json_string
-          JSON.parse(json.compile!).should == JSON.parse(json_string)
+          MultiJson.decode(json.compile!).should == MultiJson.decode(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]]'
-          JSON.parse(json.compile!).should == JSON.parse(expected)
+          MultiJson.decode(json.compile!).should == MultiJson.decode(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"}]}]}'
-      JSON.parse(json.compile!).should == JSON.parse(expected)
+      MultiJson.decode(json.compile!).should == MultiJson.decode(expected)
     end
     it 'simple append' do
       json.letters('a'..'c') do |letter|
         json << letter.upcase
       end
       expected = '{"letters":["A","B","C"]}'
-      JSON.parse(json.compile!).should == JSON.parse(expected)
+      MultiJson.decode(json.compile!).should == MultiJson.decode(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"}]}'
-    JSON.parse(result.to_json).should == JSON.parse(expected)
+    MultiJson.decode(result.encode_as_json).should == MultiJson.decode(expected)
   end
 
   describe 'complex example' do
@@ -29,7 +29,7 @@ describe Jsonify::Generate do
         }
       )
       expected = "{\"links\":[{\"rel\":\"foo\",\"href\":\"goo\"},{\"rel\":\"bar\",\"href\":\"baz\"}]}"
-      JSON.parse(json.to_json).should == JSON.parse(expected)
+      MultiJson.decode(json.encode_as_json).should == MultiJson.decode(expected)
     end
   end
 end

data/spec/json_value_spec.rb

@@ -8,35 +8,35 @@ describe Jsonify::JsonValue do
       pair.key.should == 'key'
     end
     it 'should evaluate to key:value' do
-      pair.to_json.should == "\"key\":\"value\""
+      pair.encode_as_json.should == "\"key\":\"value\""
     end
   end
 
   describe Jsonify::JsonTrue do
     it 'should have a value of true' do
-      Jsonify::JsonTrue.new.to_json.should == 'true'
+      Jsonify::JsonTrue.new.encode_as_json.should == 'true'
     end
   end
 
   describe Jsonify::JsonFalse do
     it 'should have a value of false' do
-      Jsonify::JsonFalse.new.to_json.should == 'false'
+      Jsonify::JsonFalse.new.encode_as_json.should == 'false'
     end
   end
 
   describe Jsonify::JsonNull do
     it 'should have a value of true' do
-      Jsonify::JsonNull.new.to_json.should == 'null'
+      Jsonify::JsonNull.new.encode_as_json.should == 'null'
     end
   end
 
   describe 'strings' do
     it 'should quote the value' do
-      'foo'.to_json.should == "\"foo\""
+      'foo'.encode_as_json.should == "\"foo\""
     end
     it 'should encode unicode' do
       unicode = 'goober'.concat(16)
-      unicode.to_json.should == "\"goober\\u0010\""
+      unicode.encode_as_json.should == "\"goober\\u0010\""
     end
   end
 

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'benchmark'
 require 'bundler'
 require 'bundler/setup'

data/spec/template_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Jsonify::Template do
   it 'should be associated with .jsonify files' do
     template = Tilt.new('spec/hello_world.jsonify')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonify
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2012-01-30 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70207654989540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70207654989540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70165351228400 !ruby/object:Gem::Requirement
+  requirement: &70207654987420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165351228400
+  version_requirements: *70207654987420
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70165351226320 !ruby/object:Gem::Requirement
+  requirement: &70207654982440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70165351226320
+  version_requirements: *70207654982440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70165351224580 !ruby/object:Gem::Requirement
+  requirement: &70207654967060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165351224580
+  version_requirements: *70207654967060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165351223680 !ruby/object:Gem::Requirement
+  requirement: &70207654965240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165351223680
+  version_requirements: *70207654965240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70165351220980 !ruby/object:Gem::Requirement
+  requirement: &70207654963880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165351220980
+  version_requirements: *70207654963880
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70165351220280 !ruby/object:Gem::Requirement
+  requirement: &70207654961800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165351220280
+  version_requirements: *70207654961800
 description: Turn Ruby objects into JSON -- correctly!
 email:
 - bsiggelkow@me.com
@@ -122,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 50285731348355282
+      hash: 3560170480060204469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 50285731348355282
+      hash: 3560170480060204469
 requirements: []
 rubyforge_project: jsonify
 rubygems_version: 1.8.6