jsonbuilder 0.2.3 → 0.3.0

data/.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+*.gem
+pkg

data/README

@@ -49,11 +49,11 @@
   end
 
   def to_hash(options = {})
-    self.serialize(Builder::Hash.new, options)
+    self.serialize(Builder::HashStructure.new, options)
   end
 
   def to_json(options = {})
-    self.serialize(Builder::Json.new, options)
+    self.serialize(Builder::JsonFormat.new, options)
   end
 
 == Synopsis

data/Rakefile

@@ -1,143 +1,45 @@
 require 'rubygems'
 require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'rake/contrib/sshpublisher'
-require 'fileutils'
-include FileUtils
-
-NAME              = "jsonbuilder"
-AUTHOR            = "nov"
-EMAIL             = "nov@matake.jp"
-DESCRIPTION       = "Builder::XmlMarkup like JsonBuilder"
-RUBYFORGE_PROJECT = NAME
-HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-BIN_FILES         = %w(  )
-
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
-require 'lib/jsonbuilder'
-VERS              = JsonBuilder::Version.to_version
-CLEAN.include ['*.gem', '.config']
-RDOC_OPTS = [
-  "--title", "#{NAME} documentation",
-  "--charset", "utf-8",
-  "--opname", "index.html",
-  "--line-numbers",
-  "--main", "README",
-  "--inline-source",
-]
-
-task :default => [:spec]
-task :package => [:clean]
 
 begin
-  require 'spec/rake/spectask'
-
-  Spec::Rake::SpecTask.new('spec') do |t|
-    t.spec_opts = ["-f specdoc", "-c"]
-    t.spec_files = FileList['spec/*_spec.rb', 'spec/builder/*_spec.rb', 'spec/ext/*_spec.rb']
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = 'jsonbuilder'
+    gem.summary = %Q{Builder::XmlMarkup like JsonBuilder}
+    gem.description = %Q{Builder::XmlMarkup like JsonBuilder}
+    gem.email = 'nov@matake.jp'
+    gem.homepage = 'http://github.com/nov/jsonbuilder'
+    gem.authors = ['nov matake']
+    gem.add_dependency 'activesupport'
+    gem.add_development_dependency 'rspec'
+    gem.add_development_dependency 'rcov'
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  desc 'Spec rake task not available'
-  task :spec do
-    abort 'Spec rake task is not available. Be sure to install rspec as a gem or plugin'
-  end
+  puts 'Jeweler not available. Install it with: gem install jeweler'
 end
 
-spec = Gem::Specification.new do |s|
-  s.name              = NAME
-  s.version           = VERS
-  s.platform          = Gem::Platform::RUBY
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = ["README", "ChangeLog"]
-  s.rdoc_options     += RDOC_OPTS + ['--exclude', '^(examples)/']
-  s.summary           = DESCRIPTION
-  s.description       = DESCRIPTION
-  s.author            = AUTHOR
-  s.email             = EMAIL
-  s.homepage          = HOMEPATH
-  s.executables       = BIN_FILES
-  s.rubyforge_project = RUBYFORGE_PROJECT
-  s.require_path      = "lib"
-  #s.autorequire       = ""
-  s.test_files        = Dir["spec/*_spec.rb"]
-  s.files = %w(README ChangeLog Rakefile) +
-    Dir.glob("{spec,lib}/**/*") + 
-    Dir.glob("examples/**/*.rb")
-  s.add_dependency('builder')
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.fail_on_error = false
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.need_tar = true
-  p.gem_spec = spec
-end
-
-desc "Install"
-task :install do
-  name = "#{NAME}-#{VERS}.gem"
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{name}}
-end
-
-desc "Uninstall"
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+  spec.rcov_opts = ['--exclude spec,gems']
 end
+task :spec => :check_dependencies
+task :default => :spec
 
+require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.options += RDOC_OPTS
-  rdoc.template = "resh"
-  #rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-  if ENV['DOC_FILES']
-    rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
-  else
-    rdoc.rdoc_files.include('README', 'ChangeLog')
-    rdoc.rdoc_files.include('lib/**/*.rb')
-  end
-end
-
-desc "Publish to RubyForge"
-task :rubyforge => [:rdoc, :package] do
-  require 'rubyforge'
-  Rake::RubyForgePublisher.new(RUBYFORGE_PROJECT, 'nov').upload
-end
-
-# rake release VERSION=x.y.z
-desc 'Package and upload the release to rubyforge.'
-task :release => [:clean, :package] do |t|
-  v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
-  abort "Versions don't match #{v} vs #{VERS}" unless v == VERS
-  pkg = "pkg/#{NAME}-#{VERS}"
-
-  require 'rubyforge'
-  rf = RubyForge.new.configure
-  puts "Logging in"
-  rf.login
-
-  c = rf.userconfig
-  c["preformatted"] = true
-
-  files = [
-    "#{pkg}.tgz",
-    "#{pkg}.gem"
-  ].compact
-
-  puts "Releasing #{NAME} v. #{VERS}"
-  rf.add_release RUBYFORGE_PROJECT, NAME, VERS, *files
-end
-
-desc 'Show information about the gem.'
-task :debug_gem do
-  puts spec.to_ruby
-end
-
-desc 'Update gem spec'
-task :gemspec do
-  open("#{NAME}.gemspec", 'w').write spec.to_ruby
+  version = File.read('VERSION')
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = 'fb_graph #{version}'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -0,0 +1 @@
+0.3.0

data/jsonbuilder.gemspec

@@ -0,0 +1,77 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{jsonbuilder}
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["nov matake"]
+  s.date = %q{2010-05-19}
+  s.description = %q{Builder::XmlMarkup like JsonBuilder}
+  s.email = %q{nov@matake.jp}
+  s.extra_rdoc_files = [
+    "ChangeLog",
+     "README"
+  ]
+  s.files = [
+    ".gitignore",
+     "ChangeLog",
+     "README",
+     "Rakefile",
+     "VERSION",
+     "jsonbuilder.gemspec",
+     "lib/builder/abstract.rb",
+     "lib/builder/hash_structure.rb",
+     "lib/builder/json_format.rb",
+     "lib/builder/xml_markup.rb",
+     "lib/ext/stackable_array.rb",
+     "lib/ext/stackable_hash.rb",
+     "lib/jsonbuilder.rb",
+     "lib/patch/active_support_json_decode.rb",
+     "spec/builder/array_mode_spec.rb",
+     "spec/builder/hash_structure_spec.rb",
+     "spec/builder/json_format_spec.rb",
+     "spec/builder/xml_markup_spec.rb",
+     "spec/ext/stackable_array_spec.rb",
+     "spec/ext/stackable_hash_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/nov/jsonbuilder}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Builder::XmlMarkup like JsonBuilder}
+  s.test_files = [
+    "spec/builder/array_mode_spec.rb",
+     "spec/builder/hash_structure_spec.rb",
+     "spec/builder/json_format_spec.rb",
+     "spec/builder/xml_markup_spec.rb",
+     "spec/ext/stackable_array_spec.rb",
+     "spec/ext/stackable_hash_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/builder/json_format.rb

@@ -1,4 +1,3 @@
-require 'activesupport'
 require 'patch/active_support_json_decode'
 
 module Builder

data/lib/jsonbuilder.rb

@@ -1,18 +1,4 @@
 module JsonBuilder
-  module Version
-    MAJOR = 0
-    MINOR = 2
-    REVISION = 3
-    class << self
-      def to_version
-        "#{MAJOR}.#{MINOR}.#{REVISION}"
-      end
-
-      def to_name
-        "#{MAJOR}_#{MINOR}_#{REVISION}"
-      end
-    end
-  end
 end
 
 require 'builder/abstract'

data/lib/patch/active_support_json_decode.rb

@@ -1,6 +1,8 @@
 # Copy of rails 2.3.2 ActiveSupport::JSON since 2.2.2 doesn't correctly decode unicode.
 require 'yaml'
 require 'strscan'
+require 'active_support/core_ext'
+require 'active_support/json'
 
 silence_warnings {
   module ActiveSupport

data/spec/spec.opts

@@ -0,0 +1,3 @@
+--colour
+--format
+specdoc

metadata

@@ -1,27 +1,58 @@
 --- !ruby/object:Gem::Specification 
 name: jsonbuilder
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
-- nov
+- nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 +09:00
+date: 2010-05-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Builder::XmlMarkup like JsonBuilder
 email: nov@matake.jp
 executables: []
@@ -29,20 +60,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
 - ChangeLog
-files: 
 - README
+files: 
+- .gitignore
 - ChangeLog
+- README
 - Rakefile
-- spec/builder/array_mode_spec.rb
-- spec/builder/hash_structure_spec.rb
-- spec/builder/json_format_spec.rb
-- spec/builder/xml_markup_spec.rb
-- spec/ext/stackable_array_spec.rb
-- spec/ext/stackable_hash_spec.rb
-- spec/jsonbuilder_spec.rb
-- spec/spec_helper.rb
+- VERSION
+- jsonbuilder.gemspec
 - lib/builder/abstract.rb
 - lib/builder/hash_structure.rb
 - lib/builder/json_format.rb
@@ -51,44 +77,49 @@ files:
 - lib/ext/stackable_hash.rb
 - lib/jsonbuilder.rb
 - lib/patch/active_support_json_decode.rb
+- spec/builder/array_mode_spec.rb
+- spec/builder/hash_structure_spec.rb
+- spec/builder/json_format_spec.rb
+- spec/builder/xml_markup_spec.rb
+- spec/ext/stackable_array_spec.rb
+- spec/ext/stackable_hash_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
-homepage: http://jsonbuilder.rubyforge.org
+homepage: http://github.com/nov/jsonbuilder
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --title
-- jsonbuilder documentation
-- --charset
-- utf-8
-- --opname
-- index.html
-- --line-numbers
-- --main
-- README
-- --inline-source
-- --exclude
-- ^(examples)/
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: jsonbuilder
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Builder::XmlMarkup like JsonBuilder
 test_files: 
-- spec/jsonbuilder_spec.rb
+- spec/builder/array_mode_spec.rb
+- spec/builder/hash_structure_spec.rb
+- spec/builder/json_format_spec.rb
+- spec/builder/xml_markup_spec.rb
+- spec/ext/stackable_array_spec.rb
+- spec/ext/stackable_hash_spec.rb
+- spec/spec_helper.rb

data/spec/jsonbuilder_spec.rb

@@ -1,13 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe JsonBuilder::Version, "#to_version" do
-  it "should return version in 'X.Y.Z' format" do
-    JsonBuilder::Version.to_version.should =~ /\d+\.\d+\.\d+/
-  end
-end
-
-describe JsonBuilder::Version, "#to_name" do
-  it "should return version in 'X_Y_Z' format" do
-    JsonBuilder::Version.to_name.should =~ /\d+_\d+_\d+/
-  end
-end