family_gallery 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 601cdfd46f3c826e859d3e4c90b20c2627876409
-  data.tar.gz: 5e371952631a3cb511b4b3c404e3ee7b620835e0
+  metadata.gz: 8724caad748ce58f6c7dde4e0e79bc8c39d25303
+  data.tar.gz: 2c2270ccb9d673b54191697519dca7e0447e1960
 SHA512:
-  metadata.gz: 8d245e72706ba199f5bdd8815906e7d5498e6288f3f72fac7ed3d58e3a79c218317598287e9e378551edf86397aca8a1aead73b683bf2b09a92c3673ab3196cf
-  data.tar.gz: 0c5fab8e0f6b39af552fa3836be2339d8c07ca18a045b29d5d3bffd45bce5223ee6567e50f991684835d7190645368f683efba6da7bfd8a140edf5060152142c
+  metadata.gz: ed25ed2d0f42742babbb0b183880e7dac7f24817ce4b089847bd2ce4a6fe13413f84de403c4d7c82fcf6c482e02903acec737e16347567dc5b67e24e5e33e54f
+  data.tar.gz: 6285dc6ede7d7d140f67669869e3effaab1c16346eb4ee23a8a767b5787f6cbfa0f24466d6b030edee39563fca0a4515ba86796a78d4376b0de849781dc4cc59

data/app/controllers/family_gallery/groups_controller.rb

@@ -1,10 +1,53 @@
-class FamilyGallery::GroupsController < FamilyGallery::ResourcesController
+class FamilyGallery::GroupsController < FamilyGallery::BaseController
+  load_and_authorize_resource
+
+  def index
+    @ransack_values = params[:q] || {}
+    @ransack = FamilyGallery::Group.ransack(@ransack_values)
+
+    @groups = @ransack.result.accessible_by(current_ability)
+    @groups = @groups.order(:id) unless @ransack_values[:s]
+    @groups = @groups.page(params[:page])
+    @groups = @groups.select { |group| can?(:show, group) }
+  end
+
   def show
   end
 
+  def new
+  end
+
+  def create
+    if @group.save
+      redirect_to @group
+    else
+      render :new
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @group.update_attributes(group_params)
+      redirect_to @group
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    if @group.destroy
+      redirect_to groups_url
+    else
+      flash[:error] = @group.errors.full_messages.join(". ")
+      redirect_to @group
+    end
+  end
+
 private
 
-  def resource_params
+  def group_params
     params.require(:group).permit(:name, :description)
   end
 

data/app/controllers/family_gallery/user_roles_controller.rb

@@ -0,0 +1,37 @@
+class FamilyGallery::UserRolesController < FamilyGallery::ResourcesController
+  load_and_authorize_resource
+
+  before_filter :set_user
+
+  def new
+  end
+
+  def create
+    @user_role.user = @user
+
+    if @user_role.save
+      redirect_to @user_role.user
+    else
+      flash[:error] = @user_role.errors.full_messages.join('. ')
+      render :new
+    end
+  end
+
+  def destroy
+    unless @user_role.destroy
+      flash[:errror] = @user_role.errors.full_messages.join('. ')
+    end
+
+    redirect_to @user_role.user
+  end
+
+private
+
+  def user_role_params
+    params.require(:user_role).permit(:role)
+  end
+
+  def set_user
+    @user = FamilyGallery::User.find(params[:user_id])
+  end
+end

data/app/controllers/family_gallery/user_taggings_controller.rb

@@ -1,13 +1,10 @@
-class FamilyGallery::UserTaggingsController < FamilyGallery::ResourcesController
-  load_and_authorize_resource
-
+class FamilyGallery::UserTaggingsController < FamilyGallery::BaseController
   before_filter :set_picture
 
-  def create
-    @user_tagging.picture = @picture
-    @user_tagging.tagged_by = current_user
-    @user_tagging.assign_attributes(resource_params)
+  load_and_authorize_resource
+  skip_authorize_resource only: :new
 
+  def create
     if @user_tagging.save
       flash[:notice] = t(".tagging_was_saved")
       redirect_to @picture
@@ -32,10 +29,14 @@ private
     @width = 1000
     @height = @picture.height_for_width(1000)
 
-    authorize! :edit, @picture
+    if action_name == "create"
+      @user_tagging = @picture.user_taggings.new
+      @user_tagging.tagged_by = current_user
+      @user_tagging.assign_attributes(user_tagging_params)
+    end
   end
 
-  def resource_params
+  def user_tagging_params
     params.require(:user_tagging).permit(:user_id, :position_top, :position_left)
   end
 end

data/app/controllers/family_gallery/users_controller.rb

@@ -1,10 +1,52 @@
-class FamilyGallery::UsersController < FamilyGallery::ResourcesController
+class FamilyGallery::UsersController < FamilyGallery::BaseController
+  load_and_authorize_resource
+
+  def index
+    @ransack_values = params[:q] || {}
+    @ransack = FamilyGallery::User.ransack(@ransack_values)
+
+    @users = @ransack.result
+    @users = @users.order(:id).reverse_order unless @ransack_values[:s]
+    @users = @users.page(params[:page])
+  end
+
   def show
   end
 
+  def new
+  end
+
+  def create
+    if @user.save
+      redirect_to @user
+    else
+      render :new
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @user.update_attributes(user_params)
+      redirect_to @user
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    if @user.destroy
+      redirect_to users_url
+    else
+      flash[:error] = @user.errors.full_messages.join(". ")
+      redirect_to user_url(@user)
+    end
+  end
+
 private
 
-  def resource_params
-    params.require(:user).permit(:first_name, :last_name, :email)
+  def user_params
+    params.require(:user).permit(:first_name, :last_name, :email, :password)
   end
 end

data/app/controllers/family_gallery/welcome_controller.rb

@@ -1,5 +1,8 @@
 class FamilyGallery::WelcomeController < FamilyGallery::BaseController
   def index
-    @groups = FamilyGallery::Group.ordered_by_latest_update.limit(7)
+    @groups = FamilyGallery::Group
+      .accessible_by(current_ability)
+      .ordered_by_latest_update
+      .limit(25)
   end
 end

data/app/models/family_gallery/ability.rb

@@ -4,9 +4,9 @@ class FamilyGallery::Ability
   def initialize(user)
     @user = user
 
-    can :index, FamilyGallery::Group
-
     if @user
+      user_access
+
       @user.user_roles.each do |user_role|
         __send__(user_role.role)
       end
@@ -15,10 +15,21 @@ class FamilyGallery::Ability
 
 private
 
+  def user_access
+    can [:index, :new, :create], FamilyGallery::Group
+    can [:show, :edit, :update, :destroy], FamilyGallery::Group, user_owner_id: @user.id
+
+    can [:new, :create], FamilyGallery::Picture
+    can [:edit, :update, :destroy], FamilyGallery::Picture, user_owner_id: @user.id
+
+    can [:new, :create, :edit, :update, :destroy], FamilyGallery::UserTagging, picture: {user_owner_id: @user.id}
+  end
+
   def administrator
     can :manage, FamilyGallery::Group
     can :manage, FamilyGallery::Picture
     can :manage, FamilyGallery::User
     can :manage, FamilyGallery::UserTagging
+    can :manage, FamilyGallery::UserRole
   end
 end

data/app/models/family_gallery/group.rb

@@ -1,6 +1,8 @@
 class FamilyGallery::Group < ActiveRecord::Base
   translates :name, :description
 
+  belongs_to :user_owner, class_name: "User"
+
   has_many :group_picture_links, dependent: :destroy
   has_many :pictures, through: :group_picture_links
 

data/app/models/family_gallery/picture.rb

@@ -12,6 +12,8 @@ class FamilyGallery::Picture < ActiveRecord::Base
   has_attached_file :image, style: {medium: "900x900", thumb: "120x120"}
   validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/
 
+  validates_presence_of :user_owner
+
   after_create :parse_exif
 
   def width_for_height(new_height)

data/app/models/family_gallery/user.rb

@@ -4,6 +4,7 @@ class FamilyGallery::User < ActiveRecord::Base
   validates_presence_of :email
   validates_uniqueness_of :email
 
+  has_many :owned_groups, class_name: "Group", foreign_key: "user_owner_id", dependent: :restrict_with_error
   has_many :owned_pictures, class_name: "Picture", foreign_key: "user_owner_id", dependent: :restrict_with_error
   has_many :pictures_tagged_on, through: :user_taggings, source: :picture
   has_many :user_roles, dependent: :destroy

data/app/models/family_gallery/user_role.rb

@@ -4,4 +4,10 @@ class FamilyGallery::UserRole < ActiveRecord::Base
   validates_presence_of :role
   validates_uniqueness_of :role, scope: :user_id
   validates_presence_of :user
+
+  def self.role_options
+    {
+      t('.administrator') => 'administrator'
+    }
+  end
 end

data/app/views/family_gallery/user_roles/_form.html.haml

@@ -0,0 +1,3 @@
+= simple_form_for [user, user_role] do |f|
+  = f.input :role, collection: FamilyGallery::UserRole.role_options
+  = f.submit t('save'), class: 'button'

data/app/views/family_gallery/user_roles/new.html.haml

@@ -0,0 +1,3 @@
+- content_for(:header_title) { t('.new_user_role_for', user_name: @user.name) }
+
+= render 'form', user: @user, user_role: @user_role

data/app/views/family_gallery/users/show.html.haml

@@ -13,3 +13,24 @@
 
 - unless @user.uploaded_pictures.any?
   = t(".this_user_havent_uploaded_any_pictures")
