active_presenters 1.0.1.5 → 1.0.1.6

data/lib/active_presenter_base.rb

@@ -95,43 +95,43 @@ module ActivePresenter
         eval %{
           unless method_defined?(:index_path)
             def index_path
-              #{self.plural}_path#{self.model.nested_resource.nil? ? '' : "(self.model.nested_resource)"}
+              #{self.plural}_path#{self.nested_resource_path_string}
             end
           end
         
           unless method_defined?(:show_path)
             def show_path
-              #{self.singular}_path(#{self.model.nested_resource.nil? ? '' : "self.model.nested_resource, "}self.model)
+              #{self.singular}_path#{self.nested_resource_path_string(true)}
             end
           end
 
           unless method_defined?(:new_path)
             def new_path
-              new_#{self.singular}_path#{self.model.nested_resource.nil? ? '' : "(self.model.nested_resource)"}
+              new_#{self.singular}_path#{self.nested_resource_path_string}
             end
           end
           
           unless method_defined?(:create_path)
             def create_path
-              #{self.plural}_path#{self.model.nested_resource.nil? ? '' : "(self.model.nested_resource)"}
+              #{self.plural}_path#{self.nested_resource_path_string}
             end
           end
 
           unless method_defined?(:edit_path)
             def edit_path
-              edit_#{self.singular}_path(#{self.model.nested_resource.nil? ? '' : "self.model.nested_resource, "}self.model)
+              edit_#{self.singular}_path#{self.nested_resource_path_string(true)}
             end
           end
 
           unless method_defined?(:update_path)
             def update_path
-              #{self.singular}_path(#{self.model.nested_resource.nil? ? '' : "self.model.nested_resource, "}self.model)
+              #{self.singular}_path#{self.nested_resource_path_string(true)}
             end
           end
 
           unless method_defined?(:destroy_path)
             def destroy_path
-              #{self.singular}_path(#{self.model.nested_resource.nil? ? '' : "self.model.nested_resource, "}self.model)
+              #{self.singular}_path#{self.nested_resource_path_string(true)}
             end
           end
         }
@@ -140,6 +140,13 @@ module ActivePresenter
 
     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
+      x = "(#{x})" unless x.blank?
+      x
+    end
+    
     def plural
       self.model_underscore.pluralize
     end

data/lib/tasks/rubyforge_config.yml

@@ -2,4 +2,4 @@
 gem_name: active_presenters
 package: active_presenters
 project: magrathea
-version: 1.0.1.5
+version: 1.0.1.6

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: active_presenters
 version: !ruby/object:Gem::Version 
-  version: 1.0.1.5
-date: 2007-09-27 00:00:00 -04:00
+  version: 1.0.1.6
+date: 2007-10-02 00:00:00 -04:00
 summary: active_presenters
 require_paths: 
 - lib
@@ -44,10 +44,6 @@ files:
 - lib/presentable.rb
 - lib/proxy.rb
 - lib/tasks/rubyforge_config.yml
-- test/active_presenters_test.rb
-- test/models.rb
-- test/presenters.rb
-- test/proxy_test.rb
 test_files: []
 
 rdoc_options: []

data/test/active_presenters_test.rb

