freeberry 0.2.7 → 0.2.9

data/README.rdoc

@@ -1,6 +1,6 @@
 = Freeberry
 
-Brainberry Content Managment System
+Aimbulance Content Managment System
 For more instruction see {Wiki}[http://wiki.github.com/galetahub/freeberry].
 
 == Install
@@ -10,18 +10,19 @@ For more instruction see {Wiki}[http://wiki.github.com/galetahub/freeberry].
 In your Gemfile:
   
   gem 'devise', '1.1.5'
-  gem 'paperclip', '2.3.7'
+  gem 'paperclip', '2.3.8'
   gem 'nokogiri', '1.4.4'
-  gem 'declarative_authorization', '0.5.1'
-  gem 'responders', '0.6.2'
-  gem 'inherited_resources', '1.1.2'
+  gem 'cancan', '1.5.1'
+  gem 'inherited_resources', '1.2.1'
   gem 'haddock', '0.2.2'
   gem "mime-types", '1.16', :require => 'mime/types'
-  gem "ckeditor", '3.4.3.pre'
+  gem "ckeditor", '3.5.0'
   
   gem 'awesome_nested_set', :git => 'git://github.com/galetahub/awesome_nested_set.git'
   gem 'will_paginate', :git => 'git://github.com/galetahub/will_paginate.git', :branch => 'rails3'
   gem "freeberry", :git => "git://github.com/galetahub/freeberry.git"
+  gem 'cancan_namespace', :git => 'git://github.com/galetahub/cancan_namespace.git'
+  gem 'attach_file_field', :git => 'git://github.com/galetahub/attach_file_field.git'
 
 Bundler
   
@@ -31,8 +32,7 @@ Plugins:
 
   rails plugin install git://github.com/galetahub/enum_field.git
   rails plugin install git://github.com/galetahub/salty_slugs.git
-  rails plugin install git://github.com/galetahub/auto_html.git
-  rails plugin install git://github.com/galetahub/attach_file_field.git  
+  rails plugin install git://github.com/galetahub/auto_html.git  
 
 === Generators
 
@@ -122,4 +122,4 @@ Manage scaffold:
 
 Example goes here.
 
-Copyright (c) 2010 Brainberry, released under the MIT license
+Copyright (c) 2010-2011 Aimbulance, released under the MIT license

data/Rakefile

@@ -30,7 +30,7 @@ begin
     gemspec.name = "freeberry"
     gemspec.version = Freeberry::Version.dup
     gemspec.summary = "Rails CRM System"
-    gemspec.description = "Freeberry is a Brainberry CRM System"
+    gemspec.description = "Freeberry is a Aimbulance CRM System"
     gemspec.email = "galeta.igor@gmail.com"
     gemspec.homepage = "https://github.com/galetahub/freeberry"
     gemspec.authors = ["Igor Galeta", "Pavlo Galeta"]

data/app/controllers/manage/assets_controller.rb

@@ -2,10 +2,10 @@ class Manage::AssetsController < Manage::BaseController
   before_filter :find_klass, :only => [:create, :sort]
   before_filter :find_asset, :only => [:destroy]
   
-  filter_access_to :sort, :require => :update
-  
   respond_to :html, :xml
   
+  authorize_resource
+  
   def create
     @asset ||= @klass.new(params[:asset])
     

data/app/controllers/manage/base_controller.rb

@@ -1,9 +1,24 @@
 class Manage::BaseController < ApplicationController
-  layout "manage"
-  
   before_filter :authenticate_user!
+  check_authorization
+  
+  layout "manage"
+  respond_to :html
   
-  filter_access_to :all
+  protected
   
-  respond_to :html, :xml, :json
+    rescue_from CanCan::AccessDenied do |exception|
+      flash[:failure] = exception.message
+      flash[:failure] ||= I18n.t(:access_denied, :scope => [:flash, :users])
+            
+      respond_to do |format|
+        format.html { redirect_to new_session_path(:user) }
+        format.xml  { head :unauthorized }
+        format.js   { head :unauthorized }
+      end
+    end
+    
+    def current_ability
+      @current_ability ||= ::Ability.new(current_user, :manage)
+    end
 end

data/app/controllers/manage/pages_controller.rb

@@ -1,12 +1,13 @@
 class Manage::PagesController < Manage::BaseController
   before_filter :find_structure
+  before_filter :find_page
   
   cache_sweeper :page_sweeper, :only => [:create, :update, :destroy]
   
+  authorize_resource
+  
   # GET /manage/structures/1/page/edit
   def edit
-    @page = @structure.page || @structure.build_page(:title=>@structure.title)
-    
     respond_with(@page) do |format|
       format.html { render :action => (@page.new_record? ? 'new' : 'edit') }
     end
@@ -14,17 +15,13 @@ class Manage::PagesController < Manage::BaseController
   
   # POST /manage/structures/1/page
   def create
-    @page = @structure.build_page(params[:page])
-    @page.save
-    
+    @page.update_attributes(params[:page])
     respond_with(@page, :location => manage_structures_path)
   end
   
   # PUT /manage/structures/1/page
   def update
-    @page = @structure.page
     @page.update_attributes(params[:page])
-    
     respond_with(@page, :location => manage_structures_path)
   end
   
@@ -33,4 +30,8 @@ class Manage::PagesController < Manage::BaseController
     def find_structure
       @structure = Structure.find(params[:structure_id])
     end
+    
+    def find_page
+      @page = @structure.page || @structure.build_page(:title => @structure.title)
+    end
 end

data/app/controllers/manage/posts_controller.rb

@@ -1,13 +1,12 @@
 class Manage::PostsController < Manage::BaseController
   inherit_resources
-  
-  belongs_to :structure
-  
-  before_filter :make_filter, :only => [:index]
-  
   defaults :route_prefix => 'manage'
   actions :all, :except => [:show]
+  belongs_to :structure
+  
+  load_and_authorize_resource :post, :through => :structure
   
+  before_filter :make_filter, :only => [:index] 
   cache_sweeper :post_sweeper, :only => [:create, :update, :destroy]
   
   def create
@@ -32,7 +31,7 @@ class Manage::PostsController < Manage::BaseController
       options = { :page => params[:page], :per_page => 20 }
       options.update @search.filter
       
-      @posts ||= end_of_association_chain.paginate(options)
+      @posts = (@posts || end_of_association_chain).paginate(options)
     end
     
     def make_filter

data/app/controllers/manage/settings_controller.rb

@@ -1,4 +1,6 @@
 class Manage::SettingsController < Manage::BaseController
+  authorize_resource :class => false
+
   # GET /manage/settings
   def index
   end

data/app/controllers/manage/structures_controller.rb

@@ -1,12 +1,11 @@
 class Manage::StructuresController < Manage::BaseController
   inherit_resources
-  
-  before_filter :find_root, :only=>[:index]  
-    
   defaults :route_prefix => 'manage'
   
-  filter_access_to :move, :require => :update
+  before_filter :find_root, :only=>[:index]  
   
+  load_and_authorize_resource
+    
   cache_sweeper :structure_sweeper, :only=>[:create, :update, :destroy, :move]
   
   def create
@@ -37,6 +36,6 @@ class Manage::StructuresController < Manage::BaseController
     end
     
     def collection
-      @structures ||= end_of_association_chain.with_depth(1).find(:all)
+      @structures = (@structures || end_of_association_chain).with_depth(1)
     end
 end

data/app/controllers/manage/users_controller.rb

@@ -1,11 +1,12 @@
 class Manage::UsersController < Manage::BaseController
   inherit_resources
+  defaults :route_prefix => 'manage'
   
   before_filter :make_filter, :only=>[:index]
   before_filter :check_params, :only => [:create, :update]
   before_filter :find_user, :only=>[:update, :activate]
-  
-  defaults :route_prefix => 'manage'
+
+  load_and_authorize_resource  
   
   cache_sweeper :user_sweeper, :only=>[:update, :destroy]
   
@@ -54,7 +55,7 @@ class Manage::UsersController < Manage::BaseController
       options = { :page => params[:page], :per_page => 20 }
       options.update @search.filter
       
-      @users ||= end_of_association_chain.includes(:avatar).paginate(options)
+      @users = (@users || end_of_association_chain).includes(:avatar).paginate(options)
     end
     
     def make_filter

data/config/locales/manage/en.yml

@@ -14,8 +14,8 @@ en:
       
       structure:
         title: "Name"
-        title_ru: "Name <span>(Rus)</span>"
-        title_en: "Name <span>(eng.)</span>"
+        title_ru: "Name (Rus)"
+        title_en: "Name (eng.)"
         parent_id: "Main Categories"
         is_visible: "Show?"
         kind: "Page Type"
@@ -24,32 +24,32 @@ en:
       
       header:
         title: "Title page"
-        title_ru: "Title page <span>(Rus)</span>"
-        title_en: "Title page <span>(eng.)</span>"
+        title_ru: "Title page (Rus)"
+        title_en: "Title page (eng.)"
         keywords: "Keywords"
-        keywords_ru: "Keywords <span>(Rus)</span>"
-        keywords_en: "Keywords <span>(eng.)</span>"
+        keywords_ru: "Keywords (Rus)"
+        keywords_en: "Keywords (eng.)"
         description: "Page Description"
-        description_ru: "Description page <span>(Rus)</span>"
-        description_en: "Page Description <span>(eng.)</span>"
+        description_ru: "Description page (Rus)"
+        description_en: "Page Description (eng.)"
       
       post:
         title: "Name"
-        title_ru: "Name <span>(Rus)</span>"
-        title_en: "Name <span>(eng.)</span>"
+        title_ru: "Name (Rus)"
+        title_en: "Name (eng.)"
         content: "Content"
-        content_ru: "Content <span>(Rus)</span>"
-        content_en: "Contents <span>(eng.)</span>"
+        content_ru: "Content (Rus)"
+        content_en: "Contents (eng.)"
         created_at: "Date / Time"
         picture: "Picture"
       
       page:
         title: "Name"
-        title_ru: "Name <span>(Rus)</span>"
-        title_en: "Name <span>(eng.)</span>"
+        title_ru: "Name (Rus)"
+        title_en: "Name (eng.)"
         content: "Content"
-        content_ru: "Content <span>(Rus)</span>"
-        content_en: "Contents <span>(eng.)</span>"
+        content_ru: "Content (Rus)"
+        content_en: "Contents (eng.)"
       
       tag:
         name: "Name"

data/config/locales/manage/ru.yml

@@ -14,8 +14,8 @@ ru:
       
       structure:
         title: "Название"
-        title_ru: "Название <span>(рус.)</span>"
-        title_en: "Название <span>(eng.)</span>"
+        title_ru: "Название (рус.)"
+        title_en: "Название (eng.)"
         parent_id: "Главная категория"
         is_visible: "Отображать?"
         kind: "Тип страницы"
@@ -24,32 +24,32 @@ ru:
       
       header:
         title: "Заглавие страницы"
-        title_ru: "Заглавие страницы <span>(рус.)</span>"
-        title_en: "Заглавие страницы <span>(eng.)</span>"
+        title_ru: "Заглавие страницы (рус.)"
+        title_en: "Заглавие страницы (eng.)"
         keywords: "Ключевые слова"
-        keywords_ru: "Ключевые слова <span>(рус.)</span>"
-        keywords_en: "Ключевые слова <span>(eng.)</span>"
+        keywords_ru: "Ключевые слова (рус.)"
+        keywords_en: "Ключевые слова (eng.)"
         description: "Описание страницы"
-        description_ru: "Описание страницы <span>(рус.)</span>"
-        description_en: "Описание страницы <span>(eng.)</span>"
+        description_ru: "Описание страницы (рус.)"
+        description_en: "Описание страницы (eng.)"
       
       post:
         title: "Название"
-        title_ru: "Название <span>(рус.)</span>"
-        title_en: "Название <span>(eng.)</span>"
+        title_ru: "Название (рус.)"
+        title_en: "Название (eng.)"
         content: "Содержание"
-        content_ru: "Содержание <span>(рус.)</span>"
-        content_en: "Содержание <span>(eng.)</span>"
+        content_ru: "Содержание (рус.)"
+        content_en: "Содержание (eng.)"
         created_at: "Дата/Время"
         picture: "Картинка"
       
       page:
         title: "Название"
-        title_ru: "Название <span>(рус.)</span>"
-        title_en: "Название <span>(eng.)</span>"
+        title_ru: "Название (рус.)"
+        title_en: "Название (eng.)"
         content: "Содержание"
-        content_ru: "Содержание <span>(рус.)</span>"
-        content_en: "Содержание <span>(eng.)</span>"
+        content_ru: "Содержание (рус.)"
+        content_en: "Содержание (eng.)"
       
       tag:
         name: "Название"

data/config/locales/manage/uk.yml

@@ -14,8 +14,8 @@ uk:
       
       structure:
         title: "Назва"
-        title_ru: "Назва <span>(рос.)</span>"
-        title_en: "Назва <span>(eng.)</span>"
+        title_ru: "Назва (рос.)"
+        title_en: "Назва (eng.)"
         parent_id: "Головна категорія"
         is_visible: "Відображати?"
         kind: "Тип сторінки"
@@ -24,32 +24,32 @@ uk:
       
       header:
         title: "Заголовок сторінки"
-        title_ru: "Заголовок сторінки <span>(рос.)</span>"
-        title_en: "Заголовок сторінки <span>(eng.)</span>"
+        title_ru: "Заголовок сторінки (рос.)"
+        title_en: "Заголовок сторінки (eng.)"
         keywords: "Ключові слова"
-        keywords_ru: "Ключові слова <span>(рос.)</span>"
-        keywords_en: "Ключові слова <span>(eng.)</span>"
+        keywords_ru: "Ключові слова (рос.)"
+        keywords_en: "Ключові слова (eng.)"
         description: "Опис сторінки"
-        description_ru: "Опис сторінки <span>(рос.)</span>"
-        description_en: "Опис сторінки <span>(eng.)</span>"
+        description_ru: "Опис сторінки (рос.)"
+        description_en: "Опис сторінки (eng.)"
       
       post:
         title: "Назва"
-        title_ru: "Назва <span>(рос.)</span>"
-        title_en: "Назва <span>(eng.)</span>"
+        title_ru: "Назва (рос.)"
+        title_en: "Назва (eng.)"
         content: "Зміст"
-        content_ru: "Зміст <span>(рос.)</span>"
-        content_en: "Зміст <span>(eng.)</span>"
+        content_ru: "Зміст (рос.)"
+        content_en: "Зміст (eng.)"
         created_at: "Дата / Час"
         picture: "Зображення"
       
       page:
         title: "Назва"
-        title_ru: "Назва <span>(рос.)</span>"
-        title_en: "Назва <span>(eng.)</span>"
+        title_ru: "Назва (рос.)"
+        title_en: "Назва (eng.)"
         content: "Зміст"
-        content_ru: "Зміст <span>(рос.)</span>"
-        content_en: "Зміст <span>(eng.)</span>"
+        content_ru: "Зміст (рос.)"
+        content_en: "Зміст (eng.)"
       
       tag:
         name: "Назва"

data/lib/freeberry.rb

@@ -13,9 +13,8 @@ module Freeberry
   
   # Controllers
   module Controllers
-    autoload :AuthorizedSystem, 'freeberry/controllers/authorized_system'
-    autoload :HeadOptions,      'freeberry/controllers/head_options'
-    autoload :HelperUtils,      'freeberry/controllers/helper_utils'
+    autoload :HeadOptions, 'freeberry/controllers/head_options'
+    autoload :HelperUtils, 'freeberry/controllers/helper_utils'
   end
   
   # Models

data/lib/freeberry/models/asset.rb

@@ -14,7 +14,7 @@ module Freeberry
             belongs_to :assetable, :polymorphic => true
     
             before_validation :make_content_type
-            before_create :read_dimensions, :parameterize_filename
+            before_create :read_dimensions
           end
         end
         
@@ -52,23 +52,24 @@ module Freeberry
           I18n.l(created_at, :format => "%d.%m.%Y %H:%M")
         end
         
-        def to_xml(options = {})
-          builder = options[:builder] ||= Nokogiri::XML::Builder.new(options)
-
-          builder.send(self.type.to_s.downcase) do |xml|
-            xml.id_ self.id
-            xml.filename self.filename
-            xml.size self.size
-            xml.path self.url
+        def to_xml(options = {}, &block)
+          options = {:only => [:id], :root => 'asset'}.merge(options)
+          
+          options[:procs] ||= Proc.new do |options, record| 
+            options[:builder].tag!('filename', filename)
+            options[:builder].tag!('path', url)
+            options[:builder].tag!('size', size)
             
-            xml.styles do
-              self.styles.each do |style|
-                xml.send(style.first, self.url(style.first))
+            unless styles.empty?
+              options[:builder].tag!('styles') do |xml|
+                styles.each do |style|
+                  xml.tag!(style.first, url(style.first))
+                end
               end
-            end unless self.styles.empty?
+            end
           end
           
-          builder.to_xml
+          super
         end
         
         def has_dimensions?
@@ -86,13 +87,6 @@ module Freeberry
         
         protected
         
-          def parameterize_filename
-            unless data_file_name.blank?
-              filename = Freeberry::Utils.parameterize_filename(data_file_name)
-              self.data.instance_write(:file_name, filename)
-            end  
-          end
-        
           def read_dimensions
             if image? && has_dimensions?
               self.width = geometry.width

data/lib/freeberry/models/user.rb

@@ -9,15 +9,14 @@ module Freeberry
       
       module ClassMethods
         def self.extended(base)
-          base.class_eval do
-            before_validation :make_login
-        
+          base.class_eval do        
             has_many :roles, :dependent => :delete_all
             has_one :avatar, :as => :assetable, :dependent => :destroy, :autosave => true
             
-            scope :admins, joins(:roles).where(["`roles`.role_type = ?", ::RoleType.admin.id])
-            scope :with_role, proc {|role| joins(:roles).where(["`roles`.role_type = ?", role.id]) }
+            scope :with_role, lambda {|role| joins(:roles).where(["`roles`.role_type = ?", role.id]) }
+            scope :admins, with_role(::RoleType.admin)
             
+            before_validation :generate_login, :if => :has_login?
             before_create :set_default_role, :if => :roles_empty?
           end
         end
@@ -39,7 +38,11 @@ module Freeberry
 	      def roles_empty?
 	        self.roles.empty?
 	      end
-	
+	      
+	      def has_login?
+	        respond_to?(:login)
+	      end
+	      	
 	      def roles_attributes=(value)
           options = value || {}
           options.each do |k, v|
@@ -51,6 +54,26 @@ module Freeberry
           (roles || []).map {|r| r.to_sym}
         end
         
+        def current_role
+          self.roles.first
+        end
+        
+        def role_type_id
+          if current_role
+            current_role.role_type.id
+          end
+        end
+        
+        def role_type_id=(value)
+          role_id = value.blank? ? nil : value.to_i
+          
+          if ::RoleType.all.map(&:id).include?(role_id)
+            ::RoleType.all.each do |role_type|
+              create_or_destroy_role(role_type.id, role_type.id == role_id)
+            end
+          end
+        end
+        
         def state
           return 'active' if active?
           return 'register' unless confirmed?
@@ -81,16 +104,13 @@ module Freeberry
             end
           end
           
-          def make_login
-	          return if self.email.blank?
-	          
-          	if self.login.blank?
-          		tmp_login = self.email.split('@').first
-          		tmp_login ||= ActiveSupport::SecureRandom.hex(7)
-          		tmp_login = tmp_login.parameterize.downcase.gsub('.', '_')
-          		tmp_login = [tmp_login, ActiveSupport::SecureRandom.hex(4)].join('_') unless self.class.find_by_login(tmp_login).nil?
-          		self.login = tmp_login
-          	end
+          def generate_login
+            self.login ||= begin
+              unless email.blank?
+                tmp_login = email.split('@').first 
+        		    tmp_login.parameterize.downcase.gsub(/[^A-Za-z0-9-]+/, '-').gsub(/-+/, '-')
+        		  end
+            end
           end
       end
     end

data/lib/freeberry/railtie.rb

@@ -21,10 +21,12 @@ module Freeberry
     end
     
     config.after_initialize do
-      ::ActionController::Base.send :include, Freeberry::Controllers::AuthorizedSystem
       ::ActionController::Base.send :include, Freeberry::Controllers::HeadOptions
-    
       ::ActionView::Base.send :include, Freeberry::Controllers::HelperUtils
+      
+      ::Paperclip.interpolates('basename') do |attachment, style|
+        Freeberry::Utils.parameterize_filename(attachment.original_filename.gsub(/#{File.extname(attachment.original_filename)}$/, ""))
+      end
     end
     
     rake_tasks do

data/lib/freeberry/version.rb

@@ -3,7 +3,7 @@ module Freeberry
   module Version
     MAJOR = 0
     MINOR = 2
-    RELEASE = 7
+    RELEASE = 9
 
     def self.dup
       "#{MAJOR}.#{MINOR}.#{RELEASE}"

data/lib/generators/freeberry/base/base_generator.rb

@@ -34,7 +34,6 @@ module Freeberry
     
     def copy_configurations
       copy_file('config/words', 'config/words')
-      copy_file('config/authorization_rules.rb', 'config/authorization_rules.rb')
       copy_file('config/seeds.rb', 'db/seeds.rb')
       copy_file('config/freeberry.rb', 'config/initializers/freeberry.rb')
       

data/lib/generators/freeberry/base/templates/config/application.yml

@@ -1,4 +1,4 @@
 mailer:
   subject_prefix: "[<%= app_name %>] "
-  from: "no-reply@brainberry.ua"
-  reply_to: "info@brainberry.ua"
+  from: "no-reply@aimbulance.com"
+  reply_to: "info@aimbulance.com"

data/lib/generators/freeberry/base/templates/config/seeds.rb

@@ -1,7 +1,4 @@
-def insert_user
-  # TurnOff Authorization system
-  Authorization.ignore_access_control(true)
-  
+def insert_user  
   # Path to words
   Haddock::Password.diction = Rails.root.join("config", "words")
   
@@ -10,14 +7,14 @@ def insert_user
   Role.truncate_table
   password = Haddock::Password.generate
   
-  admin = User.new(:name=>'Administrator', :email=>'bugs@brainberry.com.ua',
+  admin = User.new(:name=>'Administrator', :email=>'dev@aimbulance.com',
                    :password=>password, :password_confirmation=>password)
-  admin.login = 'admin'
+  #admin.login = 'admin'
+  admin.roles.build(:role_type => RoleType.admin)
   admin.skip_confirmation!
   admin.save!
-  admin.roles.create(:role_type => RoleType.admin)
 
-  puts "Admin account: email: #{admin.email}, :password: #{admin.password}"
+  puts "Admin: #{admin.email}, #{admin.password}"
 end
 
 def insert_structures

data/lib/generators/freeberry/base/templates/helpers/manage/base_helper.rb

@@ -1,4 +1,8 @@
 module Manage::BaseHelper
+  def content_manager?
+    user_signed_in? && current_user.admin?
+  end
+        
   def link_to_unless_current_span2(name, options = {}, html_options = {}, &block)
     if current_page?(options)
 			if block_given?

data/lib/generators/freeberry/base/templates/javascripts/manage.js

@@ -1,6 +1,6 @@
 /* ------------------------------------------------------------------------
  * manage.js
- * Copyright (c) 2007-2010 Brainberry, LLC. All rights reserved.
+ * Copyright (c) 2007-2011 Aimbulance, LLC. All rights reserved.
  * ------------------------------------------------------------------------ */
 
 $(document).ready(function(){

data/lib/generators/freeberry/base/templates/views/manage/posts/_post.html.erb

@@ -1,10 +1,10 @@
 <%= content_tag(:div, :id => dom_id(post), :class=>"dinamic-bl") do %>
   <div class="act-bl" style="display:none;">
-    <% permitted_to? :update, post, :context => :manage_posts do %>
+    <% if can? :update, post, :context => :manage %>
       <%= link_to image_tag("manage/ico_edit.gif", :title=>t('manage.edit')), edit_manage_structure_post_path(@structure.id, post.id), :class=>"icons" %>
     <% end %>
     
-    <% permitted_to? :delete, post, :context => :manage_posts do %>
+    <% if can? :delete, post, :context => :manage %>
       <%= link_to image_tag("manage/ico_del.gif", :title=>t('manage.delete')), manage_structure_post_path(@structure.id, post.id), 
             :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"icons" %>
     <% end %>

data/lib/generators/freeberry/base/templates/views/manage/posts/index.html.erb

@@ -7,7 +7,7 @@
             <%= link_to @structure.title, manage_structure_posts_path(@structure.id), :class=>"dark-text" %>
             
             <div class="act-bl">
-              <% permitted_to? :create, :manage_posts do %>
+              <% if can? :create, Post, :context => :manage %>
                 <%= link_to t('manage.add'), new_manage_structure_post_path(@structure.id), :class=>"create" %>
               <% end %>
             </div>

data/lib/generators/freeberry/base/templates/views/manage/structures/_structure.html.erb

@@ -3,7 +3,7 @@
     <div class="r-corn">
       <%= link_to structure.title, edit_structure_record_path(structure), :class=>(structure.descendants_count.zero? ? "dark-text" : "dark-arr"), :id=>"a#{structure.id}" %>
       <div class="act-bl" style="display:none;">
-        <% permitted_to? :update, structure, :context => :manage_structures do %>
+        <% if can? :update, structure, :context => :manage %>
           <%= link_to image_tag("manage/ico_down.gif", :alt=>t('manage.position.down'), :title=>t('manage.position.down')), 
               move_manage_structure_path(:id => structure.id, :direction => 'down', :format => :json),
               :remote => true,
@@ -18,7 +18,7 @@
           <%= link_to image_tag("manage/ico_settings.gif", :alt=>t('manage.label_settings'), :title=>t('manage.label_settings')), edit_manage_structure_path(:id=>structure.id), :class=>"icons" %>
         <% end %>
         
-        <% permitted_to? :delete, structure, :context => :manage_structures do %>
+        <% if can? :delete, structure, :context => :manage %>
           <%= link_to image_tag("manage/ico_del.gif", :alt=>t('manage.delete'), :title=>t('manage.delete')), manage_structure_path(:id=>structure.id), 
               :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"icons" %>
         <% end %>
@@ -32,4 +32,3 @@
     <% end %>
   <% end %>
 <% end %>
-

data/lib/generators/freeberry/base/templates/views/manage/structures/index.html.erb

@@ -5,11 +5,11 @@
         <%= link_to @structure.title, root_path, :class=>"dark-arr", :id=>"a#{@structure.id}" %>
         
         <div class="act-bl">
-          <% permitted_to? :create, :manage_structures do %>
+          <% if can? :create, Structure, :context => :manage %>
             <%= link_to t('manage.buttons.create_structure'), new_manage_structure_path, :class=>"create" %>
           <% end %>
           
-          <% permitted_to? :update, @structure, :context => :manage_structures do %>
+          <% if can? :update, @structure, :context => :manage %>
             <%= link_to image_tag("manage/ico_edit.gif", :title=>t('manage.edit')), edit_manage_structure_page_path(@structure.id), :class=>"icons" %>
             <%= link_to image_tag("manage/ico_settings.gif", :title=>t('manage.label_settings')), edit_manage_structure_path(@structure.id), :class=>"icons" %>
           <% end %>

data/lib/generators/freeberry/base/templates/views/manage/users/_user.html.erb

@@ -1,10 +1,10 @@
 <%= content_tag(:div, :id=>dom_id(user), :class=>"dinamic-bl #{user.state}") do %>
   <div class="act-bl" style="display:none;">
-    <% permitted_to? :update, user, :context => :manage_users do %>
+    <% if can? :update, user, :context => :manage %>
       <%= link_to image_tag("manage/ico_edit.gif", :title=>t('manage.edit')), edit_manage_user_path(:id=>user.id), :class=>"icons" %>
     <% end %>
     
-    <% permitted_to? :delete, user, :context => :manage_users do %>
+    <% if can? :delete, user, :context => :manage %>
       <%= link_to image_tag("manage/ico_del.gif", :title=>t('manage.delete')), manage_user_path(:id=>user.id), 
             :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"icons" %>
     <% end %>

data/lib/generators/freeberry/base/templates/views/manage/users/index.html.erb

@@ -6,7 +6,7 @@
           <div class="r-corn">
             <%= link_to t('manage.menu.users'), manage_users_path, :class=>"dark-text" %>
             <div class="act-bl">
-              <% permitted_to? :create, :manage_users do %>
+              <% if can? :create, User, :context => :manage %>
                 <%= link_to t('manage.add'), new_manage_user_path, :class=>"create" %>
               <% end %>
             </div>

data/lib/generators/freeberry/base/templates/views/shared/manage/_head.html.erb

@@ -4,15 +4,15 @@
 	
   <div class="main-menu">
     <ul>
-      <% permitted_to? :read, :manage_structures do %>
+      <% if can? :read, Structure, :context => :manage %>
         <li><%= link_to_unless_current_span2 t('manage.menu.structures'), manage_structures_path %></li>
       <% end %>
       
-      <% permitted_to? :read, :manage_users do %>
+      <% if can? :read, User, :context => :manage %>
         <li><%= link_to_unless_current_span2 t('manage.menu.users'), manage_users_path %></li>
       <% end %>
       
-      <% permitted_to? :read, :manage_settings do %>
+      <% if can? :read, :settings, :context => :manage %>
         <li><%= link_to_unless_current_span2 t('manage.menu.settings'), manage_settings_path %></li>
       <% end %>
     </ul>

data/lib/generators/freeberry/base/templates/views/shared/manage/_panel.html.erb

@@ -5,15 +5,15 @@
     	<div class="p-logo"><%=raw t('manage.title') %></div>
       <div class="panel-main-menu">
       	<ul>
-      	  <% permitted_to? :read, :manage_structures do %>
+      	  <% if can? :read, Structure, :context => :manage %>
            	<li><%= link_to_unless_current_span2 t('manage.menu.structures'), manage_structures_path %></li>
          	<% end %>
          	
-         	<% permitted_to? :read, :manage_users do %>
+         	<% if can? :read, User, :context => :manage %>
             <li><%= link_to_unless_current_span2 t('manage.menu.users'), manage_users_path %></li>
           <% end %>
           
-          <% permitted_to? :read, :manage_settings do %>
+          <% if can? :read, :settings, :context => :manage %>
             <li><%= link_to_unless_current_span2 t('manage.menu.settings'), manage_settings_path %></li>
           <% end %>
         </ul>

data/lib/generators/freeberry/manage_scaffold/manage_scaffold_generator.rb

@@ -52,7 +52,25 @@ module Freeberry
       end
       
       def klass
+        # First priority is the namespaced modek, e.g. User::Group
+        @klass ||= begin
+          namespaced_class = name.singularize
+          namespaced_class.constantize
+        rescue NameError
+          nil
+        end
+        
+        # Second priority the camelcased c, i.e. UserGroup
+        @klass ||= begin
+          camelcased_class = name.gsub('::', '').singularize
+          camelcased_class.constantize
+        rescue NameError
+          nil
+        end
+        
         @klass ||= model_name.constantize
+        
+        @klass
       end
       
       def model
@@ -60,12 +78,12 @@ module Freeberry
       end
       
       def model_name
-        @model_name ||= singular_name.camelize
+        @model_name ||= name.camelize
         @model_name
       end
       
       def controller_class_name
-        @controller_class_name ||= singular_name.pluralize.camelize
+        @controller_class_name ||= name.pluralize.camelize
       end
       
       def controller_file_name

data/lib/generators/freeberry/manage_scaffold/templates/multiplay/controller.rb

@@ -1,11 +1,11 @@
 class Manage::<%= controller_class_name %>Controller < Manage::BaseController
   inherit_resources
-  
+  defaults :route_prefix => 'manage'  
   belongs_to :<%= parent_singular_name %>
   
   before_filter :make_filter, :only=>[:index]
   
-  defaults :route_prefix => 'manage'
+  load_and_authorize_resource :<%= parent_singular_name %>, :class => <%= model_name %>
   
   def create
     create!{ manage_<%= parent_singular_name %>_<%= plural_name %>_path(@<%= parent_singular_name %>.id) }
@@ -29,7 +29,7 @@ class Manage::<%= controller_class_name %>Controller < Manage::BaseController
       options = { :page => params[:page], :per_page => 20 }
       options.update @search.filter
       
-      @<%= plural_name %> ||= end_of_association_chain.paginate(options)
+      @<%= plural_name %> = (@<%= plural_name %> || end_of_association_chain).paginate(options)
     end
     
     def make_filter

data/lib/generators/freeberry/manage_scaffold/templates/multiplay/views/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="edit-bl">
   <div class="bot-bg">
     <div class="block-title"><%%= t('manage.edit') %>:</div>
-    <%%= form_for @<%= singular_name %>, :as => :<%= singular_name %>, :url => manage_<%= parent_singular_name %>_<%= singular_name %>_path(@<%= parent_singular_name %>.id, @<%= singular_name %>.id), :html=>{:multipart=>true, :method=>:put, :id=>'<%= singular_name %>_form'} do |f| -%>
+    <%%= form_for [:manage, @<%= parent_singular_name %>, @<%= singular_name %>], :html=>{:multipart=>true, :id=>'<%= singular_name %>_form'} do |f| -%>
       <%%= render :partial=>"manage/<%= plural_name %>/form", :object=>f %>
       
       <div style="padding: 20px 0px 10px 20px;" class="buts">

data/lib/generators/freeberry/manage_scaffold/templates/multiplay/views/new.html.erb

@@ -1,7 +1,7 @@
 <div class="edit-bl">
   <div class="bot-bg">
     <div class="block-title"><%%= t('manage.add') %>:</div>
-    <%%= form_for @<%= singular_name %>, :as => :<%= singular_name %>, :url => manage_<%= parent_singular_name %>_<%= plural_name %>_path(@<%= parent_singular_name %>.id), :html=>{:multipart=>true, :id=>'<%= singular_name %>_form'} do |f| -%>
+    <%%= form_for [:manage, @<%= parent_singular_name %>, @<%= singular_name %>], :html=>{:multipart=>true, :id=>'<%= singular_name %>_form'} do |f| -%>
       <%%= render :partial=>"manage/<%= plural_name %>/form", :object=>f %>
       
       <div style="padding: 20px 0px 10px 20px;" class="buts">

data/lib/generators/freeberry/manage_scaffold/templates/single/controller.rb

@@ -1,9 +1,10 @@
 class Manage::<%= controller_class_name %>Controller < Manage::BaseController
   inherit_resources
+  defaults :route_prefix => 'manage'
   
   before_filter :make_filter, :only=>[:index]
-  
-  defaults :route_prefix => 'manage'
+
+  load_and_authorize_resource :class => <%= class_name %>
   
   def create
     create!{ manage_<%= plural_name %>_path }
@@ -23,7 +24,7 @@ class Manage::<%= controller_class_name %>Controller < Manage::BaseController
       options = { :page => params[:page], :per_page => 20 }
       options.update @search.filter
       
-      @<%= plural_name %> ||= end_of_association_chain.paginate(options)
+      @<%= plural_name %> = (@<%= plural_name %> || end_of_association_chain).paginate(options)
     end
     
     def make_filter

data/lib/generators/freeberry/manage_scaffold/templates/single/views/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="edit-bl">
   <div class="bot-bg">
     <div class="block-title"><%%= t('manage.edit') %>:</div>
-    <%%= form_for @<%= singular_name %>, :as => :<%= singular_name %>, :url => manage_<%= singular_name %>_path(@<%= singular_name %>.id), :html=>{:multipart=>true, :method=>:put, :id=>'<%= singular_name %>_form'} do |f| -%>
+    <%%= form_for [:manage, @<%= singular_name %>], :html=>{:multipart=>true, :id=>'<%= singular_name %>_form'} do |f| -%>
       <%%= render :partial=>"manage/<%= plural_name %>/form", :object=>f %>
       
       <div style="padding: 20px 0px 10px 20px;" class="buts">

data/lib/generators/freeberry/manage_scaffold/templates/single/views/new.html.erb

@@ -1,7 +1,7 @@
 <div class="edit-bl">
   <div class="bot-bg">
     <div class="block-title"><%%= t('manage.add') %>:</div>
-    <%%= form_for @<%= singular_name %>, :as => :<%= singular_name %>, :url => manage_<%= plural_name %>_path, :html=>{:multipart=>true, :id=>'<%= singular_name %>_form'} do |f| -%>
+    <%%= form_for [:manage, @<%= singular_name %>], :html=>{:multipart=>true, :id=>'<%= singular_name %>_form'} do |f| -%>
       <%%= render :partial=>"manage/<%= plural_name %>/form", :object=>f %>
       
       <div style="padding: 20px 0px 10px 20px;" class="buts">

data/lib/generators/freeberry/models/templates/create_users.rb

@@ -2,7 +2,7 @@ class FreeberryCreateUsers < ActiveRecord::Migration
   def self.up
     create_table(:users) do |t|
       t.string :name, :limit => 150
-      t.string :login, :limit => 20, :null => false
+      # t.string :login, :limit => 20, :null => false
       
       t.database_authenticatable :null => false
       t.recoverable
@@ -15,10 +15,10 @@ class FreeberryCreateUsers < ActiveRecord::Migration
       t.timestamps
     end
     
-    add_index :users, :login,                :unique => true
     add_index :users, :email,                :unique => true
     add_index :users, :reset_password_token, :unique => true
     add_index :users, :confirmation_token,   :unique => true
+    # add_index :users, :login,                :unique => true
     # add_index :users, :unlock_token,         :unique => true    
   end
 

data/lib/generators/freeberry/models/templates/models/ability.rb

@@ -0,0 +1,40 @@
+class Ability
+  include CanCanNamespace::Ability
+  
+  attr_accessor :context, :user
+
+  def initialize(user, context = nil)
+    alias_action :delete, :to => :destroy
+
+    @user = (user || User.new) # guest user (not logged in)
+    @context = context
+    
+    case @user.role_type_id
+      when RoleType.default.id then default
+      when RoleType.redactor.id then redactor
+      when RoleType.moderator.id then moderator
+      when RoleType.admin.id then admin
+    end
+  end
+  
+  def default
+    can :create, Comment
+    can [:update, :destroy], Comment, :user_id => @user.id, :newly_created? => true
+  end
+  
+  def redactor
+    # TODO
+  end
+  
+  def moderator
+    # TODO
+  end
+  
+  def admin
+    can :manage, :all
+    can :manage, :all, :context => :manage
+    
+    can [:create, :destroy], Comment
+    can :update, Comment, :user_id => @user.id
+  end
+end

data/lib/generators/freeberry/models/templates/models/comment.rb

@@ -1,8 +1,6 @@
 class Comment < ActiveRecord::Base
   include Freeberry::Models::Comment
   
-  using_access_control
-  
   validates :content, :presence => true, :length => { :maximum => 500 }
   validates :commentable_type, :presence => true, :inclusion => { :in => %w( Post Article ) }         
   validates :author_type, :inclusion => { :in => %w( User FreeberryAuth::Account ) }, :allow_blank => true

data/lib/generators/freeberry/models/templates/models/user.rb

@@ -35,8 +35,6 @@
 class User < ActiveRecord::Base
   include Freeberry::Models::User
   
-  using_access_control
-  
   # Include default devise modules.
   devise :database_authenticatable, :confirmable, :lockable, :timeoutable,
          :recoverable, :rememberable, :trackable, :validatable

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freeberry
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Igor Galeta
@@ -16,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +02:00
+date: 2011-03-18 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: Freeberry is a Brainberry CRM System
+description: Freeberry is a Aimbulance CRM System
 email: galeta.igor@gmail.com
 executables: []
 
@@ -52,7 +52,6 @@ files:
 - config/routes.rb
 - lib/freeberry.rb
 - lib/freeberry/accessible_attributes.rb
-- lib/freeberry/controllers/authorized_system.rb
 - lib/freeberry/controllers/head_options.rb
 - lib/freeberry/controllers/helper_utils.rb
 - lib/freeberry/core_ext.rb
@@ -83,7 +82,6 @@ files:
 - lib/generators/freeberry/base/USAGE
 - lib/generators/freeberry/base/base_generator.rb
 - lib/generators/freeberry/base/templates/config/application.yml
-- lib/generators/freeberry/base/templates/config/authorization_rules.rb
 - lib/generators/freeberry/base/templates/config/database.yml
 - lib/generators/freeberry/base/templates/config/freeberry.rb
 - lib/generators/freeberry/base/templates/config/logrotate-config
@@ -309,6 +307,7 @@ files:
 - lib/generators/freeberry/models/templates/create_roles.rb
 - lib/generators/freeberry/models/templates/create_structures.rb
 - lib/generators/freeberry/models/templates/create_users.rb
+- lib/generators/freeberry/models/templates/models/ability.rb
 - lib/generators/freeberry/models/templates/models/asset.rb
 - lib/generators/freeberry/models/templates/models/attachment_file.rb
 - lib/generators/freeberry/models/templates/models/avatar.rb

data/lib/freeberry/controllers/authorized_system.rb

@@ -1,60 +0,0 @@
-module Freeberry
-  module Controllers
-    module AuthorizedSystem
-      def self.included(base)
-        base.send(:extend, ClassMethods)
-        base.send(:include, InstanceMethods)
-      end
-    
-      module ClassMethods
-        def self.extended(base)
-          base.class_eval do
-            skip_before_filter :set_current_user
-            
-            # Send current_user to Declarative authorization module
-            before_filter :set_current_user
-        
-            helper_method :content_manager?
-          end
-        end
-      end
-
-      module InstanceMethods
-        protected
-        
-        # set_current_user sets the global current user for this request. This
-        # is used by model security that does not have access to the
-        # controller#current_user method. It is called as a before_filter.
-        def set_current_user
-          without_access_control do
-            Authorization.current_user = current_user
-          end
-        end
-        
-        def permission_denied
-          flash[:error] = I18n.t(:access_denied, :scope => [:flash, :users])
-          
-          respond_to do |format|
-            format.html { redirect_to new_session_path(:user) }
-            format.xml  { head :unauthorized }
-            format.js   { head :unauthorized }
-          end
-        end
-        
-        def without_access_control(&block)
-          previous_state = Authorization.ignore_access_control
-          begin
-            Authorization.ignore_access_control(true)
-            yield
-          ensure
-            Authorization.ignore_access_control(previous_state)
-          end
-        end
-        
-        def content_manager?
-          user_signed_in? && current_user.admin?
-        end
-      end
-    end
-  end
-end

data/lib/generators/freeberry/base/templates/config/authorization_rules.rb

@@ -1,51 +0,0 @@
-authorization do
-  role :guest do
-    has_permission_on :users, :to => [:create, :update]
-    has_permission_on :accounts, :to => [:show, :create]
-    has_permission_on :comments, :to => [:read, :create]
-  end
-  
-  role :default do
-    has_permission_on :accounts, :to => [:show]
-    has_permission_on :accounts, :to => [:update] do
-      if_attribute :id => is {user.id}
-    end
-    
-    has_permission_on :users, :to => [:update] do
-      if_attribute :id => is {user.id}
-    end
-        
-    has_permission_on :comments, :to => [:read, :create]
-    has_permission_on :comments, :to => [:update, :delete] do
-      if_attribute :author => is {user}
-    end
-  end
-  
-  role :admin do
-    # Models
-    has_permission_on :users, :to => :manage
-    has_permission_on :comments, :to => :manage
-    has_permission_on :accounts, :to => :manage
-    
-    # Administration module
-    has_permission_on :manage_structures, :to => :manage
-    has_permission_on :manage_users, :to => [:manage, :activate]
-    has_permission_on :manage_pages, :to => :manage
-    has_permission_on :manage_pictures, :to => :manage
-    has_permission_on :manage_assets, :to => :manage
-    has_permission_on :manage_posts, :to => :manage    
-    has_permission_on :manage_settings, :to => :manage
-    
-    has_permission_on :authorization_rules, :to => :read
-    has_permission_on :authorization_usages, :to => :read
-  end
-end
-
-privileges do
-  # default privilege hierarchies to facilitate RESTful Rails apps
-  privilege :manage, :includes => [:create, :read, :update, :delete]
-  privilege :read,   :includes => [:index, :show]
-  privilege :create, :includes => :new
-  privilege :update, :includes => :edit
-  privilege :delete, :includes => :destroy
-end