regulate 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    regulate (0.1.0)
-      abstract_auth (~> 0.1.0)
+    regulate (0.1.1)
+      abstract_auth (~> 0.1.3)
       grit (~> 2.3.0)
       rails (~> 3.0.0)
 
@@ -10,8 +10,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    abstract_auth (0.1.0)
-      module_ext (~> 0.1.0)
+    abstract_auth (0.1.3)
+      module_ext (~> 0.1.1)
     actionmailer (3.0.3)
       actionpack (= 3.0.3)
       mail (~> 2.2.9)
@@ -50,10 +50,10 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.2)
-    celerity (0.8.6)
+    celerity (0.8.7)
     childprocess (0.1.6)
       ffi (~> 0.6.3)
-    culerity (0.2.13)
+    culerity (0.2.14)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -64,13 +64,13 @@ GEM
       mime-types (~> 1.15)
     i18n (0.5.0)
     json_pure (1.4.6)
-    mail (2.2.13)
+    mail (2.2.14)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    module_ext (0.1.0)
+    module_ext (0.1.1)
     nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
@@ -103,7 +103,7 @@ GEM
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
-    xpath (0.1.2)
+    xpath (0.1.3)
       nokogiri (~> 1.3)
     yard (0.6.4)
 
@@ -111,7 +111,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  abstract_auth (~> 0.1.0)
+  abstract_auth (~> 0.1.3)
   bluecloth (~> 2.0.9)
   bundler (~> 1.0.0)
   capybara (~> 0.4.0)

data/app/controllers/regulate/admin/pages_controller.rb

@@ -4,14 +4,11 @@ module Regulate
   module Admin
 
     # Standard CRUD Controller
-    class PagesController < ActionController::Base
-      # Check that a user is authenticated
-      before_filter :is_authorized?
-      # Check that the user is an admin
+    class PagesController < ::ApplicationController
+      include Regulate::Helpers::ControllerHelpers
+      before_filter :is_authenticated?
       before_filter :is_admin?, :only => [:new, :create, :destroy]
-      # Check that the user is at least an editor
       before_filter :is_editor?, :not => [:new, :create, :destroy]
-      # Load in our page object based on the ID
       before_filter :load_page, :only => [:edit,:update,:destroy]
 
       # POST route to create a new page
@@ -61,29 +58,6 @@ module Regulate
         render :action => :edit
       end
 
-      private
-
-      def is_authorized?
-        @authorized_user = AbstractAuth.invoke(:authorized_user)
-        @is_admin = AbstractAuth.invoke(:is_admin)
-        # Uncomment the following line to test out admin interface
-        #@is_admin = true
-        @is_editor = AbstractAuth.invoke(:is_editor)
-      end
-
-      def is_editor?
-        redirect_to root_path if !@is_editor
-      end
-
-      def is_admin?
-        redirect_to regulate_admin_regulate_pages_path if !@is_admin
-      end
-
-      # Grab a page resource based on the ID passed to the URI
-      def load_page
-        @page = Regulate::Page.find(params[:id])
-      end
-
     end # class PagesController
 
   end # module Admin

data/app/controllers/regulate/pages_controller.rb

@@ -1,12 +1,12 @@
 module Regulate
 
-  # @todo Build out XHR-only methods for frontend inline editing
-  class PagesController < ActionController::Base
+  class PagesController < ::ApplicationController
+    include Regulate::Helpers::ControllerHelpers
+    before_filter :load_page
+    before_filter :is_authenticated?
+    before_filter :is_published?
 
-    # Show function for front-end
-    def show
-      @page = Regulate::Page.find(params[:id])
-    end
+    def show; end
 
   end # class PagesController
 

data/app/models/regulate/page.rb

@@ -12,7 +12,7 @@ module Regulate
       # Make sure that we're setting our ID.
       # This needs to be URI-friendly
       #@id = self.title.gsub(%r{[ /<>]}, '-').downcase
-      @id = self.title.gsub(/[^a-zA-Z0-9']+/, "-").chomp('-').reverse.chomp('-').reverse.downcase
+      @id = self.title.gsub(/[^a-zA-Z0-9]+/, "-").chomp('-').reverse.chomp('-').reverse.downcase
     end
 
   end

data/app/views/regulate/admin/pages/_form.html.erb

@@ -20,6 +20,10 @@ textarea {height:250px;}
         Title: <%= @page.title %>
       </div>
     <% end %>
+    <div class="form_row">
+      <%= f.label :published %>
+      <%= f.check_box :published %>
+    </div>
     <% if @is_admin %>
       <div class="form_row">
         <%= f.label :view %>

data/app/views/regulate/admin/pages/index.html.erb

@@ -6,6 +6,7 @@
   <% @pages.each do |page| %>
     <li>
       <%= page.title %>
+      <%= link_to "Show" , regulate_page_path(page) %>
       <%= link_to "Edit" , edit_regulate_admin_regulate_page_path(page) %>
       <% if @is_admin %>
         <%= link_to "Delete" , regulate_admin_regulate_page_path(page), :confirm => 'Are you sure?', :method => :delete, :class => 'delete_link' %>

data/app/views/regulate/pages/show.html.erb

@@ -1,5 +1,10 @@
 <h2><%= @page.title %></h2>
 <cite>by, <%= @page.versions.first.author.name %></cite>
+<% if !@page.published? %>
+  <div>
+    THIS PAGE HAS NOT YET BEEN PUBLISHED
+  </div>
+<% end %>
 <div>
   <%= raw @page.rendered %>
 </div>

data/config/routes.rb

@@ -17,6 +17,7 @@ Rails.application.routes.draw do
     scope "admin", :module => :admin, :as => :admin_regulate do
       resources :pages
     end
+
   end
 
 end

data/lib/generators/templates/regulate.rb

@@ -1,32 +1,33 @@
-Regulate.setup do |config|
-
-  # Role that allows a user to manage pages and define what parts are editable, default is :admin
-  # The namespace that you would like to use for the routes. The default is 'cms'.
-  # @example Setting a custom route namespace
-  #   Regulate.setup do |config|
-  #     config.route_namespace = 'my_custom_route_namespace'
-  #   end
-  #
-  # config.route_namespace = 'my_custom_route_namespace'
-
-end
+# Role that allows a user to manage pages and define what parts are editable, default is :admin
+# The namespace that you would like to use for the routes. The default is 'cms'.
+# Run rake:routes to see this in action
+# @example Setting a custom route namespace
+#   Regulate.setup do |config|
+#     config.route_namespace = 'my_custom_route_namespace'
+#   end
 
 # AbstractAuth Implementations
 # You NEED to set these methods appropriately for Regulate to function
-# This method should return a the currently authenticated resource
-#AbstractAuth.implement :authorized_user do
-  #::ApplicationController.send('current_user')
+# This method should return the currently authenticated resource if they are authorized to manage the cms
+# The following should work with Devise/AuthLogic
+#AbstractAuth.implement :authenticated_user do
+  # current_user
 #end
+
 # This method should return whether the currently authenticated resource is an admin or not
 # Admins are able to edit the view field on a CMS page and define the editable regions
 # If you want any authenticated user to be able to have this ability, simply return true in your implementation
+# This must return true for a user if they are supposed to be able to create new pages and edit the view of a page
 #AbstractAuth.implement :is_admin do
-  #::ApplicationController.send('current_user').is_admin?
+  # current_user.is_admin?
 #end
+
 # This method should return whether the currently authenticated resource is an admin or not
 # Editors only have the ability to change the content of editable regions on the page
 # If you want any authenticated user to be able to have this ability, simply return true in your implementation
+# In other words, this must return true for a user to have any access/management rights in the CMS
+# If this returns false, the user will be redirected to the root path of the app
 #AbstractAuth.implement :is_editor do
-  #::ApplicationController.send('current_user').is_editor?
+  # current_user.is_editor?
 #end
 

data/lib/regulate.rb

@@ -8,10 +8,11 @@ module Regulate
 
   # Autoloads
   autoload :Git , 'regulate/git'
+  autoload :Helpers , 'regulate/helpers'
 
   # Setup our AbstractAuth requirements
   AbstractAuth.setup do |config|
-    config.requires :authorized_user , :is_admin , :is_editor
+    config.requires :authenticated_user , :is_admin , :is_editor
   end
 
   # Our host application root path

data/lib/regulate/git/model/base.rb

@@ -254,7 +254,12 @@ module Regulate
         end
 
         # These attributes will be required for all of our models, so we set them here
-        attributes :id, :commit_message, :author_name, :author_email, :title, :view, :edit_regions
+        attributes :id, :commit_message, :author_name, :author_email, :title, :view, :edit_regions, :published
+
+        # Override the published? method
+        def published?
+          published == true || published == "1" || published == "t" || published == "true"
+        end
 
         protected
 

data/lib/regulate/helpers.rb

@@ -0,0 +1,10 @@
+module Regulate
+
+  module Helpers
+
+    autoload :ControllerHelpers , 'regulate/helpers/controller_helpers'
+
+  end
+
+end
+

data/lib/regulate/helpers/controller_helpers.rb

@@ -0,0 +1,46 @@
+module Regulate
+
+  module Helpers
+
+    module ControllerHelpers
+
+      private
+
+      # Check that a user is authenticated
+      def is_authenticated?
+        @authenticated_user = instance_eval &AbstractAuth.invoke(:authenticated_user)
+        @is_admin = instance_eval &AbstractAuth.invoke(:is_admin)
+        # Uncomment the following line to test out admin interface
+        #@is_admin = true
+        @is_editor = instance_eval &AbstractAuth.invoke(:is_editor)
+      end
+
+      # Check that the user is at least an editor
+      def is_editor?
+        redirect_to root_path if !@is_editor
+      end
+
+      # Check that the user is an admin
+      def is_admin?
+        redirect_to regulate_admin_regulate_pages_path if !@is_admin
+      end
+
+      # Grab a page resource based on the ID passed to the URI
+      # Load in our page object based on the ID
+      def load_page
+        @page = Regulate::Page.find(params[:id])
+      end
+
+      # Check whether a page is published
+      def is_published?
+        if !@is_admin || !@is_editor
+          redirect_to root_path if !@page.published?
+        end
+      end
+
+    end
+
+  end
+
+end
+

data/lib/regulate/version.rb

@@ -1,4 +1,5 @@
 module Regulate
   # Our gem version
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
+

data/regulate.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
   s.authors     = ["Collin Schaafsma", "Ryan Cook"]
   s.email       = ["collin@quickleft.com", "ryan@quickleft.com"]
   s.homepage    = ""
-  s.summary     = %q{The CMS we always wanted.}
-  s.description = %q{The CMS we always wanted.}
+  s.summary     = %q{Rails 3 engine that provides a Git backed CMS that allows for an admin to define editable regions in a page view.}
+  s.description = %q{Rails 3 engine that provides a Git backed CMS that allows for an admin to define editable regions in a page view.}
 
   s.rubyforge_project = "regulate"
 
   s.add_dependency "rails", "~> 3.0.0"
   s.add_dependency "grit", "~> 2.3.0"
-  s.add_dependency "abstract_auth", "~> 0.1.0"
+  s.add_dependency "abstract_auth", "~> 0.1.3"
   s.add_development_dependency "bluecloth", "~> 2.0.9"
   s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "capybara", "~> 0.4.0"

data/test/dummy/app/controllers/application_controller.rb

@@ -1,8 +1,12 @@
 class ApplicationController < ActionController::Base
 
+  def home
+    render :text => "hello"
+  end
+
   protect_from_forgery
 
-  def self.current_user
+  def current_user
     User.new
   end
 

data/test/dummy/config/initializers/regulate.rb

@@ -1,14 +1,13 @@
-# Regulate stuff
-
 # AbstractAuth Implementations
-AbstractAuth.implement :authorized_user do
-  ::ApplicationController.instance_eval "current_user"
+AbstractAuth.implement :authenticated_user do
+  current_user
 end
 
 AbstractAuth.implement :is_admin do
-  ::ApplicationController.instance_eval("current_user").is_admin?
+  current_user.is_admin?
 end
 
 AbstractAuth.implement :is_editor do
-  ::ApplicationController.instance_eval("current_user").is_editor?
+  current_user.is_editor?
 end
+

data/test/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Dummy::Application.routes.draw do
+  root :to => "application#home"
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/test/models/regulate_page_test.rb

@@ -16,4 +16,11 @@ class Regulate::PageTest < ActiveSupport::TestCase
     assert_equal "a-fa-ncy-title" , page.id
   end
 
+  test "removes apostrophes when creating id from title" do
+    page = Regulate::Page.new({
+      :title => "We'll LOVE you FORever"
+    })
+    assert_equal "we-ll-love-you-forever" , page.id
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: regulate
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Collin Schaafsma
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -07:00
+date: 2011-01-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 29
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -147,7 +147,7 @@ dependencies:
         version: 0.6.4
   type: :development
   version_requirements: *id008
-description: The CMS we always wanted.
+description: Rails 3 engine that provides a Git backed CMS that allows for an admin to define editable regions in a page view.
 email: 
 - collin@quickleft.com
 - ryan@quickleft.com
@@ -190,6 +190,8 @@ files:
 - lib/regulate/git/interface.rb
 - lib/regulate/git/model.rb
 - lib/regulate/git/model/base.rb
+- lib/regulate/helpers.rb
+- lib/regulate/helpers/controller_helpers.rb
 - lib/regulate/version.rb
 - public/javascripts/jquery.min.js
 - public/javascripts/regulate_admin.js
@@ -276,7 +278,7 @@ rubyforge_project: regulate
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: The CMS we always wanted.
+summary: Rails 3 engine that provides a Git backed CMS that allows for an admin to define editable regions in a page view.
 test_files: 
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb