wheels 0.0.18 → 0.0.19

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/app/controllers/access_control_entries_controller.rb

@@ -0,0 +1,19 @@
+class AccessControlEntriesController < InheritedResources::Base
+  before_filter :authenticate!
+  has_scope :by_resource, :using => [:class, :resource_id]
+
+  def collection
+    @access_control_entries ||= load_resource
+  end
+
+  private
+    def load_resource
+      if params[:id]
+        AccessControlEntry.find(params[:id])
+      else
+        raise "No resource id supplied" unless params[:class]
+        AccessControlEntry.find_by_resource_class_name_and_resource_id params[:class], params[:resource_id]
+      end
+    end
+end
+

data/app/controllers/discussions_controller.rb

@@ -0,0 +1,10 @@
+class DiscussionsController < InheritedResources::Base
+  belongs_to :forum
+
+  def new
+    new! do |format|
+      @new_message = ForumMessage.new(:discussion=>resource, :author=>current_user)
+    end
+  end
+end
+

data/app/controllers/forum_messages_controller.rb

@@ -0,0 +1,13 @@
+class ForumMessagesController < InheritedResources::Base
+  belongs_to :forum, :discussion
+
+  resource_attributes({:author => :current_user})
+
+  def create
+    create! {forum_discussion_path(@discussion.forum, @discussion)}
+  end
+  def update
+    update! {forum_discussion_path(@discussion.forum, @discussion)}
+  end
+end
+

data/app/controllers/forums_controller.rb

@@ -0,0 +1,2 @@
+class ForumsController < InheritedResources::Base
+end

data/app/controllers/pages_controller.rb

@@ -4,7 +4,7 @@ class PagesController < InheritedResources::Base
     if page_id.is_numeric?
       @page ||= Page.find(page_id)
     else
-      @page ||= Page.where(["pages.title.tolower() = ?", page_id.downcase])
+      @page ||= Page.where(["lower(pages.title) = ?", page_id.downcase.gsub(/[_]/, ' ')]).first
     end
   end
 end

data/app/helpers/access_control_entries_helper.rb

@@ -0,0 +1,2 @@
+module AccessControlEntriesHelper
+end

data/app/helpers/discussions_helper.rb

@@ -0,0 +1,2 @@
+module DiscussionsHelper
+end

data/app/helpers/forums_helper.rb

@@ -0,0 +1,2 @@
+module ForumsHelper
+end

data/app/models/access_control_entry.rb

@@ -0,0 +1,84 @@
+class AccessControlEntry < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :role
+
+  scope :by_resource, lambda {|resource_class_name, resource_id|
+    where(:resource_class_name=>resource_class_name).
+    where(:resource_id=>resource_id)
+  }
+
+  def resource
+    @resource ||= (resource_id.nil? ? self.resource_class_name.constantize :
+                  self.resource_class_name.constantize.find(self.resource_id))
+  end
+
+  def resource=(res)
+    @resource = res
+    if res.type==Class
+      self.resource_id = nil
+      self.resource_class_name = res.name
+    else
+      self.resource_id = res.id
+      self.resource_class_name = res.class.name
+    end
+  end
+
+  def options
+    @options ||= eval(self.serialized_options)
+  end
+
+  def options=(opts)
+    raise "I only take hash" unless opts.class==Hash
+    klasses = %w(String Symbol)
+    opts.delete_if{|u,v| !klasses.include?(u.class.name) || !klasses.include?(v.class.name)}
+    @options = opts
+    self.serialized_options = opts.inspect
+  end
+
+  def configure(ability)
+    ability.send method_name, verb, resource, options
+  end
+
+  def self.can(verb, resource, options={})
+    AccessControlEntry.new(true, verb, resource, options )
+  end
+  def self.cannot(verb, resource, options)
+    AccessControlEntry.new(false, verb, resource, options )
+  end
+
+  def initialize(can, verb, resource, options={})
+    @options = options
+    self.can = can
+    self.verb = verb
+    self.resource = resource
+    self.options = options
+  end
+
+  def method_name
+    self.can ? :can : :cannot
+  end
+
+  def user_email
+    self.user.email if self.user
+  end
+  def user_email=(email)
+    self.user = User.find_by_email(email) unless email.blank?
+  end
+
+  def role=(role)
+    if role.kind_of? Role
+      self.role_id = role.id
+    else
+      role = role.to_s.camelize
+      if role.is_numeric?
+        self.role_id= role
+      else
+        self.role_id= Role.find_by_name(role).id
+      end
+    end
+  end
+
+  attr_protected :serialized_options
+
+end
+

data/app/models/discussion.rb

@@ -0,0 +1,19 @@
+class Discussion < ActiveRecord::Base
+  belongs_to :forum
+  has_many :forum_messages
+
+  attr_accessor :new_message
+  after_save :save_new_message
+
+  def save_new_message
+    self.new_message.save if self.new_message
+  end
+
+  def new_message_attributes=(attributes)
+    unless attributes["body"].blank?
+      self.new_message ||= ForumMessage.new(:discussion=>self)
+      self.new_message.attributes = attributes
+    end
+  end
+end
+

data/app/models/forum.rb

@@ -0,0 +1,4 @@
+class Forum < ActiveRecord::Base
+  has_many :discussions
+end
+

data/app/models/forum_message.rb

@@ -0,0 +1,5 @@
+class ForumMessage < ActiveRecord::Base
+  belongs_to :discussion
+  belongs_to :author, :class_name=>"User", :foreign_key=>"author_id"
+end
+

data/app/models/role.rb

@@ -1,5 +1,6 @@
 class Role < ActiveRecord::Base
   has_many :users
+  has_many :access_control_entries
 
   SUPER = 1
   ADMIN = 2

data/app/models/user.rb

@@ -1,12 +1,12 @@
 class User < ActiveRecord::Base
-  before_create :create_profile
+  after_create :create_profile
   belongs_to :role
   has_many :blogs, :dependent => :destroy
   has_one :profile, :dependent => :destroy
   has_many :galleries, :dependent => :destroy
 
   def create_profile
-    self.profile ||= Profile.create(:user => self)
+    Profile.create(:user=>self) unless self.profile
   end
 
   def role?(role)
@@ -39,9 +39,7 @@ class User < ActiveRecord::Base
 
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :token_authenticatable, :confirmable, :lockable, :timeoutable
+  devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable, :confirmable, :lockable, :timeoutable
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation

data/app/views/access_control_entries/_form.html.haml

@@ -0,0 +1,27 @@
+= form_for @access_control_entry do |f|
+  -if @access_control_entry.errors.any?
+    #errorExplanation
+      %h2= "#{pluralize(@access_control_entry.errors.count, "error")} prohibited this access_control_entry from being saved:"
+      %ul
+        - @access_control_entry.errors.full_messages.each do |msg|
+          %li= msg
+  %ul.form_fields
+    %li
+      = f.label :resource_class_name
+      = f.select :resource_class_name, [["Forum", "Forum"], ["Page", "Page"]]
+      = f.hidden_field :resource_id
+    %li
+      = f.label :user_email
+      = f.text_field :user_email
+    %li
+      = f.label :role
+      = f.select :role, ["Admin", "User", "Nobody"]
+    %li
+      = f.label :can
+      = f.check_box :can
+    %li
+      = f.label :verb
+      = f.text_field :verb
+    %li
+      = f.submit 'Save'
+

data/app/views/access_control_entries/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing access_control_entry
+
+= render 'form'
+
+= link_to 'Show', @access_control_entry
+\|
+= link_to 'Back', access_control_entries_path

data/app/views/access_control_entries/index.html.haml

@@ -0,0 +1,29 @@
+%h1 Listing access_control_entries
+
+%table
+  %tr
+    %th Resource class name
+    %th Resource
+    %th User
+    %th Role
+    %th Can
+    %th Verb
+    %th
+    %th
+    %th
+
+  - @access_control_entries.each do |access_control_entry|
+    %tr
+      %td= access_control_entry.resource_class_name
+      %td= access_control_entry.resource_id
+      %td= access_control_entry.user_id
+      %td= access_control_entry.role_id
+      %td= access_control_entry.can
+      %td= access_control_entry.verb
+      %td= link_to 'Show', access_control_entry
+      %td= link_to 'Edit', edit_access_control_entry_path(access_control_entry)
+      %td= link_to 'Destroy', access_control_entry, :confirm => 'Are you sure?', :method => :delete
+
+%br
+
+= link_to 'New access_control_entry', new_access_control_entry_path

data/app/views/access_control_entries/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New access_control_entry
+
+= render 'form'
+
+= link_to 'Back', access_control_entries_path

data/app/views/access_control_entries/show.html.haml

@@ -0,0 +1,22 @@
+%p
+  %b Resource class name:
+  = @access_control_entry.resource_class_name
+%p
+  %b Resource:
+  = @access_control_entry.resource_id
+%p
+  %b User:
+  = @access_control_entry.user_id
+%p
+  %b Role:
+  = @access_control_entry.role_id
+%p
+  %b Can:
+  = @access_control_entry.can
+%p
+  %b Verb:
+  = @access_control_entry.verb
+
+= link_to 'Edit', edit_access_control_entry_path(@access_control_entry)
+\|
+= link_to 'Back', access_control_entries_path

data/app/views/discussions/_form.html.haml

@@ -0,0 +1,16 @@
+= form_for @discussion do |f|
+  -if @discussion.errors.any?
+    #errorExplanation
+      %h2= "#{pluralize(@discussion.errors.count, "error")} prohibited this discussion from being saved:"
+      %ul
+        - @discussion.errors.full_messages.each do |msg|
+          %li= msg
+
+  .field
+    = f.label :subject
+    = f.text_field :subject
+  .field
+    = f.label :forum_id
+    = f.text_field :forum_id
+  .actions
+    = f.submit 'Save'

data/app/views/discussions/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing discussion
+
+= render 'form'
+
+= link_to 'Show', @discussion
+\|
+= link_to 'Back', discussions_path

data/app/views/discussions/index.html.haml

@@ -0,0 +1,10 @@
+%h1 Listing discussions in forum #{@forum.name}
+= link_to 'New discussion', new_resource_url if can? :create, Discussion, :forum_id=>@forum.id
+
+%ul
+  - for discussion in @discussions.sort{|u,v| u.updated_at <=> v.update_at}
+    %li
+      = link_to discussion.subject, url_for([@forum, discussion])
+      - if can? :manage, discussion
+        = link_to "Manage", edit_forum_discussion_path(@forum, discussion)
+

data/app/views/discussions/new.html.haml

@@ -0,0 +1,25 @@
+%h1 New discussion
+- include_ckeditor
+= form_for [@forum, @discussion] do |f|
+  -if @discussion.errors.any?
+    #errorExplanation
+      %h2= "#{pluralize(@discussion.errors.count, "error")} prohibited this discussion from being saved:"
+      %ul
+        - @discussion.errors.full_messages.each do |msg|
+          %li= msg
+
+  %ul.form_fields
+    %li.field
+      = f.label :subject
+      = f.text_field :subject
+      = f.hidden_field :forum_id
+    %li.field
+      = f.fields_for :new_message, @new_message do |ff|
+        = ff.hidden_field :author_id
+        %ul.form_fields
+          %li.field= ff.text_area :message, :class=>'ckeditor_textarea'
+  .actions
+    = f.submit 'Create new discussion'
+
+= link_to 'Back', collection_url
+

data/app/views/discussions/show.html.haml

@@ -0,0 +1,16 @@
+%h2 #{@forum.name} > #{@discussion.subject}
+
+%ul
+  - for message in @discussion.forum_messages
+    %li
+      .named_box
+        .box_title
+          Posted By #{message.author.email} on #{message.updated_at}
+        .box_content!= message.message
+
+= content_for :links do
+  %ul
+    - if can? :create, Discussion, :forum_id=>@forum.id
+      %li= link_to "Reply to this discussion", new_forum_discussion_forum_message_path(@forum, @discussion)
+    %li= link_to 'Back to Forum', @forum
+

data/app/views/forum_messages/_form.html.haml

@@ -0,0 +1,6 @@
+- include_ckeditor
+= form_for [@discussion.forum, @discussion, @forum_message] do |f|
+  = f.hidden_field :author_id
+  = f.text_area :message, :class=>'ckeditor_textarea'
+  = f.submit
+

data/app/views/forum_messages/index.html.haml

@@ -0,0 +1,11 @@
+%h1 Messages in #{@discussion.subject}
+- if can? :create, Discussion, :forum_id=>@discussion.forum.id
+  = link_to "Reply to this topic", new_resource_url
+
+%ul.listing
+  - for message in @forum_messages
+    %li
+      .content_box
+        .box_title Posted By #{message.author.email} on #{message.created_at}
+        .box_content!= message.message
+

data/app/views/forum_messages/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New message in topic #{@discussion.subject}
+= render :partial=>'form'
+
+= link_to "Back to discussion", forum_discussion_path(@discussion.forum, @discussion)
+

data/app/views/forums/_form.html.haml

@@ -0,0 +1,13 @@
+= form_for @forum do |f|
+  -if @forum.errors.any?
+    #errorExplanation
+      %h2= "#{pluralize(@forum.errors.count, "error")} prohibited this forum from being saved:"
+      %ul
+        - @forum.errors.full_messages.each do |msg|
+          %li= msg
+
+  .field
+    = f.label :name
+    = f.text_field :name
+  .actions
+    = f.submit 'Save'

