binda 0.1.5 → 0.1.6

data/app/models/binda/gallery.rb

@@ -1,9 +1,8 @@
 module Binda
   class Gallery < ApplicationRecord
 
-  	# Associations
-  	belongs_to :fieldable, polymorphic: true
-  	belongs_to :field_setting
+    include Fields
+    include FieldUniqueness
 
   end
 end

data/app/models/binda/image.rb

@@ -4,9 +4,12 @@ module Binda
 
     mount_uploader :image, ImageUploader
 
+    # Register image details
+    # 
+    # Do not delete. This method is used by a rake task
     def register_deatils
       if !self.image.present?
-        puts "Ops, there is no image for Binda::Image id=#{self.id}"
+        warn "Ops, there is no image for Binda::Image id=#{self.id}"
       elsif CarrierWave::Uploader::Base.storage == CarrierWave::Storage::File
         file = MiniMagick::Image.open(::Rails.root.join(self.image.path))
         register_details_of(file)
@@ -16,6 +19,9 @@ module Binda
       end
     end
 
+    # Register image details
+    # 
+    # This method is used by register_deatils in a rake task
     def register_details_of(file)
       self.file_width = file.width
       self.file_height = file.height

data/app/models/binda/relation.rb

@@ -18,11 +18,8 @@ module Binda
   #   relation.dependent_components << dependent
   class Relation < ApplicationRecord
 
-    belongs_to :fieldable, polymorphic: true
-    belongs_to :field_setting
-
-    validates :fieldable_id, presence: true
-    validates :fieldable_type, presence: true
+    include Fields
+    include FieldUniqueness
 
     # Relations are the connection between a Owner to its Dependents
     # The Active Relation connects a Relation to a Dependent (which is can be a Component or a Board)

data/app/models/binda/repeater.rb

@@ -2,13 +2,7 @@ module Binda
   class Repeater < ApplicationRecord
 
     include FieldableAssociations
-
-  	# Associations
-  	belongs_to :fieldable, polymorphic: true
-    belongs_to :field_setting
-
-    validates :fieldable_id, presence: true
-    validates :fieldable_type, presence: true
+    include Fields
 
     # The following direct association is used to securely delete associated fields
     # Infact via `fieldable` the associated fields might not be deleted 
@@ -20,17 +14,19 @@ module Binda
     # 
     # This methods ensure that every repeater instance has an explicit position.
     #   The latest repeater created gets the highest position number.
-    #   The first position is 1 (not 0).
     # 
     # @return [object] Repeater instance
     def set_default_position
-        # apparently `self.fieldable != self.fieldable_type.constantize.find( self.fieldable_id )`
-        # as the former has always one repeater, the latter has all repeaters created so far
-        # that's way we use the longer version
-        instance = self.fieldable_type.constantize.find( self.fieldable_id )
-        position = instance.repeaters.find_all{ |r| r.field_setting_id == self.field_setting.id }.length
-        self.update_attribute 'position', position
+        Repeater
+            .where(
+                field_setting_id: self.field_setting_id,
+                fieldable_id: self.fieldable_id,
+                fieldable_type: self.fieldable_type
+            )
+            .each{|repeater| repeater.increment(:position).save!}
     end
 
+
+
   end
 end

data/app/models/binda/selection.rb

@@ -132,11 +132,11 @@ module Binda
 	# 
 	class Selection < ApplicationRecord
 
-		has_and_belongs_to_many :choices
-		belongs_to :field_setting
+  	include Fields
+  	include FieldUniqueness
 
+		has_and_belongs_to_many :choices
 		validate :has_choices
-		validates :fieldable_id, presence: true
 
 		after_save do
 			if !self.field_setting.allow_null && 

data/app/models/binda/structure.rb

@@ -23,6 +23,7 @@ module Binda
 		extend FriendlyId
 		friendly_id :default_slug, use: [:slugged, :finders]
 
+		before_save :board_contraints
 		after_create :add_default_field_group
 		after_save :add_instance_details
 		after_create :set_default_position
@@ -72,17 +73,21 @@ module Binda
 		#   It also disable categories (this could be a different method, or method could be more explicit)
 		def add_instance_details
 			if self.instance_type == 'board'
-				self.update_attribute('has_categories', false)
-					add_default_board
+				add_default_board
 			end
 		end
 
+		def board_contraints
+			self.has_categories = false if self.instance_type == 'board'
+		end
+
 		# Add default board to a structure if needed
 		def add_default_board
 			if Board.where(structure_id: self.id).empty?
 				board = self.build_board( name: self.name )
 				unless board.save
-					return redirect_to structure_path(self.slug), flash: { error: I18n.t('binda.default_field_group.error_on_create') }
+					errors.add(:base, I18n.t('binda.default_field_group.error_on_create'))
+					# return redirect_to structure_path(self.slug), flash: { error: I18n.t('binda.default_field_group.error_on_create') }
 				end
 			end
 		end
@@ -94,8 +99,7 @@ module Binda
 		# 
 		# @return [object] Repeater instance
 		def set_default_position
-			position = Structure.all.length
-			self.update_attribute('position', position)
+      Structure.all.each{|structure| structure.increment(:position).save!}
 		end
 
 	end

data/app/models/binda/text.rb

@@ -7,12 +7,8 @@ module Binda
 	#   a simple string of text as well.
   class Text < 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/user.rb

@@ -4,5 +4,15 @@ module Binda
     # :confirmable, :lockable, :timeoutable and :omniauthable
     devise :database_authenticatable, :registerable,
            :recoverable, :rememberable, :trackable, :validatable
+
+	  def self.create_super_admin_user
+			STDOUT.puts "What is your email? [mail@domain.com]"
+		  username = STDIN.gets.strip
+		  username = 'mail@domain.com' if username.blank?
+			STDOUT.puts "What is your password? [password]"
+		  password = STDIN.gets.strip
+		  password = 'password' if password.blank?
+		  User.create!( email: username, password: password, password_confirmation: password, is_superadmin: true )
+	  end
   end
 end

data/app/models/concerns/binda/field_uniqueness.rb

@@ -0,0 +1,31 @@
+module Binda
+	# Some fields are meant to be unique, meaning there must be only one instance 
+	# 	associated with a specific component and field setting
+	module FieldUniqueness	
+		
+		extend ActiveSupport::Concern
+
+		included do
+			validate  :field_uniqueness
+		end
+		# Make sure there is only one instance associated simultaneously with a specific component and field setting
+		# @return [boolean]
+		def field_uniqueness
+			instances = Text.where(
+				field_setting_id: self.field_setting.id,
+				fieldable_id: self.fieldable_id,
+				fieldable_type: self.fieldable_type
+			)
+			if instances.any? && instances.first.id != self.id
+				errors.add(:base, I18n.t("binda.duplicate_validation", { 
+					arg1: self.field_setting.field_type, 
+					arg2: self.fieldable_id,
+					arg3: self.field_setting.slug 
+				}))
+				return false
+			else
+				return true
+			end
+		end
+	end
+end

data/app/models/concerns/binda/fieldable_association_helpers.rb

@@ -10,9 +10,15 @@ module Binda
 		# @return [string] Returns the content of the text 
 		# @return [error]  Raise an error if no record is found
 		def get_text(field_slug)
-			obj = self.texts.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type != 'Binda::String' }	
+			obj = Text
+				.includes(:field_setting)
+				.where(fieldable_id: self.id, fieldable_type: self.class.name)
+				.where(binda_field_settings: { slug: field_slug })
+				.where.not(binda_field_settings: { field_type: "string" })
+				.first
 			unless obj.nil?
-				obj.content
+				# to_s ensures the returned object is class String
+				obj.content.to_s
 			else
 				check_text_error field_slug
 			end
@@ -21,7 +27,7 @@ module Binda
 		# Check why get_text doesn't return a value
 		# This method isn't supposed to be used by anything other than get_text method
 		def check_text_error(field_slug)
-			you_mean_string = !self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type = 'Binda::String' }.nil?
+			you_mean_string = !self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type == 'Binda::String' }.nil?
 			if you_mean_string
 				raise ArgumentError, "This slug (#{field_slug}) is associated to a string not a text. Use get_string() instead on instance (#{self.class.name} ##{self.id}).", caller
 			else
@@ -34,7 +40,12 @@ module Binda
 		# @param field_slug [string] The slug of the field setting
 		# @return [boolean]
 		def has_text(field_slug)
-			obj = self.texts.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type != 'Binda::String' }
+			obj = Text
+				.includes(:field_setting)
+				.where(fieldable_id: self.id, fieldable_type: self.class.name)
+				.where(binda_field_settings: { slug: field_slug })
+				.where.not(binda_field_settings: { field_type: "string" })
+				.first
 			raise ArgumentError, "There isn't any text associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller if obj.nil?
 			if obj.present?
 				return !obj.content.nil?
@@ -50,9 +61,14 @@ module Binda
 		# @return [string] Returns the content of the string 
 		# @return [error]  Raise an error if no record is found
 		def get_string(field_slug)
-			obj = self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type == 'Binda::String' }
+			obj = Text
+				.includes(:field_setting)
+				.where(fieldable_id: self.id, fieldable_type: self.class.name)
+				.where(binda_field_settings: { slug: field_slug, field_type: "string" })
+				.first
 			unless obj.nil?
-				obj.content
+				# to_s ensures the returned object is class String
+				obj.content.to_s
 			else
 				check_string_error field_slug
 			end
@@ -61,7 +77,7 @@ module Binda
 		# Check why get_string doesn't return a value
 		# This method isn't supposed to be used by anything other than get_string method
 		def check_string_error(field_slug)
-			you_mean_text = !self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type = 'Binda::Text' }.nil?
+			you_mean_text = !self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type == 'Binda::Text' }.nil?
 			if you_mean_text
 				raise ArgumentError, "This slug (#{field_slug}) is associated to a text not a string. Use get_text() instead on instance (#{self.class.name} ##{self.id}).", caller
 			else
@@ -74,7 +90,11 @@ module Binda
 		# @param field_slug [string] The slug of the field setting
 		# @return [boolean]
 		def has_string(field_slug)
-			obj = self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type == 'Binda::String' }
+			obj = Text
+				.includes(:field_setting)
+				.where(fieldable_id: self.id, fieldable_type: self.class.name)
+				.where(binda_field_settings: { slug: field_slug, field_type: "string" })
+				.first
 			raise ArgumentError, "There isn't any string associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller if obj.nil?
 			if obj.present?
 				return !obj.content.nil?
@@ -130,7 +150,7 @@ module Binda
 			# Alternative query
 			# obj = Image.where(field_setting_id: FieldSetting.get_id( field_slug ), fieldable_id: self.id, fieldable_type: self.class.to_s ).first
 			raise ArgumentError, "There isn't any image associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller if obj.nil?
-			if obj.image.present? && obj.image.respond_to?(size) && %w[thumb medium large].include?(size)
+			if obj.image.present? && obj.image.respond_to?(size) && %w[thumb].include?(size)
 					obj.image.send(size).send(info)
 			elsif obj.image.present?
 				obj.image.send(info)
@@ -142,7 +162,7 @@ module Binda
 		# Get image size
 		# 
 		# @param field_slug [string] The slug of the field setting
-		# @return [string] with image type
+		# @return [float] with image type
 		def get_image_size(field_slug)
 			obj = self.images.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) }
      	return bytes_to_megabytes(obj.file_size)
@@ -165,7 +185,7 @@ module Binda
 		# Get image dimension
 		# 
 		# @param field_slug [string] The slug of the field setting
-		# @return [hash] with width and height
+		# @return [hash] with width and height as floats
 		def get_image_dimension(field_slug)
 			obj = self.images.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) }
      	return { width: obj.file_width, height: obj.file_height }

data/app/models/concerns/binda/fieldable_associations.rb

@@ -1,9 +1,8 @@
 module Binda
 	# Fieldable associations are Binda's core feature. 
 	# 
-	# They provide model classes like `Binda::Component` and `Binda::Board` with a collection of fields 
-	#   (texts, assets, dates and so on) to store data in a simple yet powerful way. It's possible to 
-	#   make use of a set of helpers to retrieve fields data belonging to each model instance. 
+	# They provide classes like `Binda::Component` and `Binda::Board` with a collection of fields 
+	#   (texts, assets, dates and so on) to store data in a simple yet powerful way. 
 	module FieldableAssociations
 
 		extend ActiveSupport::Concern

data/app/models/concerns/binda/fields.rb

@@ -0,0 +1,21 @@
+module Binda
+	# Fieldable associated are Binda's core fields. 
+	# 
+	# They are associated to classes like `Binda::Component` and `Binda::Board` and store data 
+	# 	in a simple yet powerful way. 
+	module Fields
+
+		extend ActiveSupport::Concern
+
+		included do
+	  	# Associations
+	  	belongs_to :fieldable, polymorphic: true
+	  	belongs_to :field_setting
+	  	
+	  	validates :field_setting, presence: true
+			validates :fieldable_id, presence: true
+			validates :fieldable_type, presence: true  	
+		end
+
+	end
+end

data/app/views/binda/boards/edit.html.erb

@@ -7,7 +7,8 @@
   <div class="main-header--buttons">
   	<% if @structure.has_preview %>
   		<a href="<%= "#{binda.root_path}#{@structure.slug}/#{@instance.slug}" %>" 
-  			class="main-header--link b-btn b-btn-primary">
+  			class="main-header--link b-btn b-btn-primary"
+        target="_blank">
   			<i class="fas fa-link"></i> 
   			<%= t 'binda.preview' %> 
   			<%= @structure.name.humanize.split.map(&:capitalize).join(' ') %>

data/app/views/binda/components/edit.html.erb

@@ -8,7 +8,8 @@
   <div class="main-header--buttons">
   	<% if @structure.has_preview %>
 	    <a href="<%= "#{binda.root_path}#{@structure.slug}/#{@instance.slug}" %>"
-	    	class="main-header--link b-btn b-btn-primary">
+	    	class="main-header--link b-btn b-btn-primary"
+        target="_blank">
 	    	<i class="fas fa-link"></i>
 	    	<%= t 'binda.preview' %> 
 	    	<%= @structure.name.humanize.split.map(&:capitalize).join(' ') %> 

data/app/views/binda/field_groups/_form_body.html.erb

@@ -4,52 +4,14 @@
     <%= f.error_notification %>
     <%= render 'layouts/binda/form_errors', f: f %>
     <div class="standard-form--body">
-      <div class="standard-form--container">
-        <div class="standard-form--header">
-          <small><%= "#{ t :details }" %></small>
-        </div>
-        <%= f.input :name %>
-        <% if @field_group.slug.nil? %>
-          <%= f.input :slug, as: :hidden %>
-        <% else %>
-          <%= f.input :slug %>
-        <% end %>
-      </div>
-      <div class="standard-form--container">
-        <div id="form-section--field-group-<%= @field_group.id %>" class="form-section--wide-container">
-          <div class="standard-form--header">
-            <small><%= "#{ t 'binda.field_setting.plural' }" %></small>
-          </div>
-          <%= render "form_section", f: f %>
-        </div>
-      </div>
+      <%= render "form_header", f: f %>
+      <%= render "form_section", f: f %>
       <% @field_group.field_settings.where( field_type: 'repeater' ).order( :position, :id ).each do |repeater| %>
-        <div class="standard-form--container">
-          <div id="form-section--repeater-<%= repeater.id %>" class="form-section--wide-container">
-            <div class="form-section">
-              <div class="standard-form--header field-settings-header">
-                <small><%= "#{ t('binda.repeater_field_settings', arg1: repeater.name ) }" %></small>
-              </div>
-              <%= render "form_section_repeater", f: f, repeater: repeater %>
-            </div>
-          </div>
-        </div>
+        <%= render "form_section_repeater", f: f, repeater: repeater %>
       <% end %>
     </div>
     <div class="standard-form--sidebar">
-      <div class="standard-form--container">
-        <div class="standard-form--header">
-          <small><%= "#{ t :setting }".pluralize %></small>
-        </div>
-        <div class="standard-form--main-actions">
-          <%= button_tag '<i class="fas fa-check"></i>Save changes'.html_safe, {
-              class: 'b-btn b-btn-primary b-btn-settings',
-              id: 'save',
-              'data-entries-number': get_entries_number,
-              'data-instance-type': @structure.instance_type.pluralize
-          } %>
-        </div>
-      </div>
+      <%= render "form_sidebar" %>
     </div>
   <% end %>
 </div>

data/app/views/binda/field_groups/_form_header.html.erb

@@ -0,0 +1,11 @@
+<div class="standard-form--container">
+  <div class="standard-form--header">
+    <small><%= "#{ t :details }" %></small>
+  </div>
+  <%= f.input :name %>
+  <% if @field_group.slug.nil? %>
+    <%= f.input :slug, as: :hidden %>
+  <% else %>
+    <%= f.input :slug %>
+  <% end %>
+</div>