fjson 0.1.0 → 0.1.1

data/ext/extensions/hash_ext/hash_ext.h

@@ -1,13 +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 json_shift(VALUE, VALUE, VALUE, VALUE);
 static VALUE generate_key_value_json(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
-static VALUE process_internal_json(VALUE, VALUE, VALUE, VALUE, VALUE);
 static VALUE json_transform(VALUE, 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 to_json(int, VALUE*, VALUE);
+static VALUE process_internal_json(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);

data/ext/json_ext/json_ext.c

@@ -1,6 +1,5 @@
 #include "json_ext.h"
 
-static VALUE mJSON;
 static VALUE mJSONModuleMethods;
 static VALUE cStandardError;
 static VALUE cJSONError;
@@ -9,8 +8,8 @@ static VALUE cUnparserError;
 static VALUE cCircularDatastructure;
 
 void Init_json_ext() {
-  mJSON = rb_define_module("JSON");
-  mJSONModuleMethods = rb_define_module_under(mJSON, "ModuleMethods");
+  rb_cJSON = rb_define_module("JSON");
+  mJSONModuleMethods = rb_define_module_under(rb_cJSON, "ModuleMethods");
 
   _begin_setup_iconv();
 
@@ -21,22 +20,22 @@ void Init_json_ext() {
   /**
    * The base exception for JSON errors.
    */
-  cJSONError = rb_define_class_under(mJSON, "JSONError", cStandardError);
+  cJSONError = rb_define_class_under(rb_cJSON, "JSONError", cStandardError);
 
   /**
    * This exception is raise, if a parser error occurs.
    */
-  cParserError = rb_define_class_under(mJSON, "ParserError", cJSONError);
+  cParserError = rb_define_class_under(rb_cJSON, "ParserError", cJSONError);
 
   /**
    * This exception is raise, if a unparser error occurs.
    */
-  cUnparserError = rb_define_class_under(mJSON, "UnparserError", cJSONError);
+  cUnparserError = rb_define_class_under(rb_cJSON, "UnparserError", cJSONError);
 
   /**
    * If a circular data structure is encountered while unparsing this exception is raised.
    */
-  cCircularDatastructure = rb_define_class_under(mJSON, "CircularDatastructure", cUnparserError);
+  cCircularDatastructure = rb_define_class_under(rb_cJSON, "CircularDatastructure", cUnparserError);
 }
 
 /**
@@ -45,7 +44,7 @@ void Init_json_ext() {
 static VALUE utf8_to_utf16(self, string)
   VALUE self, string;
 {
-  VALUE mUTF8toUTF16 = rb_const_get(mJSON, rb_intern("UTF8toUTF16"));
+  VALUE mUTF8toUTF16 = rb_const_get(rb_cJSON, rb_intern("UTF8toUTF16"));
   VALUE packed_bytes = rb_funcall(mUTF8toUTF16, rb_intern("iconv"), 1, string);
   VALUE unpacked_bytes = rb_funcall(packed_bytes, rb_intern("unpack"), 1, rb_str_new2("H*"));
   return rb_ary_entry(unpacked_bytes, 0);
@@ -64,7 +63,7 @@ static VALUE utf8_to_json(self, input)
 
   VALUE supports_utf8 = Qfalse;
   if(
-    rb_funcall(mJSON, rb_intern("support_unicode?"), 0) == Qtrue &&
+    rb_funcall(rb_cJSON, rb_intern("support_unicode?"), 0) == Qtrue &&
     rb_equal(rb_gv_get("KCODE"), rb_str_new2("UTF8"))
   ) {
     supports_utf8 = Qtrue;
@@ -86,14 +85,14 @@ static void _begin_setup_iconv() {
 
   VALUE mUTF8toUTF16 = rb_funcall(mIconv, rb_intern("new"), 2, rb_str_new2("utf-8"), rb_str_new2("utf-16be"));
   rb_const_set(
-    mJSON,
+    rb_cJSON,
     rb_intern("UTF16toUTF8"),
     mUTF8toUTF16
   );
 
   VALUE mUTF16toUTF8 = rb_funcall(mIconv, rb_intern("new"), 2, rb_str_new2("utf-16be"), rb_str_new2("utf-8"));
   rb_const_set(
-    mJSON,
+    rb_cJSON,
     rb_intern("UTF8toUTF16"),
     mUTF16toUTF8
   );
@@ -170,7 +169,7 @@ static long _convert_utf8_char(input, i, result, supports_utf8)
   }
   else {
     char* error_message = "Encountered unknown UTF-8 byte: ";
-    error_message += c_current;
+    append(error_message, c_current);
     strcat(error_message, "!");
     rb_raise(rb_eRuntimeError, error_message);
   }
@@ -184,7 +183,7 @@ static VALUE _convert_utf_8_string_part(result, input, i, length)
 {
   rb_str_cat2(result, "\\u");
   VALUE utf_header = rb_funcall(input, rb_intern("[]"), 2, LONG2NUM(i), LONG2NUM(length));
-  rb_str_append(result, utf8_to_utf16(mJSON, utf_header));
+  rb_str_append(result, utf8_to_utf16(rb_cJSON, utf_header));
 
   return Qnil;
 }

data/ext/json_ext/json_ext.h

@@ -7,3 +7,5 @@ static long _convert_utf8_char(VALUE, long, VALUE, VALUE);
 static VALUE utf8_to_json(VALUE, VALUE);
 static void _begin_setup_iconv();
 void Init_json_ext();
+
+VALUE rb_cJSON;

data/ext/state_ext/state_ext.c

@@ -1,61 +1,42 @@
 #include "state_ext.h"
 
-static VALUE cState;
-static VALUE mClassMethods;
-static VALUE mJSON;
-
 /**
  * This class is used to create State instances, that are used to hold data
  * while unparsing a Ruby data structure into a JSON string.
  */
 void Init_state_ext() {
-  mJSON = rb_const_get(rb_cObject, rb_intern("JSON"));
-  cState = rb_define_class_under(mJSON, "State", rb_cObject);
-  mClassMethods = rb_define_module_under(cState, "ClassMethods");
+  VALUE mJSON = rb_const_get(rb_cObject, rb_intern("JSON"));
+  rb_cJsonState = rb_define_class_under(mJSON, "State", rb_cObject);
+  VALUE mClassMethods = rb_define_module_under(rb_cJsonState, "ClassMethods");
 
-  rb_define_method(mClassMethods, "from_state", from_state, 1);
-  rb_extend_object(cState, mClassMethods);
+  rb_define_method(mClassMethods, "from_state", rb_json_from_state, 1);
+  rb_extend_object(rb_cJsonState, mClassMethods);
 
-  rb_define_method(cState, "initialize", initialize, -1);
-  rb_define_method(cState, "seen?", seen, 1);
-  rb_define_method(cState, "remember", remember, 1);
-  rb_define_method(cState, "forget", forget, 1);
+  rb_define_method(rb_cJsonState, "initialize", initialize, -1);
+  rb_define_method(rb_cJsonState, "seen?", rb_json_state_seen, 1);
+  rb_define_method(rb_cJsonState, "remember", rb_json_state_remember, 1);
+  rb_define_method(rb_cJsonState, "forget", rb_json_state_forget, 1);
 
   /*
    * This string is used to indent levels in the JSON string.
    */
-   rb_define_method(cState, "indent", get_indent, 0);
-   rb_define_method(cState, "indent=", set_indent, 1);
+   rb_define_method(rb_cJsonState, "indent", rb_json_state_get_intent, 0);
+   rb_define_method(rb_cJsonState, "indent=", rb_json_state_set_intent, 1);
 
   /*
    * This string is used to include a space between the tokens in a JSON string.
    */
-  rb_define_attr(cState, "space", 1, 1);
+  rb_define_attr(rb_cJsonState, "space", 1, 1);
 
   /*
    * This string is put at the end of a line that holds a JSON object (or Hash).
    */
-  rb_define_attr(cState, "object_nl", 1, 1);
+  rb_define_attr(rb_cJsonState, "object_nl", 1, 1);
 
   /*
    * This string is put at the end of a line that holds a JSON array.
    */
-  rb_define_attr(cState, "array_nl", 1, 1);
-}
-
-void rb_json_state_indent(state, json, depth)
-  VALUE state, json;
-  long depth;
-{
-  VALUE indent = rb_funcall(state, rb_intern("indent"), 0);
-  char* c_indent = StringValueCStr(indent);
-  // Incrementing the depth
-  char* full_indent;
-  long i;
-  for(i=0; i<depth; i++) {
-    strcat(full_indent, c_indent);
-  }
-  rb_str_cat2(json, full_indent);
+  rb_define_attr(rb_cJsonState, "array_nl", 1, 1);
 }
 
 /** Static **/
@@ -92,68 +73,18 @@ static VALUE initialize(argc, argv, self)
   rb_ivar_set(self, rb_intern("@seen"), rb_hash_new());
 }
 
-static VALUE get_indent(self)
+static VALUE rb_json_state_get_intent(self)
   VALUE self;
 {
   return rb_ivar_get(self, rb_intern("@indent"));
 }
 
-static VALUE set_indent(self, indent)
+static VALUE rb_json_state_set_intent(self, indent)
   VALUE self, indent;
 {
   rb_ivar_set(self, rb_intern("@indent"), indent);
 }
 
-/**
- * Creates a State object from _opts_, which ought to be Hash to create a
- * new State instance configured by opts, something else to create an
- * unconfigured instance. If _opts_ is a State object, it is just returned.
- */
-static VALUE from_state(self, opts)
-  VALUE self, opts;
-{
-  if(rb_obj_is_kind_of(opts, cState)) {
-    return opts;
-  }
-  else if(rb_obj_is_kind_of(opts, rb_cHash)) {
-    return rb_funcall(self, rb_intern("new"), 1, opts);
-  }
-  else {
-    return rb_funcall(self, rb_intern("new"), 0);
-  }
-}
-
-/**
- * Returns _true_, if _object_ was already seen during this Unparsing run.
- */
-static VALUE seen(self, object)
-  VALUE self, object;
-{
-  VALUE seen_ivar = rb_ivar_get(self, rb_intern("@seen"));
-  return rb_hash_aref(seen_ivar, rb_obj_id(object));
-}
-
-/**
- * Remember _object_, to find out if it was already encountered (to find out
- * if a cyclic data structure is unparsed).
- */
-static VALUE remember(self, object)
-  VALUE self, object;
-{
-  VALUE seen_ivar = rb_ivar_get(self, rb_intern("@seen"));
-  rb_hash_aset(seen_ivar, rb_obj_id(object), Qtrue);
-}
-
-/**
- * Forget _object_ for this Unparsing run.
- */
-static VALUE forget(self, object)
-  VALUE self, object;
-{
-  VALUE seen_ivar = rb_ivar_get(self, rb_intern("@seen"));
-  rb_hash_delete(seen_ivar, rb_obj_id(object));
-}
-
 /** private **/
 static VALUE hash_value_or_empty_string_default(hash, cKey)
   VALUE hash;

data/ext/state_ext/state_ext.h

@@ -1,14 +1,10 @@
 #include "ruby.h"
+#include "state_lib.h"
 #include <string.h>
 
 static VALUE initialize(int, VALUE*, VALUE);
 static VALUE state_allocate(VALUE);
-static VALUE from_state(VALUE, VALUE);
 static VALUE hash_value_or_empty_string_default(VALUE, const char*);
-static VALUE seen(VALUE, VALUE);
-static VALUE remember(VALUE, VALUE);
-static VALUE forget(VALUE, VALUE);
 
-static VALUE get_indent(VALUE);
-static VALUE set_indent(VALUE, VALUE);
-void rb_json_state_indent(VALUE, VALUE, long);
+static VALUE rb_json_state_get_intent(VALUE);
+static VALUE rb_json_state_set_intent(VALUE, VALUE);

data/ext/state_ext/state_lib.c

@@ -0,0 +1,107 @@
+#include "state_lib.h"
+
+void rb_json_state_indent(state, json, depth)
+  VALUE state, json;
+  long depth;
+{
+  VALUE indent = rb_json_state_get_intent(state);
+  char* c_indent = StringValueCStr(indent);
+  // Incrementing the depth
+  char* full_indent;
+  long i;
+  for(i=0; i<depth; i++) {
+    strcat(full_indent, c_indent);
+  }
+  rb_str_cat2(json, full_indent);
+}
+
+VALUE rb_to_json(rb_target, rb_state, rb_indent)
+  VALUE rb_target, rb_state, rb_indent;
+{
+  VALUE args = rb_ary_new2(3);
+  rb_ary_store (args, 0, rb_target);
+  rb_ary_store (args, 1, rb_state);
+  rb_ary_store (args, 2, rb_indent);
+  return rb_rescue(call_to_json, args, to_json_exception, rb_target);
+}
+
+VALUE rb_json_should_shift(state, object_nl)
+  VALUE state, object_nl;
+{
+  if(state == Qnil) return Qfalse;
+  if(RSTRING(object_nl)->len == 0) return Qfalse;
+  return Qtrue;
+}
+
+/**
+ * Creates a State object from _opts_, which ought to be Hash to create a
+ * new State instance configured by opts, something else to create an
+ * unconfigured instance. If _opts_ is a State object, it is just returned.
+ */
+VALUE rb_json_from_state(self, opts)
+  VALUE self, opts;
+{
+  if(rb_obj_is_kind_of(opts, rb_cJsonState)) {
+    return opts;
+  }
+  else if(rb_obj_is_kind_of(opts, rb_cHash)) {
+    return rb_funcall(self, rb_intern("new"), 1, opts);
+  }
+  else {
+    return rb_funcall(self, rb_intern("new"), 0);
+  }
+}
+
+/**
+ * Returns _true_, if _object_ was already seen during this Unparsing run.
+ */
+VALUE rb_json_state_seen(self, object)
+  VALUE self, object;
+{
+  VALUE seen_ivar = rb_ivar_get(self, rb_intern("@seen"));
+  return rb_hash_aref(seen_ivar, rb_obj_id(object));
+}
+
+/**
+ * Remember _object_, to find out if it was already encountered (to find out
+ * if a cyclic data structure is unparsed).
+ */
+VALUE rb_json_state_remember(self, object)
+  VALUE self, object;
+{
+  VALUE seen_ivar = rb_ivar_get(self, rb_intern("@seen"));
+  rb_hash_aset(seen_ivar, rb_obj_id(object), Qtrue);
+}
+
+/**
+ * Forget _object_ for this Unparsing run.
+ */
+VALUE rb_json_state_forget(self, object)
+  VALUE self, object;
+{
+  VALUE seen_ivar = rb_ivar_get(self, rb_intern("@seen"));
+  rb_hash_delete(seen_ivar, rb_obj_id(object));
+}
+
+/** Static **/
+
+static VALUE call_to_json(args)
+  VALUE args;
+{
+  VALUE rb_target = rb_ary_entry(args, 0);
+  VALUE rb_state = rb_ary_entry(args, 1);
+  VALUE rb_indent = rb_ary_entry(args, 2);
+  return rb_funcall(rb_target, rb_intern("to_json"), 2, rb_state, rb_indent);
+}
+
+static VALUE to_json_exception(rb_target, rb_error)
+  VALUE rb_target, rb_error;
+{
+  VALUE rb_error_class = rb_obj_class(rb_error);
+  if(rb_error_class == rb_eArgError) {
+    return rb_funcall(rb_target, rb_intern("to_json"), 0);
+  }
+  else {
+    rb_exc_raise(rb_error);
+  }
+}

data/ext/state_ext/state_lib.h

@@ -0,0 +1,15 @@
+#include "ruby.h"
+#include <string.h>
+
+VALUE rb_json_from_state(VALUE, VALUE);
+VALUE rb_json_state_seen(VALUE, VALUE);
+VALUE rb_json_state_remember(VALUE, VALUE);
+VALUE rb_json_state_forget(VALUE, VALUE);
+VALUE rb_json_should_shift(VALUE, VALUE);
+VALUE rb_to_json(VALUE, VALUE, VALUE);
+void rb_json_state_indent(VALUE, VALUE, long);
+
+static VALUE call_to_json(VALUE);
+static VALUE to_json_exception(VALUE, VALUE);
+
+VALUE rb_cJsonState;

data/hash_benchmark.rb

@@ -1,5 +1,3 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/lib/fjson"
 require 'benchmark'
 
 def execute

data/hash_benchmark_action_support.rb

@@ -0,0 +1,4 @@
+require "rubygems"
+require "active_support"
+dir = File.dirname(__FILE__)
+require "#{dir}/hash_benchmark"

data/hash_benchmark_fjson.rb

@@ -0,0 +1,3 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/lib/fjson"
+require "#{dir}/hash_benchmark"

data/hash_benchmark_json.rb

@@ -0,0 +1,4 @@
+require "rubygems"
+require "json"
+dir = File.dirname(__FILE__)
+require "#{dir}/hash_benchmark"

data/lib/json/editor.rb

@@ -974,7 +974,7 @@ module JSON
         #vbox.border_width = 0
 
         @treeview = JSONTreeView.new(self)
-        @treeview.signal_connect(:'cursor-changed') do
+        @treeview.signal_connect(:"cursor-changed") do
           display_status('')
         end
 

data/mkmf_tasks.rb

@@ -0,0 +1,99 @@
+class MkmfTasks
+  attr_writer :extconf_file_name,
+              :project_dir,
+              :file_extension,
+              :extension_paths,
+              :extconf_arguments
+
+  def initialize(actor)
+    @actor = actor
+  end
+
+  def default
+    compile
+  end
+
+  def compile
+    @extension_paths.each do |extension|
+      dir = "ext/#{extension}"
+      extconf dir
+      make dir
+    end
+  end
+
+  def spec
+    compile
+    install
+    dir = @project_dir
+    require File.expand_path("#{dir}/spec/spec_suite")
+  end
+
+  def lib
+    directory "lib"
+  end
+
+  def install
+    @extension_paths.each do |extension_path|
+      build_path = build_path(extension_path)
+      raise "File #{build_path} does not exist" unless File.exists?(build_path)
+      cp build_path, library_path(extension_path)
+    end
+  end
+
+  def cleanup
+    @extension_paths.each do |extension_path|
+      library_path = library_path(extension_path)
+      rm library_path if library_path && File.exists?(library_path)
+
+      build_file_path = build_path(extension_path)
+      rm build_file_path if build_file_path && File.exists?(build_file_path)
+
+      build_object_path = "#{build_path_without_file_extension(extension_path)}.o"
+      rm build_object_path if build_object_path && File.exists?(build_object_path)
+
+      build_dir = build_dir(extension_path)
+      make_file_path = "#{build_dir}/Makefile"
+      rm make_file_path if make_file_path && File.exists?(make_file_path)
+    end    
+  end
+
+  protected
+  def extconf(dir)
+    Dir.chdir(dir) do
+      sh("ruby #{@extconf_arguments} #{@extconf_file_name}")
+    end
+  end
+
+  def make(makedir)
+    Dir.chdir(makedir) do
+      sh("make")
+    end
+  end
+
+  def build_dir(relative_extension_path)
+    "#{@project_dir}/ext/#{relative_extension_path}"
+  end
+
+  def build_path(relative_extension_path)
+    basename = build_path_without_file_extension(relative_extension_path)
+    "#{basename}.#{@file_extension}"
+  end
+
+  def build_path_without_file_extension(relative_extension_path)
+    "#{build_dir(relative_extension_path)}/#{File.basename(relative_extension_path)}"
+  end
+
+  def library_path(relative_extension_path)
+    library_directory_path = File.expand_path("#{@project_dir}/lib/#{File.dirname(relative_extension_path)}")
+    binary_name = "#{File.basename(relative_extension_path)}.#{@file_extension}"
+    "#{library_directory_path}/#{binary_name}"
+  end
+
+  def rm(path)
+    @actor.__send__ :rm, path
+  end
+
+  def sh(cmd)
+    @actor.__send__ :sh, cmd
+  end
+end