fjson 0.1.0 → 0.1.1

data/CHANGES

@@ -1,6 +1,3 @@
-2007-02-02 (0.0.9)
-  * Updated for latest version of rubygems 0.9.1. Removed dependency to rspec in the gem.
-
 2006-11-04 (0.0.8)
   * Fixed build issues. Better spec coverage on build.
 

data/Rakefile

@@ -1,46 +1,52 @@
 dir = File.dirname(__FILE__)
 require File.expand_path("#{dir}/rake_helper")
-rake_builder = MkmfRakeBuilder.new
-rake_builder.project_dir = File.dirname(__FILE__)
-rake_builder.rake_application = Rake.application
-rake_builder.rake_tasks = Rake::Task
-rake_builder.rake_file_tasks = Rake::FileTask
-rake_builder.dir_class = Dir
-rake_builder.file_class = File
-file_extension = (RUBY_PLATFORM =~ /darwin/) ? "bundle" : "so"
-rake_builder.file_extension = file_extension
-fjson_extensions = rake_builder.extensions_to_build = [
-  [:json_ext, "json_ext"],
-  [:state_ext, "state_ext"],
-  [:object_ext, "extensions/object_ext"],
-  [:integer_ext, "extensions/integer_ext"],
-  [:float_ext, "extensions/float_ext"],
-  [:string_ext, "extensions/string_ext"],
-  [:true_class_ext, "extensions/true_class_ext"],
-  [:false_class_ext, "extensions/false_class_ext"],
-  [:nil_class_ext, "extensions/nil_class_ext"],
-  [:array_ext, "extensions/array_ext"],
-  [:hash_ext, "extensions/hash_ext"]
-]
-
-rake_builder.build_default_task
-rake_builder.build_compile_task
-rake_builder.build_spec_task
-rake_builder.build_lib_task
-rake_builder.build_extension_compile_tasks
-rake_builder.build_install_task
-rake_builder.build_cleanup_task
-
 def win32?
   ENV["target_platform"] == "win32"
 end
 
-if win32?
-  #Rake::Task[].invoke
+desc "Compiles the library"
+task(:default) {mkmf_tasks.default}
+
+desc "Compiles the library"
+task(:compile) {mkmf_tasks.compile}
+
+desc "Compiles, installs, and runs the specs"
+task(:spec) {mkmf_tasks.spec}
+
+desc "Creates the lib directory"
+task(:lib) {mkmf_tasks.lib}
+
+desc "Installs the compiled files"
+task(:install) {mkmf_tasks.install}
+
+desc "Cleans up the build files"
+task(:cleanup) {mkmf_tasks.cleanup}
+
+def mkmf_tasks
+  tasks = MkmfTasks.new(self)
+  tasks.extconf_file_name = "extconf.mkmf.rb"
+  tasks.project_dir = File.dirname(__FILE__)
+  tasks.file_extension = (RUBY_PLATFORM =~ /darwin/) ? "bundle" : "so"
+  tasks.extconf_arguments = ""
+#  tasks.extconf_arguments = "-I /usr/local/lib/ruby-mingw32/lib/ruby/1.8/i386-mingw32" if win32?
+  tasks.extension_paths = [
+    "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"
+  ]
+  tasks
 end
 
 PKG_NAME = "fjson"
-PKG_VERSION   = "0.1.0"
+PKG_VERSION   = "0.1.1"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -49,6 +55,7 @@ PKG_FILES = FileList[
   'ext/**/*.{h,c,rb}',
   'spec/**/*.rb'
 ]
+PKG_FILES.include('lib/**/*.so') if win32?
 
 spec = Gem::Specification.new do |s|
   s.name = PKG_NAME
@@ -60,6 +67,7 @@ spec = Gem::Specification.new do |s|
   EOF
   s.test_files = Dir.glob('spec/*_spec.rb')
   s.description = s.summary
+  s.platform = (win32?) ? Gem::Platform::WIN32 : Gem::Platform::RUBY
 
   s.files = PKG_FILES.to_a
   s.require_path = 'lib'
@@ -75,13 +83,7 @@ spec = Gem::Specification.new do |s|
   s.homepage = "http://fjson.rubyforge.org"
   s.rubyforge_project = "fjson"
 
-  s.extensions = ["Rakefile"]
-
-  #s.add_dependency "mkrf", ">=0.1.2"
-
-  if win32?
-    
-  end
+  s.extensions = ["Rakefile"] unless win32?
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/ext/extensions/array_ext/array_ext.c

@@ -1,74 +1,17 @@
 #include "array_ext.h"
+#include "enumerable.c"
 
-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"));
+  rb_cJsonState = rb_const_get(mJSON, rb_intern("State"));
   cCircularDatastructure = rb_const_get(mJSON, rb_intern("CircularDatastructure"));
-  rb_define_method(cArray, "to_json", (VALUE(*)(ANYARGS)) &to_json, -1);
+  rb_define_method(rb_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);
-  }
-}
+/** private **/
 
 static VALUE json_transform(self, state, depth)
   VALUE self, state, depth;
@@ -76,21 +19,21 @@ static VALUE json_transform(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);
+  new_line(delim, array_nl);
 
   VALUE json = rb_str_new2("[");
-  if(array_nl != Qnil) rb_str_append(json, array_nl);
+  new_line(json, array_nl);
 
-  process_internal_json(self, json, state, depth, delim);
+  process_internal_json(self, json, state, depth, delim, array_nl);
 
-  if(array_nl != Qnil) rb_str_append(json, array_nl);
-  json_shift(self, json, state, depth);
+  new_line(json, array_nl);
+  if(rb_json_should_shift(state, array_nl) == Qtrue) json_shift(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;
+static VALUE process_internal_json(self, json, state, depth, delim, array_nl)
+  VALUE self, json, state, depth, delim, array_nl;
 {
   VALUE next_depth = LONG2NUM(NUM2LONG(depth) + 1);
 
@@ -101,18 +44,7 @@ static VALUE process_internal_json(self, json, state, depth, delim)
       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));
+    if(rb_json_should_shift(state, array_nl) == Qtrue) json_shift(json, state, depth);
+    rb_str_append(json, rb_to_json(current_value, state, 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

@@ -1,12 +1,8 @@
 #include "ruby.h"
 #include <string.h>
-#include "../../state_ext/state_ext.h"
-#include "../../state_ext/state_ext.c"
+#include "state_lib.h"
+#include "enumerable.h"
 
-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);
+static VALUE process_internal_json(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+static VALUE to_json(int, VALUE*, VALUE);

data/ext/extensions/array_ext/extconf.mkmf.rb

@@ -1,3 +1,6 @@
 require 'mkmf'
 
+dir = File.dirname(__FILE__)
+find_header("state_lib.h", "#{dir}/../../state_ext")
+find_header("enumerable.h", "#{dir}/../enumerable")
 create_makefile("array_ext")

data/ext/extensions/enumerable/enumerable.c

@@ -0,0 +1,70 @@
+#include "enumerable.h"
+
+static VALUE cCircularDatastructure;
+
+/**
+ * Returns a JSON string for this object.
+ * _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_json_from_state(rb_cJsonState, state);
+  return json_check_circular_and_transform(self, state, depth);
+}
+
+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_json_state_seen(state, self) == Qtrue) {
+      rb_raise(
+        cCircularDatastructure,
+        "circular data structures not supported!"
+      );
+    }
+    rb_json_state_remember(state, 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_json_state_forget(state, self);
+  }
+}
+
+static VALUE new_line(result, object_nl)
+  VALUE result, object_nl;
+{
+  if(object_nl != Qnil) rb_str_append(result, object_nl);
+}
+
+static VALUE json_shift(json, state, depth)
+  VALUE json, state, depth;
+{
+  rb_json_state_indent(state, json, NUM2LONG(depth) + 1);
+  return Qnil;
+}

data/ext/extensions/enumerable/enumerable.h

@@ -0,0 +1,9 @@
+#include "ruby.h"
+#include <string.h>
+
+static VALUE to_json(int, VALUE*, VALUE);
+static VALUE json_check_circular_and_transform(VALUE, VALUE, VALUE);
+static VALUE json_check_circular_and_transform_call(VALUE);
+static VALUE json_check_circular_and_transform_ensure(VALUE);
+static VALUE new_line(VALUE, VALUE);
+static VALUE json_shift(VALUE, VALUE, VALUE);

data/ext/extensions/hash_ext/extconf.mkmf.rb

@@ -1,3 +1,6 @@
 require 'mkmf'
 
+dir = File.dirname(__FILE__)
+find_header("state_lib.h", "#{dir}/../../state_ext")
+find_header("enumerable.h", "#{dir}/../enumerable")
 create_makefile("hash_ext")

data/ext/extensions/hash_ext/hash_ext.c

@@ -1,96 +1,39 @@
 #include "hash_ext.h"
+#include "enumerable.c"
 
-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"));
+  rb_cJsonState = rb_const_get(mJSON, rb_intern("State"));
   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);
+  rb_define_method(rb_cHash, "to_json", (VALUE(*)(ANYARGS)) &to_json, -1);
 }
 
 /** 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);
+  new_line(delim, object_nl);
 
   VALUE result = rb_str_new2("{");
-  if(object_nl != Qnil) rb_str_append(result, object_nl);
+  new_line(result, object_nl);
 
-  process_internal_json(self, result, state, depth, delim);
+  process_internal_json(self, result, state, depth, delim, object_nl);
 
-  if(object_nl != Qnil) rb_str_append(result, object_nl);
-  json_shift(self, result, state, depth);
+  new_line(result, object_nl);
+  if(rb_json_should_shift(state, object_nl) == Qtrue) json_shift(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;
+static VALUE process_internal_json(self, json, state, depth, delim, object_nl)
+  VALUE self, json, state, depth, delim, object_nl;
 {
   // TODO: Use st_foreach for even better performance
   VALUE key_value_pairs = rb_funcall(self, rb_intern("to_a"), 0);
@@ -107,22 +50,11 @@ static VALUE process_internal_json(self, json, state, depth, delim)
     VALUE key = rb_ary_entry(key_value, 0);
     VALUE value = rb_ary_entry(key_value, 1);
 
-    json_shift(self, json, state, depth);
+    if(rb_json_should_shift(state, object_nl) == Qtrue) json_shift(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_append(json, rb_to_json(key_string, 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));
+    rb_str_append(json, rb_to_json(value, 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;
-}