droom 0.4.3 → 0.5.3

data/app/controllers/droom/group_invitations_controller.rb

@@ -3,10 +3,8 @@ module Droom
     respond_to :js, :html
     layout :no_layout_if_pjax
     
-    before_filter :get_event
-    before_filter :build_group_invitation, :only => [:new]
-    before_filter :find_or_build_group_invitation, :only => [:create]
-    before_filter :get_group_invitation, :only => :destroy
+    load_and_authorize_resource :event, :class => Droom::Event
+    load_and_authorize_resource :group_invitation, :through => :event, :class => Droom::GroupInvitation
 
     def destroy
       @group_invitation.destroy
@@ -23,33 +21,18 @@ module Droom
     end
     
     def create
-      if @group_invitation.save
+      if @group_invitation.update_attributes(group_invitation_params)
         render :partial => "created"
       else
         respond_with @group_invitation
       end
     end
 
-    protected
+  protected
     
-    def get_event
-      @event = Droom::Event.find(params[:event_id])
-    end
-
-    def build_group_invitation
-      @group_invitation = @event.group_invitations.build(params[:group_invitation])
-    end
-    
-    def find_or_build_group_invitation
-      @group = Droom::Group.find(params[:group_invitation][:group_id])
-      unless @group_invitation = @event.group_invitations.for_group(@group).first()
-        @group_invitation = @event.group_invitations.build(params[:group_invitation])
-      end
+    def group_invitation_params
+      params.require(:group_invitation).permit(:event_id, :group_id)
     end
 
-    def get_group_invitation
-      @group_invitation = @event.group_invitations.find(params[:id])
-    end
-    
   end
 end

data/app/controllers/droom/group_permissions_controller.rb

@@ -0,0 +1,26 @@
+module Droom
+  class GroupPermissionsController < Droom::EngineController
+    respond_to :js, :html
+    layout :no_layout_if_pjax
+    
+    load_and_authorize_resource :group, :class => Droom::Group
+    load_and_authorize_resource :group_permission, :through => :group, :class => Droom::GroupPermission
+    
+    def create
+      @group_permission.save
+      render :partial => 'droom/group_permissions/toggle'
+    end
+
+    def destroy
+      @group_permission.destroy
+      render :partial => 'droom/group_permissions/toggle'
+    end
+
+  protected
+  
+    def group_permission_params
+      params.require(:group_permission).permit(:permission_id, :group_id)
+    end
+
+  end
+end

data/app/controllers/droom/groups_controller.rb

@@ -3,9 +3,8 @@ module Droom
     respond_to :html, :js
     layout :no_layout_if_pjax
 
-    before_filter :build_group, :only => [:new, :create]
-    before_filter :get_group, :only => [:show, :edit, :update, :destroy]
-    before_filter :get_groups, :only => :index
+    before_filter :get_groups, :only => [:index]
+    load_and_authorize_resource
 
     def index
       respond_with @groups do |format|
@@ -20,6 +19,7 @@ module Droom
     end
 
     def show
+      @users = paginated(@group.users, 20)
       respond_with @group do |format|
         format.js {
           render :partial => 'droom/groups/group'
@@ -32,12 +32,12 @@ module Droom
     end
 
     def update
-      @group.update_attributes(params[:group])
+      @group.update_attributes(group_params)
       render :partial => 'group'
     end
 
     def create
-      if @group.save
+      if @group.update_attributes(group_params)
         render :partial => "created"
       else
         respond_with @group
@@ -50,17 +50,13 @@ module Droom
     end
 
   protected
-
-    def build_group
-      @group = Droom::Group.new(params[:group])
-    end
-
-    def get_group
-      @group = Droom::Group.find(params[:id])
+  
+    def group_params
+      params.require(:group).permit(:name, :leader_id, :description)
     end
-
+    
     def get_groups
-      @groups = current_user.admin? ? Droom::Group.all : Droom::Group.visible_to(current_user)
+      @groups = Droom::Group.shown_in_directory.accessible_by(current_ability).order("name ASC")
     end
 
   end

data/app/controllers/droom/invitations_controller.rb

@@ -3,14 +3,11 @@ module Droom
     respond_to :js, :html
     layout :no_layout_if_pjax
     
-    before_filter :get_event
-    before_filter :build_invitation, :only => [:new]
-    before_filter :find_or_build_invitation, :only => [:create]
-    before_filter :get_invitation, :only => [:accept, :refuse, :toggle]
-
+    load_and_authorize_resource :event, :class => Droom::Event
+    load_and_authorize_resource :invitation, :through => :event, :class => Droom::Invitation
+    
     def destroy
-      @invitation = @event.invitations.find_by_id(params[:id])
-      @invitation.destroy if @invitation
+      @invitation.destroy
       head :ok
     end
     
@@ -24,7 +21,7 @@ module Droom
     end
     
     def create
-      if @invitation.save
+      if @invitation.update_attributes(invitation_params)
         render :partial => "created"
       else
         respond_with @invitation
@@ -48,23 +45,8 @@ module Droom
 
   protected
     
-    def get_event
-      @event = Droom::Event.find(params[:event_id])
-    end
-    
-    def build_invitation
-      @invitation = @event.invitations.build(params[:invitation])
-    end
-    
-    def find_or_build_invitation
-      @person = Droom::Person.find(params[:invitation][:person_id])
-      unless @invitation = @event.invitations.for_person(@person).first()
-        @invitation = @event.invitations.build(params[:invitation])
-      end
-    end
-
-    def get_invitation
-      @invitation = @event.invitations.find(params[:id])
+    def invitation_params
+      params.require(:invitation).permit(:event_id, :user_id)
     end
 
   end

data/app/controllers/droom/memberships_controller.rb

@@ -3,22 +3,21 @@ module Droom
     respond_to :js, :html
     layout :no_layout_if_pjax
     
-    before_filter :build_membership, :only => [:new, :create]
-    before_filter :get_membership, :only => :destroy
+    load_and_authorize_resource :group, :class => Droom::Group
+    load_and_authorize_resource :membership, :through => :group, :class => Droom::Membership
 
     def destroy
       @membership = Membership.find(params[:id])
       @group = @membership.group
-      @person = @membership.person
+      @user = @membership.user
       @membership.destroy
-      render :partial => "membership_toggle"
+      render :partial => "toggle"
     end
         
     def new
-      if params[:person_id]
-        @group = Droom::Group.find(params[:group_id])
-        @person = Droom::Person.find(params[:person_id])
-        @membership = @group.memberships.create!(:person_id => @person.id, :group_id => @group.id)
+      if params[:user_id]
+        @user = Droom::User.find(params[:user_id])
+        @membership = @group.memberships.create!(:user_id => @user.id, :group_id => @group.id)
         render :partial => "button"
       else
         respond_with @membership
@@ -27,22 +26,18 @@ module Droom
     
     def create
       if @membership.save
-        @person = @membership.person
-        render :partial => "membership_toggle"
+        @user = @membership.user
+        render :partial => "toggle"
       else
         respond_with @membership
       end
     end
 
-    protected
-    
-    def build_membership
-      @group = Droom::Group.find(params[:group_id])
-      @membership = @group.memberships.new(params[:membership])
-    end
+  protected
 
-    def get_membership
-      @membership = Droom::Membership.find(params[:id])
+    def membership_params
+      permitted_user_attributes = [:title, :family_name, :given_name, :chinese_name, :email, :password, :password_confirmation, :phone, :description, :admin, :preferences_attributes, :confirm, :old_id, :invite_on_creation, :post_line1, :post_line2, :post_city, :post_region, :post_country, :post_code, :mobile, :dob, :organisation_id, :public, :private, :female, :image, :send_confirmation]
+      params.require(:membership).permit(:group_id, :user_id, user_attributes: permitted_user_attributes)
     end
 
   end

data/app/controllers/droom/organisations_controller.rb

@@ -3,20 +3,15 @@ module Droom
     respond_to :html, :js
     layout :no_layout_if_pjax
     helper Droom::DroomHelper
-  
-    before_filter :authenticate_user!
-    before_filter :get_people, :only => [:index]
-    before_filter :find_organisations, :only => [:index]
-    before_filter :get_organisation, :only => [:show, :edit, :update, :destroy]
-    before_filter :build_organisation, :only => [:new, :create]
+    load_and_authorize_resource
 
     def create
-      @organisation.update_attributes(params[:organisation])
+      @organisation.update_attributes(organisation_params)
       respond_with @organisation
     end
 
     def update
-      @organisation.update_attributes(params[:organisation])
+      @organisation.update_attributes(organisation_params)
       respond_with @organisation
     end
 
@@ -30,24 +25,10 @@ module Droom
     end
 
   protected
-
-    def find_organisations
-      @organisations = Droom::Organisation.order("name asc")
-    end
-
-    def get_people
-      @show = params[:show] || 10
-      @page = params[:page] || 1
-      @people = Droom::Person.order("name asc").page(@page).per(@show)
-    end
-    
-    def get_organisation
-      @organisation = Droom::Organisation.find(params[:id])
+  
+    def organisation_params
+      params.require(:organisation).permit(:name, :description, :owner, :owner_id, :url)
     end
 
-    def build_organisation
-      @organisation = Droom::Organisation.new(params[:organisation])
-    end
-  
   end
 end

data/app/controllers/droom/permissions_controller.rb

@@ -0,0 +1,50 @@
+module Droom
+  class PermissionsController < Droom::EngineController
+    respond_to :js, :html
+    layout :no_layout_if_pjax
+
+    load_and_authorize_resource :service, :class => Droom::Service
+    load_and_authorize_resource :permission, :through => :service, :class => Droom::Permission
+
+    def index
+      @permissions = Droom::Permission.all
+      respond_with(@permissions)
+    end
+    
+    def show
+      respond_with @permission
+    end
+
+    def new
+      respond_with @permission
+    end
+    
+    def create
+      @permission.save
+      respond_with @service, @permission
+    end
+    
+    def edit
+      respond_with @permission
+    end
+
+    def update
+      @permission.update_attributes(permission_params)
+      respond_with @service, @permission
+    end
+    
+    def destroy
+      @permission.destroy
+      head :ok
+    end
+  
+  protected
+  
+    def permission_params
+      params.require(:permission).permit(:name, :description)
+    end
+    
+  end
+end
+
+

data/app/controllers/droom/preferences_controller.rb

@@ -2,11 +2,10 @@ module Droom
   class PreferencesController < Droom::EngineController
     respond_to :js, :html
     layout :no_layout_if_pjax
-  
-    before_filter :authenticate_user!
-    before_filter :get_preference, :only => [:show, :edit, :update]
-    before_filter :build_preference, :only => [:new, :create]
     
+    before_filter :build_preference, :only => [:new, :create]
+    load_and_authorize_resource :through => :current_user
+
     def create
       @preference.update_attributes(params[:preference])
       @preference.save
@@ -20,15 +19,15 @@ module Droom
     end
     
   protected
-    
-    def get_preference
-      @preference = current_user.preferences.find(params[:id])
-    end
 
     def build_preference
       key = params[:preference][:key] || params[:key]
-      @preference = current_user.preferences.find_or_initialize_by_key(key)
+      @preference = current_user.preferences.where(:key => key).first_or_initialize
     end
-    
+
+    def preference_parameters
+      params.require(:preference).permit(:value, :uuid)
+    end
+
   end
 end

data/app/controllers/droom/scraps_controller.rb

@@ -3,13 +3,13 @@ module Droom
     respond_to :html, :js, :json, :atom
     layout :no_layout_if_pjax
   
-    before_filter :authenticate_user!
-    before_filter :scale_image_params, :only => [:create, :update]
-    before_filter :find_scraps, :only => [:index]
-    before_filter :get_scrap, :only => [:show, :edit, :update, :destroy, :chart]
+    before_filter :get_scraps, :only => [:index]
+    before_filter :get_scraptype, :only => [:new, :create, :update]
     before_filter :build_scrap, :only => [:new, :create]
+    load_and_authorize_resource
 
     def index
+      @scraps = paginated(@scraps, 8)
       respond_with(@scraps) do |format|
         format.js { render :partial => 'droom/scraps/stream' }
       end
@@ -28,12 +28,12 @@ module Droom
     end
 
     def update
-      @scrap.update_attributes(params[:scrap])
+      @scrap.update_attributes(scrap_params(@scraptype))
       respond_with(@scrap)
     end
 
     def create
-      @scrap.update_attributes(params[:scrap])
+      @scrap.update_attributes(scrap_params(@scraptype))
       respond_with(@scrap)
     end
   
@@ -41,35 +41,32 @@ module Droom
       @scrap.destroy
       head :ok
     end
-    
-    def feed
-      
-    end
 
   protected
 
-    def find_scraps
-      @show = params[:show] || 10
-      @page = params[:page] || 1
-      @scraps = Droom::Scrap.by_date.page(@page).per(@show) unless @show == 'all'
+    def get_scraps
+      @scraps = paginated(Droom::Scrap.order("created_at DESC") )
     end
 
-    def get_scrap
-      @scrap = Droom::Scrap.find(params[:id])
+    def build_scrap
+      @scrap = current_user.scraps.build(:scraptype => @scraptype)
     end
 
-    def build_scrap
-      params[:scrap]
-      @scrap = Droom::Scrap.new(params[:scrap])
-      @folder = Droom::Folder.find_or_create_by_slug("stream")
-      @scrap.scraptype ||= 'text'
+    def get_scraptype
+      if params[:scrap]
+        @scraptype = params[:scrap][:scraptype] if Droom.scrap_types.include?(params[:scrap][:scraptype])
+      end
+      @scraptype ||= Droom.default_scrap_type
     end
 
-    def scale_image_params
-      if multiplier = params[:multiplier]
-        [:image_scale_width, :image_scale_height, :image_offset_left, :image_offset_top].each do |p|
-          params[:scrap][p] = (params[:scrap][p].to_i * multiplier.to_i) unless params[:scrap][p].blank?
-        end
+    def scrap_params(scraptype=@scraptype)
+      case scraptype.to_sym
+      when :image then params.require(:scrap).permit(:name, :image, :note, :url, :scraptype)
+      when :video then params.require(:scrap).permit(:name, :youtube_id, :note, :url, :scraptype)
+      when :link then params.require(:scrap).permit(:name, :note, :url, :scraptype)
+      when :event then params.require(:scrap).permit(:name, :note, :url, :scraptype, :event_attributes => [:id, :calendar_id, :start])
+      when :document then params.require(:scrap).permit(:name, :note, :url, :scraptype, :document_attributes => [:id, :file, :folder_id])
+      else params.require(:scrap).permit(:name, :body, :note, :url, :scraptype)
       end
     end