markbates-distribunaut 0.0.2.20090406 → 0.1.20090406

data/lib/distribunaut/distributable.rb

@@ -40,25 +40,13 @@ module Distribunaut # :nodoc:
             
             end
           }
-          obj = "Distribunaut::Distributed::#{base}Proxy".constantize.instance
+          obj = "Distribunaut::Distributed::#{base}Proxy".constantize.instance 
+          raise Distribunaut::Distributed::Errors::ApplicationNameUndefined.new if configatron.distribunaut.app_name.nil?
           Distribunaut::Distributed::Utils::Rinda.register_or_renew(:space => "#{base}".to_sym, 
-                                                  :object => obj)
+                                                                    :object => obj,
+                                                                    :app_name => configatron.distribunaut.app_name)
         end
       end
       
   end # Distributable
-end # Distribunaut
-
-module DRb # :nodoc:
-  class DRbObject # :nodoc:
-
-    alias_method :_original_inspect, :inspect unless method_defined?(:_original_inspect)
-    
-    def inspect
-      "#{_original_inspect}|#{method_missing(:inspect)}"
-    end
-    
-    undef :id if method_defined?(:id)
-    
-  end
-end
+end # Distribunaut

data/lib/distribunaut/extensions/drb_object.rb

@@ -0,0 +1,13 @@
+module DRb # :nodoc:
+  class DRbObject # :nodoc:
+
+    alias_method :_original_inspect, :inspect unless method_defined?(:_original_inspect)
+    
+    def inspect
+      "#{_original_inspect}|#{method_missing(:inspect)}"
+    end
+    
+    undef :id if method_defined?(:id)
+    
+  end
+end

data/lib/distribunaut/utils/rinda.rb

@@ -7,8 +7,8 @@ module Distribunaut
           options = handle_options(options)
           begin
             ring_server.take([options[:app_name], options[:space], nil, nil], options[:timeout])
-          rescue Exception => e
-            # Distribunaut.logger.error(e)
+          rescue ::Rinda::RequestExpiredError => e
+            # it's ok that it expired. It could be that it was never registered.
           end
           register(options)
         end
@@ -39,8 +39,7 @@ module Distribunaut
         
         private
         def self.handle_options(options = {})
-          raise Distribunaut::Distributed::Errors::ApplicationNameUndefined.new if configatron.distribunaut.app_name.nil?
-          {:app_name => configatron.distribunaut.app_name, 
+          {:app_name => nil, 
            :space => nil, 
            :object => nil, 
            :description => nil, 

data/lib/distribunaut.rb

@@ -9,13 +9,9 @@ require 'activesupport'
 
 base = File.join(File.dirname(__FILE__), 'distribunaut')
 
-configatron.distribunaut.set_default(:share_routes, false)
 configatron.distribunaut.set_default(:share_objects, false)
-configatron.distribunaut.set_default(:share_views, false)
 configatron.distribunaut.set_default(:app_name, nil)
-configatron.distribunaut.set_default(:site_domain, nil)
 configatron.distribunaut.set_default(:timeout, 0)
-configatron.distribunaut.set_default(:enable_view_cache, false)
 
 # load *.rb files
 Dir.glob(File.join(base, "**", "*.rb")).each do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markbates-distribunaut
 version: !ruby/object:Gem::Version 
-  version: 0.0.2.20090406
+  version: 0.1.20090406
 platform: ruby
 authors: 
 - markbates
@@ -64,6 +64,7 @@ files:
 - lib/distribunaut/distributable.rb
 - lib/distribunaut/distributed.rb
 - lib/distribunaut/errors/errors.rb
+- lib/distribunaut/extensions/drb_object.rb
 - lib/distribunaut/tasks/ring_server_tasks.rake
 - lib/distribunaut/utils/rinda.rb
 - lib/distribunaut.rb