railhead_handlersocket 0.0.1 → 0.0.2

data/lib/railhead_handlersocket.rb

@@ -42,15 +42,27 @@ class HandlerSocket
       result
     end
   end
+
+  def execute_delete_with_error(*args)
+    result = execute_delete(*args)
+    if result.nil?
+      raise HandlerSocketError, 'nil returned (execute delete)'
+    elsif result[0] != 0
+      raise HandlerSocketError, result[1]
+    else
+      result
+    end
+  end
 end
 
 
 class ActiveRecord::Base
 
-  def self.use_handlersocket(host = '127.0.0.1', port = 9998)
+  def self.use_handlersocket(host = '127.0.0.1', port = 9999)
     @@hs = HandlerSocket.new(host, port)
     @@hs_db_name = connection.instance_variable_get(:@config)[:database]
     @@hs_indexes = {}
+    alias_method_chain :destroy, :handlersocket
 
     class << self
       alias_method_chain :find_one, :handlersocket
@@ -63,16 +75,39 @@ class ActiveRecord::Base
   def self.reconnect_handlersocket
     @@hs.reconnect
     @@hs_indexes = {}
-    @hs_reconnected = true
+  end
+
+  def destroy_with_handlersocket
+    begin
+      self.class.del_through_handlersocket(self.id) unless new_record?
+      @destroyed = true
+      freeze
+    rescue
+      destroy_without_handlersocket
+    end
   end
 
   class << self
 
     def open_index(index_name)
-      unless index = @@hs_indexes["#{@@hs_db_name}.#{table_name} #{index_name}"]
-        index = @@hs_indexes.size
-        @@hs.open_index_with_error(index, @@hs_db_name, table_name, index_name, column_names.join(','))
-        @@hs_indexes["#{@@hs_db_name}.#{table_name} #{index_name}"] = index
+      hs_reconnected = false
+      begin
+        unless index = @@hs_indexes["#{@@hs_db_name}.#{table_name} #{index_name}"]
+          index = @@hs_indexes.size
+          logger.debug "HS: open index #{@@hs_db_name}.#{table_name} #{index_name}"
+          @@hs.open_index_with_error(index, @@hs_db_name, table_name, index_name, column_names.join(','))
+          @@hs_indexes["#{@@hs_db_name}.#{table_name} #{index_name}"] = index
+        end
+      rescue HandlerSocket::HandlerSocketError => e
+        unless hs_reconnected
+          logger.info "HS: reconnecting"
+          hs_reconnected = true
+          ActiveRecord::Base.reconnect_handlersocket
+          retry
+        else
+          logger.info "HS: reconnection failed"
+          raise e
+        end
       end
       index
     end
@@ -87,19 +122,7 @@ class ActiveRecord::Base
 
     def get_through_handlersocket(ids, index_name = 'PRIMARY')
       unless ids.nil?
-        @hs_reconnected = false
-        begin
-          index = open_index(index_name)
-        rescue HandlerSocket::HandlerSocketError => e
-          unless @hs_reconnected
-            logger.info "HS: reconnecting"
-            ActiveRecord::Base.reconnect_handlersocket
-            retry
-          else
-            logger.info "HS: reconnection failed"
-            raise e
-          end
-        end
+        index = open_index(index_name)
         begin
           logger.debug "HS: #{@@hs_db_name}.#{table_name} #{index_name} #{ids.inspect}"
           if ids.is_a?(Array)
@@ -114,6 +137,19 @@ class ActiveRecord::Base
       end
     end
 
+    def del_through_handlersocket(id, index_name = 'PRIMARY')
+      unless id.nil?
+        index = open_index(index_name)
+        begin
+          logger.debug "HS: #{@@hs_db_name}.#{table_name} #{index_name} DELETE #{id}"
+          @@hs.execute_delete_with_error(index, '=', [id], 1, 0)
+        rescue HandlerSocket::HandlerSocketError => e
+          logger.debug "HS: delete failed - #{e.message}"
+          raise e
+        end
+      end
+    end
+
     def find_one_with_handlersocket(ids, options = {})
       get_through_handlersocket(ids) rescue find_one_without_handlersocket(ids, options)
     end

data/railhead_handlersocket.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name     = "railhead_handlersocket"
-  s.version  = "0.0.1"
-  s.date     = "2011-05-07"
-  s.summary  = "Hacks for ActiveRecord 2.x to working with HandlerSocket.B"
+  s.version  = "0.0.2"
+  s.date     = "2011-06-10"
+  s.summary  = "Hacks for ActiveRecord 2.x to working with HandlerSocket."
   s.email    = "nagybence@tipogral.hu"
   s.homepage = "http://github.com/nagybence/railhead_cacheify"
   s.description = "Hacks for ActiveRecord 2.x to working with HandlerSocket."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railhead_handlersocket
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 27
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Bence Nagy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 +02:00
+date: 2011-06-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -64,9 +64,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Hacks for ActiveRecord 2.x to working with HandlerSocket.B
+summary: Hacks for ActiveRecord 2.x to working with HandlerSocket.
 test_files: []