mack-distributed 0.7.1.1 → 0.8.0

data/README

@@ -18,11 +18,10 @@ Distributed objects are an easy way to share functionality across many different
 
 Let's configure our 'server' application. This is where pretty much all the 'heavy lifting' is done. First we need setup our configuration file:
 
-config/app_config/default.yml:
+config/configatron/default.rb:
   # All distributed applications need to have a unique name so they can easily be identified for lookup.
-  mack::distributed_app_name: my_cool_app
-  # Turn object sharing on
-  mack::share_objects: true
+  configatron.mack.distributed.app_name = 'my_cool_app'
+  configatron.mack.distributed.share_objects = true
 
 Let's assume that we have a simple User DataMapper model that looks something like this:
 
@@ -71,12 +70,11 @@ When you include Mack::Distributable into a class it registers a proxy of that c
 With distributed views, you can easily share views and layouts among different Mack Applications.
   
 == Application #1 (Server)
-config/app_config/default.yml:
-mack::distributed_site_domain: http://localhost:3001
-mack::distributed_app_name: my_cool_app
-# Turn view sharing on
-mack::share_views: true
-# and all the model sharing settings...
+config/configatron/default.rb:
+  
+  configatron.mack.distributed.site_domain = 'http://localhost:3001'
+  configatron.mack.distributed.share_views = true
+  configatron.mack.app_name = 'my_cool_app'
 
 That's it.  When the server is started, the distributed view module will register a proxy with rinda ready for use by the client.
 

data/lib/mack-distributed/distributable.rb

@@ -1,7 +1,7 @@
 module Mack # :nodoc:
   # Include this module into any class it will instantly register that class with
   # the mack_ring_server. The class will be registered with the name of the class
-  # and the mack.distributed_app_name configured in your config/app_config/*.yml file.
+  # and the mack.distributed_app_name configured in your config/configatron/*.rb file.
   # If the mack.distributed_app_name configuration parameter is nil it will raise
   # an Mack::Distributed::Errors::ApplicationNameUndefined exception.
   # 
@@ -17,7 +17,7 @@ module Mack # :nodoc:
   module Distributable
       
       def self.included(base) # :nodoc:
-        if app_config.mack.share_objects
+        if configatron.mack.distributed.share_objects
           base.class_eval do
             include ::DRbUndumped
           end
@@ -43,8 +43,8 @@ module Mack # :nodoc:
               # end
             end
           }
