ok_hbase 0.0.5 → 0.0.6

data/README.md

@@ -2,7 +2,7 @@
 
 Welcome HBase cowboys.
 
-Read the [wiki](https://github.com/okcwest/ok-hbase/wiki)!
+Read the [pages site](http://okcwest.github.io/ok_hbase/)!
 
 ## Installation
 
@@ -20,22 +20,47 @@ Or install it yourself as:
 
 ## Usage
 
-```bash
-$ bundle console
-Resolving dependencies...
-irb(main):030:0> connection = OkHbase::Connection.new(host: "hbase-dev")
-=> #<OkHbase::Connection:0x00000002440140 <snip>
-irb(main):031:0> table = OkHbase::Table.new(mytable, connection)
-=> #<OkHbase::Table:0x00000002449f38 <snip> 
-irb(main):032:0> count = 0
-=> 0
-irb(main):033:0> table.scan row_prefix: [ myid, 1, 5, 1, 0 ].pack("L>CCCC") do |row, col|
-irb(main):034:1*   count += 1
-irb(main):035:1> end
-=> nil
-irb(main):036:0> count
-=> 1072
-irb(main):037:0> connection.close
+```ruby
+# simple example showing how to:
+# 1) connect
+# 2) create a table
+# 3) write rows
+# 4) scan for rows
+# 5) get a row by key
+# 6) delete a table
+
+require 'ok_hbase'
+
+# get a connection
+conn = OkHbase::Connection.new(
+  host: 'localhost',
+  port: 9090,
+  auto_connect: true
+)
+
+# create a new table with column family 'd'
+table = conn.create_table('ok_hbase_test', d: {})
+
+# put a bunch of data in the table
+('hbaaa'..'hbzzz').each_with_index do |row_key, index|
+  table.put(
+    row_key,
+    {
+      'd:row_number' => "#{index+1}",
+      'd:message' => "this is row number #{index+1}"
+    }
+  )
+print "wrote row: #{row_key}\r"
+end
+
+# scan for all rows beginning with 'hba'
+table.scan(row_prefix: 'hba')
+
+# get the row with the row key 'hbase'
+table.row('hbase')
+
+# clean up
+conn.delete_table('ok_hbase_test', true)
 ```
 
 ## Contributing

data/lib/ok_hbase/concerns/custom_row.rb

@@ -8,7 +8,7 @@ module OkHbase
       end
 
       def rows(row_keys, columns = nil, timestamp = nil, include_timestamp = false)
-        super.map.with_index! { |data, i| self.row_class.new table: self, row_key: row_keys[i], default_column_family: self.default_column_family, raw_data: data }
+        super.map { |row_key, data| self.row_class.new table: self, row_key: row_key, default_column_family: self.default_column_family, raw_data: data }
       end
 
       def scan(opts={})

data/lib/ok_hbase/concerns/table.rb

@@ -86,7 +86,7 @@ module OkHbase
           self.connection.client.getRowsWithColumns(self.connection.table_name(table_name), row_keys, columns)
         end
 
-        rows.map { |row| _make_row(row.columns, include_timestamp) }
+        rows.map { |row| [row.row, _make_row(row.columns, include_timestamp) ]}
       end
 
       def cells(row_key, column, versions = nil, timestamp = nil, include_timestamp = nil)

data/lib/ok_hbase/version.rb

@@ -1,3 +1,3 @@
 module OkHbase
-    VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/ok_hbase/table_spec.rb

@@ -126,11 +126,11 @@ module OkHbase
           subject.put(row_key2, row_data2.merge('d:foo' => 'OldFoo2'), timestamp-5)
           subject.put(row_key2, row_data2, timestamp)
 
-          subject.rows([row_key1, row_key2]).should == [row_data1, row_data2]
-          subject.rows([row_key1, row_key2], nil, timestamp-9).should == [row_data1, row_data2.merge('d:foo' => 'OldFoo1')]
+          subject.rows([row_key1, row_key2]).should == [[row_key1, row_data1], [row_key2, row_data2]]
+          subject.rows([row_key1, row_key2], nil, timestamp-9).should == [[row_key1, row_data1], [row_key2, row_data2.merge('d:foo' => 'OldFoo1')]]
 
-          subject.rows([row_key1, row_key2], row_data1.keys - ['d:foo']).should == [row_data1.except('d:foo'), row_data2.except('d:foo')]
-          subject.rows([row_key1, row_key2], row_data1.keys - ['d:foo'], timestamp-5).should == [row_data1.except('d:foo'), row_data2.except('d:foo')]
+          subject.rows([row_key1, row_key2], row_data1.keys - ['d:foo']).should == [[row_key1, row_data1.except('d:foo')], [row_key2, row_data2.except('d:foo')]]
+          subject.rows([row_key1, row_key2], row_data1.keys - ['d:foo'], timestamp-5).should == [[row_key1, row_data1.except('d:foo')], [row_key2, row_data2.except('d:foo')]]
 
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ok_hbase
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Lightweight Ruby Hbase Client