Updates for JRuby compatibility

* Handling the requirement of json is now done within the code instead of Rubygems.

History.txt

@@ -1,5 +1,5 @@
 v1.5.0 January 17, 2010
- * Renamed the project to hbase-stargate and it can be found at: http://github.com/greglu/hbase-stargate
+ * Renamed the project from hbase-ruby to hbase-stargate and it can be found at: http://github.com/greglu/hbase-stargate
 
 v1.1.2 Nov 8, 2009
  * A bug with the timestamps in create_row() was fixed. Also updated specs.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Dingding Ye
+Copyright (c) 2007 openplaces.org
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

Rakefile

@@ -14,7 +14,6 @@ begin
     gemspec.extra_rdoc_files = FileList["LICENSE","README.textile"].to_a
 
     gemspec.add_development_dependency "rspec"
-    gemspec.add_dependency "json"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

hbase-stargate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hbase-stargate}
-  s.version = "1.5.0"
+  s.version = "1.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Openplaces"]
-  s.date = %q{2010-01-17}
+  s.date = %q{2010-01-18}
   s.description = %q{A Ruby client used to interact with HBase through its Stargate web service front-end}
   s.email = %q{greg.lu@gmail.com}
   s.extra_rdoc_files = [
@@ -75,7 +75,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby client for HBase's Stargate web service}
   s.test_files = [
-    "spec/hbase-stargate/request/row_request_spec.rb",
+    "spec/spec_helper.rb",
+     "spec/hbase-stargate/record_spec.rb",
+     "spec/hbase-stargate/request/row_request_spec.rb",
      "spec/hbase-stargate/request/table_request_spec.rb",
      "spec/hbase-stargate/request/meta_request_spec.rb",
      "spec/hbase-stargate/request/scanner_request_spec.rb",
@@ -89,12 +91,10 @@ Gem::Specification.new do |s|
      "spec/hbase-stargate/operation/meta_operation_spec.rb",
      "spec/hbase-stargate/operation/scanner_operation_spec.rb",
      "spec/hbase-stargate/operation/table_operation_spec.rb",
-     "spec/hbase-stargate/record_spec.rb",
      "spec/hbase-stargate/response/scanner_response_spec.rb",
      "spec/hbase-stargate/response/meta_response_spec.rb",
      "spec/hbase-stargate/response/table_response_spec.rb",
-     "spec/hbase-stargate/response/row_response_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/hbase-stargate/response/row_response_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -103,14 +103,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
   end
 end
 

lib/stargate/response/basic_response.rb

@@ -1,4 +1,9 @@
-require 'json'
+begin
+  require 'json'
+rescue LoadError => e
+  puts "[hbase-stargate] json is required. Install it with 'gem install json' (or json-jruby for JRuby)"
+  raise e
+end
 
 module Stargate
   module Response