data/app/views/forums/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing forum
+
+= render 'form'
+
+= link_to 'Show', @forum
+\|
+= link_to 'Back', forums_path

data/app/views/forums/index.html.haml

@@ -0,0 +1,26 @@
+%h1 Listing forums
+
+%ul
+  - @forums.each do |forum|
+    - if can? :read, forum
+      %li
+        = link_to forum.name, forum
+        - if can? :create, Discussion, :forum_id=>forum.id
+          = link_to "New Topic", new_forum_discussion_path(forum)
+        - if can? :manage, forum
+          = link_to "Manage Forum", edit_forum_path(forum)
+
+- if can? :create, Forum
+  %h2 Open a New Forum
+  = form_for Forum.new do |f|
+    %ul.form_fields
+      %li.field
+        Name:
+        = f.text_field :name
+      %li.action
+        = f.submit
+
+= content_for :links do
+  %ul
+    %li= link_to 'New forum', new_forum_path if can? :create, Forum
+

data/app/views/forums/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New forum
+
+= render 'form'
+
+= link_to 'Back', forums_path

data/app/views/forums/show.html.haml

@@ -0,0 +1,21 @@
+%h1 Forum: #{@forum.name}
+
+.titled_box
+  .box_title Discussions in this forum
+  .box_contents
+    %ul
+      - for discussion in @forum.discussions.sort{|u,v| u.updated_at <=> v.update_at}
+        %li
+          = link_to discussion.subject, url_for([@forum, discussion])
+          - if can? :create, Discussion, :forum_id => @forum.id
+            = link_to "Reply to this topic", new_forum_discussion_forum_message_path(@forum, discussion)
+          - if can? :manage, discussion
+            = link_to "Manage", edit_forum_discussion_path(@forum, discussion)
+
+= content_for :links do
+  %ul
+    - if can? :create, Discussion, :forum_id=>@forum.id
+      %li= link_to "New topic in this forum", new_forum_discussion_path(@forum)
+    - if can? :manage, @forum
+      %li= link_to 'Edit', edit_forum_path(@forum)
+

data/app/views/pages/index.html.haml

@@ -1,21 +1,7 @@
-%h1 Listing pages
+= link_to 'New page', new_page_path if can? :create, Page
 
-%table
-  %tr
-    %th Title
-    %th Body
-    %th
-    %th
-    %th
+- @pages.each do |page|
+  %h1= link_to page.title, page
+  = link_to "Edit", edit_page_path(page) if can? :edit, page
+  .page_content!= page.body[0..5000]
 
-  - @pages.each do |page|
-    %tr
-      %td= page.title
-      %td= page.body
-      %td= link_to 'Show', page
-      %td= link_to 'Edit', edit_page_path(page)
-      %td= link_to 'Destroy', page, :confirm => 'Are you sure?', :method => :delete
-
-%br
-
-= link_to 'New page', new_page_path

data/app/views/pages/show.html.haml

@@ -1,5 +1,5 @@
-%h1= @page.title
-.page_content!= @page.body
+%h1= resource.title
+.page_content!= resource.body
 
 - if can? :edit, @page
   = link_to 'Edit', edit_page_path(@page)

data/lib/wheels/routes.rb

@@ -12,13 +12,27 @@ module ActionDispatch::Routing
       resources :users do
         resource :profile
         resources :galleries
-        resources :blogs, :path=>"blog" do
-          resources :blog_images, :path=>"images"
+        resources :blogs, :path=>"blog"
+      end
+
+      resources :layouts
+      resources :forums do
+        resources :discussions do
+          resources :forum_messages
         end
       end
-      scope :module=>"admin" do
+
+      resources :pages, :only => [:index, :show]
+      resources :product_revisions
+      scope "/publish" do
+        resources :pages
+      end
+
+      scope "/admin" do
+        resources :access_control_entries
         resources :users
       end
+
     end
   end
 end

data/wheels.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
@@ -20,16 +20,27 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "app/controllers/access_control_entries_controller.rb",
      "app/controllers/blogs_controller.rb",
+     "app/controllers/discussions_controller.rb",
+     "app/controllers/forum_messages_controller.rb",
+     "app/controllers/forums_controller.rb",
      "app/controllers/galleries_controller.rb",
      "app/controllers/images_controller.rb",
      "app/controllers/pages_controller.rb",
      "app/controllers/profiles_controller.rb",
      "app/controllers/users_controller.rb",
