governor 0.3.1 → 0.4.0

data/Gemfile

@@ -11,7 +11,6 @@ group :development, :test do
   gem 'factory_girl_rails', '~> 1.1.beta'
   gem 'activerecord-nulldb-adapter'
   
-  gem 'will_paginate', '~> 3.0.beta'
   gem 'devise'
   gem 'governor', :path => './'
   gem 'dynamic_form'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    governor (0.3.0)
+    governor (0.3.1)
       rails (~> 3.0.5)
 
 GEM
@@ -103,7 +103,6 @@ GEM
     tzinfo (0.3.24)
     warden (1.0.3)
       rack (>= 1.0.0)
-    will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
@@ -120,4 +119,3 @@ DEPENDENCIES
   rails (~> 3.0.5)
   rspec-rails
   sqlite3
-  will_paginate (~> 3.0.beta)

data/README.rdoc

@@ -11,10 +11,9 @@ try the specs, they're fresh!
 == Dependencies
 
 * ActiveRecord
-* will_paginate[https://github.com/mislav/will_paginate]
 
-At some point (at least by v1.0), these dependencies will be removed. Sorry
-about the meantime.
+By 1.0, I'd like to make it possible to use Governor with other ORMs, but I'm
+not sure when that'll be.
 
 == Setting Up
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/app/controllers/governor/articles_controller.rb

@@ -15,7 +15,11 @@ class Governor::ArticlesController < ApplicationController
   # GET /articles
   # GET /articles.xml
   def index
-    set_resources model_class.paginate :page => params[:page], :order => 'created_at DESC'
+    set_resources(if model_class.respond_to?(:paginate)
+      model_class.paginate :page => params[:page], :order => 'created_at DESC'
+    else
+      model_class.all :order => 'created_at DESC'
+    end)
     respond_with resources
   end
 
@@ -43,7 +47,7 @@ class Governor::ArticlesController < ApplicationController
     set_resource model_class.new(params[mapping.singular])
     resource.author = the_governor
     if resource.save
-      flash[:notice] = "#{mapping.humanize} was successfully created."
+      flash[:notice] = t('governor.article_created', :resource_type => mapping.humanize)
     end
     respond_with resource
   end
@@ -52,7 +56,7 @@ class Governor::ArticlesController < ApplicationController
   # PUT /articles/1.xml
   def update
     if resource.update_attributes(params[mapping.singular])
-      flash[:notice] = "#{mapping.humanize} was successfully updated."
+      flash[:notice] = t('governor.article_updated', :resource_type => mapping.humanize)
     end
     respond_with resource
   end
@@ -61,7 +65,7 @@ class Governor::ArticlesController < ApplicationController
   # DELETE /articles/1.xml
   def destroy
     resource.destroy
-    flash[:notice] = "#{mapping.humanize} was successfully updated."
+    flash[:notice] = t('governor.article_destroyed', :resource_type => mapping.humanize)
     respond_with resource
   end
   

data/app/helpers/governor_helper.rb

@@ -1,6 +1,4 @@
 module GovernorHelper
-  @@months = %w(January February March April May June July August September October November December)
-  
   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
@@ -14,14 +12,8 @@ module GovernorHelper
     return output.html_safe
   end
   
-  def get_date_label
-    if not params[:day].nil?
-      "#{@@months[params[:month].to_i - 1]} #{params[:day]}, #{params[:year]}"
-    elsif not params[:month].nil?
-      "#{@@months[params[:month].to_i - 1]} #{params[:year]}"
-    else
-      params[:year]
-    end
+  def get_date_label(year, month=nil, day=nil)
+    l Date.new(*[year, month, day].compact), :format => "#{'%B ' if month}#{'%d, ' if day}%Y"
   end
 
   def show_time_ago(date)

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

@@ -2,5 +2,5 @@
 <%= render :partial => 'article', :collection => resources %>
 
 <p>
-<%= will_paginate resources %>
+<%= will_paginate(resources) if respond_to?(:will_paginate) %>
 </p>

data/config/locales/en.yml

@@ -1,6 +1,6 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
-  hello: "Hello world"
-  unauthorized_edit: "You're not allowed to edit this %{resource_type}."
+  governor:
+    article_created: "%{resource_type} was successfully created."
+    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}."

