rufus-json 0.2.5 → 0.2.6

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-json CHANGELOG.txt
 
 
+== rufus-json - 0.2.6    released 2011/05/20
+
+- Rufus::Json .dump and .load (aliases to .encode/.decode). Thanks @tenderlove
+
+
 == rufus-json - 0.2.5    released 2010/08/10
 
 - Rufus::Json.encode(o) now accepting string, numbers, boolean and null

data/Rakefile

@@ -1,85 +1,85 @@
 
-
-require 'lib/rufus/json.rb'
+$:.unshift('.') # 1.9.2
 
 require 'rubygems'
+require 'rubygems/user_interaction' if Gem::RubyGemsVersion == '1.5.0'
+
 require 'rake'
+require 'rake/clean'
+require 'rake/rdoctask'
 
 
 #
-# CLEAN
+# clean
 
-require 'rake/clean'
-CLEAN.include('pkg', 'tmp', 'html')
-task :default => [ :clean ]
+CLEAN.include('pkg', 'rdoc')
 
 
 #
-# GEM
+# test
 
-require 'jeweler'
+#task :spec => :check_dependencies do
+task :test do
+  sh 'ruby test/test.rb'
+end
 
-Jeweler::Tasks.new do |gem|
+task :default => :test
 
-  gem.version = Rufus::Json::VERSION
-  gem.name = 'rufus-json'
 
-  gem.summary = 'One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.'
+#
+# gem
 
-  gem.description = %{
-One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
-  }
-  gem.email = 'jmettraux@gmail.com'
-  gem.homepage = 'http://github.com/jmettraux/rufus-json/'
-  gem.authors = [ 'John Mettraux', 'Torsten Schoenebaum' ]
-  gem.rubyforge_project = 'rufus'
+GEMSPEC_FILE = Dir['*.gemspec'].first
+GEMSPEC = eval(File.read(GEMSPEC_FILE))
+GEMSPEC.validate
 
-  gem.test_file = 'test/test.rb'
 
-  gem.add_development_dependency 'json'
-  gem.add_development_dependency 'yajl-ruby'
-  gem.add_development_dependency 'activesupport'
-  #gem.add_development_dependency 'json_pure'
-  #gem.add_development_dependency 'json-jruby'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'jeweler'
+desc %{
+  builds the gem and places it in pkg/
+}
+task :build do
 
-  # gemspec spec : http://www.rubygems.org/read/chapter/20
+  sh "gem build #{GEMSPEC_FILE}"
+  sh "mkdir pkg" rescue nil
+  sh "mv #{GEMSPEC.name}-#{GEMSPEC.version}.gem pkg/"
 end
-Jeweler::GemcutterTasks.new
 
+desc %{
+  builds the gem and pushes it to rubygems.org
+}
+task :push => :build do
+
+  sh "gem push pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.gem"
+end
 
-#
-# DOC
 
-begin
+#
+# rdoc
+#
+# make sure to have rdoc 2.5.x to run that
 
-  require 'yard'
+Rake::RDocTask.new do |rd|
 
-  YARD::Rake::YardocTask.new do |doc|
-    doc.options = [
-      '-o', 'html/rufus-json', '--title',
-      "rufus-json #{Rufus::Json::VERSION}"
-    ]
-  end
+  rd.main = 'README.txt'
+  rd.rdoc_dir = "rdoc/#{GEMSPEC.name}"
 
-rescue LoadError
+  rd.rdoc_files.include('README.rdoc', 'CHANGELOG.txt', 'lib/**/*.rb')
 
-  task :yard do
-    abort "YARD is not available : sudo gem install yard"
-  end
+  rd.title = "#{GEMSPEC.name} #{GEMSPEC.version}"
 end
 
 
 #
-# TO THE WEB
+# upload_rdoc
 
-task :upload_website => [ :clean, :yard ] do
+desc %{
+  upload the rdoc to rubyforge
+}
+task :upload_rdoc => [ :clean, :rdoc ] do
 
   account = 'jmettraux@rubyforge.org'
   webdir = '/var/www/gforge-projects/rufus'
 
-  sh "rsync -azv -e ssh html/rufus-json #{account}:#{webdir}/"
+  sh "rsync -azv -e ssh rdoc/#{GEMSPEC.name} #{account}:#{webdir}/"
 end
 

data/lib/rufus/json.rb

@@ -26,7 +26,7 @@
 module Rufus
 module Json
 
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 
   # The JSON / JSON pure decoder
   #
@@ -138,6 +138,13 @@ module Json
     end
   end
 
+  # An alias for .encode
+  #
+  def self.dump (o, opts={})
+
+    encode(o, opts)
+  end
+
   # Decodes the given JSON string.
   #
   def self.decode (s)
@@ -148,6 +155,13 @@ module Json
     raise ParserError.new(e.message)
   end
 
+  # An alias for .decode
+  #
+  def self.load (s)
+
+    decode(s)
+  end
+
   # Duplicates an object by turning it into JSON and back.
   #
   # Don't laugh, yajl-ruby makes that faster than a Marshal copy.

data/rufus-json.gemspec

@@ -1,73 +1,37 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
+
+require File.join(File.dirname(__FILE__), 'lib/rufus/json')
+  # bundler wants absolute path
+
 
 Gem::Specification.new do |s|
-  s.name = %q{rufus-json}
-  s.version = "0.2.5"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Mettraux", "Torsten Schoenebaum"]
-  s.date = %q{2010-08-10}
-  s.description = %q{
+  s.name = 'rufus-json'
+  s.version = Rufus::Json::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors = [ 'John Mettraux' ]
+  s.email = [ 'jmettraux@gmail.com' ]
+  s.homepage = 'http://github.com/jmettraux/rufus-json'
+  s.rubyforge_project = 'rufus'
+  s.summary = 'One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.'
+
+  s.description = %{
 One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
-  }
-  s.email = %q{jmettraux@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-     "README.rdoc"
-  ]
-  s.files = [
-    "CHANGELOG.txt",
-     "CREDITS.txt",
-     "LICENSE.txt",
-     "README.rdoc",
-     "Rakefile",
-     "lib/rufus-json.rb",
-     "lib/rufus/json.rb",
-     "rufus-json.gemspec",
-     "test/backend_test.rb",
-     "test/do_test.rb",
-     "test/nesting20.rb",
-     "test/test.rb"
-  ]
-  s.homepage = %q{http://github.com/jmettraux/rufus-json/}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rufus}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.}
-  s.test_files = [
-    "test/test.rb"
+  }.strip
+
+  #s.files = `git ls-files`.split("\n")
+  s.files = Dir[
+    'Rakefile',
+    'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb',
+    '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_development_dependency 'json'
+  s.add_development_dependency 'json_pure'
+  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'activesupport'
+  s.add_development_dependency 'rake'
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_development_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  s.require_path = 'lib'
 end
 

data/test/do_test.rb

@@ -48,6 +48,16 @@ class DoTest < Test::Unit::TestCase
     assert_equal "[1,2,3]", Rufus::Json.encode([ 1, 2, 3 ])
   end
 
+  def test_load
+
+    assert_equal [ 1, 2, 3 ], Rufus::Json.load("[ 1, 2, 3 ]")
+  end
+
+  def test_dump
+
+    assert_equal "[1,2,3]", Rufus::Json.dump([ 1, 2, 3 ])
+  end
+
   def test_encode_value # instead of object or array
 
     assert_equal 'null', Rufus::Json.encode(nil)

metadata

@@ -1,147 +1,148 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-json
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - John Mettraux
-- Torsten Schoenebaum
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +09:00
+date: 2011-05-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: json_pure
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: yajl-ruby
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
-description: "\n\
-  One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.\n  "
-email: jmettraux@gmail.com
+description: One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
+email: 
+- jmettraux@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- CHANGELOG.txt
-- CREDITS.txt
-- LICENSE.txt
-- README.rdoc
 - Rakefile
-- lib/rufus-json.rb
 - lib/rufus/json.rb
-- rufus-json.gemspec
+- lib/rufus-json.rb
 - test/backend_test.rb
 - test/do_test.rb
 - test/nesting20.rb
 - test/test.rb
+- rufus-json.gemspec
+- CHANGELOG.txt
+- CREDITS.txt
+- LICENSE.txt
+- README.rdoc
 has_rdoc: true
-homepage: http://github.com/jmettraux/rufus-json/
+homepage: http://github.com/jmettraux/rufus-json
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rufus
-rubygems_version: 1.3.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: One interface to various JSON ruby libs (yajl, json, json_pure, json-jruby, active_support). Has a preference for yajl.
-test_files: 
-- test/test.rb
+test_files: []
+