fjson 0.0.1 → 0.0.2

data/CHANGES

@@ -1,5 +1,5 @@
-2006-02-06 (0.4.1)
-  * Fixed a bug concerning escaping with backslashes. Thanks for the report go
-    to Florian Munz <surf@theflow.de>.
-2005-09-23 (0.4.0)
-  * Initial Rubyforge Version
+2006-10-16 (0.0.2)
+  * Gem now compiles the extension rather than just distribute the binary.
+
+2006-10-10 (0.0.1)
+  * Initial Rubyforge Version. Forked from ruby json library. http://json.rubyforge.org

data/README

@@ -1,19 +1,19 @@
+Project Site - http://fjson.rubyforge.org
+Rubyforge Project - http://rubyforge.org/projects/fjson
+
 Installation
 ============
 
-Just type into the command line as root:
+Install Fast Json as a gem.
 
-# ruby install.rb
+gem install fjson
 
 Testing and Examples
 ====================
 
-To run the tests type:
-
-$ ruby -I lib tests/runner.rb
+To run the specs type:
 
-To get an idea how this library is used also look at the tests (until I have
-time to better document it.)
+$ ruby spec/spec_suite.rb
 
 Author
 ======
@@ -25,4 +25,3 @@ License
 =======
 
 GNU General Public License (GPL)
-

data/Rakefile

@@ -7,7 +7,10 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 
-task :default => [
+task :default => [ :compile ] do
+end
+
+task :compile => [
   :json_ext,
   :state_ext,
   :object_ext,
@@ -18,12 +21,11 @@ task :default => [
   :false_class_ext,
   :nil_class_ext,
   :array_ext,
-  :hash_ext,
-  :spec
+  :hash_ext
 ] do
 end
 
-task :spec do
+task :spec => [:compile, :install] do
   require File.expand_path("#{dir}/spec/spec_suite")
 end
 
@@ -31,25 +33,57 @@ task :lib do
   directory "lib"
 end
 
-setup_extension("json_ext")
-setup_extension("state_ext")
-setup_extension("extensions/object_ext")
-setup_extension("extensions/integer_ext")
-setup_extension("extensions/float_ext")
-setup_extension("extensions/string_ext")
-setup_extension("extensions/true_class_ext")
-setup_extension("extensions/false_class_ext")
-setup_extension("extensions/nil_class_ext")
-setup_extension("extensions/array_ext")
-setup_extension("extensions/hash_ext")
+fjson_extensions = [
+  "json_ext",
+  "state_ext",
+  "extensions/object_ext",
+  "extensions/integer_ext",
+  "extensions/float_ext",
+  "extensions/string_ext",
+  "extensions/true_class_ext",
+  "extensions/false_class_ext",
+  "extensions/nil_class_ext",
+  "extensions/array_ext",
+  "extensions/hash_ext"
+]
+
+fjson_extensions.each do |ext|
+  setup_extension ext
+end
+
+task :install do
+  dir = File.dirname(__FILE__)
+  fjson_extensions.each do |extension_path|
+    cp extension_binary_path(extension_path), "#{dir}/lib/#{extension_path}"
+  end
+end
+
+task :cleanup do
+  fjson_extensions.each do |extension_path|
+    rm extension_binary_path(extension_path)
+    rm "#{extension_directory_path(extension_path)}/Rakefile"
+  end
+end
+
+def extension_binary_path(relative_extension_path)
+  binary_name = File.basename(relative_extension_path) + ".so"
+  directory = extension_directory_path(relative_extension_path)
+  "#{directory}/#{binary_name}"
+end
+
+def extension_directory_path(relative_extension_path)
+  base_extension_path = File.dirname(__FILE__) + "/ext"
+  "#{base_extension_path}/#{relative_extension_path}"
+end
 
 PKG_NAME = "fjson"
-PKG_VERSION   = "0.0.1"
+PKG_VERSION   = "0.0.2"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
+  '*.rb',
   'lib/**/*.rb',
-  'lib/**/*.so',
+  'ext/**/*.{h,c,rb}',
   'spec/**/*.rb'
 ]
 
@@ -67,6 +101,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.has_rdoc = true
+  s.extra_rdoc_files = [ "README" ]
 
   s.test_files = Dir.glob('spec/*_spec.rb')
   s.require_path = 'lib'
@@ -75,6 +110,10 @@ spec = Gem::Specification.new do |s|
   s.email = "brian.takita@gmail.com"
   s.homepage = "http://fjson.rubyforge.org"
   s.rubyforge_project = "fjson"
+
+  s.extensions = ["Rakefile"]
+
+  s.add_dependency "mkrf", ">=0.1.2"
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/TODO

@@ -0,0 +1 @@
+* Port the library to windows.

data/ext/extensions/array_ext/array_ext.c

@@ -0,0 +1,118 @@
+#include "array_ext.h"
+
+static VALUE cArray;
+static VALUE mJSON;
+static VALUE cState;
+static VALUE cCircularDatastructure;
+
+void Init_array_ext() {
+  mJSON = rb_const_get(rb_cObject, rb_intern("JSON"));
+  cState = rb_const_get(mJSON, rb_intern("State"));
+  cArray = rb_const_get(rb_cObject, rb_intern("Array"));
+  cCircularDatastructure = rb_const_get(mJSON, rb_intern("CircularDatastructure"));
+  rb_define_method(cArray, "to_json", (VALUE(*)(ANYARGS)) &to_json, -1);
+}
+
+/**
+ * Returns a JSON string containing a JSON array, that is unparsed from
+ * this Array instance.
+ * _state_ is a JSON::State object, that can also be used to configure the
+ * produced JSON string output further.
+ * _depth_ is used to find out nesting depth, to indent accordingly.
+ */
+static VALUE to_json(argc, argv, self)
+  int argc;
+  VALUE *argv;
+  VALUE self;
+{
+  VALUE state, depth;
+  rb_scan_args(argc, argv, "02", &state, &depth);
+  if(depth == Qnil) depth = rb_int2inum(0);
+
+  state = rb_funcall(cState, rb_intern("from_state"), 1, state);
+  return json_check_circular_and_transform(self, state, depth);
+}
+
+/** Private **/
+
+static VALUE json_check_circular_and_transform(self, state, depth)
+  VALUE self, state, depth;
+{
+  VALUE call_args = rb_ary_new3(3, self, state, depth);
+  return rb_ensure(json_check_circular_and_transform_call, call_args, json_check_circular_and_transform_ensure, call_args);
+}
+
+static VALUE json_check_circular_and_transform_call(args)
+  VALUE args;
+{
+  VALUE self = rb_ary_entry(args, 0);
+  VALUE state = rb_ary_entry(args, 1);
+  VALUE depth = rb_ary_entry(args, 2);
+  if(state != Qnil) {
+    if(rb_funcall(state, rb_intern("seen?"), 1, self) == Qtrue) {
+      rb_raise(
+        cCircularDatastructure,
+        "circular data structures not supported!"
+      );
+    }
+    rb_funcall(state, rb_intern("remember"), 1, self);
+  }
+  return json_transform(self, state, depth);
+}
+
+static VALUE json_check_circular_and_transform_ensure(args)
+  VALUE args;
+{
+  VALUE self = rb_ary_entry(args, 0);
+  VALUE state = rb_ary_entry(args, 1);
+  if(state != Qnil) {
+    rb_funcall(state, rb_intern("forget"), 1, self);
+  }
+}
+
+static VALUE json_transform(self, state, depth)
+  VALUE self, state, depth;
+{
+  VALUE delim = rb_str_new2(",");
+  VALUE array_nl = Qnil;
+  if(state != Qnil) array_nl = rb_funcall(state, rb_intern("array_nl"), 0);
+  if(array_nl != Qnil) rb_str_append(delim, array_nl);
+
+  VALUE json = rb_str_new2("[");
+  if(array_nl != Qnil) rb_str_append(json, array_nl);
+
+  process_internal_json(self, json, state, depth, delim);
+
+  if(array_nl != Qnil) rb_str_append(json, array_nl);
+  json_shift(self, json, state, depth);
+  rb_str_cat2(json, "]");
+  return json;
+}
+
+static VALUE process_internal_json(self, json, state, depth, delim)
+  VALUE self, json, state, depth, delim;
+{
+  VALUE next_depth = LONG2NUM(NUM2LONG(depth) + 1);
+
+  VALUE current_value;
+  int i;
+  for(i = 0; i < RARRAY(self)->len; i++) {
+    if(i > 0) {
+      rb_str_concat(json, delim);
+    }
+    current_value = rb_ary_entry(self, i);
+    json_shift(self, json, state, depth);
+    rb_str_append(json, rb_funcall(current_value, rb_intern("to_json"), 2, state, next_depth));
+  }
+}
+
+static VALUE json_shift(self, json, state, depth)
+  VALUE self, json, state, depth;
+{
+  if(state == Qnil) return Qnil;
+  VALUE array_nl = rb_funcall(state, rb_intern("array_nl"), 0);
+  if(RSTRING(array_nl)->len == 0) return Qnil;
+
+  rb_json_state_indent(state, json, NUM2LONG(depth) + 1);
+  return Qnil;
+}

data/ext/extensions/array_ext/array_ext.h

@@ -0,0 +1,12 @@
+#include "ruby.h"
+#include <string.h>
+#include "../../state_ext/state_ext.h"
+#include "../../state_ext/state_ext.c"
+
+static VALUE to_json(int, VALUE*, VALUE);
+static VALUE json_check_circular_and_transform_call(VALUE);
+static VALUE json_check_circular_and_transform_ensure(VALUE);
+static VALUE json_check_circular_and_transform(VALUE, VALUE, VALUE);
+static VALUE json_transform(VALUE, VALUE, VALUE);
+static VALUE json_shift(VALUE, VALUE, VALUE, VALUE);
+static VALUE process_internal_json(VALUE, VALUE, VALUE, VALUE, VALUE);

data/ext/extensions/array_ext/extconf.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'mkrf'
+
+dir = File.dirname(__FILE__)
+Mkrf::Generator.new('array_ext', "#{dir}/*.c") do |g|
+  g.include_header File.expand_path("#{dir}/../../state_ext/state_ext.h")
+end

data/ext/extensions/false_class_ext/extconf.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'mkrf'
+
+dir = File.dirname(__FILE__)
+Mkrf::Generator.new('false_class_ext', "#{dir}/*.c")

data/ext/extensions/false_class_ext/false_class_ext.c

@@ -0,0 +1,19 @@
+#include "false_class_ext.h"
+
+static VALUE cFalseClass;
+
+void Init_false_class_ext() {
+  cFalseClass = rb_const_get(rb_cObject, rb_intern("FalseClass"));
+  rb_define_method(cFalseClass, "to_json", (VALUE(*)(ANYARGS)) &to_json, -1);
+}
+
+/**
+ * Returns a JSON string for false: 'false'.
+ */
+static VALUE to_json(argc, argv, self)
+  int argc;
+  VALUE *argv;
+  VALUE self;
+{
+  return rb_funcall(self, rb_intern("to_s"), 0);
+}

data/ext/extensions/false_class_ext/false_class_ext.h

@@ -0,0 +1,4 @@
+#include "ruby.h"
+#include <string.h>
+
+static VALUE to_json(int, VALUE*, VALUE);

data/ext/extensions/float_ext/extconf.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'mkrf'
+
+dir = File.dirname(__FILE__)
+Mkrf::Generator.new('float_ext', "#{dir}/*.c")

data/ext/extensions/float_ext/float_ext.c

@@ -0,0 +1,19 @@
+#include "float_ext.h"
+
+static VALUE cFloat;
+
+void Init_float_ext() {
+  cFloat = rb_const_get(rb_cObject, rb_intern("Float"));
+  rb_define_method(cFloat, "to_json", (VALUE(*)(ANYARGS)) &to_json, -1);
+}
+
+/**
+ * Returns a JSON string representation for this Float number.
+ */
+static VALUE to_json(argc, argv, self)
+  int argc;
+  VALUE *argv;
+  VALUE self;
+{
+  return rb_funcall(self, rb_intern("to_s"), 0);
+}

data/ext/extensions/float_ext/float_ext.h

@@ -0,0 +1,4 @@
+#include "ruby.h"
+#include <string.h>
+
+static VALUE to_json(int, VALUE*, VALUE);

data/ext/extensions/hash_ext/extconf.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'mkrf'
+
+dir = File.dirname(__FILE__)
+Mkrf::Generator.new('hash_ext', "#{dir}/*.c") do |g|
+  g.include_header File.expand_path("#{dir}/../../state_ext")
+end

data/ext/extensions/hash_ext/hash_ext.c

@@ -0,0 +1,128 @@
+#include "hash_ext.h"
+
+static VALUE cHash;
+static VALUE mJSON;
+static VALUE cState;
+static VALUE cCircularDatastructure;
+
+void Init_hash_ext() {
+  mJSON = rb_const_get(rb_cObject, rb_intern("JSON"));
+  cState = rb_const_get(mJSON, rb_intern("State"));
+  cHash = rb_const_get(rb_cObject, rb_intern("Hash"));
+  cCircularDatastructure = rb_const_get(mJSON, rb_intern("CircularDatastructure"));
+  rb_define_method(cHash, "to_json", (VALUE(*)(ANYARGS)) &to_json, -1);
+}
+
+/**
+ * Returns a JSON string containing a JSON hash, that is unparsed from
+ * this Hash instance.
+ * _state_ is a JSON::State object, that can also be used to configure the
+ * produced JSON string output further.
+ * _depth_ is used to find out nesting depth, to indent accordingly.
+ */
+static VALUE to_json(argc, argv, self)
+  int argc;
+  VALUE *argv;
+  VALUE self;
+{
+  VALUE state, depth;
+  rb_scan_args(argc, argv, "02", &state, &depth);
+  if(depth == Qnil) depth = INT2NUM(0);
+
+  state = rb_funcall(cState, rb_intern("from_state"), 1, state);
+  return json_check_circular_and_transform(self, state, depth);
+}
+
+/** private **/
+
+static VALUE json_check_circular_and_transform(self, state, depth)
+  VALUE self, state, depth;
+{
+  VALUE call_args = rb_ary_new3(3, self, state, depth);
+  return rb_ensure(json_check_circular_and_transform_call, call_args, json_check_circular_and_transform_ensure, call_args);
+}
+
+static VALUE json_check_circular_and_transform_ensure(args)
+  VALUE args;
+{
+  VALUE self = rb_ary_entry(args, 0);
+  VALUE state = rb_ary_entry(args, 1);
+  if(state != Qnil) {
+    rb_funcall(state, rb_intern("forget"), 1, self);
+  }
+}
+
+static VALUE json_check_circular_and_transform_call(args)
+  VALUE args;
+{
+  VALUE self = rb_ary_entry(args, 0);
+  VALUE state = rb_ary_entry(args, 1);
+  VALUE depth = rb_ary_entry(args, 2);
+  if(state != Qnil) {
+    if(rb_funcall(state, rb_intern("seen?"), 1, self) == Qtrue) {
+      rb_raise(
+        cCircularDatastructure,
+        "circular data structures not supported!"
+      );
+    }
+    rb_funcall(state, rb_intern("remember"), 1, self);
+  }
+  return json_transform(self, state, depth);
+}
+
+static VALUE json_transform(self, state, depth)
+  VALUE self, state, depth;
+{
+  VALUE delim = rb_str_new2(",");
+  VALUE object_nl = Qnil;
+  if(state != Qnil) object_nl = rb_funcall(state, rb_intern("object_nl"), 0);
+  if(object_nl != Qnil) rb_str_append(delim, object_nl);
+
+  VALUE result = rb_str_new2("{");
+  if(object_nl != Qnil) rb_str_append(result, object_nl);
+
+  process_internal_json(self, result, state, depth, delim);
+
+  if(object_nl != Qnil) rb_str_append(result, object_nl);
+  json_shift(self, result, state, depth);
+  rb_str_append(result, rb_str_new2("}"));
+  return result;
+}
+
+static VALUE process_internal_json(self, json, state, depth, delim)
+  VALUE self, json, state, depth, delim;
+{
+  // TODO: Use st_foreach for even better performance
+  VALUE key_value_pairs = rb_funcall(self, rb_intern("to_a"), 0);
+  VALUE new_depth = LONG2NUM(NUM2LONG(depth) + 1);
+  VALUE space = rb_funcall(state, rb_intern("space"), 0);
+
+  VALUE key_value = Qnil;
+  int i;
+  for(i = 0; i < RARRAY(key_value_pairs)->len; i++) {
+    if(i > 0) {
+      rb_str_concat(json, delim);
+    }
+    key_value = rb_ary_entry(key_value_pairs, i);
+    VALUE key = rb_ary_entry(key_value, 0);
+    VALUE value = rb_ary_entry(key_value, 1);
+
+    json_shift(self, json, state, depth);
+    VALUE key_string = rb_funcall(key, rb_intern("to_s"), 0);
+    rb_str_append(json, rb_funcall(key_string, rb_intern("to_json"), 2, state, new_depth));
+    rb_str_cat2(json, ":");
+    rb_str_append(json, space);
+    rb_str_append(json, rb_funcall(value, rb_intern("to_json"), 2, state, new_depth));
+  }
+}
+
+static VALUE json_shift(self, json, state, depth)
+  VALUE self, json, state, depth;
+{
+  if(state == Qnil) return Qnil;
+  VALUE object_nl = rb_funcall(state, rb_intern("object_nl"), 0);
+  if(RSTRING(object_nl)->len == 0) return Qnil;
+
+  rb_json_state_indent(state, json, NUM2LONG(depth) + 1);
+  return Qnil;
+}