-          raise Mack::Distributed::Errors::ApplicationNameUndefined.new if app_config.mack.distributed_app_name.nil?
-          Mack::Distributed::Utils::Rinda.register_or_renew(:space => app_config.mack.distributed_app_name.to_sym, 
+          raise Mack::Distributed::Errors::ApplicationNameUndefined.new if configatron.mack.distributed.app_name.nil?
+          Mack::Distributed::Utils::Rinda.register_or_renew(:space => configatron.mack.distributed.app_name.to_sym, 
                                                             :klass_def => "#{base}".to_sym, 
                                                             :object => "Mack::Distributed::#{base}Proxy".constantize.instance)
         end
@@ -56,10 +56,10 @@ end # Mack
 module DRb # :nodoc:
   class DRbObject # :nodoc:
 
-    alias_method :original_inspect, :inspect
+    alias_instance_method :inspect
     
     def inspect
-      "#{original_inspect}|#{method_missing(:inspect)}"
+      "#{_original_inspect}|#{method_missing(:inspect)}"
     end
     
     undef :id

data/lib/mack-distributed/extensions/route_map.rb

@@ -1,25 +1,20 @@
 module Mack
   module Routes # :nodoc:
     class RouteMap # :nodoc:
-      
-      # let's make sure we only do the alias_method once.
-      unless self.private_instance_methods.include?("normal_connect_with_named_route")
-        
-        alias_method :normal_connect_with_named_route, :connect_with_named_route
-      
-        def connect_with_named_route(n_route, pattern, options = {}) # :nodoc:
-          n_route = n_route.methodize
-          normal_connect_with_named_route(n_route, pattern, options)
-          if app_config.mack.share_routes
-            Mack::Routes::Urls.class_eval %{
-              def #{n_route}_distributed_url(options = {})
-                (@dsd || app_config.mack.distributed_site_domain) + #{n_route}_url(options)
-              end
-            }
-          end
-        end # connect_with_named_route
-        
-      end
+
+      alias_instance_method :connect_with_name
+    
+      def connect_with_name(name, path, options = {}, &block) # :nodoc:
+        n_route = name.methodize
+        _original_connect_with_name(n_route, path, options, &block)
+        if configatron.mack.distributed.share_routes
+          Mack::Routes::Urls.class_eval %{
+            def #{n_route}_distributed_url(options = {})
+              (@dsd || configatron.mack.distributed.site_domain) + #{n_route}_url(options)
+            end
+          }
+        end
+      end # connect_with_name
       
     end # RouteMap
   end # Routes

data/lib/mack-distributed/extensions/urls.rb

@@ -1,8 +1,7 @@
 module Mack # :nodoc:
   module Routes # :nodoc:
     module Urls
-      
-      alias_deprecated_method :droute_url, :distributed_url, '0.7.0', '>=0.8.0'
+
       # Retrieves a distributed route from a DRb server.
       # 
       # Example:
@@ -18,7 +17,7 @@ module Mack # :nodoc:
           route_name << "_distributed_url"
         end
         
-        if !app_config.mack.distributed_app_name.nil? && app_name.to_sym == app_config.mack.distributed_app_name.to_sym
+        if !configatron.mack.distributed.app_name.nil? && app_name.to_sym == configatron.mack.distributed.app_name.to_sym
           # if it's local let's just use it and not go out to Rinda
           return self.send(route_name, options)
         end

data/lib/mack-distributed/routes/urls.rb

@@ -11,7 +11,7 @@ module Mack
         end
         
         def put
-          Mack::Distributed::Utils::Rinda.register_or_renew(:space => app_config.mack.distributed_app_name.to_sym, 
+          Mack::Distributed::Utils::Rinda.register_or_renew(:space => configatron.mack.distributed.app_name.to_sym, 
                                                             :klass_def => :distributed_routes, 
                                                             :object => self, :timeout => 0)
         end
@@ -36,10 +36,10 @@ module Mack
 end # Mack
 
 Mack::Routes.after_class_method(:build) do
-  if app_config.mack.share_routes
-    raise Mack::Distributed::Errors::ApplicationNameUndefined.new if app_config.mack.distributed_app_name.nil?
+  if configatron.mack.distributed.share_routes
+    raise Mack::Distributed::Errors::ApplicationNameUndefined.new if configatron.mack.distributed.app_name.nil?
     
-    d_urls = Mack::Distributed::Routes::Urls.new(app_config.mack.distributed_site_domain)
+    d_urls = Mack::Distributed::Routes::Urls.new(configatron.mack.distributed.site_domain)
     d_urls.put
     Mack::Routes::Urls.include_safely_into(Mack::Distributed::Routes::Urls)
     Mack::Distributed::Routes::Urls.protected_instance_methods.each do |m|

data/lib/mack-distributed/utils/rinda.rb

@@ -23,8 +23,8 @@ module Mack
         end
         
         def self.ring_server
-          if app_config.mack.distributed_acl
-            acl = ACL.new(app_config.mack.distributed_acl)
+          if configatron.mack.distributed.retrieve(:acl, nil)
+            acl = ACL.new(configatron.mack.distributed.acl)
             DRb.install_acl(acl)
           end
           ::DRb.start_service
@@ -39,7 +39,7 @@ module Mack
         
         private
         def self.handle_options(options = {})
-          {:space => nil, :klass_def => nil, :object => nil, :description => nil, :timeout => app_config.mack.drb_timeout}.merge(options)
+          {:space => nil, :klass_def => nil, :object => nil, :description => nil, :timeout => configatron.mack.distributed.timeout}.merge(options)
         end
         
       end

data/lib/mack-distributed/views/rendering/type/layout.rb

@@ -2,15 +2,13 @@ module Mack
   module Rendering # :nodoc:
     module Type # :nodoc:
       class Layout
-      
-        unless public_instance_methods.include?("old_render")
-          alias_method :old_render, :render
-        end
+        
+        alias_instance_method :render
         
         def render
           if !self.options[:layout].starts_with?("distributed")
             # this is the regular layout, so call the local_render method
-            old_render
+            _original_render
           else
             uri = Addressable::URI.parse(self.options[:layout])
             raise InvalidAddressableURIFormat.new("#{self.options[:layout]}") if uri.host.nil? or uri.path.nil?
@@ -34,13 +32,11 @@ module Mack
               old_render_value = self.view_template.render_value.dup
               self.view_template.render_value = raw
               Mack::Rendering::Type::Inline.new(self.view_template).render
-              # self.view_template.render_value = old_render_value
             end
           end
-        end
+        end # render
         
-      end
-    end
-  end
-end
-
+      end # Layout
+    end # Type
+  end # Rendering
+end # Mack

data/lib/mack-distributed/views/view.rb

@@ -13,11 +13,11 @@ module Mack
       
       class << self
         def register
-          if app_config.mack.share_views
-            raise Mack::Distributed::Errors::ApplicationNameUndefined.new if app_config.mack.distributed_app_name.nil?
+          if configatron.mack.distributed.share_views
+            raise Mack::Distributed::Errors::ApplicationNameUndefined.new if configatron.mack.distributed.app_name.nil?
             # Mack.logger.info "Registering Mack::Distributed::View for '#{app_config.mack.distributed_app_name}' with Rinda"
             
-            Mack::Distributed::Utils::Rinda.register_or_renew(:space => app_config.mack.distributed_app_name.to_sym,
+            Mack::Distributed::Utils::Rinda.register_or_renew(:space => configatron.mack.distributed.app_name.to_sym,
                                                               :klass_def => :distributed_views, 
                                                               :object => Mack::Distributed::View.instance)
           end

data/lib/mack-distributed.rb

@@ -1,18 +1,16 @@
 require 'drb/acl'
 require 'addressable/uri'
 require 'ruby-debug'
+require 'mack-caching'
 
 base = File.join(File.dirname(__FILE__), "mack-distributed")
 
-config = {
-  "mack::share_routes" => false,
-  "mack::share_objects" => false,
-  "mack::share_views" => false,
-  "mack::distributed_app_name" => nil,
-  "mack::distributed_site_domain" => "http://localhost:3000",
-  "mack::drb_timeout" => 0
-}
-app_config.load_hash(config.merge(app_config.final_configuration_settings), "mack-distributed")
+configatron.mack.distributed.set_default(:share_routes, false)
+configatron.mack.distributed.set_default(:share_objects, false)
+configatron.mack.distributed.set_default(:share_views, false)
+configatron.mack.distributed.set_default(:app_name, nil)
+configatron.mack.distributed.set_default(:site_domain, 'http://localhost:3000')
+configatron.mack.distributed.set_default(:timeout, 0)
 
 # load *.rb files
 Dir.glob(File.join(base, "**", "*.rb")).each do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-distributed
 version: !ruby/object:Gem::Version 
-  version: 0.7.1.1
+  version: 0.8.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 -04:00
+date: 2008-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.4
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mack-caching
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.8.0
+    version: 
 description: Distributed Application Support for Mack Framework
 email: mark@mackframework.com
 executables: 
@@ -70,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: magrathea
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Distributed Application