Update: Classy Inheritance to current version 0.4.4

History.txt

@@ -1,3 +1,6 @@
+== 0.5.11 2008-06-25
+* Update: Classy Inheritance to current version 0.4.4
+
 == 0.5.10 2008-06-24
 * Modified: Classy Inheritance is now bundled with Lockdown to simplify the user management screens.
 * Fixed: Templates: Use m.template with views to test for rails version for action_name issue 

lib/lockdown/classy-inheritance.rb

@@ -39,7 +39,7 @@ def depends_on(model_sym, options = {})
           define_can_be_method_on_requisite_class(model_sym, options[:as])
         end
 
-        options[:attrs].each{|attr| define_accessors(model_sym, attr, options[:prefix])}
+        options[:attrs].each{|attr| define_accessors(model_sym, attr, options)}
       end
 
 
@@ -65,7 +65,7 @@ def can_be(model_sym, options = {})
 
       def define_relationship(model_sym, options)
         opts = options.dup
-        opts.delete(:attrs)
+        [:attrs, :prefix].each{|key| opts.delete(key)}
         if opts[:as]
           as_opt = opts.delete(:as)
           opts = polymorphic_constraints(as_opt).merge(opts)
@@ -115,8 +115,8 @@ def define_find_with_method(model_sym)
         end
       end
 
-      def define_accessors(model_sym, attr, prefix)
-        accessor_method_name = ( prefix ? "#{model_sym}_#{attr}" : attr)
+      def define_accessors(model_sym, attr, options)
+        accessor_method_name = ( options[:prefix] ? "#{model_sym}_#{attr}" : attr)
 
         define_method accessor_method_name do
           eval("self.#{model_sym} ? self.#{model_sym}.#{attr} : nil")
@@ -126,7 +126,7 @@ def define_accessors(model_sym, attr, prefix)
           model_defined = eval("self.#{model_sym}")
 
           unless model_defined
-            klass = model_sym.to_s.classify
+            klass = options[:class_name] || model_sym.to_s.classify
             eval("self.#{model_sym} = #{klass}.new")
           end
 

lib/lockdown/version.rb

@@ -2,7 +2,7 @@ module Lockdown #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 10
+    TINY  = 11
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

website/index.html

@@ -33,7 +33,7 @@
     <h1>Lockdown</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/lockdown"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.10</a>
+      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.11</a>
     </div>
     <h2>What</h2>