governor 0.2.3 → 0.3.0

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/app/controllers/governor/articles_controller.rb

@@ -7,38 +7,34 @@ class Governor::ArticlesController < ApplicationController
   
   helper Governor::Controllers::Helpers
   
+  respond_to :html
+  Governor::PluginManager.plugins.each do |plugin|
+    plugin.mimes.each{|mimes| respond_to *mimes.dup }
+  end
+  
   # GET /articles
   # GET /articles.xml
   def index
     set_resources model_class.paginate :page => params[:page], :order => 'created_at DESC'
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => resources }
-    end
+    respond_with resources
   end
 
   # GET /articles/1
   # GET /articles/1.xml
   def show
-    respond_to do |format|
-      format.html # show.html.erb
-      format.xml  { render :xml => resource }
-    end
+    respond_with resource
   end
 
   # GET /articles/new
   # GET /articles/new.xml
   def new
     set_resource model_class.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => resource }
-    end
+    respond_with resource
   end
 
   # GET /articles/1/edit
   def edit
+    respond_with resource
   end
 
   # POST /articles
@@ -46,43 +42,27 @@ class Governor::ArticlesController < ApplicationController
   def create
     set_resource model_class.new(params[mapping.singular])
     resource.author = the_governor
-
-    respond_to do |format|
-      if resource.save
-        flash[:notice] = "#{mapping.humanize} was successfully created."
-        format.html { redirect_to(resource) }
-        format.xml  { render :xml => resource, :status => :created, :location => resource }
-      else
-        format.html { render :action => 'new' }
-        format.xml  { render :xml => resource.errors, :status => :unprocessable_entity }
-      end
+    if resource.save
+      flash[:notice] = "#{mapping.humanize} was successfully created."
     end
+    respond_with resource
   end
 
   # PUT /articles/1
   # PUT /articles/1.xml
   def update
-    respond_to do |format|
-      if resource.update_attributes(params[mapping.singular])
-        flash[:notice] = "#{mapping.humanize} was successfully updated."
-        format.html { redirect_to(resource) }
-        format.xml  { head :ok }
-      else
-        format.html { render :action => 'edit' }
-        format.xml  { render :xml => resource.errors, :status => :unprocessable_entity }
-      end
+    if resource.update_attributes(params[mapping.singular])
+      flash[:notice] = "#{mapping.humanize} was successfully updated."
     end
+    respond_with resource
   end
 
   # DELETE /articles/1
   # DELETE /articles/1.xml
   def destroy
     resource.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(polymorphic_path(mapping.plural)) }
-      format.xml  { head :ok }
-    end
+    flash[:notice] = "#{mapping.humanize} was successfully updated."
+    respond_with resource
   end
   
   def find_by_date

data/app/views/governor/articles/_form.html.erb

@@ -13,7 +13,7 @@
 
   <p id="article_text">
     <b><%= f.label :post %></b><br>
-    <%= f.text_area :post %>
+<%= f.text_area :post -%>
   </p>
   
   <p>

data/app/views/governor/articles/_form.html.haml

@@ -0,0 +1,26 @@
+= error_messages_for resource_sym
+
+= form_for resource do |f|
+  %p
+    %b= f.label :title
+    %br
+    = f.text_field :title
+    
+  %p
+    %b= f.label :description
+    %br
+    = f.text_field :description
+    
+  %p#article_text
+    %b= f.label :post
+    %br
+    ~ f.text_area :post
+
+  %p
+    %b= f.label :format
+    = f.select :format, Governor::Formatters.available_formatters.keys
+  
+  = render_plugin_partial('bottom_of_form', :locals => {:f => f})
+  
+  %p
+    = f.submit "#{controller.action_name.titleize} Article"

data/governor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{governor}
-  s.version = "0.2.3"
+  s.version = "0.3.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-12}
+  s.date = %q{2011-04-16}
   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 = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "app/helpers/governor_helper.rb",
     "app/views/governor/articles/_article.html.erb",
     "app/views/governor/articles/_form.html.erb",
+    "app/views/governor/articles/_form.html.haml",
     "app/views/governor/articles/edit.html.erb",
     "app/views/governor/articles/index.html.erb",
     "app/views/governor/articles/new.html.erb",
@@ -71,6 +72,7 @@ Gem::Specification.new do |s|
     "spec/rails_app/app/helpers/home_helper.rb",
     "spec/rails_app/app/models/article.rb",
     "spec/rails_app/app/models/user.rb",
+    "spec/rails_app/app/views/governor/articles/index.xml.builder",
     "spec/rails_app/app/views/home/index.html.erb",
     "spec/rails_app/app/views/layouts/application.html.erb",
     "spec/rails_app/config.ru",
@@ -84,6 +86,7 @@ Gem::Specification.new do |s|
     "spec/rails_app/config/initializers/backtrace_silencers.rb",
     "spec/rails_app/config/initializers/devise.rb",
     "spec/rails_app/config/initializers/governor.rb",
+    "spec/rails_app/config/initializers/governor_testing.rb",
     "spec/rails_app/config/initializers/inflections.rb",
     "spec/rails_app/config/initializers/mime_types.rb",
     "spec/rails_app/config/initializers/secret_token.rb",
@@ -141,6 +144,7 @@ Gem::Specification.new do |s|
     "spec/rails_app/config/initializers/backtrace_silencers.rb",
     "spec/rails_app/config/initializers/devise.rb",
     "spec/rails_app/config/initializers/governor.rb",
+    "spec/rails_app/config/initializers/governor_testing.rb",
     "spec/rails_app/config/initializers/inflections.rb",
     "spec/rails_app/config/initializers/mime_types.rb",
     "spec/rails_app/config/initializers/secret_token.rb",

data/lib/governor/plugin.rb

@@ -1,12 +1,13 @@
 module Governor
   class Plugin
-    attr_reader :name, :migrations, :routes, :resources, :helpers
+    attr_reader :name, :migrations, :routes, :resources, :helpers, :mimes
     def initialize(name)
       @name = name
       @migrations = []
       @helpers = []
       @resources = {}
       @partials = {}
+      @mimes = []
     end
     
     def add_migration(path)
@@ -86,5 +87,9 @@ module Governor
     def register_model_callback(&block)
       @model_callback = block
     end
+    
+    def responds_to(*mimes)
+      @mimes << mimes
+    end
   end
 end

data/lib/governor/rails/routes.rb

@@ -20,7 +20,7 @@ module ActionDispatch #:nodoc:
           mapping = Governor.map(resource, options)
           resources mapping.resource, :controller => mapping.controller, :governor_mapping => resource do
             Governor::PluginManager.plugins.map{|p| p.routes }.each do |routes|
-              instance_eval(&routes)
+              instance_eval(&routes) if routes.present?
             end
           end
         end

data/spec/action_dispatch/routing/mapper_spec.rb

@@ -12,7 +12,7 @@ module ActionDispatch::Routing
         end
         Governor::PluginManager.register @plugin
         
-        @article = Factory(:article)
+        @article = Factory(:article, :author => Factory(:user))
         Rails.application.reload_routes!
       end
       

data/spec/controllers/governor/articles_controller_spec.rb

@@ -4,6 +4,37 @@ module Governor
   describe ArticlesController do
     include Devise::TestHelpers
     
+    context "which has a plugin with a registered mime response" do
+      # not sure how to add something before the controller is loaded, so I
+      # added an initializer which adds a plugin that registers a type. See
+      # 'governor_testing' in the rails_app/config/initializers directory:
+      #
+      #     plugin = Governor::Plugin.new('xml support')
+      #     plugin.responds_to :xml, :only => [:index]
+      #     Governor::PluginManager.register plugin
+      #
+      render_views
+      it "responds to standard html" do
+        get :index, :governor_mapping => :articles
+        assigns[:articles].should == [@article]
+        response.status.should == 200 # :success
+      end
+      it "doesn't respond to JSON" do
+        get :index, :governor_mapping => :articles, :format => :json
+        response.status.should == 406 # :not_acceptable
+      end
+      it "responds to index.xml because the plugin added it" do
+        get :index, :governor_mapping => :articles, :format => :xml
+        assigns[:articles].should == [@article]
+        response.status.should == 200 # :success
+        response.body.should =~ /It worked/
+      end
+      it "doesn't respond to show.xml" do
+        get :show, :governor_mapping => :articles, :id => @article.id, :format => :xml
+        response.status.should == 406 # :not_acceptable
+      end
+    end
+    
     before(:each) do
       @user = Factory(:user)
       @article = Factory(:article, :author => @user)
@@ -73,7 +104,7 @@ module Governor
       context "when signed in" do
         before(:each) { sign_in @user }
         it "creates a new article and redirects to its page" do
-          post :create, :governor_mapping => :articles
+          post :create, :governor_mapping => :articles, :article => {:title => 'Want a job?', :post => 'I accept checks'}
           assigns[:article].should be_a ::Article
           assigns[:article].should_not be_a_new_record
           assigns[:article].author.should == @user

data/spec/rails_app/Gemfile.lock

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

data/spec/rails_app/app/views/governor/articles/index.xml.builder

@@ -0,0 +1,5 @@
+xml.instruct!
+xml.success do
+  xml.message "It worked."
+  xml.test_description "This is a test to make sure that other plugins can register to listen for mime types"
+end

data/spec/rails_app/config/initializers/governor_testing.rb

@@ -0,0 +1,4 @@
+# For testing purposes:
+plugin = Governor::Plugin.new('xml support')
+plugin.responds_to :xml, :only => [:index]
+Governor::PluginManager.register plugin

data/spec/rails_app/spec/factories.rb

@@ -1,6 +1,7 @@
 FactoryGirl.define do
   factory :article do |a|
     a.title "Some article"
+    a.post "This is the post. It shouldn't be blank."
   end
   
   factory :user do |u|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: governor
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Liam Morley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -04:00
+date: 2011-04-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -219,6 +219,7 @@ files:
 - app/helpers/governor_helper.rb
 - app/views/governor/articles/_article.html.erb
 - app/views/governor/articles/_form.html.erb
+- app/views/governor/articles/_form.html.haml
 - app/views/governor/articles/edit.html.erb
 - app/views/governor/articles/index.html.erb
 - app/views/governor/articles/new.html.erb
@@ -261,6 +262,7 @@ files:
 - spec/rails_app/app/helpers/home_helper.rb
 - spec/rails_app/app/models/article.rb
 - spec/rails_app/app/models/user.rb
+- spec/rails_app/app/views/governor/articles/index.xml.builder
 - spec/rails_app/app/views/home/index.html.erb
 - spec/rails_app/app/views/layouts/application.html.erb
 - spec/rails_app/config.ru
@@ -274,6 +276,7 @@ files:
 - spec/rails_app/config/initializers/backtrace_silencers.rb
 - spec/rails_app/config/initializers/devise.rb
 - spec/rails_app/config/initializers/governor.rb
+- spec/rails_app/config/initializers/governor_testing.rb
 - spec/rails_app/config/initializers/inflections.rb
 - spec/rails_app/config/initializers/mime_types.rb
 - spec/rails_app/config/initializers/secret_token.rb
@@ -359,6 +362,7 @@ test_files:
 - spec/rails_app/config/initializers/backtrace_silencers.rb
 - spec/rails_app/config/initializers/devise.rb
 - spec/rails_app/config/initializers/governor.rb
+- spec/rails_app/config/initializers/governor_testing.rb
 - spec/rails_app/config/initializers/inflections.rb
 - spec/rails_app/config/initializers/mime_types.rb
 - spec/rails_app/config/initializers/secret_token.rb