hbase-ruby 1.1.3 → 1.2.0

data/README.textile

@@ -44,7 +44,10 @@ Here are some examples:
 <pre><code>
 require 'hbase'
 
-client = HBase::Client.new("http://localhost:8080") # this url is the default for stargate.
+# Direct connection
+# client = HBase::Client.new("http://localhost:8080") # this url is the default for stargate.
+# Connection through a proxy
+client = HBase::Client.new("http://localhost:8080", { :proxy => "10.2.3.4:8080" }) 
 
 # Table Operation
 tables = client.list_tables                              # list available tables

data/Rakefile

@@ -1,4 +1,4 @@
-require 'rubygems'
+require 'spec/rake/spectask'
 
 begin
   require 'jeweler'
@@ -10,8 +10,8 @@ begin
     gemspec.homepage = "http://github.com/greglu/hbase-ruby"
     gemspec.summary = "A pure ruby client for HBase using the Stargate interface."
     gemspec.description = "A pure ruby client used to interact with HBase through its Stargate interface which serves up XML, JSON, protobuf, and more."
-    gemspec.files = FileList["{lib,spec,tasks}/**/*","Rakefile","VERSION","History.txt","MIT-LICENSE","README.textile"].to_a
-    gemspec.extra_rdoc_files = FileList["MIT-LICENSE","README.textile"].to_a
+    gemspec.files = FileList["{lib,spec}/**/*","Rakefile","VERSION","LICENSE","README.textile"].to_a
+    gemspec.extra_rdoc_files = FileList["LICENSE","README.textile"].to_a
 
     gemspec.add_development_dependency "rspec"
     gemspec.add_dependency "json"
@@ -21,4 +21,7 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = File.open("spec/spec.opts").readlines.map{|x| x.chomp}
+end

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/lib/hbase.rb

@@ -1,44 +1,9 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'hbase/client'
-require 'hbase/exception'
-require 'hbase/model'
-require 'hbase/request'
-require 'hbase/response'
-
-module HBase; end
-
-class Object
-  def to_proc
-    proc { |obj, *args| obj.send(self, *args) }
-  end
-
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-end
-
-class NilClass #:nodoc:
-  def blank?
-    true
-  end
+module HBase
+  VERSION = File.read(File.join(File.dirname(__FILE__), "..", "VERSION")).chomp.freeze
 end
 
-class Array #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class Hash #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class String #:nodoc:
-  def blank?
-    self !~ /\S/
-  end
-
-  def to_b
-    self == "true" ? true : false
-  end
-end
+require File.join(File.dirname(__FILE__), "hbase", "client")
+require File.join(File.dirname(__FILE__), "hbase", "exception")
+require File.join(File.dirname(__FILE__), "hbase", "model")
+require File.join(File.dirname(__FILE__), "hbase", "request")
+require File.join(File.dirname(__FILE__), "hbase", "response")

data/lib/hbase/client.rb

@@ -1,8 +1,8 @@
 require 'net/http'
-require 'hbase/operation/meta_operation'
-require 'hbase/operation/table_operation'
-require 'hbase/operation/row_operation'
-require 'hbase/operation/scanner_operation'
+require File.dirname(__FILE__) + '/operation/meta_operation'
+require File.dirname(__FILE__) + '/operation/table_operation'
+require File.dirname(__FILE__) + '/operation/row_operation'
+require File.dirname(__FILE__) + '/operation/scanner_operation'
 
 module HBase
   class Client
@@ -20,7 +20,12 @@ module HBase
       end
 
       # Not actually opening the connection yet, just setting up the persistent connection.
-      @connection = Net::HTTP.new(@url.host, @url.port)
+      if opts[:proxy]
+        proxy_address, proxy_port = opts[:proxy].split(':')
+        @connection = Net::HTTP.Proxy(proxy_address, proxy_port).new(@url.host, @url.port)
+      else
+        @connection = Net::HTTP.new(@url.host, @url.port)
+      end
       @connection.read_timeout = opts[:timeout] if opts[:timeout]
     end
 

data/lib/hbase/model.rb

@@ -11,9 +11,9 @@ module HBase
   end
 end
 
-require 'hbase/model/column'
-require 'hbase/model/column_descriptor'
-require 'hbase/model/region_descriptor'
-require 'hbase/model/row'
-require 'hbase/model/table_descriptor'
-require 'hbase/model/scanner'
+require File.dirname(__FILE__) + '/model/column'
+require File.dirname(__FILE__) + '/model/column_descriptor'
+require File.dirname(__FILE__) + '/model/region_descriptor'
+require File.dirname(__FILE__) + '/model/row'
+require File.dirname(__FILE__) + '/model/table_descriptor'
+require File.dirname(__FILE__) + '/model/scanner'