data/governor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{governor}
-  s.version = "0.3.1"
+  s.version = "0.4.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-24}
+  s.date = %q{2011-04-28}
   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 = [
@@ -37,8 +37,8 @@ Gem::Specification.new do |s|
     "config/locales/en.yml",
     "governor.gemspec",
     "lib/generators/USAGE",
+    "lib/generators/governor/configure_generator.rb",
     "lib/generators/governor/create_articles_generator.rb",
-    "lib/generators/governor/install_generator.rb",
     "lib/generators/governor/migrate_generator.rb",
     "lib/generators/governor/templates/governor.rb",
     "lib/generators/governor/templates/migrations/create_articles.rb",
@@ -171,7 +171,6 @@ Gem::Specification.new do |s|
       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"])
-      s.add_development_dependency(%q<will_paginate>, ["~> 3.0.beta"])
       s.add_development_dependency(%q<devise>, [">= 0"])
       s.add_development_dependency(%q<governor>, [">= 0"])
       s.add_development_dependency(%q<dynamic_form>, [">= 0"])
@@ -184,7 +183,6 @@ Gem::Specification.new do |s|
       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"])
-      s.add_dependency(%q<will_paginate>, ["~> 3.0.beta"])
       s.add_dependency(%q<devise>, [">= 0"])
       s.add_dependency(%q<governor>, [">= 0"])
       s.add_dependency(%q<dynamic_form>, [">= 0"])
@@ -198,7 +196,6 @@ Gem::Specification.new do |s|
     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"])
-    s.add_dependency(%q<will_paginate>, ["~> 3.0.beta"])
     s.add_dependency(%q<devise>, [">= 0"])
     s.add_dependency(%q<governor>, [">= 0"])
     s.add_dependency(%q<dynamic_form>, [">= 0"])

data/lib/generators/governor/{install_generator.rb → configure_generator.rb}

@@ -1,5 +1,5 @@
 module Governor
-  class InstallGenerator < Rails::Generators::Base
+  class ConfigureGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
   
     def copy_initializer

data/lib/generators/governor/templates/governor.rb

@@ -2,10 +2,12 @@
 
 # How to reference the author of an article
 Governor.author = Proc.new do
-  if respond_to?(:current_user)
+  if defined?(Devise)
+    send("current_#{Devise.default_scope}")
+  elsif respond_to?(:current_user)
     current_user
   else
-    raise "Set up Governor.author in #{File.expand_path(__FILE__)}"
+    raise "Please define Governor.author. Run `rails generator governor:configure` to install an initializer."
   end
 end
 
@@ -13,10 +15,14 @@ end
 Governor.authorize_if do |action, article|
   case action.to_sym
   when :new, :create
-    if respond_to?(:user_signed_in?)
-      user_signed_in?
+    if defined?(Devise) && respond_to?("#{Devise.default_scope}_signed_in?")
+      send("#{Devise.default_scope}_signed_in?")
+    elsif respond_to?(:signed_in?)
+      signed_in?
+    elsif respond_to?(:current_user)
+      current_user.present?
     else
-      raise "Set up Governor.authorize_if in #{File.expand_path(__FILE__)}"
+      raise "Please define Governor.authorize_if. Run `rails generator governor:configure` to install an initializer."
     end
   when :edit, :update, :destroy
     article.author == instance_eval(&Governor.author)
@@ -28,9 +34,11 @@ end
 # What should Governor do if someone tries to do something they weren't
 # authorized to do?
 Governor.if_not_allowed do
-  if respond_to?(Devise)
+  if defined?(Devise)
     send("authenticate_#{Devise.default_scope}!")
+  elsif respond_to?(:deny_access)
+    deny_access
   else
-    raise ArgumentError.new("Set up Governor.if_not_allowed in #{File.expand_path(__FILE__)}")
+    redirect_to :root
   end
 end

data/lib/governor.rb

@@ -16,7 +16,8 @@ module Governor
   
   # Specifies the action that should occur if an unpermitted action is
   # attempted. Usually specified within the initializer, though evaluated in
-  # the scope of a Rails session.
+  # the scope of a Rails session. If not defined, the default is to redirect
+  # to the root path.
   #
   # Example:
   #
@@ -29,6 +30,15 @@ module Governor
   #     end
   #
   mattr_accessor :if_not_allowed
+  Governor.if_not_allowed do
+    if defined?(Devise)
+      send("authenticate_#{Devise.default_scope}!")
+    elsif respond_to?(:deny_access)
+      deny_access
+    else
+      redirect_to :root
+    end
+  end
   
   # Specifies how to reference the author of an article. Usually specified
   # within the initializer, though evaluated in the scope of a Rails session.
@@ -44,6 +54,15 @@ module Governor
   #     end
   #
   mattr_accessor :author
+  Governor.author = Proc.new do
+    if defined?(Devise)
+      send("current_#{Devise.default_scope}")
+    elsif respond_to?(:current_user)
+      current_user
+    else
+      raise "Please define Governor.author. Run `rails generator governor:configure` to install an initializer."
+    end
+  end
   
   # Maps a given resource name with a pair of options, to be supplied as
   # arguments to the routes. Usually called from within +governate+.
@@ -75,4 +94,22 @@ module Governor
   def self.authorize_if(&blk)
     @@authorization_rules = blk
   end
+  Governor.authorize_if do |action, article|
+    case action.to_sym
+    when :new, :create
+      if defined?(Devise) && respond_to?("#{Devise.default_scope}_signed_in?")
+        send("#{Devise.default_scope}_signed_in?")
+      elsif respond_to?(:signed_in?)
+        signed_in?
+      elsif respond_to?(:current_user)
+        current_user.present?
+      else
+        raise "Please define Governor.authorize_if. Run `rails generator governor:configure` to install an initializer."
+      end
+    when :edit, :update, :destroy
+      article.author == instance_eval(&Governor.author)
+    else
+      raise ArgumentError.new('action must be new, create, edit, update, or destroy')
+    end
+  end
 end

data/lib/governor/article.rb

@@ -6,6 +6,11 @@ module Governor
       base.belongs_to :author, :polymorphic => true
       base.validates_presence_of :author, :title, :post
       
+      if defined?(WillPaginate)
+        base.cattr_reader :per_page
+        base.class_eval "@@per_page = 10"
+      end
+      
       Governor::PluginManager.plugins.each do |plugin|
         plugin.include_in_model(base)
       end
@@ -17,7 +22,11 @@ module Governor
       def base.find_all_by_date(year, month = nil, day = nil, page = 1)
         from, to = self.time_delta(year, month, day)
         conditions = ['created_at BETWEEN ? AND ?', from, to]
-        paginate :page => page, :conditions => conditions, :order => 'created_at DESC'
+        if model_class.respond_to?(:paginate)
+          paginate :page => page, :conditions => conditions, :order => 'created_at DESC'
+        else
+          all :conditions => conditions, :order => 'created_at DESC'
+        end
       end
 
       private

data/spec/controllers/governor/articles_controller_spec.rb

@@ -109,6 +109,7 @@ module Governor
           assigns[:article].should_not be_a_new_record
           assigns[:article].author.should == @user
           response.should redirect_to(assigns[:article])
+          flash[:notice].should == 'Article was successfully created.'
         end
       end
     end
@@ -126,6 +127,7 @@ module Governor
         it "updates the article" do
           put :update, :governor_mapping => :articles, :id => @article.id, :article => {:title => 'I am awesome, you are awesome'}
           assigns[:article].title.should == 'I am awesome, you are awesome'
+          flash[:notice].should == 'Article was successfully updated.'
         end
       end
     end
@@ -146,6 +148,7 @@ module Governor
           assigns[:article].should be_destroyed
           ::Article.count.should == 0
           response.should redirect_to(articles_path)
+          flash[:notice].should == 'Article was successfully deleted, and this is a custom localized message.'
         end
       end
     end

data/spec/rails_app/Gemfile

@@ -12,8 +12,6 @@ gem 'governor', :path => '../..'
 
 gem 'dynamic_form'
 
-gem 'will_paginate', '~> 3.0.beta'
-
 # Use unicorn as the web server
 # gem 'unicorn'
 

data/spec/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    governor (0.3.0)
+    governor (0.3.1)
       rails (~> 3.0.5)
 
 GEM
@@ -77,7 +77,6 @@ GEM
     tzinfo (0.3.25)
     warden (1.0.3)
       rack (>= 1.0.0)
-    will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
@@ -88,4 +87,3 @@ DEPENDENCIES
   governor!
   rails (= 3.0.5)
   sqlite3
-  will_paginate (~> 3.0.beta)

data/spec/rails_app/app/models/article.rb

@@ -1,5 +1,3 @@
 class Article < ActiveRecord::Base
   include Governor::Article
-  cattr_reader :per_page
-  @@per_page = 10
 end

data/spec/rails_app/config/locales/en.yml

@@ -2,4 +2,6 @@
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
+  governor:
+    article_destroyed: "%{resource_type} was successfully deleted, and this is a custom localized message."
   hello: "Hello world"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: governor
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Liam Morley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 -04:00
+date: 2011-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,27 +139,11 @@ dependencies:
         - 0
         version: "0"
   requirement: *id008
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: will_paginate
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31098121
-        segments: 
-        - 3
-        - 0
-        - beta
-        version: 3.0.beta
-  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: devise
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,12 +152,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: governor
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,12 +166,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: dynamic_form
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,7 +180,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
+  requirement: *id011
 description: Because Blogojevich would be too tough to remember. It's a pluggable blogging system for Rails 3.
 email: liam@carpeliam.com
 executables: []
@@ -227,8 +211,8 @@ files:
 - config/locales/en.yml
 - governor.gemspec
 - lib/generators/USAGE
+- lib/generators/governor/configure_generator.rb
 - lib/generators/governor/create_articles_generator.rb
-- lib/generators/governor/install_generator.rb
 - lib/generators/governor/migrate_generator.rb
 - lib/generators/governor/templates/governor.rb
 - lib/generators/governor/templates/migrations/create_articles.rb