+     "app/helpers/access_control_entries_helper.rb",
      "app/helpers/blogs_helper.rb",
+     "app/helpers/discussions_helper.rb",
+     "app/helpers/forums_helper.rb",
      "app/helpers/pages_helper.rb",
      "app/models/ability.rb",
+     "app/models/access_control_entry.rb",
      "app/models/blog.rb",
+     "app/models/discussion.rb",
+     "app/models/forum.rb",
+     "app/models/forum_message.rb",
      "app/models/gallery.rb",
      "app/models/image.rb",
      "app/models/page.rb",
@@ -38,12 +49,30 @@ Gem::Specification.new do |s|
      "app/models/role.rb",
      "app/models/tagging.rb",
      "app/models/user.rb",
+     "app/views/access_control_entries/_form.html.haml",
+     "app/views/access_control_entries/edit.html.haml",
+     "app/views/access_control_entries/index.html.haml",
+     "app/views/access_control_entries/new.html.haml",
+     "app/views/access_control_entries/show.html.haml",
      "app/views/blogs/_form.html.haml",
      "app/views/blogs/edit.html.haml",
      "app/views/blogs/index.html.haml",
      "app/views/blogs/index.xml.builder",
      "app/views/blogs/new.html.haml",
      "app/views/blogs/show.html.haml",
+     "app/views/discussions/_form.html.haml",
+     "app/views/discussions/edit.html.haml",
+     "app/views/discussions/index.html.haml",
+     "app/views/discussions/new.html.haml",
+     "app/views/discussions/show.html.haml",
+     "app/views/forum_messages/_form.html.haml",
+     "app/views/forum_messages/index.html.haml",
+     "app/views/forum_messages/new.html.haml",
+     "app/views/forums/_form.html.haml",
+     "app/views/forums/edit.html.haml",
+     "app/views/forums/index.html.haml",
+     "app/views/forums/new.html.haml",
+     "app/views/forums/show.html.haml",
      "app/views/galleries/_form.html.haml",
      "app/views/galleries/_show.html.haml",
      "app/views/galleries/edit.html.haml",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wheels
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -45,16 +45,27 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/access_control_entries_controller.rb
 - app/controllers/blogs_controller.rb
+- app/controllers/discussions_controller.rb
+- app/controllers/forum_messages_controller.rb
+- app/controllers/forums_controller.rb
 - app/controllers/galleries_controller.rb
 - app/controllers/images_controller.rb
 - app/controllers/pages_controller.rb
 - app/controllers/profiles_controller.rb
 - app/controllers/users_controller.rb
+- app/helpers/access_control_entries_helper.rb
 - app/helpers/blogs_helper.rb
+- app/helpers/discussions_helper.rb
+- app/helpers/forums_helper.rb
 - app/helpers/pages_helper.rb
 - app/models/ability.rb
+- app/models/access_control_entry.rb
 - app/models/blog.rb
+- app/models/discussion.rb
+- app/models/forum.rb
+- app/models/forum_message.rb
 - app/models/gallery.rb
 - app/models/image.rb
 - app/models/page.rb
@@ -63,12 +74,30 @@ files:
 - app/models/role.rb
 - app/models/tagging.rb
 - app/models/user.rb
+- app/views/access_control_entries/_form.html.haml
+- app/views/access_control_entries/edit.html.haml
+- app/views/access_control_entries/index.html.haml
+- app/views/access_control_entries/new.html.haml
+- app/views/access_control_entries/show.html.haml
 - app/views/blogs/_form.html.haml
 - app/views/blogs/edit.html.haml
 - app/views/blogs/index.html.haml
 - app/views/blogs/index.xml.builder
 - app/views/blogs/new.html.haml
 - app/views/blogs/show.html.haml
+- app/views/discussions/_form.html.haml
+- app/views/discussions/edit.html.haml
+- app/views/discussions/index.html.haml
+- app/views/discussions/new.html.haml
+- app/views/discussions/show.html.haml
+- app/views/forum_messages/_form.html.haml
+- app/views/forum_messages/index.html.haml
+- app/views/forum_messages/new.html.haml
+- app/views/forums/_form.html.haml
+- app/views/forums/edit.html.haml
+- app/views/forums/index.html.haml
+- app/views/forums/new.html.haml
+- app/views/forums/show.html.haml
 - app/views/galleries/_form.html.haml
 - app/views/galleries/_show.html.haml
 - app/views/galleries/edit.html.haml