active_presenters 1.1.0 → 1.1.4

data/lib/active_presenter_base.rb

@@ -24,9 +24,9 @@ module ActivePresenter
     include ActionView::Helpers::CacheHelper
     include ActionView::Helpers::DateHelper
     include ActionView::Helpers::JavaScriptHelper
-    include ActionView::Helpers::JavaScriptMacrosHelper
+    # include ActionView::Helpers::JavaScriptMacrosHelper
     include ActionView::Helpers::NumberHelper
-    include ActionView::Helpers::PaginationHelper
+    # include ActionView::Helpers::PaginationHelper
     include ActionView::Helpers::PrototypeHelper
     include ActionView::Helpers::ScriptaculousHelper
     attr_accessor :options
@@ -78,153 +78,80 @@ module ActivePresenter
       
       eval %{
         unless method_defined?(:#{verb}_link)
-          def #{verb}_link(name = #{verb}_link_text, options = {}, html_options = nil, *args)
+          def #{verb}_link(name = #{verb}_link_text, options = {})
             options = #{verb}_link_options.merge(options)
-            link_to(h(name), #{verb}_path, options, html_options, *args)
+            link_to(h(name), #{verb}_path, options)
           end
         end
       }
     end
     
+    # TODO: FIX THIS!!!
+    def protect_against_forgery?
+      false
+    end
+    
     def destroy_link_options
       {:confirm => 'Are you sure?', :method => :delete}
     end
     
     def index_path
       ivar_cache do
-        eval "#{self.plural}_path#{self.nested_resource_path_string}"
+        eval(path_builder(:type => :plural))
       end
     end
 
     def show_path
       ivar_cache do
-        eval "#{self.singular}_path#{self.nested_resource_path_string(true)}"
+        eval(path_builder(:include_self => true))
       end
     end
 
     def new_path
       ivar_cache do
-        eval "new_#{self.singular}_path#{self.nested_resource_path_string}"
+        eval(path_builder(:prefix => "new"))
       end
     end
 
     def create_path
       ivar_cache do
-        eval "#{self.plural}_path#{self.nested_resource_path_string}"
+        eval(path_builder(:type => :plural))
       end
     end
 
     def edit_path
       ivar_cache do
-        eval "edit_#{self.singular}_path#{self.nested_resource_path_string(true)}"
+        eval(path_builder(:prefix => "edit", :include_self => true))
       end
     end
 
     def update_path
       ivar_cache do
-        eval "#{self.singular}_path#{self.nested_resource_path_string(true)}"
+        eval(path_builder(:include_self => true))
       end
     end
 
     def destroy_path
       ivar_cache do
-        eval "#{self.singular}_path#{self.nested_resource_path_string(true)}"
+        eval(path_builder(:include_self => true))
       end
     end
     
     
     protected
     
-    # def build_common_ar_resource_methods
-    #   instance_eval do
-    #     unless method_defined?(:destroy_link_options)
-    #       def destroy_link_options
-    #         {:confirm => 'Are you sure?', :method => :delete}
-    #       end
-    #     end
-    #   end
-    # 
-    #   instance_eval do
-    #     REST_VERBS.each_pair do |verb, meth|
-    #       eval %{
-    #         unless method_defined?(:#{verb}_link_text)
-    #           def #{verb}_link_text
-    #             "#{verb}"
-    #           end
-    #         end
-    #       
-    #         unless method_defined?(:#{verb}_link_options)
-    #           def #{verb}_link_options
-    #             #{meth == :get ? "{}" : "{:method => :#{meth}}"}
-    #           end
-    #         end
-    #       
-    #         unless method_defined?(:#{verb}_link)
-    #           def #{verb}_link(name = #{verb}_link_text, options = {}, html_options = nil, *args)
-    #             options = #{verb}_link_options.merge(options)
-    #             link_to(h(name), #{verb}_path, options, html_options, *args)
-    #           end
-    #         end
-    #       }
-    #     end
-    #   end
-    # end
-    # 
-    # def build_ar_resource_methods
-    #   instance_eval do
-    #     eval %{
-    #       unless method_defined?(:index_path)
-    #         def index_path
-    #           #{self.plural}_path#{self.nested_resource_path_string}
-    #         end
-    #       end
-    #     
-    #       unless method_defined?(:show_path)
-    #         def show_path
-    #           #{self.singular}_path#{self.nested_resource_path_string(true)}
-    #         end
-    #       end
-    # 
-    #       unless method_defined?(:new_path)
-    #         def new_path
-    #           new_#{self.singular}_path#{self.nested_resource_path_string}
-    #         end
-    #       end
-    #       
-    #       unless method_defined?(:create_path)
-    #         def create_path
-    #           #{self.plural}_path#{self.nested_resource_path_string}
-    #         end
-    #       end
-    # 
-    #       unless method_defined?(:edit_path)
-    #         def edit_path
-    #           edit_#{self.singular}_path#{self.nested_resource_path_string(true)}
-    #         end
-    #       end
-    # 
-    #       unless method_defined?(:update_path)
-    #         def update_path
-    #           #{self.singular}_path#{self.nested_resource_path_string(true)}
-    #         end
-    #       end
-    # 
-    #       unless method_defined?(:destroy_path)
-    #         def destroy_path
-    #           #{self.singular}_path#{self.nested_resource_path_string(true)}
-    #         end
-    #       end
-    #     }
-    # 
-    #   end
-    # 
-    # end
-    
-    def nested_resource_path_string(include_self = false)
-      x = self.model.nested_resource.nil? ? '' : "self.model.nested_resource"
-      x << (x.blank? ? '' : ", ") << "self.model" if include_self
+    def path_builder(options = {})
+      options = {:prefix => "", :type => :singular, :include_self => false}.merge(options)
+      path = ""
+      path << options[:prefix] << "_" unless options[:prefix].blank?
+      path << (self.model.nested_resource.nil? ? '' : "#{self.model.nested_resource.class.name.underscore}_")
+      path << self.send(options[:type]) << "_path"
+      x = (self.model.nested_resource.nil? ? '' : "self.model.nested_resource")
+      x << (x.blank? ? '' : ", ") << "self.model" if options[:include_self]
       x = "(#{x})" unless x.blank?
-      x
+      path << x
+      # puts path
+      path
     end
     
     def plural

data/lib/tasks/rubyforge_config.yml

@@ -2,4 +2,4 @@
 gem_name: active_presenters
 package: active_presenters
 project: magrathea
-version: 1.1.0
+version: 1.1.4

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: active_presenters
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2007-10-04 00:00:00 -04:00
+  version: 1.1.4
+date: 2007-11-12 00:00:00 -05:00
 summary: active_presenters
 require_paths: 
 - lib