@@ -1,93 +0,0 @@
-require 'test/unit'
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
-require File.expand_path(File.dirname(__FILE__) + "/../init")
-require File.expand_path(File.dirname(__FILE__) + "/models")
-require File.expand_path(File.dirname(__FILE__) + "/presenters")
-
-ActionController::Routing::Routes.draw do |map|
-  map.resources :blog_posts
-  map.resources :blog_users
-  map.resources :blog_comments
-end
-
-class ActivePresentersTest < Test::Unit::TestCase
-  include ActionView::Helpers::TagHelper # link_to
-  include ActionView::Helpers::UrlHelper # url_for
-  include ActionController::UrlWriter # named routes
-  include ActionView::Helpers::TextHelper # link_to
-  include ActionView::Helpers::FormHelper
-  include ActionView::Helpers::FormTagHelper
-  include ActionView::Helpers::FormOptionsHelper
-
-  def test_base_presenter_built
-    bp = BlogPost.build_new
-    p = bp.presenter
-    assert_presenter_basics(bp, p)
-  end
-  
-  def test_default_presenter_built
-    bc = BlogComment.build_new
-    p = bc.presenter
-    assert_presenter_basics(bc, p)
-    assert p.is_a?(BlogCommentPresenter)
-  end
-  
-  def test_custom_presenter_built
-    bu = BlogUser.build_new
-    p = bu.presenter
-    assert_presenter_basics(bu, p, "special_foo_presenter")
-    assert p.is_a?(SpecialFooPresenter)
-    assert_equal "Hello World!", p.show_link_text
-  end
-  
-  def test_poro_presenter_built
-    poro = Poro.new
-    p = poro.presenter
-    assert_presenter_basics(poro, p)
-  end
-  
-  def test_ar_resource_methods_built
-    bp = BlogPost.build_new
-    p = bp.presenter
-    assert bp.is_restful?
-    assert_nil bp.nested_resource
-    rest_verbs.each_pair do |verb, meth|
-      assert p.respond_to?("#{verb}_link_text")
-      assert_equal verb.to_s, p.send("#{verb}_link_text")
-      assert p.respond_to?("#{verb}_link_options")
-      assert_equal({:method => meth.to_sym}, p.send("#{verb}_link_options")) unless verb == :destroy
-      assert_equal({:method => meth.to_sym, :confirm => 'Are you sure?', :method => :delete}, p.send("#{verb}_link_options")) if verb == :destroy
-      assert p.respond_to?("#{verb}_link")
-      assert_equal link_to(h("#{verb}"), p.send("#{verb}_path"), p.send("#{verb}_link_options")), p.send("#{verb}_link")
-      assert p.respond_to?("#{verb}_path")
-    end
-  end
-  
-  def test_ar_resource_methods_not_built
-    bp = Poro.new
-    p = bp.presenter
-    rest_verbs.each_pair do |verb, meth|
-      assert !p.respond_to?("#{verb}_link_text")
-      assert !p.respond_to?("#{verb}_link_options")
-      assert !p.respond_to?("#{verb}_link")
-      assert !p.respond_to?("#{verb}_path")
-    end
-  end
-
-  def rest_verbs
-    ActivePresenter::REST_VERBS
-  end
-  
-  def assert_presenter_basics(model, presenter, presenter_name = "#{model.class.to_s.underscore.to_sym}_presenter")
-    m_underscore_sym = model.class.to_s.underscore.to_sym
-    assert model.is_presentable?
-    assert_equal presenter_name, model.presenter_name
-    assert_not_nil presenter
-    assert presenter.is_a?(ActivePresenter::Base)
-    assert_equal model, presenter.model
-    assert presenter.respond_to?(m_underscore_sym)
-    assert_equal presenter.model, presenter.send(m_underscore_sym)
-  end
-  
-end

data/test/models.rb

