binda 0.1.5 → 0.1.6

data/app/controllers/binda/field_groups_controller.rb

@@ -3,7 +3,7 @@ require_dependency "binda/application_controller"
 module Binda
   class FieldGroupsController < ApplicationController
     before_action :set_structure
-    before_action :set_field_group, only: [:show, :edit, :update, :destroy]
+    before_action :set_field_group, only: [:show, :edit, :update, :destroy, :add_field_setting]
 
     def index
       redirect_to structure_field_group_path( @structure.slug )
@@ -33,7 +33,6 @@ module Binda
 
     def update
       # Add nested classes
-      add_new_field_settings
       add_new_choices
       check_if_needs_to_update_choices
 
@@ -47,9 +46,39 @@ module Binda
     end
 
     def destroy
-      @field_group.destroy
+      @field_group.destroy!
       reset_field_settings_cache
-      redirect_to structure_path( @structure.slug ), notice: 'Field group was successfully destroyed.'
+      if params[:isAjax]
+        render json: { target_id: params[:target_id] }, status: 200
+      else
+        redirect_to structure_path( @structure.slug ), notice: 'Field group was successfully destroyed along with all dependents.'
+      end
+    end
+
+    def sort
+      params[:field_group].each_with_index do |id, i|
+        FieldGroup.find( id ).update_column('position', i+1) # use update_column to skip callbacks (which leads to huge useless memory consumption)
+      end
+      render json: { id: "##{params[:id]}" }, status: 200
+    end
+
+    def sort_field_settings
+      sort_field_setting_by(params["form--list-item"])
+      render json: { id: "##{params[:id]}" }, status: 200
+    end
+
+    def add_field_setting
+      # We set some default values in order to be able to save the field setting
+      # (if field setting isn't save it makes impossible to sort the order)
+      # TODO params should be passed into a permit method
+      @field_setting = FieldSetting.new(
+        name: "#{I18n.t('binda.field_setting.new')}",
+        field_group_id: @field_group.id, 
+        field_type: 'string',
+        ancestry: params[:ancestry]
+      )
+      @field_setting.save!
+      render 'binda/field_groups/_form_new_item', layout: false
     end
 
     private
@@ -64,27 +93,30 @@ module Binda
 
       # Only allow a trusted parameter "white list" through.
       def field_group_params
-        params.require(:field_group).permit(:name, :slug, :description, :position, :layout, :structure_id, field_settings_attributes: [ :id, :field_group_id, :field_setting_id, :name, :slug, :description, :field_type, :position, :required, :default_text, :ancestry, :default_choice_id, :allow_null, accepted_structure_ids: [], choices: [], choices_attributes: [ :id, :field_setting_id, :label, :value ]])
+        params.require(:field_group).permit(
+          :name, :slug, :description, :position, :layout, :structure_id, field_settings_attributes: [ 
+            :id, :field_group_id, :field_setting_id, :name, :slug, :description, :field_type, :position, :required, :default_text, :ancestry, :default_choice_id, :allow_null, accepted_structure_ids: [], choices: [], choices_attributes: [ 
+              :id, :field_setting_id, :label, :value 
+            ]
+          ]
+        )
       end
 
       def new_params
-        params.require(:field_group).permit( new_field_settings: [ :id, :field_group_id, :field_setting_id, :name, :slug, :description, :field_type, :position, :required, :ancestry, :default_choice_id, :allow_null, choices: [] ],new_choices: [ :id, :field_setting_id, :label, :value ])
+        params.require(:field_group).permit( 
+          new_field_settings: [ 
+            :id, :field_group_id, :field_setting_id, :name, :slug, :description, :field_type, :position, :required, :ancestry, :default_choice_id, :allow_null, choices: [] 
+          ], 
+          new_choices: [ 
+            :id, :field_setting_id, :label, :value 
+          ]
+        )
       end
 
       def reset_field_settings_cache
         FieldSetting.reset_field_settings_array
       end
 
-      def add_new_field_settings
-        # Create new fields if any
-        new_params[:new_field_settings].each do |field_setting|
-          next if field_setting[:name].blank?
-          new_field_setting = @field_group.field_settings.create( field_setting )
-          next if new_field_setting
-          return redirect_to edit_structure_field_group_path( @structure.slug, @field_group.slug ), flash: { error: new_field_setting.errors }
-        end
-      end
-
       def add_new_choices
         # Create new fields if any
         return if new_params[:new_choices].nil? 
@@ -118,5 +150,14 @@ module Binda
           end
         end
       end
+
+      # Sort field settings following the order with which are listed in the array provided as a argument.
+      #
+      # @param field_settings [Array] the list of ids of the field settings
+      def sort_field_setting_by(field_settings)
+        field_settings.each_with_index do |id, i|
+          FieldSetting.find( id ).update_column('position', i+1)
+        end
+      end
   end
 end

data/app/controllers/binda/field_settings_controller.rb

@@ -40,8 +40,20 @@ module Binda
     end
 
     def destroy
-      @field_setting.destroy
-      redirect_to structure_field_group_path( @structure, @field_group ), notice: 'Field setting and all dependent content were successfully destroyed.'
+      @field_setting.destroy!
+      FieldSetting.reset_field_settings_array
+      if params[:isAjax]
+        render json: { target_id: params[:target_id] }, status: 200
+      else
+        redirect_to structure_field_group_path( @structure, @field_group ), notice: 'Field setting and all dependent content were successfully destroyed.'
+      end
+    end
+
+    def sort
+      params[:field_setting].each_with_index do |id, i|
+        FieldSetting.find( id ).update_column('position', i+1) # use update_column to skip callbacks (which leads to huge useless memory consumption)
+      end
+      render json: { id: "##{params[:id]}" }, status: 200
     end
 
     private

data/app/controllers/binda/repeaters_controller.rb

@@ -35,10 +35,10 @@ module Binda
 
     # DELETE /repeaters/1
     def destroy
-      @repeater.destroy
+      @repeater.destroy!
       # redirect_to repeaters_url, notice: 'Repeater was successfully destroyed.'
       if params['isAjax']
-        head :ok
+        render json: { target_id: params[:target_id] }, status: 200
       else
         redirect_to :back, notice: 'Field group was successfully destroyed.'
       end

data/app/controllers/binda/structures_controller.rb

@@ -2,7 +2,7 @@ require_dependency "binda/application_controller"
 
 module Binda
   class StructuresController < ApplicationController
-    before_action :set_structure, only: [:show, :edit, :update, :destroy, :fields_update ]
+    before_action :set_structure, only: [:show, :edit, :update, :destroy, :fields_update, :add_field_group ]
 
     def index
       @structures = Structure.order('position').all.page params[:page]
@@ -30,9 +30,6 @@ module Binda
     end
 
     def update
-      # Create new fields if any
-      add_new_field_groups
-
       # Update the other ones
       if @structure.update(structure_params)
         redirect_to structure_path( @structure.slug ), notice: "#{ @structure.name.capitalize } structure was successfully updated."
@@ -52,7 +49,7 @@ module Binda
 
     def sort
       params[:structure].each_with_index do |id, i|
-        Structure.find( id ).update({ position: i + 1 })
+        Structure.find( id ).update({ position: i })
       end
       render js: "$('##{params[:id]}').sortable('option', 'disabled', false); $('.popup-warning').addClass('popup-warning--hidden'); $('.sortable').removeClass('sortable--disabled')"
     end
@@ -61,6 +58,22 @@ module Binda
       @structures = Structure.order('position').all.page params[:page]
     end
 
+    def sort_field_groups
+      sort_field_group_by(params["form--list-item"])
+      render json: { id: "##{params[:id]}" }, status: 200
+    end
+
+    def add_field_group
+      # We set some default values in order to be able to save the field setting
+      # (if field setting isn't save it makes impossible to sort the order)
+      @field_group = FieldGroup.new(
+        name: "#{I18n.t('binda.field_group.new')}",
+        structure_id: @structure.id
+      )
+      @field_group.save!
+      render 'binda/structures/_form_new_field_group_item', layout: false
+    end
+
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_structure
@@ -69,24 +82,27 @@ module Binda
 
       # Only allow a trusted parameter "white list" through.
       def structure_params
-        params.require(:structure).permit(:name, :slug, :position, :has_categories, :has_preview, :instance_type, field_groups_attributes: [ :id, :name, :structure_id, :slug ] )
+        params.require(:structure).permit(
+          :name, :slug, :position, :has_categories, :has_preview, :instance_type, field_groups_attributes: [ 
+            :id, :name, :structure_id, :slug, :description, field_settings_attributes: [
+              :id, :name, :slug, :field_group_id
+            ]
+          ]
+        )
       end
 
       def new_params
         params.require(:structure).permit( new_field_groups:[ :name, :slug, :structure_id ] )
       end
 
-      def add_new_field_groups
-        new_params[:new_field_groups].each do |field_group|
-          next if field_group[:name].blank?
-          new_field_group = @structure.field_groups.create(name: field_group[:name], slug: field_group[:slug])
-          unless new_field_group
-            return redirect_to(
-              structure_path(@structure.slug), 
-              flash: { error: new_field_group.errors }
-            )
-          end
+      # Sort field settings following the order with which are listed in the array provided as a argument.
+      #
+      # @param field_settings [Array] the list of ids of the field settings
+      def sort_field_group_by(field_groups)
+        field_groups.each_with_index do |id, i|
+          FieldGroup.find( id ).update_column('position', i+1)
         end
       end
+
   end
 end

data/app/controllers/concerns/binda/fieldable_helpers.rb

@@ -14,7 +14,7 @@ module Binda
         radios_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],
         selections_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],
         checkboxes_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ],
-        relations_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, dependent_component_ids: [], parent_related_board_ids: []  ],
+        relations_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, dependent_component_ids: [], dependent_board_ids: []  ],
         repeaters_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :field_group_id,
           texts_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :content ], 
           strings_attributes:    [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :content ], 
@@ -22,7 +22,7 @@ module Binda
           videos_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :video, :video_cache ], 
           dates_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :date ], 
           galleries_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id ],
-          relations_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, dependent_component_ids: [],  parent_related_board_ids: []  ],
+          relations_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, dependent_component_ids: [],  dependent_board_ids: []  ],
           repeaters_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :field_group_id ],
           radios_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],
           selections_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],

data/app/helpers/binda/components_helper.rb

@@ -36,16 +36,28 @@ module Binda
 		# 
 		# @param field_setting [Binda::FieldSetting] The field setting object
 		def prepare_description_for_selections_form_hint(field_setting)
-			description = []
 			unless field_setting.description.blank? && field_setting.allow_null?
-				description << field_setting.description unless field_setting.description.blank?
-				description << I18n.t("binda.null_is_not_allowed") if !field_setting.allow_null? 
-				return description.join('. ')
+				prepare_description_for_selections_from_hint_with(field_setting)
 			else
 				return false 
 			end
 		end
 
+		#
+		# Prepare description for selections with field setting detail
+		#
+		# @param      field_setting  The field setting
+		#
+		# @return     [String] The description
+		#
+		def prepare_description_for_selections_from_hint_with(field_setting)
+			description = []
+			description << field_setting.description unless field_setting.description.blank?
+      description << I18n.t("binda.null_is_not_allowed") if !field_setting.allow_null? 
+      return description.join('. ')
+		end
+
+
 		# Get sort link by argument
 		#
 		# This method returns a URL which contains the current sort options

data/app/helpers/binda/field_groups_helper.rb

@@ -1,12 +1,13 @@
 module Binda
   module FieldGroupsHelper
 
-
+    # Returns the right path for "new" or "edit" action
   	def get_form_field_group_url
   		return structure_field_groups_path if action_name == 'new'
   		return structure_field_group_path  if action_name == 'edit'
   	end
 
+    # Get all components related to a "relation" field setting
   	def get_relationable_components(field_setting)
   		if @instance.class.to_s == 'Binda::Component'
 	  		Binda::Component.where(structure_id: Binda::Structure.where(id: field_setting.accepted_structure_ids)).where.not(id: @instance.id)
@@ -15,6 +16,7 @@ module Binda
 	  	end
   	end
 
+    # Get all boards related to a "relation" field setting
   	def get_relationable_boards(field_setting)
   		if @instance.class.to_s == 'Binda::Component'
 	  		Binda::Board.where(structure_id: Binda::Structure.where(id: field_setting.accepted_structure_ids))
@@ -23,6 +25,7 @@ module Binda
 	  	end
   	end
 
+    # Retrieve the number of records present in the database for the current structure
     def get_entries_number
       instance_type = @structure.instance_type
       if ['board', 'component'].include? instance_type

data/app/models/binda/asset.rb

@@ -3,9 +3,7 @@ module Binda
 	# all the classes that deal with files.
   class Asset < ApplicationRecord
 
-  	# Associations
-  	belongs_to :fieldable, polymorphic: true
-  	belongs_to :field_setting
+  	include Fields
 
   end
 end

data/app/models/binda/component.rb

@@ -15,7 +15,8 @@ module Binda
 
 		accepts_nested_attributes_for :categories, allow_destroy: true
 
-		after_create :set_position
+		after_create :set_default_position
+		after_create :create_field_instances
 
 		# Slug
 		extend FriendlyId
@@ -51,17 +52,23 @@ module Binda
 			1000
 		end
 
+    # Create field instances for the current component
+    def create_field_instances
+    	instance_field_settings = FieldSetting
+    		.includes(field_group: [ :structure ])
+    		.where(binda_structures: { id: self.structure.id })
+    	instance_field_settings.each do |field_setting|
+    		field_setting.create_field_instance_for(self)
+    	end
+    end
+
 		private 
 
-			# By default a newly created component gets the last position
-	    def set_position
-	    	# check whats the latest component
-	    	last_position = self.structure.components.order(:position).pluck(:position).last
-	    	# if latest component position isn't set get position by counting the amount of components
-	    	last_position = self.structure.components.length if last_position.nil?
-	    	# update component
-	      self.update_attributes(position: last_position + 1)
-	    end
+			def set_default_position
+				Component
+					.where(structure_id: self.structure_id)
+					.each{|component| component.increment(:position).save!}
+			end
 
 	end
 end

data/app/models/binda/date.rb

@@ -2,12 +2,8 @@ module Binda
 	# This class provides support for dates.
   class Date < ApplicationRecord
 
-  	# Associations
-  	belongs_to :fieldable, polymorphic: true
-  	belongs_to :field_setting
-
-		validates :fieldable_id, presence: true
-		validates :fieldable_type, presence: true
+    include Fields
+    include FieldUniqueness
 		
   end
 end

data/app/models/binda/field_group.rb

@@ -20,7 +20,7 @@ module Binda
 		extend FriendlyId
 		friendly_id :default_slug, use: [:slugged, :finders]
 
-		after_create :update_position
+		after_create :set_default_position
 
 		# Friendly id preference on slug generation
 		#
@@ -58,10 +58,12 @@ module Binda
 
 		private 
 
-			def update_position
-				if self.position.nil?
-					self.update_attribute('position', self.structure.field_groups.length)
-				end
+			# Set a default position if isn't set and updates all related field settings
+			# Update all field settings related to the one created
+			def set_default_position
+				FieldGroup
+					.where(structure_id: self.structure_id)
+					.each{|field_group| field_group.increment(:position).save!}
 			end
 
 	end

data/app/models/binda/field_setting.rb

@@ -84,9 +84,11 @@ module Binda
     	self.class.reset_field_settings_array
     	convert_allow_null__nil_to_false
     	create_field_instances
+    	set_default_position
     end
 
     after_update do
+			self.class.remove_orphan_fields
 			if %w(radio selection checkbox).include?(self.field_type) && self.choices.empty?
 				check_allow_null_option
 			end
@@ -108,10 +110,10 @@ module Binda
 		validates :field_type, inclusion: { 
 			in: [ *FieldSetting.get_field_classes.map{ |fc| fc.to_s.underscore } ], 
 			allow_nil: false,
-			message: -> (field_setting) { 
+			message: -> (field_setting, _) { 
 				I18n.t(
 					"binda.field_setting.validation_message.field_type", 
-					{ arg1: field_setting.name, arg2: "#{FieldSetting.get_field_classes.join(", ")}" }
+					{ arg1: field_setting.name, arg2: FieldSetting.get_field_classes.join(", ") }
 				)
 			}
 		}
@@ -144,6 +146,7 @@ module Binda
 		#
 		# It generates 4 possible slugs before falling back to FriendlyId default behaviour
 		def default_slug
+			return self.name if self.field_group_id.nil?
 			slug = ''
 			slug << self.field_group.structure.name
 			slug << '-'
@@ -249,25 +252,25 @@ module Binda
 		def create_field_instances
 			# Get the structure
 			structure = self.structures.includes(:board, components: [:repeaters]).first
-			field_class = "Binda::#{self.field_type.classify}"
 			structure.components.each do |component|
-				create_field_instances_for_instance(component, field_class, self.id)
+				create_field_instance_for(component)
 			end
-			create_field_instances_for_instance(structure.board, field_class, self.id) if structure.board.present?
+			create_field_instance_for(structure.board) if structure.board.present?
 		end
 
 		def create_field_instance_for(instance)
+			field_class = "Binda::#{self.field_type.classify}"
 			if self.is_root?
-				create_field_instances_for_instance(instance, field_class, self.id)
+				create_field_instance_for_instance(instance, field_class, self.id)
 			else
 				instance.repeaters.select{|r| r.field_setting_id == self.parent_id}.each do |repeater|
-					create_field_instances_for_instance(repeater, field_class, self.id)
+					create_field_instance_for_instance(repeater, field_class, self.id)
 				end
 			end
 		end
 
 		# Helper for create_field_instances method
-		def create_field_instances_for_instance(instance, field_class, field_setting_id)
+		def create_field_instance_for_instance(instance, field_class, field_setting_id)
 			field_class.constantize.find_or_create_by!(
 				field_setting_id: field_setting_id,
 				fieldable_id: instance.id,
@@ -304,5 +307,63 @@ module Binda
 			end
 		end
 
+		# Remove all orphan fields
+		# 
+		# Specifically:
+		# - all fields where their field setting doesn't exist anymore
+		# - all fields where their field setting has change type
+		# 
+		# Used by task `rails binda:remove_orphan_fields`
+		def self.remove_orphan_fields
+			FieldSetting.get_field_classes.each do |field_class|
+				FieldSetting.remove_orphan_fields_with_no_settings(field_class)
+				FieldSetting.remove_orphan_fields_with_wrong_field_type(field_class)
+			end
+		end
+
+		# Remove orphan fields that isn't associated to any field setting
+		def self.remove_orphan_fields_with_no_settings(field_class)
+			"Binda::#{field_class}"
+				.constantize
+				.includes(:field_setting)
+				.where(binda_field_settings: {id: nil})
+				.each do |s| 
+					s.destroy!
+					puts "Binda::#{field_class} with id ##{s.id} successfully destroyed"
+				end
+		end
+
+		# Remove orphan fields with wrong field type
+		def self.remove_orphan_fields_with_wrong_field_type(field_class)
+			field_types = []
+			case field_class
+			when 'Selection'
+				field_types = %w(selection checkbox radio)
+			when 'Text'
+				field_types = %w(string text)
+			else
+				field_types = [ field_class.underscore ]
+			end
+			"Binda::#{field_class}"
+				.constantize
+				.includes(:field_setting)
+				.where.not(binda_field_settings: {field_type: field_types})
+				.each do |s| 
+					s.destroy!
+					puts "Binda::#{field_class} with id ##{s.id} but wrong type successfully destroyed"
+				end
+		end
+
+		# Set a default position if isn't set and updates all related field settings
+		# Update all field settings related to the one created
+		def set_default_position
+			FieldSetting
+				.where(
+					field_group_id: self.field_group_id,
+					ancestry: self.ancestry
+				)
+				.each{|field_setting| field_setting.increment(:position).save!}
+		end
+
 	end
 end