data/lib/hbase/model/row.rb

@@ -3,9 +3,16 @@ module HBase
     class Row < Record
       attr_accessor :table_name
       attr_accessor :name
-      attr_accessor :timestamp
       attr_accessor :total_count
       attr_accessor :columns
+
+      def timestamp
+        warn "[DEPRECATION] timestamp attribute will be removed from the Row model. "
+      end
+
+      def timestamp=
+        timestamp
+      end
     end
   end
 end

data/lib/hbase/operation/row_operation.rb

@@ -20,7 +20,6 @@ module HBase
           request = Request::RowRequest.new(table_name, name, timestamp)
           row = Response::RowResponse.new(get(request.show(columns, options)), :show_row).parse.first
           row.table_name = table_name
-          row.timestamp = timestamp
           row
         rescue Net::ProtocolError => e
           # TODO: Use better handling instead of this.

data/lib/hbase/operation/table_operation.rb

@@ -4,8 +4,8 @@ module HBase
       def show_table(name)
         begin
           request = Request::TableRequest.new(name)
-          table_descriptor = Response::TableResponse.new(get(request.show)).parse
-        rescue Net::ProtocolError => e
+          Response::TableResponse.new(get(request.show)).parse
+        rescue Net::ProtocolError
           raise TableNotFoundError, "Table '#{name}' Not found"
         end
       end

data/lib/hbase/request.rb

@@ -1,7 +1,7 @@
 module HBase; module Request; end; end
 
-require 'hbase/request/basic_request'
-require 'hbase/request/meta_request'
-require 'hbase/request/table_request'
-require 'hbase/request/row_request'
-require 'hbase/request/scanner_request'
+require File.dirname(__FILE__) + '/request/basic_request'
+require File.dirname(__FILE__) + '/request/meta_request'
+require File.dirname(__FILE__) + '/request/table_request'
+require File.dirname(__FILE__) + '/request/row_request'
+require File.dirname(__FILE__) + '/request/scanner_request'

data/lib/hbase/response.rb

@@ -1,7 +1,7 @@
 module HBase; module Response; end; end
 
-require 'hbase/response/basic_response'
-require 'hbase/response/meta_response'
-require 'hbase/response/table_response'
-require 'hbase/response/row_response'
-require 'hbase/response/scanner_response'
+require File.dirname(__FILE__) + '/response/basic_response'
+require File.dirname(__FILE__) + '/response/meta_response'
+require File.dirname(__FILE__) + '/response/table_response'
+require File.dirname(__FILE__) + '/response/row_response'
+require File.dirname(__FILE__) + '/response/scanner_response'

data/lib/hbase/response/meta_response.rb

@@ -11,7 +11,7 @@ module HBase
       def parse_content(raw_data)
         case @method
         when :list_tables
-          if raw_data.blank? || raw_data == "null" # "null" from json
+          if raw_data.to_s.empty? || raw_data == "null" # "null" from json
             puts "There are no available tables in the HBase"
             return []
           end

data/lib/hbase/response/table_response.rb

@@ -9,7 +9,7 @@ module HBase
         table["ColumnSchema"].each do |columnfamily|
           colname = columnfamily["name"].strip
           compression = columnfamily["COMPRESSION"].strip
-          bloomfilter = columnfamily["BLOOMFILTER"].strip.to_b
+          bloomfilter = (columnfamily["BLOOMFILTER"].strip =~ /^true$/i ? true : false)
           max_versions = columnfamily["VERSIONS"].strip.to_i
 
           column_descriptor = Model::ColumnDescriptor.new(:name => colname,

data/spec/hbase/model/row_spec.rb

@@ -4,7 +4,7 @@ describe HBase::Model::Row do
 
   it "should be have such attributes" do
     obj = HBase::Model::Row.new({})
-    %w{name table_name timestamp columns}.each do |method|
+    %w{name table_name columns}.each do |method|
       obj.should respond_to(method)
     end
   end

data/spec/hbase/model/scanner.rb

@@ -2,6 +2,4 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
 describe HBase::Model::Scanner do
 
-  it "should be ..."
-
 end

data/spec/hbase/operation/table_operation_spec.rb

@@ -30,18 +30,6 @@ describe HBase::Operation::TableOperation do
     end
   end
 
-  it "should disable table 'test-hbase-ruby'" do
-    lambda {
-      table = @client.disable_table('test-hbase-ruby')
-    }.should_not raise_error
-  end
-
-  it "should enable table 'test-hbase-ruby'" do
-    lambda {
-      table = @client.enable_table('test-hbase-ruby')
-    }.should_not raise_error
-  end
-
   it "should delete the table 'test-hbase-ruby'" do
     lambda {
       table = @client.destroy_table("test-hbase-ruby")

data/spec/hbase/record_spec.rb

@@ -2,11 +2,6 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
 describe HBase::Model::Record do
 
-  # Stub
-  it "should be true" do
-    true.should == true
-  end
-
   describe "Init" do
 
     it "should be successfuly when has the such instance variable" do

data/spec/hbase/request/row_request_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
 describe HBase::Request::RowRequest do
-
 end

data/spec/hbase/request/scanner_request_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
 describe HBase::Request::ScannerRequest do
-
 end

data/spec/spec.opts

@@ -2,4 +2,3 @@
 --format specdoc
 --loadby mtime
 --reverse
---debugger

data/spec/spec_helper.rb

@@ -1,7 +1,3 @@
-require "rubygems"
-require "spec"
-require File.join(File.dirname(__FILE__), "..", "lib", "hbase")
-
-Spec::Runner.configure do |config|
-  #.etc
-end
+require 'rubygems'
+require 'spec'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "hbase"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hbase-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ye Dingding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -05:00
+date: 2010-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,11 +40,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- MIT-LICENSE
+- LICENSE
 - README.textile
 files: 
-- History.txt
-- MIT-LICENSE
+- LICENSE
 - README.textile
 - Rakefile
 - VERSION
@@ -95,7 +94,6 @@ files:
 - spec/hbase/response/table_response_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/rspec.rake
 has_rdoc: true
 homepage: http://github.com/greglu/hbase-ruby
 licenses: []
@@ -125,23 +123,23 @@ signing_key:
 specification_version: 3
 summary: A pure ruby client for HBase using the Stargate interface.
 test_files: 
-- spec/spec_helper.rb
-- spec/hbase/record_spec.rb
-- spec/hbase/response/table_response_spec.rb
-- spec/hbase/response/row_response_spec.rb
-- spec/hbase/response/scanner_response_spec.rb
-- spec/hbase/response/meta_response_spec.rb
+- spec/hbase/request/row_request_spec.rb
+- spec/hbase/request/table_request_spec.rb
+- spec/hbase/request/meta_request_spec.rb
+- spec/hbase/request/scanner_request_spec.rb
+- spec/hbase/model/scanner.rb
 - spec/hbase/model/column_spec.rb
+- spec/hbase/model/row_spec.rb
 - spec/hbase/model/column_descriptor_spec.rb
-- spec/hbase/model/scanner.rb
 - spec/hbase/model/region_descriptor_spec.rb
 - spec/hbase/model/table_descriptor_spec.rb
-- spec/hbase/model/row_spec.rb
-- spec/hbase/request/table_request_spec.rb
-- spec/hbase/request/meta_request_spec.rb
-- spec/hbase/request/row_request_spec.rb
-- spec/hbase/request/scanner_request_spec.rb
+- spec/hbase/operation/row_operation_spec.rb
+- spec/hbase/operation/meta_operation_spec.rb
 - spec/hbase/operation/scanner_operation_spec.rb
 - spec/hbase/operation/table_operation_spec.rb
-- spec/hbase/operation/meta_operation_spec.rb
-- spec/hbase/operation/row_operation_spec.rb
+- spec/hbase/record_spec.rb
+- spec/hbase/response/scanner_response_spec.rb
+- spec/hbase/response/meta_response_spec.rb
+- spec/hbase/response/table_response_spec.rb
+- spec/hbase/response/row_response_spec.rb
+- spec/spec_helper.rb

data/History.txt

@@ -1,17 +0,0 @@
-v1.1.2 Nov 8, 2009
- * A bug with the timestamps in create_row() was fixed. Also updated specs.
-
-v1.1.1 Nov 7, 2009
-* Improved the scanner functionality. Decided it was worth a version bump and release.
-
-v1.1.0 Nov 7, 2009
-* Bumped to version 1.1.0 to avoid confusion with an existing hbase-ruby on gemcutter that was at version 1.0
-* Reimplemented entirely with HBase Stargate (old REST API was obsoleted by this)
-* Since Stargate can return JSON, parsing is now done with JSON instead of XML
-* API change to open_scanner. Now expects open_scanner(table_name, options) with available options listed under HBase::Model::Scanner.AVAILABLE_OPTS 
-
-v0.4 Oct 12, 2008
-* support 'scanner'
-
-v0.1 Jul 29, 2008
-* initial version 

data/tasks/rspec.rake

@@ -1,7 +0,0 @@
-require 'rake'
-require 'spec/rake/spectask'
-
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = File.open("spec/spec.opts").readlines.map{|x| x.chomp}
-end