fjson 0.0.4 → 0.0.5

data/CHANGES

@@ -1,3 +1,6 @@
+2006-10-21 (0.0.5)
+  * Works on OSX.
+
 2006-10-17 (0.0.4)
   * Fixed compiler warnings.
 

data/Rakefile

@@ -6,7 +6,6 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-
 task :default => [ :compile ] do
 end
 
@@ -52,33 +51,51 @@ fjson_extensions.each do |ext|
 end
 
 task :install do
-  dir = File.dirname(__FILE__)
   fjson_extensions.each do |extension_path|
-    binary_path = extension_binary_path(extension_path)
-    cp binary_path, "#{dir}/lib/#{extension_path}.so"
+    library_path = library_path(extension_path)
+    raise "Extension binary for #{extension_path} does not exist. Did you run rake compile?" unless library_path
+    cp build_path(extension_path), library_path(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"
+    library_path = library_path(extension_path)
+    rm library_path if library_path && File.exists?(library_path)
+    rake_file_path = "#{build_path(extension_path)}/Rakefile"
+    rm rake_file_path if rake_file_path && File.exists?(rake_file_path)
   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}"
+def build_path(relative_extension_path)
+  basename = "#{File.dirname(__FILE__)}/ext/#{relative_extension_path}/#{File.basename(relative_extension_path)}"
+  if File.exists?("#{basename}.so")
+    return "#{basename}.so"
+  elsif File.exists?("#{basename}.bundle")
+    return "#{basename}.bundle"
+  end
+  return nil
 end
 
-def extension_directory_path(relative_extension_path)
-  base_extension_path = File.dirname(__FILE__) + "/ext"
-  "#{base_extension_path}/#{relative_extension_path}"
+def library_path(relative_extension_path)
+  build_path = build_path(relative_extension_path)
+  return nil unless build_path
+  extname = File.extname(build_path)
+  library_directory_path = File.dirname(__FILE__) + "/lib/" + File.dirname(relative_extension_path)
+  binary_name = "#{File.basename(relative_extension_path)}#{extname}"
+  "#{library_directory_path}/#{binary_name}"
+end
+
+def win32?
+  ENV["target_platform"] == "win32"
+end
+
+if win32?
+  #Rake::Task[].invoke
 end
 
 PKG_NAME = "fjson"
-PKG_VERSION   = "0.0.4"
+PKG_VERSION   = "0.0.5"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -96,6 +113,7 @@ spec = Gem::Specification.new do |s|
     This library is a fork of Florian Frank's JSON library with key parts implemented
     in C for performance improvements.
   EOF
+  s.test_files = Dir.glob('spec/*_spec.rb')
   s.description = s.summary
 
   s.files = PKG_FILES.to_a
@@ -115,6 +133,10 @@ spec = Gem::Specification.new do |s|
   s.extensions = ["Rakefile"]
 
   s.add_dependency "mkrf", ">=0.1.2"
+
+  if win32?
+    
+  end
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

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

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("array_ext")

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

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("false_class_ext")

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

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("float_ext")

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

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("hash_ext")

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

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("integer_ext")

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

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("nil_class_ext")

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

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("object_ext")

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

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("string_ext")

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

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("true_class_ext")

data/ext/json_ext/extconf.mkmf.rb

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("json_ext")

data/ext/state_ext/extconf.mkmf.rb

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("state_ext")

data/rake_helper.rb

@@ -1,6 +1,6 @@
-def setup_extension(dir, extension=nil)
-  ext_dir = "ext/#{dir}"
-  extension = File.basename(dir) if extension.nil?
+def setup_extension(extension_path, extension=nil)
+  ext_dir = "ext/#{extension_path}"
+  extension = File.basename(extension_path) if extension.nil?
   ext_so = "#{ext_dir}/#{extension}.#{Config::CONFIG['DLEXT']}"
 
   desc "Builds the #{extension} extension"
@@ -10,6 +10,10 @@ def setup_extension(dir, extension=nil)
     extconf "#{ext_dir}"
   end
 
+  create_so_file_tasks(ext_dir, ext_so)
+end
+
+def create_so_file_tasks(ext_dir, ext_so)
   ext_files = FileList[
     "#{ext_dir}/*.c",
     "#{ext_dir}/*.h",
@@ -17,7 +21,6 @@ def setup_extension(dir, extension=nil)
     "#{ext_dir}/Rakefile",
     "lib"
   ]
-  ext_subdir = File.dirname(dir)
   file ext_so => ext_files do
     rake ext_dir
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: fjson
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2006-10-17 00:00:00 -07:00
+  version: 0.0.5
+date: 2006-10-21 00:00:00 -07:00
 summary: This library is for parsing JSON strings and unparsing ruby data structures. This library is a fork of Florian Frank's JSON library with key parts implemented in C for performance improvements.
 require_paths: 
 - lib
@@ -29,84 +29,95 @@ post_install_message:
 authors: 
 - Brian Takita
 files: 
-- Rakefile
-- GPL
-- TODO
 - CHANGES
+- GPL
+- Rakefile
 - README
-- rake_helper.rb
-- install.rb
+- TODO
 - hash_benchmark.rb
-- lib/parser.rb
+- install.rb
+- rake_helper.rb
 - lib/fjson.rb
-- lib/extensions/kernel.rb
+- lib/parser.rb
 - lib/extensions/class.rb
+- lib/extensions/kernel.rb
 - lib/extensions/string.rb
 - lib/json/editor.rb
+- ext/extensions/array_ext/array_ext.h
 - ext/extensions/false_class_ext/false_class_ext.h
-- ext/extensions/hash_ext/hash_ext.h
-- ext/extensions/true_class_ext/true_class_ext.h
 - ext/extensions/float_ext/float_ext.h
+- ext/extensions/hash_ext/hash_ext.h
+- ext/extensions/integer_ext/integer_ext.h
+- ext/extensions/nil_class_ext/nil_class_ext.h
 - ext/extensions/object_ext/object_ext.h
 - ext/extensions/string_ext/string_ext.h
-- ext/extensions/nil_class_ext/nil_class_ext.h
-- ext/extensions/integer_ext/integer_ext.h
-- ext/extensions/array_ext/array_ext.h
-- ext/state_ext/state_ext.h
+- ext/extensions/true_class_ext/true_class_ext.h
 - ext/json_ext/json_ext.h
+- ext/state_ext/state_ext.h
+- ext/extensions/array_ext/array_ext.c
 - ext/extensions/false_class_ext/false_class_ext.c
-- ext/extensions/hash_ext/hash_ext.c
-- ext/extensions/true_class_ext/true_class_ext.c
 - ext/extensions/float_ext/float_ext.c
+- ext/extensions/hash_ext/hash_ext.c
+- ext/extensions/integer_ext/integer_ext.c
+- ext/extensions/nil_class_ext/nil_class_ext.c
 - ext/extensions/object_ext/object_ext.c
 - ext/extensions/string_ext/string_ext.c
-- ext/extensions/nil_class_ext/nil_class_ext.c
-- ext/extensions/integer_ext/integer_ext.c
-- ext/extensions/array_ext/array_ext.c
-- ext/state_ext/state_ext.c
+- ext/extensions/true_class_ext/true_class_ext.c
 - ext/json_ext/json_ext.c
+- ext/state_ext/state_ext.c
+- ext/extensions/array_ext/extconf.mkmf.rb
+- ext/extensions/array_ext/extconf.rb
+- ext/extensions/false_class_ext/extconf.mkmf.rb
 - ext/extensions/false_class_ext/extconf.rb
-- ext/extensions/hash_ext/extconf.rb
-- ext/extensions/true_class_ext/extconf.rb
+- ext/extensions/float_ext/extconf.mkmf.rb
 - ext/extensions/float_ext/extconf.rb
+- ext/extensions/hash_ext/extconf.mkmf.rb
+- ext/extensions/hash_ext/extconf.rb
+- ext/extensions/integer_ext/extconf.mkmf.rb
+- ext/extensions/integer_ext/extconf.rb
+- ext/extensions/nil_class_ext/extconf.mkmf.rb
+- ext/extensions/nil_class_ext/extconf.rb
+- ext/extensions/object_ext/extconf.mkmf.rb
 - ext/extensions/object_ext/extconf.rb
+- ext/extensions/string_ext/extconf.mkmf.rb
 - ext/extensions/string_ext/extconf.rb
-- ext/extensions/nil_class_ext/extconf.rb
-- ext/extensions/integer_ext/extconf.rb
-- ext/extensions/array_ext/extconf.rb
-- ext/state_ext/extconf.rb
+- ext/extensions/true_class_ext/extconf.mkmf.rb
+- ext/extensions/true_class_ext/extconf.rb
+- ext/json_ext/extconf.mkmf.rb
 - ext/json_ext/extconf.rb
-- spec/true_class_spec.rb
-- spec/float_spec.rb
-- spec/string_spec.rb
-- spec/object_spec.rb
-- spec/nil_class_spec.rb
+- ext/state_ext/extconf.mkmf.rb
+- ext/state_ext/extconf.rb
 - spec/array_spec.rb
-- spec/spec_helper.rb
 - spec/false_class_spec.rb
-- spec/string_when_not_supporting_unicode_and_kcode_is_not_utf8_json_spec.rb
-- spec/state_spec.rb
+- spec/float_spec.rb
 - spec/hash_spec.rb
-- spec/spec_suite.rb
 - spec/integer_spec.rb
+- spec/nil_class_spec.rb
+- spec/object_spec.rb
+- spec/spec_helper.rb
+- spec/spec_suite.rb
+- spec/state_spec.rb
+- spec/string_spec.rb
+- spec/string_when_not_supporting_unicode_and_kcode_is_not_utf8_json_spec.rb
 - spec/string_when_supporting_unicode_and_kcode_is_not_utf8_json_spec.rb
 - spec/string_with_latin1_character_set_json_spec.rb
 - spec/string_with_utf8_values_when_supporting_unicode_json_spec.rb
-test_files: 
 - spec/true_class_spec.rb
-- spec/float_spec.rb
-- spec/string_spec.rb
-- spec/object_spec.rb
-- spec/nil_class_spec.rb
+test_files: 
 - spec/array_spec.rb
 - spec/false_class_spec.rb
-- spec/string_when_not_supporting_unicode_and_kcode_is_not_utf8_json_spec.rb
-- spec/state_spec.rb
+- spec/float_spec.rb
 - spec/hash_spec.rb
 - spec/integer_spec.rb
+- spec/nil_class_spec.rb
+- spec/object_spec.rb
+- spec/state_spec.rb
+- spec/string_spec.rb
+- spec/string_when_not_supporting_unicode_and_kcode_is_not_utf8_json_spec.rb
 - spec/string_when_supporting_unicode_and_kcode_is_not_utf8_json_spec.rb
 - spec/string_with_latin1_character_set_json_spec.rb
 - spec/string_with_utf8_values_when_supporting_unicode_json_spec.rb
+- spec/true_class_spec.rb
 rdoc_options: []
 
 extra_rdoc_files: