governor 0.4.0 → 0.5.0

data/Gemfile

@@ -6,7 +6,9 @@ group :development, :test do
   gem 'jeweler', '~> 1.5.2'
   gem 'sqlite3'
   gem 'rspec-rails'
+  gem 'rcov'
   gem 'mocha'
+  gem 'webrat'
   gem 'factory_girl', '~> 2.0.0.beta'
   gem 'factory_girl_rails', '~> 1.1.beta'
   gem 'activerecord-nulldb-adapter'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    governor (0.3.1)
+    governor (0.4.0)
       rails (~> 3.0.5)
 
 GEM
@@ -63,6 +63,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.12)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -83,6 +84,7 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
+    rcov (0.9.9)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -103,6 +105,10 @@ GEM
     tzinfo (0.3.24)
     warden (1.0.3)
       rack (>= 1.0.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
 
 PLATFORMS
   ruby
@@ -117,5 +123,7 @@ DEPENDENCIES
   jeweler (~> 1.5.2)
   mocha
   rails (~> 3.0.5)
+  rcov
   rspec-rails
   sqlite3
+  webrat

data/Rakefile

@@ -35,6 +35,7 @@ end
 RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = %w{--exclude gems\/,spec\/}
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/app/helpers/governor_application_helper.rb

@@ -0,0 +1,24 @@
+module GovernorApplicationHelper
+  # A navigation header for allowing an administrator to access
+  # Governor-related links. By default, it includes a link to all articles and
+  # a link to create a new article.
+  #
+  # The default separator between items is |, which can be customized to be a
+  # bullet, an image, or any other string. If you're using Governor with
+  # multiple resources, you'll want to specify which one as the second
+  # argument. It defaults to the first resource registered.
+  def governor_header(separator = '|', resource = Governor.default_resource.plural)
+    mapping = Governor.resources[resource.to_sym]
+    content_tag :div, :class => 'governor_header' do
+      concat(link_to t('governor.all_articles', :resource_type => mapping.humanize.pluralize), send("#{mapping.plural}_path"))
+      concat(" #{separator} ".html_safe)
+      concat(link_to t('governor.new_article', :resource_type => mapping.humanize), send("new_#{mapping.singular}_path"))
+      Governor::PluginManager.plugins.map{|p| p.navigation_hook }.each do |hook|
+        if hook.present?
+          concat(" #{separator} ".html_safe)
+          instance_exec(resource, &hook)
+        end
+      end
+    end
+  end
+end

data/app/helpers/governor_helper.rb

@@ -1,8 +1,4 @@
 module GovernorHelper
-  Governor::PluginManager.plugins.map{|p| p.helpers }.flatten.each do |mod|
-    include mod.constantize # FIXME this feels pretty dirty, there has to be a better way
-  end
-  
   def render_plugin_partial(where, options = {})
     output = ''
     Governor::PluginManager.plugins.map{|p| p.partial_for(where) }.compact.each do |partial|

data/config/locales/en.yml

@@ -4,3 +4,6 @@ en:
     article_updated: "%{resource_type} was successfully updated."
     article_destroyed: "%{resource_type} was successfully deleted."
     unauthorized_edit: "You're not allowed to edit this %{resource_type}."
+    
+    all_articles: "%{resource_type}"
+    new_article: "New %{resource_type}"

data/governor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{governor}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Liam Morley"]
-  s.date = %q{2011-04-28}
+  s.date = %q{2011-05-05}
   s.description = %q{Because Blogojevich would be too tough to remember. It's a pluggable blogging system for Rails 3.}
   s.email = %q{liam@carpeliam.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/controllers/governor/articles_controller.rb",
+    "app/helpers/governor_application_helper.rb",
     "app/helpers/governor_helper.rb",
     "app/views/governor/articles/_article.html.erb",
     "app/views/governor/articles/_form.html.erb",
@@ -61,6 +62,7 @@ Gem::Specification.new do |s|
     "spec/governor/plugin_manager_spec.rb",
     "spec/governor/plugin_spec.rb",
     "spec/governor_spec.rb",
+    "spec/helpers/governor_application_helper_spec.rb",
     "spec/rails_app/.gitignore",
     "spec/rails_app/Gemfile",
     "spec/rails_app/Gemfile.lock",
@@ -115,7 +117,9 @@ Gem::Specification.new do |s|
     "spec/rails_app/script/rails",
     "spec/rails_app/spec/factories.rb",
     "spec/rails_app/vendor/plugins/.gitkeep",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/views/governor/articles/index.html.erb_spec.rb",
+    "spec/views/layouts/application.html.erb_spec.rb"
   ]
   s.homepage = %q{http://carpeliam.github.com/governor}
   s.licenses = ["MIT"]
@@ -129,6 +133,7 @@ Gem::Specification.new do |s|
     "spec/governor/plugin_manager_spec.rb",
     "spec/governor/plugin_spec.rb",
     "spec/governor_spec.rb",
+    "spec/helpers/governor_application_helper_spec.rb",
     "spec/rails_app/app/controllers/application_controller.rb",
     "spec/rails_app/app/controllers/home_controller.rb",
     "spec/rails_app/app/helpers/application_helper.rb",
@@ -155,7 +160,9 @@ Gem::Specification.new do |s|
     "spec/rails_app/db/schema.rb",
     "spec/rails_app/db/seeds.rb",
     "spec/rails_app/spec/factories.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/views/governor/articles/index.html.erb_spec.rb",
+    "spec/views/layouts/application.html.erb_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -167,7 +174,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<webrat>, [">= 0"])
       s.add_development_dependency(%q<factory_girl>, ["~> 2.0.0.beta"])
       s.add_development_dependency(%q<factory_girl_rails>, ["~> 1.1.beta"])
       s.add_development_dependency(%q<activerecord-nulldb-adapter>, [">= 0"])
@@ -179,7 +188,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<webrat>, [">= 0"])
       s.add_dependency(%q<factory_girl>, ["~> 2.0.0.beta"])
       s.add_dependency(%q<factory_girl_rails>, ["~> 1.1.beta"])
       s.add_dependency(%q<activerecord-nulldb-adapter>, [">= 0"])
@@ -192,7 +203,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<webrat>, [">= 0"])
     s.add_dependency(%q<factory_girl>, ["~> 2.0.0.beta"])
     s.add_dependency(%q<factory_girl_rails>, ["~> 1.1.beta"])
     s.add_dependency(%q<activerecord-nulldb-adapter>, [">= 0"])

data/lib/governor/plugin.rb

@@ -1,10 +1,9 @@
 module Governor
   class Plugin
-    attr_reader :name, :migrations, :routes, :resources, :helpers, :mimes
+    attr_reader :name, :migrations, :routes, :resources, :mimes, :navigation_hook
     def initialize(name)
       @name = name
       @migrations = []
-      @helpers = []
       @resources = {}
       @partials = {}
       @mimes = []
@@ -51,19 +50,6 @@ module Governor
       @partials[type.to_sym]
     end
     
-    # Associates a helper for this plugin, to be included into the controller
-    # and view.
-    #
-    # Currently this requires a string. This will be refactored soon.
-    #
-    # Example:
-    #
-    #     comments.add_helper "GovernorCommentsHelper"
-    #
-    def add_helper(mod)
-      @helpers << mod
-    end
-    
     def include_in_model(base) #:nodoc:
       instance_exec(base, &@model_callback) if @model_callback
     end
@@ -88,8 +74,40 @@ module Governor
       @model_callback = block
     end
     
+    # Defines mime types that this plugin responds to. These mime types will
+    # be passed on to the controller.
+    #
+    # Example:
+    #
+    #    plugin.responds_to :xml, :json
+    #
+    # Specifies that this plugin can deliver a view for XML documents as well
+    # as JSON.
+    #
+    # Any arguments that can be passed to +respond_to+ in the controller can
+    # be passed here:
+    #
+    #     plugin.responds_to :atom, :only => :index
+    #
+    # This specifies that the :index action responds to :atom, but no others.
     def responds_to(*mimes)
       @mimes << mimes
     end
+    
+    # Adds the given block to the Governor navigation header in
+    # GovernorApplicationHeader#governor_header.
+    #
+    # Example:
+    #
+    #     plugin.add_to_navigation do
+    #       concat(link_to("Rod's favorite movie?", 'http://www.imdb.com/title/tt0031679/'))
+    #     end
+    #
+    # This would add a link to Rod's favorite movie in the Governor navigation
+    # header. You're responsible for wrapping any content you want included
+    # with concat().
+    def add_to_navigation(&block)
+      @navigation_hook = block
+    end
   end
 end

data/lib/governor/rails.rb

@@ -3,6 +3,8 @@ require 'governor/rails/routes'
 module Governor
   # Standard <code>Rails::Engine</code>.
   class Engine < ::Rails::Engine
-    
+    config.to_prepare do
+      ActionController::Base.helper(GovernorApplicationHelper)
+    end
   end
 end

data/spec/helpers/governor_application_helper_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe GovernorApplicationHelper do
+  describe "#governor_header" do
+    it "includes a link to a new article" do
+      governor_header.should have_selector('a', :href => new_article_path, :content => "New Article")
+    end
+    it "includes a link to all articles" do
+      governor_header.should have_selector('a', :href => articles_path, :content => "Article")
+    end
+  end
+end

data/spec/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    governor (0.3.1)
+    governor (0.4.0)
       rails (~> 3.0.5)
 
 GEM

data/spec/rails_app/app/views/layouts/application.html.erb

@@ -8,6 +8,7 @@
 </head>
 <body>
 <% if user_signed_in? %>
+  <%= governor_header %>
   <%= link_to 'new article', new_article_path %> |
   <%= link_to 'sign out', destroy_user_session_path %>
 <% else %>

data/spec/views/governor/articles/index.html.erb_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+module Governor
+  describe "governor/articles/index.html.erb" do
+    it "can render plugin partials" do
+      view.should respond_to(:render_plugin_partial)
+    end
+  end
+end

data/spec/views/layouts/application.html.erb_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "layouts/application.html.erb" do
+  include Devise::TestHelpers
+  
+  before(:each) do
+    sign_in Factory(:user)
+  end
+  
+  it "includes the helper" do
+    view.should respond_to(:governor_header)
+  end
+  
+  it "links to articles page" do
+    render
+    rendered.should have_selector('a', :href => articles_path, :content => 'Articles')
+  end
+  
+  it "links to new article page" do
+    render
+    rendered.should have_selector('a', :href => new_article_path, :content => 'New Article')
+  end
+  
+  context "with a plugin that adds a hook" do
+    before do
+      @test = Governor::Plugin.new('test')
+      @test.add_to_navigation do
+        concat(link_to('Google', 'http://www.google.com'))
+      end
+      Governor::PluginManager.register @test
+    end
+    it "shows any plugin's hooks" do
+      render
+      rendered.should have_selector('a', :href => 'http://www.google.com', :content => 'Google')
+    end
+    after do
+      Governor::PluginManager.remove_plugin(@test)
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: governor
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Liam Morley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -04:00
+date: 2011-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,7 +81,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: mocha
+  name: rcov
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,8 +95,36 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: factory_girl
+  name: mocha
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: webrat
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: factory_girl
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -108,12 +136,12 @@ dependencies:
         - 0
         - beta
         version: 2.0.0.beta
-  requirement: *id006
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: factory_girl_rails
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,12 +152,12 @@ dependencies:
         - 1
         - beta
         version: 1.1.beta
-  requirement: *id007
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: activerecord-nulldb-adapter
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -138,12 +166,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: devise
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -152,12 +180,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: governor
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -166,12 +194,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: dynamic_form
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -180,7 +208,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  requirement: *id013
 description: Because Blogojevich would be too tough to remember. It's a pluggable blogging system for Rails 3.
 email: liam@carpeliam.com
 executables: []
@@ -200,6 +228,7 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/governor/articles_controller.rb
+- app/helpers/governor_application_helper.rb
 - app/helpers/governor_helper.rb
 - app/views/governor/articles/_article.html.erb
 - app/views/governor/articles/_form.html.erb
@@ -235,6 +264,7 @@ files:
 - spec/governor/plugin_manager_spec.rb
 - spec/governor/plugin_spec.rb
 - spec/governor_spec.rb
+- spec/helpers/governor_application_helper_spec.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Gemfile
 - spec/rails_app/Gemfile.lock
@@ -290,6 +320,8 @@ files:
 - spec/rails_app/spec/factories.rb
 - spec/rails_app/vendor/plugins/.gitkeep
 - spec/spec_helper.rb
+- spec/views/governor/articles/index.html.erb_spec.rb
+- spec/views/layouts/application.html.erb_spec.rb
 has_rdoc: true
 homepage: http://carpeliam.github.com/governor
 licenses: 
@@ -331,6 +363,7 @@ test_files:
 - spec/governor/plugin_manager_spec.rb
 - spec/governor/plugin_spec.rb
 - spec/governor_spec.rb
+- spec/helpers/governor_application_helper_spec.rb
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/controllers/home_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
@@ -358,3 +391,5 @@ test_files:
 - spec/rails_app/db/seeds.rb
 - spec/rails_app/spec/factories.rb
 - spec/spec_helper.rb
+- spec/views/governor/articles/index.html.erb_spec.rb
+- spec/views/layouts/application.html.erb_spec.rb