jsonify 0.0.8 → 0.0.9

data/jsonify.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project = s.name
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,performance}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'json_pure'
+  # 1.9 JSON library built-in
+  s.add_development_dependency 'json' unless RUBY_VERSION =~ /^1.9/
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

data/lib/jsonify.rb

@@ -1,7 +1,10 @@
-require 'json'
+begin
+  require 'json'
+rescue LoadError
+  raise "No JSON implementation found. Please install a JSON library of your choosing."
+end
 require 'jsonify/blank_slate'
 require 'jsonify/version'
 require 'jsonify/json_value'
 require 'jsonify/generate'
-require 'jsonify/builder'
-require 'benchmark'
+require 'jsonify/builder'

data/lib/jsonify/builder.rb

@@ -35,7 +35,7 @@ module Jsonify
     # @raise [TypeError] only if +:verify+ is set to true
     # @raise [JSON::ParseError] only if +:verify+ is set to true
     def compile!
-      result = (@stack[0] ? @stack[0].evaluate : {}.to_json)
+      result = (@stack[0] || {}).to_json
       JSON.parse(result) if @verify
       @pretty ? JSON.pretty_generate(JSON.parse(result)) : result
     end

data/lib/jsonify/generate.rb

@@ -4,31 +4,30 @@ module Jsonify
   module Generate
 
     class << self
-
-      # Coerces the given value into a JsonValue.
+      
+      # Coerces the given value into a JsonValue (or subclass), String, or Number.
       #
       # The coercion rules are based on the type (class) of the value as follows:
       # - +JsonValue+ => no coercion
-      # - +String+    => JsonString ( \"foo\" )
-      # - +Numeric+   => JsonNumber ( 1 )
+      # - +String+    => no coercion
+      # - +Numeric+   => no coercion
       # - +TrueClass+ => JsonTrue   ( true )
       # - +FalseClass+=> JsonFalse  ( false )
       # - +NilClass+  => JsonNull   ( null )
       # - +Array+     => JsonArray  ( [1,2,3] )
       # - +Hash+      => JsonObject ( <code>{"\a":1,\"b\":2}</code> )
+      # - +else+      => #to_s
       # 
       # @param val value to coerce into a JsonValue.
       def value(val)
         case val
-          when JsonValue; val
-          when String; string_value val
-          when Numeric; number_value val
-          when TrueClass; true_value
-          when FalseClass; false_value
-          when NilClass; null_value
+          when JsonValue, String, Numeric; val
+          when TrueClass;  @json_true  ||= JsonTrue.new
+          when FalseClass; @json_false ||= JsonFalse.new
+          when NilClass;   @json_null  ||= JsonNull.new
           when Array; array_value val
-          when Hash; object_value val
-          else string_value val
+          when Hash;  object_value val
+          else val.to_s
         end
       end
     
@@ -36,10 +35,6 @@ module Jsonify
         JsonPair.new(key,value(val))
       end
     
-      def string_value(val)
-        JsonString.new(val)
-      end
-
       def object_value(hash)
         json_object = JsonObject.new
         hash.each { |key,val| json_object.add( pair_value(key, val) ) }
@@ -50,22 +45,6 @@ module Jsonify
         JsonArray.new(Array(vals).map{ |v| value v })
       end
     
-      def number_value(val)
-        JsonNumber.new(val)
-      end
-
-      def true_value
-        @json_true ||= JsonTrue.new # memoize
-      end
-
-      def false_value
-        @json_false ||= JsonFalse.new # memoize
-      end
-
-      def null_value
-        @json_null ||= JsonNull.new # memoize
-      end
-
     end
 
   end

data/lib/jsonify/json_value.rb

@@ -6,8 +6,8 @@ module Jsonify
       @values = values || []
     end
     
-    def evaluate
-      wrap values.map {|v| v.evaluate}.join(',')
+    def to_json
+      wrap values.map {|v| v.to_json}.join(',')
     end
     
     def add(jsonValue)
@@ -41,7 +41,6 @@ module Jsonify
     end
 
     alias_method :<<, :add
-    alias_method :add!, :add # for consistency with the Builder api
 
   end
 
@@ -61,7 +60,6 @@ module Jsonify
     end
 
     alias_method :<<, :add
-    alias_method :add!, :add # for consistency with the Builder api
     
   end
   
@@ -71,45 +69,25 @@ module Jsonify
       @key = key.to_s
       @value = Generate.value(value)
     end
-    def evaluate
-      %Q{#{key.to_json}:#{value.evaluate}}
-    end
-  end
-  
-  class JsonString < JsonValue
-    attr_accessor :value
-    def initialize(value)
-      @value = value.to_s
-    end
-    def evaluate
-      value.to_json
-    end
-  end
-  
-  class JsonNumber < JsonValue
-    attr_accessor :value
-    def initialize(value)
-      @value = value
-    end
-    def evaluate
-      value
+    def to_json
+      %Q{#{key.to_json}:#{value.to_json}}
     end
   end
 
   class JsonTrue < JsonValue
-    def evaluate
+    def to_json
       'true'
     end
   end
   
   class JsonFalse < JsonValue
-    def evaluate
+    def to_json
       'false'
     end
   end
   
   class JsonNull < JsonValue
-    def evaluate
+    def to_json
       'null'
     end
   end

data/lib/jsonify/version.rb

@@ -1,3 +1,3 @@
 module Jsonify
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/builder_spec.rb

@@ -23,7 +23,7 @@ describe Jsonify::Builder do
           attr_accessor :stack
         end
         class FooBar
-          def evaluate
+          def to_json
             "foobar"
           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.evaluate).should == JSON.parse(expected)
+    JSON.parse(result.to_json).should == JSON.parse(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.evaluate).should == JSON.parse(expected)
+      JSON.parse(json.to_json).should == JSON.parse(expected)
     end
   end
 end

data/spec/json_value_spec.rb

@@ -3,49 +3,40 @@ require 'spec_helper'
 describe Jsonify::JsonValue do
 
   describe Jsonify::JsonPair do
-    let(:pair) { Jsonify::JsonPair.new('key',Jsonify::JsonString.new('value')) }
+    let(:pair) { Jsonify::JsonPair.new('key','value') }
     it 'should be constructed of a key and value' do
       pair.key.should == 'key'
     end
     it 'should evaluate to key:value' do
-      pair.evaluate.should == "\"key\":\"value\""
+      pair.to_json.should == "\"key\":\"value\""
     end
   end
 
   describe Jsonify::JsonTrue do
     it 'should have a value of true' do
-      Jsonify::JsonTrue.new.evaluate.should == 'true'
+      Jsonify::JsonTrue.new.to_json.should == 'true'
     end
   end
 
   describe Jsonify::JsonFalse do
     it 'should have a value of false' do
-      Jsonify::JsonFalse.new.evaluate.should == 'false'
+      Jsonify::JsonFalse.new.to_json.should == 'false'
     end
   end
 
   describe Jsonify::JsonNull do
     it 'should have a value of true' do
-      Jsonify::JsonNull.new.evaluate.should == 'null'
+      Jsonify::JsonNull.new.to_json.should == 'null'
     end
   end
 
-  describe Jsonify::JsonNumber do
-    it 'should accept an integer' do
-      Jsonify::JsonNumber.new(1).evaluate.should == 1
-    end
-    it 'should accept a float' do
-      Jsonify::JsonNumber.new(1.23).evaluate.should == 1.23
-    end
-  end
-
-  describe Jsonify::JsonString do
+  describe 'strings' do
     it 'should quote the value' do
-      Jsonify::JsonString.new('foo').evaluate.should == "\"foo\""
+      'foo'.to_json.should == "\"foo\""
     end
     it 'should encode unicode' do
       unicode = 'goober'.concat(16)
-      Jsonify::JsonString.new(unicode).evaluate.should == "\"goober\\u0010\""
+      unicode.to_json.should == "\"goober\\u0010\""
     end
   end
 

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'benchmark'
 require 'bundler'
 require 'bundler/setup'
 require 'jsonify'
-require 'benchmark_helper'
 
 RSpec.configure do |config|
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonify
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000Z
+date: 2011-08-05 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: &70097037247660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70097037247660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70097037247160 !ruby/object:Gem::Requirement
+  requirement: &70213882267320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097037247160
+  version_requirements: *70213882267320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70097037246620 !ruby/object:Gem::Requirement
+  requirement: &70213882266100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097037246620
+  version_requirements: *70213882266100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70097037245940 !ruby/object:Gem::Requirement
+  requirement: &70213882264440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097037245940
+  version_requirements: *70213882264440
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70097037245420 !ruby/object:Gem::Requirement
+  requirement: &70213882261500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097037245420
+  version_requirements: *70213882261500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70097037244760 !ruby/object:Gem::Requirement
+  requirement: &70213882260300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097037244760
+  version_requirements: *70213882260300
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70097037244220 !ruby/object:Gem::Requirement
+  requirement: &70213882258020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097037244220
+  version_requirements: *70213882258020
 - !ruby/object:Gem::Dependency
   name: ruby-prof
-  requirement: &70097037243620 !ruby/object:Gem::Requirement
+  requirement: &70213882254960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097037243620
+  version_requirements: *70213882254960
 description: Turn Ruby objects into JSON -- correctly!
 email:
 - bsiggelkow@me.com
@@ -119,15 +108,13 @@ files:
 - lib/jsonify/generate.rb
 - lib/jsonify/json_value.rb
 - lib/jsonify/version.rb
-- spec/benchmark_helper.rb
-- spec/benchmark_spek.rb
+- performance/profile.rb
+- performance/speed.rb
 - spec/builder_spec.rb
 - spec/generate_spec.rb
 - spec/json_value_spec.rb
 - spec/jsonify_spec.rb
-- spec/profile.rb
 - spec/spec_helper.rb
-- spec/speed.rb
 homepage: http://github.com/bsiggelkow/jsonify
 licenses: []
 post_install_message: 
@@ -142,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2291352512493608136
+      hash: -1667055293303286952
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2291352512493608136
+      hash: -1667055293303286952
 requirements: []
 rubyforge_project: jsonify
 rubygems_version: 1.8.6
@@ -159,12 +146,10 @@ signing_key:
 specification_version: 3
 summary: Turn Ruby objects into JSON
 test_files:
-- spec/benchmark_helper.rb
-- spec/benchmark_spek.rb
+- performance/profile.rb
+- performance/speed.rb
 - spec/builder_spec.rb
 - spec/generate_spec.rb
 - spec/json_value_spec.rb
 - spec/jsonify_spec.rb
-- spec/profile.rb
 - spec/spec_helper.rb
-- spec/speed.rb

data/spec/benchmark_helper.rb

@@ -1,133 +0,0 @@
-require "benchmark"
-require "rspec"
-
-module RSpec
-  module Benchmark
-    class Result
-      attr_accessor :slowest, :fastest, :average, :elapsed
-
-      def initialize(elapsed)
-        @elapsed = elapsed
-        @slowest = elapsed.max
-        @fastest = elapsed.min
-        @average = elapsed.inject(0) {|b, t| b + t} / elapsed.size
-      end
-
-      def to_s
-        "[average: #{average}, slowest: #{slowest}, fastest: #{fastest}]"
-      end
-    end
-
-    # Run a given block and calculate the average execution time.
-    # The block will be executed 1000 times by default.
-    #
-    #   benchmark { do something }
-    #   benchmark(100) { do something }
-    #
-    def benchmark(times = 1_000, &block)
-      elapsed = (1..times).collect do
-        GC.start
-        ::Benchmark.realtime(&block) * 1000
-      end
-
-      Result.new(elapsed)
-    end
-  end
-end
-
-# Check if the slowest execution is less than expected.
-#
-#   it "should do something fast" do
-#     benchmark { do something }.should be_faster_than(1.3)
-#   end
-#
-RSpec::Matchers.define :be_faster_than do |expected|
-  match do |result|
-    result.slowest < expected
-  end
-end
-
-# Check if the slowest execution is greater than expected.
-#
-#   it "should do something slow" do
-#     benchmark { do something }.should_not be_slower_than(1.3)
-#   end
-#
-RSpec::Matchers.define :be_slower_than do |expected|
-  match do |result|
-    result.slowest > expected
-  end
-end
-
-# Check if the execution average is close to expected.
-#
-#   it "should do something average time" do
-#     benchmark { do something }.should be_on_average(1.3, 0.01)
-#   end
-#
-RSpec::Matchers.define :be_on_average do |expected, delta|
-  match do |result|
-    (result.average - expected).abs < delta
-  end
-end
-
-# Include matchers and <tt>benchmark</tt> method into RSpec context.
-RSpec.configure do |config|
-  config.include(RSpec::Benchmark)
-end
-
-if ARGV[0] == __FILE__
-  describe RSpec::Benchmark do
-    before do
-      GC.stub(:start)
-    end
-
-    it "should be faster than expected" do
-      stub(:slowest => 0.01).should be_faster_than(0.5)
-    end
-
-    it "should not be faster than expected" do
-      stub(:slowest => 2).should_not be_faster_than(0.5)
-    end
-
-    it "should be slower than expected" do
-      stub(:slowest => 2).should be_slower_than(0.5)
-    end
-
-    it "should not be slower than expected" do
-      stub(:slowest => 0.5).should_not be_slower_than(2)
-    end
-
-    it "should be on average" do
-      stub(:average => 0.51).should be_on_average(0.5, 0.019)
-      stub(:average => 0.49).should be_on_average(0.5, 0.019)
-    end
-
-    it "should call garbage collector" do
-      GC.should_receive(:start).exactly(5).times
-      benchmark(5) { true }
-    end
-
-    it "should return result with collected data" do
-      result = benchmark(5) { true }
-
-      result.average.should be_kind_of(Float)
-      result.slowest.should be_kind_of(Float)
-      result.fastest.should be_kind_of(Float)
-    end
-
-    it "should run block" do
-      object = mock
-      object.should_receive(:run).exactly(1000).times
-
-      benchmark { object.run }
-    end
-
-    it "should run block with custom range" do
-      object = mock
-      object.should_receive(:run).exactly(3).times
-
-      benchmark(3) { object.run }
-    end
-  end
-end

data/spec/benchmark_spek.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe Jsonify::Builder do
-  
-  let(:j) { Jsonify::Builder.new }
-  
-  describe 'hello world' do
-    it "runs under 0.3 milliseconds" do
-      benchmark do
-        j.hello 'world'
-        j.compile!
-        j.reset!
-      end.should be_faster_than( 0.3 ) #milliseconds
-    end
-  end
-  
-  
-  describe 'json_builder example' do
-    it 'should be better than builder (0.5 milliseconds)' do
-      benchmark do
-        j.name "Garrett Bjerkhoel"
-        j.birthday Time.local(1991, 9, 14)
-        j.street do
-          j.address "1143 1st Ave"
-          j.address2 "Apt 200"
-          j.city "New York"
-          j.state "New York"
-          j.zip 10065
-        end
-        j.skills do
-          j.ruby true
-          j.asp false
-          j.php true
-          j.mysql true
-          j.mongodb true
-          j.haproxy true
-          j.marathon false
-        end
-        j.single_skills ['ruby', 'php', 'mysql', 'mongodb', 'haproxy']
-        j.booleans [true, true, false, nil]
-        j.reset!
-      end.should be_faster_than(0.5)
-    end
-  end
-
-end