inline_forms 0.9.6 → 0.9.7

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/app/controllers/inline_forms_controller.rb

@@ -22,6 +22,27 @@
 #
 class InlineFormsController < ApplicationController
   before_filter :getKlass
+
+  def self.cancan_enabled?
+    begin
+      ::Ability && true
+    rescue NameError
+      false
+    end
+  end
+
+  def cancan_enabled?
+    self.class.cancan_enabled?
+  end
+
+  def cancan_disabled?
+    ! self.class.cancan_enabled?
+  end
+
+  helper_method :cancan_disabled?, :cancan_enabled?
+
+  load_and_authorize_resource if cancan_enabled?
+
   include InlineFormsHelper
 
   # shows a list of all objects from class @Klass, using will_paginate
@@ -31,11 +52,12 @@ class InlineFormsController < ApplicationController
   def index
     update_span = params[:update]
     @parent_class = params[:parent_class]
-    if @parent_class.nil?
-      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC'
+    @parent_id = params[:parent_id]
+    @parent_class.nil? ? conditions = [] : conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
+    if cancan_enabled?
+      @objects = @Klass.accessible_by(current_ability).paginate :page => params[:page], :order => 'created_at DESC', :conditions => conditions
     else
-      @parent_id = params[:parent_id]
-      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC', :conditions => [ "#{@parent_class.foreign_key} = ?", @parent_id ]
+      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC', :conditions => conditions
     end
 
     respond_to do |format|
@@ -99,12 +121,14 @@ class InlineFormsController < ApplicationController
       flash.now[:error] = "Failed to create #{object.class.to_s.underscore}."
     end
     @parent_class = params[:parent_class]
-    if @parent_class.nil?
-      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC'
+    @parent_id = params[:parent_id]
+    @parent_class.nil? ? conditions = [] : conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
+    if cancan_enabled?
+      @objects = @Klass.accessible_by(current_ability).paginate :page => params[:page], :order => 'created_at DESC', :conditions => conditions
     else
-      @parent_id = params[:parent_id]
-      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC', :conditions => [ "#{@parent_class.foreign_key} = ?", @parent_id ]
+      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC', :conditions => conditions
     end
+
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
       format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/list'}
@@ -190,9 +214,11 @@ class InlineFormsController < ApplicationController
   #    redirect_to(@Klass.constantizes_url)
   #  end
 
+
   private
   # Get the class from the controller name.
   def getKlass #:doc:
     @Klass = self.controller_name.classify.constantize
   end
+
 end

data/app/helpers/form_elements/check_list.rb

@@ -15,7 +15,11 @@ end
 
 def check_list_edit(object, attribute)
   object.send(attribute).build  if object.send(attribute).empty?
-  values = object.send(attribute).first.class.name.constantize.find(:all) # TODO bring order
+  if cancan_enabled?
+    values = object.send(attribute).first.class.name.constantize.accessible_by(current_ability) # TODO bring order!
+  else
+    values = object.send(attribute).first.class.name.constantize.all # TODO bring order!
+  end
   out = '<div class="edit_form_checklist">'
   out << '<ul>'
   values.each do | item |
@@ -34,6 +38,6 @@ end
 
 def check_list_update(object, attribute)
   params[attribute] ||= {}
-  object.send(attribute.singularize + '_ids=', params[attribute].keys)
+  object.send(attribute.to_s.singularize + '_ids=', params[attribute].keys)
 end
 

data/app/helpers/form_elements/dropdown.rb

@@ -8,7 +8,11 @@ end
 
 def dropdown_edit(object, attribute)
   object.send('build_' + attribute.to_s) unless object.send(attribute)
-  values = object.send(attribute).class.name.constantize.find(:all) # TODO bring order!
+  if cancan_enabled?
+    values = object.send(attribute).class.name.constantize.accessible_by(current_ability) # TODO bring order!
+  else
+    values = object.send(attribute).class.name.constantize.all # TODO bring order!
+  end
   # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
   collection_select( ('_' + object.class.to_s.underscore).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', '_presentation', :selected => object.send(attribute).id)
 end

data/app/helpers/inline_forms_helper.rb

@@ -1,5 +1,4 @@
 module InlineFormsHelper
-
   # load form elements. Each element goes into a separate file
   # and defines a _show, _edit and _update method.
   #
@@ -27,6 +26,7 @@ module InlineFormsHelper
     spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
     attribute_value << "&nbsp;".html_safe * spaces
     css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
+    if cancan_disabled? || ( can? :update, object )
     link_to attribute_value,
       send( 'edit_' + object.class.to_s.underscore + '_path',
       object,
@@ -34,6 +34,9 @@ module InlineFormsHelper
       :form_element => calling_method.sub(/_[a-z]+$/,''),
       :update => css_class_id ),
       :remote => true
+    else
+    attribute_value
+    end
   end
 
   # link to inline image edit
@@ -48,6 +51,16 @@ module InlineFormsHelper
       :remote => true
   end
 
+  def link_to_new_record(text, model, path_to_new, update_span, parent_class, parent_id)
+    out = ""
+    out << "<li class='new_record_link'>"
+    out << (link_to text, send(path_to_new, :update => update_span, :parent_class => parent_class, :parent_id => parent_id ), :remote => true)
+    out << "</li>"
+    ""
+    raw out if cancan_disabled? || ( can? :create, model.constantize )
+  end
+
+
   # get the values for an attribute
   #
   # values should be a Hash { integer => string, ... }

data/app/views/inline_forms/_list.html.erb

@@ -43,13 +43,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
   <ul id="<%= update_span -%>" class="inline_forms_list">
   <% end %>
   <!--  # link to new -->
-  <li class="new_record_link">
-    <%= link_to "Add a new #{human_readable_class}",
-      send(path_to_new, :update       => update_span,
-      :parent_class => parent_class,
-      :parent_id    => parent_id ),
-      :remote => true -%>
-  </li>
+  <%= link_to_new_record("Add a new #{human_readable_class}", objects.first.class.name, path_to_new, update_span, parent_class, parent_id) -%>
   <!--  # list of objects -->
   <% for object in objects %>
     <% if parent_class.nil?  %>

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-04-30}
+  s.date = %q{2011-05-25}
   s.description = %q{Inline Forms aims to ease the setup of forms that provide inline editing. The field list can be specified in the model.}
   s.email = %q{ace@suares.an}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 -04:00
+date: 2011-05-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency