key_value 0.3.0 → 0.4.0

data/Readme.md

@@ -10,8 +10,8 @@ Migration
 
     class CreateKeyValue < ActiveRecord::Migration
       def self.up
-        create_table :key_values, :id => false do |t|
-          t.string :key, :null => false, :primary => true
+        create_table :key_values do |t|
+          t.string :key, :null => false
           t.text :value, :null => false
         end
         add_index :key_values, :key, :unique => true
@@ -53,7 +53,6 @@ HandlerSocket ([Ubuntu natty guide](http://grosser.it/2011/05/14/installing-mysq
 
 TODO
 ====
- - nice error handling for HandlerSocket
  - HandlerSocket write support
  - make test database configurable
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/key_value.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{key_value}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Heinrich", "Michael Grosser"]
-  s.date = %q{2011-05-15}
+  s.date = %q{2011-05-17}
   s.email = %q{michael@grosser.it}
   s.files = [
     "Gemfile",

data/lib/key_value.rb

@@ -1,6 +1,8 @@
 require 'active_record'
 
 class KeyValue < ActiveRecord::Base
+  class HandlerSocketError < RuntimeError; end
+
   HS_DEFAULT_CONFIG = {:port => '9998'}
   HS_INDEX = 31234 # just some high number...
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
@@ -19,9 +21,8 @@ class KeyValue < ActiveRecord::Base
   def self.get(key)
     if handler_socket
       open_key_index
-      result = hs_connection.execute_single(HS_INDEX, '=', [key])
-      return unless result = result[1][0]
-      YAML.load(result[0])
+      result = hs_find_by_key(key)
+      YAML.load(result) if result
     else
       KeyValue.find_by_key(key).try(:value)
     end
@@ -78,6 +79,18 @@ class KeyValue < ActiveRecord::Base
   end
 
   def self.open_key_index
-    @open_key_index ||= hs_connection.open_index(HS_INDEX, hs_connection_config[:database], table_name, "index_#{table_name}_on_key", 'value')
+    @open_key_index ||= begin
+      result = hs_connection.open_index(HS_INDEX, hs_connection_config[:database], table_name, "index_#{table_name}_on_key", 'value')
+      raise HandlerSocketError, result[1] if result[0] == -1
+    end
+  end
+
+  def self.hs_find_by_key(key)
+    result = hs_connection.execute_single(HS_INDEX, '=', [key])
+    if result[0] == -1
+      raise HandlerSocketError, result[1]
+    else
+      result[1][0].try(:[],0)
+    end
   end
 end

data/spec/key_value_spec.rb

@@ -124,6 +124,13 @@ describe KeyValue do
         KeyValue['xxx'].should == false
       end
 
+      it "raises on hs error" do
+        KeyValue.hs_connection.should_receive(:execute_single).and_return [-1, 'wtf']
+        lambda{
+          KeyValue['xxx'].should == '123'
+        }.should raise_error('wtf')
+      end
+
       it "uses defaults" do
         KeyValue.send(:hs_connection_config).except(:username, :password).should == {
           :flags=>2,

data/spec/spec_helper.rb

@@ -19,8 +19,8 @@ end
 ActiveRecord::Schema.define(:version => 1) do
   drop_table :key_values rescue nil
 
-  create_table :key_values, :id => false do |t|
-    t.string :key, :null => false,:primary => true
+  create_table :key_values do |t|
+    t.string :key, :null => false
     t.text :value, :null => false
   end
   add_index :key_values, :key, :unique => true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: key_value
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Roman Heinrich
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 +02:00
+date: 2011-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency