binda 0.0.3 → 0.0.5

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

@@ -0,0 +1,16 @@
+module Binda
+	module ComponentControllerHelper
+		extend ActiveSupport::Concern
+
+	  def get_components( slug, ask_for_published = true, custom_order = '' )
+	  	if ask_for_published && custom_order.blank?
+		  	Binda::Structure.friendly.find( slug ).components.published.order('position')
+		  elsif custom_order.blank?
+		  	Binda::Structure.friendly.find( slug ).components.order('position')
+		  else
+		  	Binda::Structure.friendly.find( slug ).components.order( custom_order )
+		  end
+	  end
+
+	end
+end

data/app/models/binda/checkbox.rb

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

data/app/models/binda/choice.rb

@@ -0,0 +1,11 @@
+module Binda
+  class Choice < ApplicationRecord
+
+  	belongs_to :field_setting
+  	belongs_to :selectable, polymorphic: true, optional: true
+
+		validates :label, presence: true
+		validates :value, presence: true
+
+  end
+end

data/app/models/binda/component.rb

@@ -1,18 +1,23 @@
 module Binda
 	class Component < ApplicationRecord
 
+		include ComponentModelHelper
+
 		# 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 :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, allow_destroy: true
+		accepts_nested_attributes_for :structure, :categories, :texts, :dates, :assets, :galleries, :repeaters, :radios, :selects, :checkboxes, allow_destroy: true
 
 		cattr_accessor :field_settings_array
 
@@ -47,140 +52,11 @@ module Binda
 
 
 		# CUSTOM METHODS
-		# --------------
-		# https://github.com/norman/friendly_id/issues/436
+		# 
+		# @see https://github.com/norman/friendly_id/issues/436
 		def should_generate_new_friendly_id?
 			slug.blank?
 		end
-
-		def find_or_create_a_field_by field_setting_id, field_type
-			if Binda::FieldSetting.get_fieldables.include?( field_type.capitalize ) && field_setting_id.is_a?( Integer )
-				self.send( field_type.pluralize ).find_or_create_by( field_setting_id: field_setting_id )
-			else
-				raise ArgumentError, "A parameter of the method 'find_or_create_a_field_by' is not correct.", caller
-			end
-		end
-		
-		def get_text( field_slug )
-			# Get the object related to that field setting
-			self.texts.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }.content
-		end
-
-		def has_text( field_slug )
-			# Get the object related to that field setting
-			obj = self.texts.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-			if obj.present?
-				return !obj.content.blank?
-			else
-				return false
-			end
-		end
-
-		def has_image( field_slug )
-			# Check if the field has an attached image
-			obj = self.assets.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }.image
-			return obj.present?
-		end
-
-		def get_image_url( field_slug, size = '' )
-			get_image_info( field_slug, size, 'url' )
-		end
-
-		def get_image_path( field_slug, size = '' )
-			get_image_info( field_slug, size, 'path' )
-		end
-
-		def get_image_info( field_slug, size, info )
-			# Get the object related to that field setting
-			obj = self.assets.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-			if obj.image.present?
-				if obj.image.respond_to?(size) && %w[thumb medium large].include?(size)
-					obj.image.send(size).send(info)
-				else
-					obj.image.send(info)
-				end
-			end
-		end
-
-		def has_date( field_slug )
-			# Check if the field has an attached date
-			obj = self.dates.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-			if obj.present?
-				return !obj.date.nil?
-			else
-				return false
-			end
-		end
-
-		def get_date( field_slug )
-			# Get the object related to that field setting
-			self.dates.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }.date
-		end
-
-    def has_repeater( field_slug )
-      obj = self.repeaters.find_all{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-      return obj.present?
-    end
-
-    def get_repeater( field_slug )
-      self.repeaters.find_all{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }.sort_by(&:position)
-    end
-
-
-			# benchmark do
-			# 	id = Binda::FieldSetting.field_settings_array.find { |fs| fs.slug == 'home-slides-project-image' }.id
-			# 	obj = slide.assets.find{ |t| t.field_setting_id == id }
-			# 	if obj.image.present?
-			# 		if obj.image.respond_to?('') && %w[thumb medium large].include?('')
-			# 		  obj.image.send('').send('path')
-			# 		else
-			# 			obj.image.send('path')
-			# 		end
-			# 	end
-			# end
-
-			# BENCHMARK GET_IMAGE METHODS
-			# ---------------------------
-			# def get_image_benchmark( field_slug, size, info )
-				# # Best is to run this group of test alone (i.e. without TestA and TestB) 
-				# 
-				# obj = self.assets.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-				#
-				# self.class.benchmark("Check if image is present") do
-				# 	obj.image.present?
-				# end
-				# self.class.benchmark("Check if file exists") do
-				# 	obj.image.file.exists?
-				# end
-				# self.class.benchmark("Check if image respond to size") do
-				# 	obj.image.respond_to?(size)
-				# end
-				# self.class.benchmark("Check if size is in array") do
-				# 	%w[thumb medium large].include?(size)
-				# end
-				# if %w[thumb medium large].include?(size)
-				# 	self.class.benchmark("get resized image") do
-				# 	  obj.image.send(size).send(info)
-				# 	end
-				# else
-				# 	self.class.benchmark("get default image") do
-				# 		obj.image.send(info)
-				# 	end
-				# end
-
-				# # Run TestA and TestB separately not one after the other
-				# # as the first time carrierwave runs is slower than the second time
-				# self.class.benchmark("TestA: Get image info (url)") do
-				# 	get_image_info( field_slug, size, 'url' )
-				# end
-				# self.class.benchmark("TestB: Get image info (path)") do
-				# 	get_image_info( field_slug, size, 'path' )
-				# end
-
-				# self.class.benchmark("Get field setting id") do
-				# 	self.assets.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-				# end
-			# end
  
 	end
 end

data/app/models/binda/field_group.rb

@@ -12,7 +12,7 @@ module Binda
 		validates :name, presence: true
 		validates :slug, uniqueness: true
 		accepts_nested_attributes_for :field_settings, allow_destroy: true, reject_if: :is_rejected
-		
+
 		# Slug
 		extend FriendlyId
 		friendly_id :default_slug, use: [:slugged, :finders]

data/app/models/binda/field_setting.rb

@@ -3,11 +3,10 @@ module Binda
 
 		# Associations
 		belongs_to :field_group
-		# has_many   :field_children, class_name: ::Binda::FieldSetting, dependent: :delete_all
 		has_ancestry orphan_strategy: :destroy
 
 		# Fields Associations
-		# -------------------
+		# 
 		# If you add a new field remember to update:
 		#   - get_fieldables (see here below)
 		#   - get_field_types (see here below)
@@ -17,6 +16,10 @@ module Binda
 		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 :checkbox,      as: :fieldable
+
 
 		# The following direct association is used to securely delete associated fields
 		# Infact via `fieldable` the associated fields might not be deleted 
@@ -25,18 +28,38 @@ module Binda
 		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 :checkbox,      dependent: :delete_all
+
+		has_many :choices,       dependent: :delete_all
+		has_one  :default_choice, class_name: 'Binda::Choice', dependent: :delete
 
-		# accepts_nested_attributes_for :children, allow_destroy: true, reject_if: :is_rejected
+		accepts_nested_attributes_for :choices, allow_destroy: true, reject_if: :is_rejected
+
+		def is_rejected( attributes )
+			attributes['label'].blank? || attributes['content'].blank?
+		end
 
 		cattr_accessor :field_settings_array
 
+    after_create do 
+    	self.class.reset_field_settings_array 
+    end
+
+    after_destroy do 
+    	self.class.reset_field_settings_array 
+    end
+
 		def self.get_fieldables
-			%w( Text Date Gallery Asset Repeater )
+			# 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
-			%w( string text asset gallery repeater date )
+			# TODO add 'gallery' to this list
+			%w( string text asset repeater date radio select checkbox )
 		end
 
 		# Validations
@@ -48,10 +71,10 @@ module Binda
 		extend FriendlyId
 		friendly_id :default_slug, use: [:slugged, :finders]
 
-
 		# CUSTOM METHODS
-		# --------------
-		# https://github.com/norman/friendly_id/issues/436
+		# 
+		# @see https://github.com/norman/friendly_id/issues/436
+
 		def should_generate_new_friendly_id?
 			slug.blank?
 		end
@@ -77,6 +100,11 @@ module Binda
 			return possible_names
 		end
 
+		# 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
+		# 
+		# @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)
@@ -84,6 +112,10 @@ module Binda
 			@@field_settings_array.find { |fs| fs.slug == field_slug }.id
 		end
 
+		# Reset the field_settings_array. It's called every time 
+		#   the user creates or destroyes a Binda::FieldSetting
+		# 
+		# @return [null]
 		def self.reset_field_settings_array
 			# Reset the result of the query taken with the above method,
 			# this is needed when a user creates a new field_setting but 

data/app/models/binda/radio.rb

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

data/app/models/binda/repeater.rb

@@ -1,13 +1,14 @@
 module Binda
   class Repeater < ApplicationRecord
 
+    include ComponentModelHelper
+
   	# Associations
   	belongs_to :fieldable, polymorphic: true
     belongs_to :field_setting
-  	# has_many :field_settings, dependent: :delete_all
 
     # Fields Associations 
-    # -------------------
+    # 
     # If you add a new field remember to update:
     #   - get_fieldables (see here below)
     #   - get_field_types (see here below)
@@ -16,92 +17,23 @@ module Binda
     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 :texts, :dates, :assets, :galleries, :repeaters, allow_destroy: true
+    accepts_nested_attributes_for :texts, :dates, :assets, :galleries, :repeaters, :radios, :selects, :checkboxes, allow_destroy: true
 
     # 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`
 
-    # # Validations
-    # validates :name, presence: true
-
-    # # Slug
-    # extend FriendlyId
-    # friendly_id :default_slug, use: [:slugged, :finders]
-
-    def find_or_create_a_field_by field_setting_id, field_type
-      if Binda::FieldSetting.get_fieldables.include?( field_type.capitalize ) && field_setting_id.is_a?( Integer )
-        self.send( field_type.pluralize ).find_or_create_by( field_setting_id: field_setting_id )
-      else
-        raise ArgumentError, "A parameter of the method 'find_or_create_a_field_by' is not correct.", caller
-      end
-    end
-
-    def get_text( field_slug )
-      # Get the object related to that field setting
-      self.texts.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }.content
-    end
-
-    def has_text( field_slug )
-      # Get the object related to that field setting
-      obj = self.texts.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-      if obj.present?
-        !obj.content.blank?
-      else
-        return false
-      end
-    end
-
-    def has_image( field_slug )
-      # Check if the field has an attached image
-      self.assets.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }.image.present?
-    end
-
-    def get_image_url( field_slug, size = '' )
-      get_image_info( field_slug, size, 'url' )
-    end
-
-    def get_image_path( field_slug, size = '' )
-      get_image_info( field_slug, size, 'path' )
-    end
-
-    def get_image_info( field_slug, size, info )
-      # Get the object related to that field setting
-      obj = self.assets.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-      if obj.image.present?
-        if obj.image.respond_to?(size) && %w[thumb medium large].include?(size)
-          obj.image.send(size).send(info)
-        else
-          obj.image.send(info)
-        end
-      end
-    end
-
-    def has_date( field_slug )
-      # Check if the field has an attached date
-      obj = self.dates.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-      if obj.present?
-        !obj.date.nil?
-      else
-        return false
-      end
-    end
-
-    def get_date( field_slug )
-      # Get the object related to that field setting
-      self.dates.find{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }.date
-    end
-
-    def has_repeater( field_slug )
-      obj = self.repeaters.find_all{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }
-      return obj.present?
-    end
+    after_create :set_default_position
 
-    def get_repeater( field_slug )
-      self.repeaters.find_all{ |t| t.field_setting_id == Binda::FieldSetting.get_id( field_slug ) }.sort_by(&:position)
+    def set_default_position
+        position = self.fieldable.repeaters.find_all{ |r| r.field_setting_id == self.field_setting.id }.length
+        self.update_attribute 'position', position
     end
 
   end

data/app/models/binda/select.rb

@@ -0,0 +1,7 @@
+module Binda
+	class Select < ApplicationRecord
+
+		has_many :choices, as: :selectable
+
+	end
+end