@@ -1,59 +0,0 @@
-class BlogPost < ActiveRecord::Base
-  
-  attr_accessor :title
-  attr_accessor :body
-  attr_accessor :created_at
-  attr_accessor :updated_at
-  attr_accessor :id
-  
-  def initialize(hsh = {}) 
-    hsh.each { |k, v| send("#{k}=", v) } 
-  end 
-  
-  def self.build_new(options = {})
-    BlogPost.new({:id => 1, :title => "Hello!", :body => "This is my body", :created_at => 1.day.ago, :updated_at => Time.now}.merge(options))
-  end
-  
-end
-
-class BlogComment < ActiveRecord::Base
-  
-  attr_accessor :blog_id
-  attr_accessor :body
-  attr_accessor :created_at
-  attr_accessor :updated_at
-  attr_accessor :id
-  
-  def initialize(hsh = {}) 
-    hsh.each { |k, v| send("#{k}=", v) } 
-  end 
-  
-  def self.build_new(options = {})
-    BlogComment.new({:id => 1, :blog_id => 1, :body => "This is my body", :created_at => 1.day.ago, :updated_at => Time.now}.merge(options))
-  end
-  
-end
-
-class BlogUser < ActiveRecord::Base
-  
-  use_presenter :special_foo
-  
-  attr_accessor :username
-  attr_accessor :email
-  attr_accessor :created_at
-  attr_accessor :updated_at
-  attr_accessor :id
-  
-  def initialize(hsh = {}) 
-    hsh.each { |k, v| send("#{k}=", v) } 
-  end 
-  
-  def self.build_new(options = {})
-    BlogUser.new({:id => 1, :username => "markbates", :email => "foo@foo.com", :created_at => 1.day.ago, :updated_at => Time.now}.merge(options))
-  end
-  
-end
-
-class Poro
-  include ActivePresenter::Presentable
-end

data/test/presenters.rb

@@ -1,11 +0,0 @@
-class BlogCommentPresenter < ActivePresenter::Base
-  
-end
-
-class SpecialFooPresenter < ActivePresenter::Base
-  
-  def show_link_text
-    "Hello World!"
-  end
-  
-end

data/test/proxy_test.rb

@@ -1,75 +0,0 @@
-require 'test/unit'
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
-require File.expand_path(File.dirname(__FILE__) + "/../init")
-require File.expand_path(File.dirname(__FILE__) + "/models")
-require File.expand_path(File.dirname(__FILE__) + "/presenters")
-
-class ProxyTest < Test::Unit::TestCase
-  
-  def test_empty_constructor
-    p = ActivePresenter::Proxy.new
-    puts "p = #{p.inspect}"
-  end
-  
-  def test_hash_constructor
-    p = ActivePresenter::Proxy.new(:foo => :bar)
-    assert p.methods.include?("foo")
-    assert p.methods.include?("foo=")
-    assert_equal :bar, p.foo
-    p.foo = :foo_bar
-    assert_equal :foo_bar, p.foo
-  end
-  
-  def test_array_constructor
-    @hello = "Hello There World!"
-    p = ActivePresenter::Proxy.new([:mark, :bates, @hello])
-    assert !p.methods.include?("mark")
-    assert !p.methods.include?("bates")
-    assert !p.methods.include?("hello")
-  end
-  
-  def test_methods_genned
-    p = ActivePresenter::Proxy.new
-    assert !p.methods.include?("foo_bar")
-    assert !p.methods.include?("foo_bar=")
-    p.foo_bar = :bar
-    assert_equal :bar, p.foo_bar
-    assert p.methods.include?("foo_bar")
-    assert p.methods.include?("foo_bar=")
-  end
-  
-  def test_block
-    p = ActivePresenter::Proxy.new(:cool => :mark)
-    assert_equal :mark, p.cool
-    x = p.cool do |v|
-      assert_equal :mark, v
-      assert_equal 2, 1 + 1
-      v = "mark is cool"
-      assert_equal "mark is cool", v
-    end
-    assert_equal :mark, x
-  end
-  
-  def test_define_method
-    p = ActivePresenter::Proxy.new
-    assert !p.methods.include?("my_crazy_method")
-    p.create_method("my_crazy_method") do |k, v|
-      return [1, 2, k, v]
-    end
-    assert p.methods.include?("my_crazy_method")
-    assert_equal [1,2,3,4], p.my_crazy_method(3,4)
-  end
-  
-  def test_block_constructor
-    p = ActivePresenter::Proxy.new(:partner => :mark) do |p|
-      assert_equal :mark, p.partner
-      p.baby = :dylan
-      assert_equal p.baby, :dylan
-    end
-    assert_equal :mark, p.partner
-    assert_equal p.baby, :dylan
-  end
-  
-  
-end