jsonify 0.0.7 → 0.0.8

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_dependency 'json'
+  s.add_dependency 'json_pure'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'autotest'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rdiscount'
+  s.add_development_dependency 'ruby-prof'
 end

data/lib/jsonify.rb

@@ -3,4 +3,5 @@ require 'jsonify/blank_slate'
 require 'jsonify/version'
 require 'jsonify/json_value'
 require 'jsonify/generate'
-require 'jsonify/builder'
+require 'jsonify/builder'
+require 'benchmark'

data/lib/jsonify/blank_slate.rb

@@ -44,66 +44,4 @@ module Jsonify
 
     instance_methods.each { |m| hide(m) }
   end
-end
-######################################################################
-# Since Ruby is very dynamic, methods added to the ancestors of
-# BlankSlate <em>after BlankSlate is defined</em> will show up in the
-# list of available BlankSlate methods.  We handle this by defining a
-# hook in the Object and Kernel classes that will hide any method
-# defined after BlankSlate has been loaded.
-#
-# module Kernel
-#   class << self
-#     alias_method :blank_slate_method_added, :method_added
-# 
-#     # Detect method additions to Kernel and remove them in the
-#     # BlankSlate class.
-#     def method_added(name)
-#       result = blank_slate_method_added(name)
-#       return result if self != Kernel
-#       BlankSlate.hide(name)
-#       result
-#     end
-#   end
-# end
-
-######################################################################
-# Same as above, except in Object.
-#
-# class Object
-#   class << self
-#     alias_method :blank_slate_method_added, :method_added
-# 
-#     # Detect method additions to Object and remove them in the
-#     # BlankSlate class.
-#     def method_added(name)
-#       result = blank_slate_method_added(name)
-#       return result if self != Object
-#       BlankSlate.hide(name)
-#       result
-#     end
-# 
-#     def find_hidden_method(name)
-#       nil
-#     end
-#   end
-# end
-
-######################################################################
-# Also, modules included into Object need to be scanned and have their
-# instance methods removed from blank slate.  In theory, modules
-# included into Kernel would have to be removed as well, but a
-# "feature" of Ruby prevents late includes into modules from being
-# exposed in the first place.
-#
-# class Module
-#   alias blankslate_original_append_features append_features
-#   def append_features(mod)
-#     result = blankslate_original_append_features(mod)
-#     return result if mod != Object
-#     instance_methods.each do |name|
-#       BlankSlate.hide(name)
-#     end
-#     result
-#   end
-# end
+end

data/lib/jsonify/version.rb

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

data/spec/benchmark_helper.rb

@@ -0,0 +1,133 @@
+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

@@ -0,0 +1,46 @@
+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

data/spec/profile.rb

@@ -0,0 +1,16 @@
+require 'bundler'
+require 'bundler/setup'
+require 'jsonify'
+require 'ruby-prof'
+
+result = RubyProf.profile do
+  1.times do
+    json=Jsonify::Builder.new
+    json.hello 'world'
+    json.compile!
+  end
+end
+
+# Print a flat profile to text
+printer = RubyProf::FlatPrinter.new(result)
+printer.print(STDOUT)

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
+require 'benchmark'
 require 'bundler'
 require 'bundler/setup'
 require 'jsonify'
+require 'benchmark_helper'
 
 RSpec.configure do |config|
-  # some (optional) config here
 end

data/spec/speed.rb

@@ -0,0 +1,39 @@
+require 'bundler'
+require 'bundler/setup'
+require 'jsonify'
+require 'benchmark'
+
+class Speed
+  def self.test
+    Benchmark.bm do |b|
+      b.report('Jsonify') do
+        15_000.times {
+          j = Jsonify::Builder.new
+          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.compile!
+        }
+      end
+    end
+  end
+end
+
+Speed.test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonify
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-02 00:00:00.000000000Z
+date: 2011-08-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70365091068360 !ruby/object:Gem::Requirement
+  name: json_pure
+  requirement: &70097037247660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365091068360
+  version_requirements: *70097037247660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70365091067280 !ruby/object:Gem::Requirement
+  requirement: &70097037247160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365091067280
+  version_requirements: *70097037247160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70365091066160 !ruby/object:Gem::Requirement
+  requirement: &70097037246620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365091066160
+  version_requirements: *70097037246620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70365091065240 !ruby/object:Gem::Requirement
+  requirement: &70097037245940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365091065240
+  version_requirements: *70097037245940
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70365091063920 !ruby/object:Gem::Requirement
+  requirement: &70097037245420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365091063920
+  version_requirements: *70097037245420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70365091062820 !ruby/object:Gem::Requirement
+  requirement: &70097037244760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365091062820
+  version_requirements: *70097037244760
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70365091061600 !ruby/object:Gem::Requirement
+  requirement: &70097037244220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365091061600
+  version_requirements: *70097037244220
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: &70097037243620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70097037243620
 description: Turn Ruby objects into JSON -- correctly!
 email:
 - bsiggelkow@me.com
@@ -108,11 +119,15 @@ files:
 - lib/jsonify/generate.rb
 - lib/jsonify/json_value.rb
 - lib/jsonify/version.rb
+- spec/benchmark_helper.rb
+- spec/benchmark_spek.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: 
@@ -127,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3226176864107262675
+      hash: 2291352512493608136
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3226176864107262675
+      hash: 2291352512493608136
 requirements: []
 rubyforge_project: jsonify
 rubygems_version: 1.8.6
@@ -144,8 +159,12 @@ signing_key:
 specification_version: 3
 summary: Turn Ruby objects into JSON
 test_files:
+- spec/benchmark_helper.rb
+- spec/benchmark_spek.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