json_builder 3.0.4 → 3.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_builder (3.0.4)
+    json_builder (3.0.6)
       activesupport (>= 2.0.0)
 
 GEM

data/lib/json_builder/compiler.rb

@@ -1,8 +1,7 @@
-require 'blankslate' unless defined?(BlankSlate)
 require 'json_builder/member'
 
 module JSONBuilder
-  class Compiler < BlankSlate
+  class Compiler
     class << self
       def generate(*args, &block)
         options = args.extract_options!
@@ -18,6 +17,8 @@ module JSONBuilder
     attr_accessor :callback
     attr_accessor :pretty_print
     
+    undef_method :id if methods.include? 'id'
+    
     def initialize(options={})
       @_members = []
       @_scope = options[:scope]
@@ -76,7 +77,7 @@ module JSONBuilder
     
     def copy_instance_variables_from(object, exclude = []) #:nodoc:
       vars = object.instance_variables.map(&:to_s) - exclude.map(&:to_s)
-      vars.each { |name| instance_variable_set(name, object.instance_variable_get(name)) }
+      vars.each { |name| instance_variable_set(name.to_sym, object.instance_variable_get(name)) }
     end
     
     # There are some special methods that need to be ignored that may be matched within +@_scope+.

data/lib/json_builder/extensions.rb

@@ -1,4 +1,4 @@
-require 'active_support/time'
+require 'active_support/all'
 
 class FalseClass
   def to_builder
@@ -32,19 +32,19 @@ end
 
 class Time
   def to_builder
-    self.iso8601.inspect
+    self.strftime("%Y-%m-%dT%H:%M:%S").inspect
   end
 end
 
 class Date
   def to_builder
-    self.iso8601.inspect
+    self.strftime("%Y-%m-%dT%H:%M:%S").inspect
   end
 end
 
 class DateTime
   def to_builder
-    self.iso8601.inspect
+    self.strftime("%Y-%m-%dT%H:%M:%S").inspect
   end
 end
 

data/lib/json_builder/version.rb

@@ -1,3 +1,3 @@
 module JSONBuilder
-  VERSION = '3.0.4'
+  VERSION = '3.0.6'
 end

data/spec/unit/json_builder_spec.rb

@@ -36,7 +36,7 @@ describe "JSONBuilder" do
       date Date.new(2011, 11, 23)
       date_time DateTime.new(2001, 2, 3, 4, 5, 6)
       timed Time.at(1322427883)
-    end.should == '{"date": "2011-11-23", "date_time": "2001-02-03T04:05:06+00:00", "timed": "2011-11-27T13:04:43-08:00"}'
+    end.should == '{"date": "2011-11-23T00:00:00", "date_time": "2001-02-03T04:05:06", "timed": "2011-11-27T13:04:43"}'
   end
   
   it "should support multiple nestings" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_builder
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000Z
+date: 2011-12-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70347426853340 !ruby/object:Gem::Requirement
+  requirement: &70270510504640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70347426853340
+  version_requirements: *70270510504640
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70347426852760 !ruby/object:Gem::Requirement
+  requirement: &70270510503740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *70347426852760
+  version_requirements: *70270510503740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70347426852220 !ruby/object:Gem::Requirement
+  requirement: &70270510503140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70347426852220
+  version_requirements: *70270510503140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70347426851720 !ruby/object:Gem::Requirement
+  requirement: &70270510502540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70347426851720
+  version_requirements: *70270510502540
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70347426851080 !ruby/object:Gem::Requirement
+  requirement: &70270510501660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70347426851080
+  version_requirements: *70270510501660
 description: Rails provides an excellent XML Builder by default to build RSS and ATOM
   feeds, but nothing to help you build complex and custom JSON data structures. The
   standard to_json works well, but can get very verbose when you need full control
@@ -83,7 +83,6 @@ files:
 - README.md
 - Rakefile
 - json_builder.gemspec
-- lib/blankslate.rb
 - lib/json_builder.rb
 - lib/json_builder/compiler.rb
 - lib/json_builder/elements.rb
@@ -154,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1648976314168666999
+      hash: -1029443064844091129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1648976314168666999
+      hash: -1029443064844091129
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/lib/blankslate.rb

@@ -1,109 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-######################################################################
-# BlankSlate provides an abstract base class with no predefined
-# methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
-# BlankSlate is useful as a base class when writing classes that
-# depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
-#
-class BlankSlate
-  class << self
-
-    # Hide the method named +name+ in the BlankSlate class.  Don't
-    # hide +instance_eval+ or any method beginning with "__".
-    def hide(name)
-      if instance_methods.include?(name.to_s) and
-        name !~ /^(__|instance_eval)/
-        @hidden_methods ||= {}
-        @hidden_methods[name.to_sym] = instance_method(name)
-        undef_method name
-      end
-    end
-
-    def find_hidden_method(name)
-      @hidden_methods ||= {}
-      @hidden_methods[name] || superclass.find_hidden_method(name)
-    end
-
-    # Redefine a previously hidden method so that it may be called on a blank
-    # slate object.
-    def reveal(name)
-      hidden_method = find_hidden_method(name)
-      fail "Don't know how to reveal method '#{name}'" unless hidden_method
-      define_method(name, hidden_method)
-    end
-  end
-
-  instance_methods.each { |m| hide(m) }
-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