binda 0.0.6 → 0.0.7

data/app/helpers/binda/boards_helper.rb

@@ -0,0 +1,13 @@
+module Binda
+  module BoardsHelper
+
+  	def get_website_name
+  		Board.friendly.find('dashboard').get_string('website-name')
+  	end
+
+  	def get_website_description
+  		Board.friendly.find('dashboard').get_text('website-description')
+  	end
+
+  end
+end

data/app/helpers/binda/components_helper.rb

@@ -1,10 +1,5 @@
 module Binda
   module ComponentsHelper
 
-  	def get_form_component_url
-  		return structure_components_path if action_name == 'new'
-  		return structure_component_path  if action_name == 'edit'
-  	end
-
   end
 end

data/app/helpers/binda/field_settings_helper.rb

@@ -7,7 +7,7 @@ module Binda
   	end
 
   	def get_field_types
-  		FieldSetting.new.get_field_types
+  		FieldSetting.get_field_classes.map{ |fc| fc.to_s.underscore }
   	end
 
   end

data/app/models/binda/asset.rb

@@ -9,13 +9,5 @@ module Binda
 
     mount_uploader :image, ImageUploader
 
-		# Validations
-
-  	# Slug
-
-
-		# CUSTOM METHODS
-		# --------------
-
   end
 end

data/app/models/binda/binda.rb

@@ -0,0 +1,7 @@
+module Binda
+  module Binda
+    def self.table_name_prefix
+      'binda_binda_'
+    end
+  end
+end

data/app/models/binda/binding.rb

@@ -12,10 +12,10 @@ module Binda
 		extend FriendlyId
 		friendly_id :name, use: [:slugged, :finders]
 
-
-		# CUSTOM METHODS
-		# --------------
-	  # https://github.com/norman/friendly_id/issues/436
+		# Friendly id preference on slug generation
+		#
+		# Method inherited from friendly id 
+		# @see https://github.com/norman/friendly_id/issues/436
 	  def should_generate_new_friendly_id?
 	    slug.blank?
 	  end

data/app/models/binda/board.rb

@@ -0,0 +1,41 @@
+module Binda
+  class Board < ApplicationRecord
+
+  	include FieldableAssociations
+
+  	belongs_to :structure, required: true
+
+		validates :name, presence: true
+		validates :slug, uniqueness: true
+
+		# Slug
+		extend FriendlyId
+		friendly_id :name, use: [:slugged, :finders]
+
+		# Friendly id preference on slug generation
+		#
+		# Method inherited from friendly id 
+		# @see https://github.com/norman/friendly_id/issues/436
+		def should_generate_new_friendly_id?
+			slug.blank?
+		end
+
+	  # def self.website_name
+	  # 	self.all.find { |s| s.slug == 'website-name' }
+	  # end
+
+	  # def self.website_description
+	  # 	self.all.find { |s| s.slug == 'website-description' }
+	  # end
+
+	  # def self.maintenance_mode
+	  # 	self.all.find { |s| s.slug == 'maintenance-mode' }
+	  # end
+
+	  # def self.is_maintenance_mode
+	  # 	# maybe this should have question mark at the end...
+	  # 	self.maintenance_mode.is_true
+	  # end
+
+  end
+end

data/app/models/binda/category.rb

@@ -13,13 +13,17 @@ module Binda
 		friendly_id :default_slug, use: [:slugged, :finders]
 
 
-		# CUSTOM METHODS
-		# --------------
-	  # https://github.com/norman/friendly_id/issues/436
+		# Friendly id preference on slug generation
+		#
+		# Method inherited from friendly id 
+		# @see https://github.com/norman/friendly_id/issues/436
 	  def should_generate_new_friendly_id?
 	    slug.blank? || name_changed?
 	  end
 
+		# Set slug name
+		#
+		# It generates 4 possible slugs before falling back to FriendlyId default behaviour
 	  def default_slug
 	  	[ "#{ self.structure.name }-#{ self.name }",
 	  		"#{ self.structure.name }-#{ self.name }-1",

data/app/models/binda/checkbox.rb

@@ -1,7 +1,5 @@
 module Binda
-	class Checkbox < Select
-
-		has_many :choices, as: :selectable
+	class Checkbox < Selection
 
 	end
 end

data/app/models/binda/choice.rb

@@ -2,10 +2,40 @@ module Binda
   class Choice < ApplicationRecord
 
   	belongs_to :field_setting
-  	belongs_to :selectable, polymorphic: true, optional: true
+  	has_and_belongs_to_many :selections
 
 		validates :label, presence: true
 		validates :value, presence: true
+		validates :field_setting_id, presence: true
+
+		after_create :set_default_choice
+		after_destroy :reset_default_choice
+
+		# In order to make sure that a default choice is set, this method is executed after
+		#   the first choice is associated to the field setting. What does it do? 
+		#   If there isn't a default it sets the current choice as the default one.
+		#   The method is executed as well if new choices are added.
+		def set_default_choice
+			unless self.field_setting.default_choice.present?
+				self.field_setting.default_choice_id = self.id
+				unless self.field_setting.save
+					raise ArgumentError "It hasn't been possible to set the default choice for the current setting."
+				end
+			end
+		end
+
+		# In order to make sure that a default choice is set, this method is executed after the 
+		#   default choice is removed. What does it do? If the removed choice is the default one it sets
+		#   another defautl picking the first of the choices associated by id.
+		#   The method is executed as well on every time a choice is removed.
+		def reset_default_choice
+			if self.field_setting.default_choice_id == self.id && self.field_setting.choices.any?
+				self.field_setting.default_choice_id = self.field_setting.choices.first.id
+				unless self.field_setting.save
+					raise ArgumentError "It hasn't been possible to set the default choice for the current setting."
+				end
+			end
+		end
 
   end
 end

data/app/models/binda/component.rb

@@ -1,34 +1,19 @@
 module Binda
 	class Component < ApplicationRecord
 
-		include ComponentModelHelper
+		include FieldableAssociations
 
 		# Associations
 		belongs_to :structure, required: true
 		has_and_belongs_to_many :categories
-		has_many :texts,      as: :fieldable, dependent: :delete_all
-		has_many :dates,      as: :fieldable, dependent: :delete_all
-		has_many :galleries,  as: :fieldable, dependent: :delete_all
-		has_many :assets,     as: :fieldable, dependent: :delete_all 
-		has_many :radios,     as: :fieldable, dependent: :delete_all 
-		has_many :selects,    as: :fieldable, dependent: :delete_all 
-		has_many :checkboxes, as: :fieldable, dependent: :delete_all 
-		# Repeaters need destroy_all, not delete_all
-		has_many :repeaters, as: :fieldable, dependent: :destroy
-
-
-		accepts_nested_attributes_for :structure, :categories, :texts, :dates, :assets, :galleries, :repeaters, :radios, :selects, :checkboxes, allow_destroy: true
-
-		cattr_accessor :field_settings_array
-
-		# has_many :bindings
-		# has_many :assets, class_name: 'Admin::Asset', through: :bindings
 
 		# Validations
 		validates :name, presence: true
 		validates :slug, uniqueness: true
 		validates :publish_state, presence: true, inclusion: { in: %w( draft published )}
 
+		accepts_nested_attributes_for :categories, allow_destroy: true
+
 		# Slug
 		extend FriendlyId
 		friendly_id :name, use: [:slugged, :finders]
@@ -50,13 +35,13 @@ module Binda
 
 			end
 
-
-		# CUSTOM METHODS
-		# 
+		# Friendly id preference on slug generation
+		#
+		# Method inherited from friendly id 
 		# @see https://github.com/norman/friendly_id/issues/436
 		def should_generate_new_friendly_id?
 			slug.blank?
 		end
- 
+
 	end
 end

data/app/models/binda/field_group.rb

@@ -19,13 +19,17 @@ module Binda
 
 		after_create :update_position
 
-		# CUSTOM METHODS
-		# --------------
-		# https://github.com/norman/friendly_id/issues/436
-		def should_generate_new_friendly_id?
-			slug.blank?
-		end
-
+		# Friendly id preference on slug generation
+		#
+		# Method inherited from friendly id 
+		# @see https://github.com/norman/friendly_id/issues/436
+	  def should_generate_new_friendly_id?
+	    slug.blank? || name_changed?
+	  end
+
+		# Set slug name
+		#
+		# It generates 4 possible slugs before falling back to FriendlyId default behaviour
 		def default_slug
 			[ "#{ self.structure.name }-#{ self.name }",
 				"#{ self.structure.name }-#{ self.name }-1",
@@ -33,6 +37,8 @@ module Binda
 				"#{ self.structure.name }-#{ self.name }-3" ]
 		end
 
+		#
+		# Sets the validation rules to accept and save an attribute
 		def is_rejected( attributes )
 			attributes['name'].blank? && attributes['field_type'].blank?
 		end

data/app/models/binda/field_setting.rb

@@ -8,41 +8,47 @@ module Binda
 		# Fields Associations
 		# 
 		# If you add a new field remember to update:
-		#   - get_fieldables (see here below)
-		#   - get_field_types (see here below)
+		#   - get_field_classes (see here below)
 		#   - component_params (app/controllers/binda/components_controller.rb)
 		has_many :texts,         as: :fieldable
+		has_many :strings,       as: :fieldable
 		has_many :dates,         as: :fieldable
 		has_many :galleries,     as: :fieldable
 		has_many :assets,        as: :fieldable
 		has_many :repeater,      as: :fieldable
 		has_many :radio,         as: :fieldable
-		has_many :select,        as: :fieldable
+		has_many :selection,     as: :fieldable
 		has_many :checkbox,      as: :fieldable
 
 
 		# The following direct association is used to securely delete associated fields
 		# Infact via `fieldable` the associated fields might not be deleted 
-		# as the fieldable_id is related to the `component` rather than the `field_setting`
+		# as the fieldable_id is related to the `component`, `board` or `repeater` rather than `field_setting`
 		has_many :texts,         dependent: :delete_all
+		has_many :strings,       dependent: :delete_all
 		has_many :dates,         dependent: :delete_all
 		has_many :galleries,     dependent: :delete_all
 		has_many :repeater,      dependent: :delete_all
 		has_many :radio,         dependent: :delete_all
-		has_many :select,        dependent: :delete_all
+		has_many :selection,     dependent: :delete_all
 		has_many :checkbox,      dependent: :delete_all
 
 		has_many :choices,       dependent: :delete_all
-		has_one  :default_choice, class_name: 'Binda::Choice', dependent: :delete
+		has_one  :default_choice, -> (field_setting) { where(id: field_setting.default_choice_id) }, class_name: 'Binda::Choice'
 
 		accepts_nested_attributes_for :choices, allow_destroy: true, reject_if: :is_rejected
 
+
+		#
+		# Sets the validation rules to accept and save an attribute
 		def is_rejected( attributes )
 			attributes['label'].blank? || attributes['content'].blank?
 		end
 
 		cattr_accessor :field_settings_array
 
+		after_create :set_allow_null
+
     after_create do 
     	self.class.reset_field_settings_array 
     end
@@ -51,45 +57,42 @@ module Binda
     	self.class.reset_field_settings_array 
     end
 
-		def self.get_fieldables
-			# TODO add 'Gallery' to this list
-			%w( Text Date Asset Repeater Radio Select Checkbox )
-		end
-
-		# Field types are't fieldable! watch out! They might use the same model (eg `string` and `text`)
-		def get_field_types
-			# TODO add 'gallery' to this list
-			%w( string text asset repeater date radio select checkbox )
+		def self.get_field_classes
+			%w( String Text Date Asset Repeater Radio Selection Checkbox )
 		end
 
 		# Validations
 		validates :name, presence: true
-		# validates :field_type, presence: true, inclusion: { in: :get_field_types }
+		validates :field_type, presence: true
+		validates :field_type, inclusion: { in: [ *FieldSetting.get_field_classes.map{ |fc| fc.to_s.underscore }, '' ], message: "Field type must be one of the following #{ FieldSetting.get_field_classes.join(", ") }" }
 		validates :field_group_id, presence: true
 
 		# Slug
 		extend FriendlyId
 		friendly_id :default_slug, use: [:slugged, :finders]
 
-		# CUSTOM METHODS
-		# 
-		# @see https://github.com/norman/friendly_id/issues/436
 
-		def should_generate_new_friendly_id?
-			slug.blank?
-		end
+		# Friendly id preference on slug generation
+		#
+		# Method inherited from friendly id 
+		# @see https://github.com/norman/friendly_id/issues/436
+	  def should_generate_new_friendly_id?
+	    slug.blank?
+	  end
 
+		# Set slug name
+		#
+		# It generates 4 possible slugs before falling back to FriendlyId default behaviour
 		def default_slug
-			slug = self.field_group.structure.name
-			
+			slug = ''
+			slug << self.field_group.structure.name
 			slug << '-'
 			slug << self.field_group.name
-
 			unless self.parent.nil?
 				slug << '-' 
 				slug << self.parent.name 
 			end
-
+			
 			possible_names = [ 
 				"#{ slug }--#{ self.name }",
 				"#{ slug }--#{ self.name }-1",
@@ -102,14 +105,16 @@ module Binda
 
 		# Retrieve the ID if a slug is provided and update the field_settings_array 
 		#   in order to avoid calling the database (or the cached response) every time.
-		#   This way Rails logs are much cleaner
+		#   This should speed up requests and make Rails logs are cleaner.
 		# 
 		# @return [integer] The ID of the field setting
 		def self.get_id( field_slug )
 			# Get field setting id from slug, without multiple calls to database 
 			# (the query runs once and caches the result, then any further call uses the cached result)
-			@@field_settings_array = self.all if @@field_settings_array.nil?
-			@@field_settings_array.find { |fs| fs.slug == field_slug }.id
+			@@field_settings_array = self.pluck(:slug, :id) if @@field_settings_array.nil?
+			id = @@field_settings_array.select{ |fs| fs[0] == field_slug }[0][1]
+			raise ArgumentError, "There isn't any field setting with the current slug.", caller if id.nil?
+			return id
 		end
 
 		# Reset the field_settings_array. It's called every time 
@@ -123,5 +128,11 @@ module Binda
 			@@field_settings_array = nil
 		end
 
+		# Make sure that allow_null is set to false instead of nil.
+		#   This isn't done with a database constraint in order to gain flexibility
+		def set_allow_null
+			self.allow_null = false if self.allow_null.nil?
+		end
+
 	end
 end

data/app/models/binda/gallery.rb

@@ -6,13 +6,6 @@ module Binda
   	has_many :assets, through: :bindings
   	belongs_to :fieldable, polymorphic: true
   	belongs_to :field_setting
-  	
-		# Validations
-
-  	# Slug
-
-		# CUSTOM METHODS
-		# --------------
 
   end
 end

data/app/models/binda/radio.rb

@@ -1,5 +1,5 @@
 module Binda
-	class Radio < Select
+	class Radio < Selection
 
 	end
 end