wheels 0.0.21 → 0.0.22

data/VERSION

@@ -1 +1 @@
-0.0.21
+0.0.22

data/app/controllers/access_control_entries_controller.rb

@@ -1,19 +1,20 @@
 class AccessControlEntriesController < InheritedResources::Base
-  before_filter :authenticate!
-  has_scope :by_resource, :using => [:class, :resource_id]
+  ajax_loading
+  before_filter :authenticate_user!
+  belongs_to :user, :optional => true
+  has_scope :by_resource, :using => [:resource_class, :resource_id]
+  has_scope :by_role, :using=>[:role_id]
+  has_scope :by_class, :using=>[:class]
+  respond_to :html, :js
 
-  def collection
-    @access_control_entries ||= load_resource
+  def new_ace
+    a = AccessControlEntry.new
+    a.user_id = params[:user_id]
+    a.role_id = params[:role_id]
+    a.resource_class_name = params[:resource_class]
+    a.options[:id] = params[:resource_id]
+    return a
   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
+  helper_method :new_ace
 end
 

data/app/controllers/pages_controller.rb

@@ -1,6 +1,13 @@
 class PagesController < InheritedResources::Base
+  before_filter :resource, :only=>[:update, :show, :destroy, :edit]
+  authorize_resource
+  has_scope :tagged_with, :as => :tag
+  has_scope :accessible_by, :type=>:boolean, :default=>true do |c,s|
+    s.accessible_by(c.current_ability)
+  end
+
   def resource
-    page_id = params[:id] || Layout.current[:default_page]
+    page_id = params[:id]
     if page_id.is_numeric?
       @page ||= Page.find(page_id)
     else

data/app/models/access_control_entry.rb

@@ -6,52 +6,59 @@ class AccessControlEntry < ActiveRecord::Base
     where(:resource_class_name=>resource_class_name).
     where(:resource_id=>resource_id)
   }
+  scope :by_role, lambda {|role_id|
+    where(:role_id=>role_id)
+  }
+  scope :by_class, lambda {|class_name|
+    where(:resource_class_name=>class_name)
+  }
 
   def resource
-    @resource ||= (resource_id.nil? ? self.resource_class_name.constantize :
-                  self.resource_class_name.constantize.find(self.resource_id))
+    @resource ||= self.resource_class_name.constantize
   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.options[:id] = res.id
       self.resource_class_name = res.class.name
     end
   end
 
   def options
-    @options ||= eval(self.serialized_options)
+    @options ||= (self.serialized_options ? eval(self.serialized_options) : {})
+  end
+
+  def options_str
+    options.map{|u,v| "#{u.inspect}=>#{v.is_numeric? ? v : v.inspect}"}.join(", ")
   end
+  def options_str=(str)
+    opts = str.split(",").map(&:strip).map_hash{|keyval|
+      key, val = keyval.split("=>").map(&:strip)
+      val = val.to_i if val.is_numeric?
+      if key.index(":")
+        key = key.gsub(/\:/, "").to_sym
+      end
+      {key=>val}
+    }
 
-  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
+    raise "I only like Ability" unless ability.class==Ability
+    ability.send method_name, verb.to_sym, resource, options
+    puts "ability.send #{method_name}, #{verb.to_sym.inspect}, #{resource.inspect}, #{options.inspect}"
   end
 
   def self.can(verb, resource, options={})
-    AccessControlEntry.new(true, verb, resource, options )
+    AccessControlEntry.new(:can=>true, :verb=> verb, :resource=>resource, :options=>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
+    AccessControlEntry.new(:can=>false, :verb=> verb, :resource=>resource, :options=>options )
   end
 
   def method_name
@@ -66,14 +73,16 @@ class AccessControlEntry < ActiveRecord::Base
   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
+    unless role.empty?
+      if role.kind_of? Role
+        self.role_id = role.id
       else
-        self.role_id= Role.find_by_name(role).id
+        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
   end

data/app/models/page.rb

@@ -1,5 +1,5 @@
 class Page < ActiveRecord::Base
   has_many :images
-
+  acts_as_taggable
 end
 

data/app/models/role.rb

@@ -2,6 +2,14 @@ class Role < ActiveRecord::Base
   has_many :users
   has_many :access_control_entries
 
+  def self.collection_entries
+    roles = [["Not Set", nil]]
+    Role.all.map{|t| [t.name, t.id]}.each do |t|
+      roles << t
+    end
+    roles
+  end
+
   SUPER = 1
   ADMIN = 2
   USER = 3

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

@@ -1,27 +1,33 @@
-= form_for @access_control_entry do |f|
+= form_for @access_control_entry, :remote=>true 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
+    = hidden_field_tag :container, "ace_listing"
+    = hidden_field_tag :ajax_function, "append"
+  %ul.ace_form_fields
     %li
-      = f.label :resource_class_name
-      = f.select :resource_class_name, [["Forum", "Forum"], ["Page", "Page"]]
-      = f.hidden_field :resource_id
+      .name Email
+      = f.text_field :user_email, :class=>"email"
     %li
-      = f.label :user_email
-      = f.text_field :user_email
+      .name Role
+      = f.select :role, Role.collection_entries
     %li
-      = f.label :role
-      = f.select :role, ["Admin", "User", "Nobody"]
-    %li
-      = f.label :can
+      .name Can?
       = f.check_box :can
     %li
-      = f.label :verb
-      = f.text_field :verb
+      .name verb
+      = f.text_field :verb, :class=>"verb"
+    %li
+      .name Resource
+      = f.select :resource_class_name, [["Forum", "Forum"], ["Page", "Page"]]
+      = f.hidden_field :resource_id
+    %li
+      .name options
+      = f.text_field :options_str, :class=>"verb"
+
     %li
-      = f.submit 'Save'
+      = f.submit 'Save', :disable_with=>"Saving..."
 

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

@@ -0,0 +1,46 @@
+%h1 Listing Access Control Entries for
+
+%ul.listing#ace_listing
+  - @access_control_entries.each do |ace|
+    %li
+      %ul.ace{:id=>ace.element_id}
+        %li= ace.user.email if ace.user
+        %li= ace.role.name if ace.role
+        %li= ace.can ? "Can" : "Cannot"
+        %li= ace.verb
+        %li= ace.resource_class_name
+        %li= ace.options_str if ace.options_str
+        - if can? :edit, ace
+          %li= link_to "Edit", edit_access_control_entry_path(ace), :remote=>true
+        - if can? :destroy, ace
+          %li= link_to "X", ace, :method=>:delete, :remote=>true, "data-confirm"=>"Are you sure?"
+
+- if can? :create, AccessControlEntry
+  %h2 Enter a new Access Control Entry
+  = form_for new_ace, :remote=>true do |f|
+    = hidden_field_tag :container, "ace_listing"
+    = hidden_field_tag :ajax_function, "append"
+    %ul.ace_form_fields
+      %li
+        .name Email
+        = f.text_field :user_email, :class=>"email"
+      %li
+        .name Role
+        = f.select :role, Role.collection_entries
+      %li
+        .name Can?
+        = f.check_box :can
+      %li
+        .name verb
+        = f.text_field :verb, :class=>"verb"
+      %li
+        .name Resource
+        = f.select :resource_class_name, [["Forum", "Forum"], ["Page", "Page"]]
+        = f.hidden_field :resource_id
+      %li
+        .name options
+        = f.text_field :options_str, :class=>"verb"
+
+      %li
+        = f.submit 'Save', :disable_with=>"Saving..."
+

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

@@ -0,0 +1,12 @@
+%ul.ace{:id=>resource.element_id}
+  %li= resource.user.email if resource.user
+  %li= resource.role.name if resource.role
+  %li= resource.can ? "Can" : "Cannot"
+  %li= resource.verb
+  %li= resource.resource_class_name
+  %li= resource.options_str if resource.options_str
+  - if can? :edit, resource
+    %li= link_to "Edit", edit_access_control_entry_path(resource), :remote=>true
+  - if can? :destroy, resource
+    %li= link_to "X", resource, :method=>:delete, :remote=>true, "data-confirm"=>"Are you sure?"
+

data/app/views/access_control_entries/create.js.haml

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('show')});
+= render :partial => "loadbehind/view"
+

data/app/views/access_control_entries/destroy.js.haml

@@ -0,0 +1,3 @@
+$('##{container}').remove();
+= render :partial => "loadbehind/destroy"
+

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

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('form')});
+= render :partial => "loadbehind/edit"
+

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

@@ -1,29 +1,2 @@
-%h1 Listing access_control_entries
+= render :partial => "index"
 
-%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/index.js.haml

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('index')});
+= render :partial => "loadbehind/view"
+

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

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('form')});
+= render :partial => "loadbehind/edit"
+

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

@@ -1,22 +1,2 @@
-%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
+= render :partial => "show"
 
-= link_to 'Edit', edit_access_control_entry_path(@access_control_entry)
-\|
-= link_to 'Back', access_control_entries_path

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

@@ -0,0 +1,4 @@
+$('##{container}').#{ajax_function}(#{raw render_js('show')});
+alert('#{container}');
+= render :partial => "loadbehind/view"
+

data/app/views/access_control_entries/update.js.haml

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('show')});
+= render :partial => "loadbehind/view"
+

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

@@ -11,6 +11,10 @@
   .field
     = f.label :title
     = f.text_field :title
+  .field
+    = f.label :tag_list
+    = f.text_field :tag_list
+
   .field
     = f.label :body
     = f.text_area :body, :class=>'ckeditor_textarea'

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

@@ -1,5 +1,14 @@
 = link_to 'New page', new_page_path if can? :create, Page
 
+= content_for :links do
+  - @pages.each do |page|
+    %li
+      = link_to page.title, page
+      - if can? :edit, @page
+        = link_to '| Edit', edit_page_path(page)
+      - if can? :manage, @page
+        = link_to '| Access Ctrl', access_control_entries_path(:resource_class=>"Page", :resource_id=>page.id)
+
 - @pages.each do |page|
   %h1= link_to page.title, page
   = link_to "Edit", edit_page_path(page) if can? :edit, page

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

@@ -3,4 +3,6 @@
 
 - if can? :edit, @page
   = link_to 'Edit', edit_page_path(@page)
+- if can? :manage, @page
+  = link_to 'Edit Access', access_control_entries_path(:resource_class=>"Page", :resource_id=>@page.id)
 

data/public/stylesheets/sass/dreamy.sass

@@ -100,6 +100,8 @@ a
     list-style-type: none
   li
     float: left
+    div
+      display: inline
     a
       padding: 0 15px
       display: block

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.21"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-08-16}
+  s.date = %q{2010-08-17}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [
@@ -50,10 +50,19 @@ Gem::Specification.new do |s|
      "app/models/tagging.rb",
      "app/models/user.rb",
      "app/views/access_control_entries/_form.html.haml",
+     "app/views/access_control_entries/_index.html.haml",
+     "app/views/access_control_entries/_show.html.haml",
+     "app/views/access_control_entries/create.js.haml",
+     "app/views/access_control_entries/destroy.js.haml",
      "app/views/access_control_entries/edit.html.haml",
+     "app/views/access_control_entries/edit.js.haml",
      "app/views/access_control_entries/index.html.haml",
+     "app/views/access_control_entries/index.js.haml",
      "app/views/access_control_entries/new.html.haml",
+     "app/views/access_control_entries/new.js.haml",
      "app/views/access_control_entries/show.html.haml",
+     "app/views/access_control_entries/show.js.haml",
+     "app/views/access_control_entries/update.js.haml",
      "app/views/blogs/_form.html.haml",
      "app/views/blogs/edit.html.haml",
      "app/views/blogs/index.html.haml",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wheels
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -07:00
+date: 2010-08-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,10 +75,19 @@ files:
 - app/models/tagging.rb
 - app/models/user.rb
 - app/views/access_control_entries/_form.html.haml
+- app/views/access_control_entries/_index.html.haml
+- app/views/access_control_entries/_show.html.haml
+- app/views/access_control_entries/create.js.haml
+- app/views/access_control_entries/destroy.js.haml
 - app/views/access_control_entries/edit.html.haml
+- app/views/access_control_entries/edit.js.haml
 - app/views/access_control_entries/index.html.haml
+- app/views/access_control_entries/index.js.haml
 - app/views/access_control_entries/new.html.haml
+- app/views/access_control_entries/new.js.haml
 - app/views/access_control_entries/show.html.haml
+- app/views/access_control_entries/show.js.haml
+- app/views/access_control_entries/update.js.haml
 - app/views/blogs/_form.html.haml
 - app/views/blogs/edit.html.haml
 - app/views/blogs/index.html.haml