+
+%h2= FamilyGallery::UserRole.model_name.human(count: 2)
+= link_to t('add_new'), new_user_user_role_path(@user), class: 'button' if can?(:new, FamilyGallery::UserRole)
+
+%br
+%br
+
+%table
+  %thead
+    %tr
+      %th= FamilyGallery::UserRole.human_attribute_name(:role)
+      %th= t('actions')
+  %tbody
+    - @user.user_roles.each do |user_role|
+      %tr
+        %td= user_role.role
+        %td
+          = link_to t('delete'), user_user_role_path(@user, user_role), method: :delete, data: {confirm: t('are_you_sure')} if can?(:destroy, user_role)
+    - if @user.user_roles.empty?
+      %tr
+        %td{colspan: 1}= t('no_results')

data/config/initializers/awesome_translations.rb

@@ -0,0 +1 @@
+ActiveRecord::Base.include AwesomeTranslations::TranslateFunctionality

data/config/initializers/simple_form.rb

@@ -0,0 +1,166 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Wrappers are used by the form builder to generate a
+  # complete input. You can remove any component from the
+  # wrapper, change the order or even add your own to the
+  # stack. The options given below are used to wrap the
+  # whole input.
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+    ## Extensions enabled by default
+    # Any of these extensions can be disabled for a
+    # given input by passing: `f.input EXTENSION_NAME => false`.
+    # You can make any of these extensions optional by
+    # renaming `b.use` to `b.optional`.
+
+    # Determines whether to use HTML5 (:email, :url, ...)
+    # and required attributes
+    b.use :html5
+
+    # Calculates placeholders automatically from I18n
+    # You can also pass a string as f.input placeholder: "Placeholder"
+    b.use :placeholder
+
+    ## Optional extensions
+    # They are disabled unless you pass `f.input EXTENSION_NAME => true`
+    # to the input. If so, they will retrieve the values from the model
+    # if any exists. If you want to enable any of those
+    # extensions by default, you can change `b.optional` to `b.use`.
+
+    # Calculates maxlength from length validations for string inputs
+    b.optional :maxlength
+
+    # Calculates pattern from format validations for string inputs
+    b.optional :pattern
+
+    # Calculates min and max from length validations for numeric inputs
+    b.optional :min_max
+
+    # Calculates readonly automatically from readonly attributes
+    b.optional :readonly
+
+    ## Inputs
+    b.use :label_input
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
+
+    ## full_messages_for
+    # If you want to display the full error message for the attribute, you can
+    # use the component :full_error, like:
+    #
+    # b.use :full_error, wrap_with: { tag: :span, class: :error }
+  end
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :default
+
+  # Define the way to render check boxes / radio buttons with labels.
+  # Defaults to :nested for bootstrap config.
+  #   inline: input + label
+  #   nested: label > input
+  config.boolean_style = :nested
+
+  # Default class for buttons
+  config.button_class = 'btn'
+
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
+  # config.error_method = :first
+
+  # Default tag used for error notification helper.
+  config.error_notification_tag = :div
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'error_notification'
+
+  # ID to add for error notification helper.
+  # config.error_notification_id = nil
+
+  # Series of attempts to detect a default label method for collection.
+  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+  # Series of attempts to detect a default value method for collection.
+  # config.collection_value_methods = [ :id, :to_s ]
+
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  # config.collection_wrapper_tag = nil
+
+  # You can define the class to use on all collection wrappers. Defaulting to none.
+  # config.collection_wrapper_class = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag,
+  # defaulting to :span. Please note that when using :boolean_style = :nested,
+  # SimpleForm will force this option to be a label.
+  # config.item_wrapper_tag = :span
+
+  # You can define a class to use in all item wrappers. Defaulting to none.
+  # config.item_wrapper_class = nil
+
+  # How the label text should be generated altogether with the required text.
+  # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+
+  # You can define the class to use on all labels. Default is nil.
+  # config.label_class = nil
+
+  # You can define the default class to be used on forms. Can be overriden
+  # with `html: { :class }`. Defaulting to none.
+  # config.default_form_class = nil
+
+  # You can define which elements should obtain additional classes
+  # config.generate_additional_classes_for = [:wrapper, :label, :input]
+
+  # Whether attributes are required by default (or not). Default is true.
+  # config.required_by_default = true
+
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
+  config.browser_validations = false
+
+  # Collection of methods to detect if a file type was given.
+  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value.
+  # config.input_mappings = { /count/ => :integer }
+
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { string: :prepend }
+
+  # Namespaces where SimpleForm should look for custom input classes that
+  # override default inputs.
+  # config.custom_inputs_namespaces << "CustomInputs"
+
+  # Default priority for time_zone inputs.
+  # config.time_zone_priority = nil
+
+  # Default priority for country inputs.
+  # config.country_priority = nil
+
+  # When false, do not use translations for labels.
+  # config.translate_labels = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  # config.inputs_discovery = true
+
+  # Cache SimpleForm inputs discovery
+  # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
+
+  # Define the default class of the input wrapper of the boolean input.
+  config.boolean_label_class = 'checkbox'
+
+  # Defines if the default input wrapper class should be included in radio
+  # collection wrappers.
+  # config.include_default_input_wrapper_class = true
+
+  # Defines which i18n scope will be used in Simple Form.
+  # config.i18n_scope = 'simple_form'
+end