binda 0.1.7 → 0.1.8

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

@@ -0,0 +1,59 @@
+module Binda
+	module FieldableAssociationHelpers
+		module FieldableTextHelpers
+
+			extend ActiveSupport::Concern
+			# Get the object related to that field setting
+			# If the object doesn't exists yet it will return nil
+			# 
+			# @param  field_slug [string] The slug of the field setting
+			# @return [string] Returns the content of the text 
+			# @return [error]  Raise an error if no record is found
+			def get_text(field_slug)
+				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?
+					# to_s ensures the returned object is class String
+					obj.content.to_s
+				else
+					check_text_error field_slug
+				end
+			end
+
+			# 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?
+				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
+					raise ArgumentError, "There isn't any text associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller
+				end
+			end
+
+			# Get the object related to that field setting
+			# 
+			# @param field_slug [string] The slug of the field setting
+			# @return [boolean]
+			def has_text(field_slug)
+				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?
+				else
+					return false
+				end
+			end
+
+		end
+	end
+end

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

@@ -0,0 +1,56 @@
+module Binda
+	module FieldableAssociationHelpers
+		module FieldableVideoHelpers
+			
+			# Check if the field has an attached video
+			# 
+			# @param field_slug [string] The slug of the field setting
+			# @return [boolean]
+			def has_video(field_slug)
+				obj = self.videos.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) }
+				# 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 video associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller if obj.nil?
+				return obj.video.present?
+			end
+
+			# Get the video url based on the size provided, 
+			#   default is Carrierwave default (usually the real size)
+			# 
+			# @param field_slug [string] The slug of the field setting
+			# @param size [string] The size. It can be 'thumb' 200x200 cropped, 
+			#   'medium' 700x700 max size, 'large' 1400x1400 max size, or blank
+			# @return [string] The url of the video
+			def get_video_url(field_slug)
+				get_video_info( field_slug, 'url' )
+			end
+
+			# Get the video path based on the size provided, 
+			#   default is Carrierwave default (usually the real size)
+			# 
+			# @param field_slug [string] The slug of the field setting
+			# @param size [string] The size. It can be 'thumb' 200x200 cropped, 
+			#   'medium' 700x700 max size, 'large' 1400x1400 max size, or blank
+			# @return [string] The url of the video
+			def get_video_path(field_slug)
+				get_video_info( field_slug, 'path' )
+			end
+
+			# Get the object related to that field setting
+			# 
+			# @param field_slug [string] The slug of the field setting
+			# @param info [string] String of the info to be retrieved
+			# @return [string] The info requested if present
+			# @return [boolean] Returns false if no info is found or if image isn't found
+			def get_video_info(field_slug, info)
+				obj = self.videos.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) }
+				# Alternative query
+				# obj = video.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 video associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller if obj.nil?
+				if obj.video.present?
+					obj.video.send(info)
+				end
+			end
+		end
+	end
+end

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

@@ -29,9 +29,10 @@ module Binda
 	    has_many :radios,        as: :fieldable, dependent: :delete_all 
 	    has_many :selections,    as: :fieldable, dependent: :delete_all 
 	    has_many :checkboxes,    as: :fieldable, dependent: :delete_all 
+	    has_many :svgs,          as: :fieldable, dependent: :delete_all
 	    # Repeaters need destroy_all, not delete_all
 	    has_many :repeaters,     as: :fieldable, dependent: :destroy
-			has_many :relations,     as: :fieldable, dependent: :destroy 
+		has_many :relations,     as: :fieldable, dependent: :destroy 
 
 
     	has_many :owner_relations, class_name: "RelationLink", 
@@ -53,7 +54,7 @@ module Binda
 	                            source: :owner 
 
 
-	    accepts_nested_attributes_for :texts, :strings, :dates, :assets, :images, :videos, :audios, :galleries, :repeaters, :radios, :selections, :checkboxes, :relations, allow_destroy: true
+	    accepts_nested_attributes_for :texts, :strings, :dates, :assets, :images, :videos, :audios, :galleries, :repeaters, :radios, :selections, :checkboxes, :relations, :svgs, allow_destroy: true
 
 			validates_associated :texts
 			validates_associated :strings
@@ -67,6 +68,7 @@ module Binda
 			validates_associated :selections
 			validates_associated :checkboxes
 			validates_associated :relations
+			validates_associated :svgs
 
       after_save :generate_fields
 

data/app/uploaders/binda/svg_uploader.rb

@@ -0,0 +1,62 @@
+module Binda
+  class SvgUploader < CarrierWave::Uploader::Base
+    # Include RMagick or MiniMagick support:
+    # include CarrierWave::RMagick
+    # include CarrierWave::MiniMagick
+
+    # Choose what kind of storage to use for this uploader:
+    # storage :file
+    # storage :fog
+
+    # Override the directory where uploaded files will be stored.
+    # This is a sensible default for uploaders that are meant to be mounted:
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    end
+
+    process :register_details
+
+    def register_details
+     if file && model
+       model.content_type = file.content_type if file.content_type
+       model.file_size = file.size
+     end
+    end
+    
+    # Provide a default URL as a default if there hasn't been a file uploaded:
+    # def default_url(*args)
+    #   # For Rails 3.1+ asset pipeline compatibility:
+    #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+    #
+    #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+    # end
+
+    # Process files as they are uploaded:
+    # process scale: [200, 300]
+    #               
+    # def scale(width, height)
+    #   # do something
+    # end
+
+    # Create different versions of your uploaded files:
+    # version :thumb do
+    #   process resize_to_fit: [50, 50]
+    # end
+    
+
+    # Add a white list of extensions which are allowed to be uploaded.
+    # For images you might use something like this:
+    # def extension_whitelist
+    #   %w(jpg jpeg gif png)
+    # end
+    def extension_whitelist
+      %w(svg)
+    end
+
+    # Override the filename of the uploaded files:
+    # Avoid using model.id or version_name here, see uploader/store.rb for details.
+    # def filename
+    #   "something.jpg" if original_filename
+    # end
+  end
+end

data/app/views/binda/fieldable/_form_item_svg.html.erb

@@ -0,0 +1,33 @@
+<div id="standard-form--image-<%= field_setting.id %>" class="standard-form--image form-item">
+  <div id="fileupload-<%= ff.object.id %>" 
+    class="fileupload form-group"
+    data-message="<%= t('binda.upload_loading_message') %>"
+    data-error="<%= t('binda.upload_error_message')%>">
+    <p class="control-label">
+        <%= field_setting.name %>    
+    </p>
+    <% image = ff.object.image.thumb.url if ff.object.image.present? %>
+    <div class="fileupload--field">
+      <%= ff.input :svg, 
+        label: "<i class=\"fa fa-upload\" aria-hidden=\"true\"></i> #{t('binda.choose_file_button')}".html_safe, 
+        hint: field_setting.description.nil? ? false : field_setting.description.html_safe, 
+        url: url_for([ff.object, action: :remove_svg]).html_safe,
+        object: ff.object,
+        wrapper: false,
+        input_html: {
+          'data-url': url_for([
+            @instance.structure, 
+            @instance, 
+            action: :upload, 
+            repeater: { id: "#{field_setting.parent_id}" }]),
+          'data-id': ff.object.id
+        } %>
+    </div>
+    <%= ff.input :svg_cache, as: :hidden %>
+    <%= ff.input :field_setting_id, as: :hidden, input_html: { value: field_setting.id } %>
+    <%= ff.input :id, as: :hidden, input_html: { value: ff.object.id } %>
+    <%= ff.input :fieldable_id, as: :hidden %>
+    <%= ff.input :fieldable_type, as: :hidden %>
+    <div class="clearfix"></div>
+  </div>
+</div>

data/app/views/binda/fieldable/_form_item_video.html.erb

@@ -7,19 +7,20 @@
     <p class="control-label"><%= field_setting.name %></p>
 
     <div class="fileupload--field">
-
-			<%= ff.input :video, 
+      <%= ff.input :video, 
         label: "<i class=\"fa fa-upload\" aria-hidden=\"true\"></i> #{t('binda.choose_file_button')}".html_safe, 
         hint: field_setting.description.nil? ? false : field_setting.description.html_safe, 
         url: url_for([ff.object, action: :remove_video]).html_safe,
         object: ff.object,
         wrapper: false,
-				input_html: { 
-					class: 'form-item--video--uploader',
-          'data-url': url_for([@instance.structure, @instance, action: :upload]),
-          'data-id': ff.object.id,
-				} %>
-      
+		input_html: { 
+			class: 'form-item--video--uploader',
+            'data-url': url_for([
+                @instance.structure, 
+                @instance, 
+                action: :upload]),
+            'data-id': ff.object.id,
+	  } %>
     </div>
 
     <%= ff.input :video_cache, as: :hidden %>

data/app/views/binda/fieldable/_form_section.html.erb

@@ -1,4 +1,4 @@
-<% if %w(text string date image video audio relation).include? field_setting.field_type %>
+<% if %w(text string date image video audio relation svg).include? field_setting.field_type %>
   <% current = @instance.find_or_create_a_field_by( field_setting.id, field_setting.field_type) %>
   <%= f.simple_fields_for "#{field_setting.field_type}s_attributes[]", current do |ff| %>
     <%= render "binda/fieldable/form_item_#{field_setting.field_type}", f: f, ff: ff, field_setting: field_setting %>

data/app/views/binda/structures/form_section/_form_section_header.html.erb

@@ -18,7 +18,7 @@
     data-id="<%= f.object.id %>"
     data-params="id=<%= f.object.id %>">
     <i class="fa fa-plus" aria-hidden="true"></i>
-    <%= t('binda.field_setting.new') %>
+    <%= t('binda.field_group.new') %>
   </a>
 	<p class="control-label clearfix">
 		<%= f.object.name %> <%= t('binda.field_group.plural') %>

data/config/initializers/simple_form__fileupload.rb

@@ -17,6 +17,8 @@ module SimpleForm
             html << " fileupload--preview--uploaded"
           elsif options[:object].audio.present?
             html << " fileupload--preview--uploaded fileupload--preview--hidden"
+          elsif options[:object].svg.present?
+            html << " fileupload--preview--uploaded\" style=\"background-image: url(#{options[:object].svg.url})"
           end
           
           # Add no-preview text
@@ -54,7 +56,7 @@ module SimpleForm
           obj = options[:object]
           url = options[:url]
           html = '<a class="b-btn b-btn-outline-danger fileupload--remove-image-btn'
-            html << ' fileupload--remove-image-btn--hidden' unless obj.image.present? || obj.video.present? || obj.audio.present?
+            html << ' fileupload--remove-image-btn--hidden' unless obj.image.present? || obj.video.present? || obj.audio.present? || obj.svg.present?
             html << '" href="'
             html << url
             html << '" data-method="delete" data-remote="true" data-confirm="'
@@ -81,32 +83,35 @@ module SimpleForm
           obj = options[:object]
 
           html = '<div class="fileupload--details'
-          html << ' fileupload--details--hidden' unless obj.image.present? || obj.video.present? || obj.audio.present?
+          html << ' fileupload--details--hidden' unless obj.image.present? || obj.video.present? || obj.audio.present? || obj.svg.present?
           html << '"><p class="fileupload--name">'
           html << "<strong>#{t 'binda.filename'}:</strong> "
           html << '<span class="fileupload--filename">'
           html << File.basename(obj.image.path).to_s if obj.image.present?
           html << File.basename(obj.video.path).to_s if obj.video.present?
           html << File.basename(obj.audio.path).to_s if obj.audio.present?
+          html << File.basename(obj.svg.path).to_s if obj.svg.present?
           html << '</span></p>'
           html << '<p class="fileupload--size">'
           html << "<strong>#{t 'binda.filesize'}:</strong> "
           html << '<span class="fileupload--filesize">'
           html << bytes_to_megabytes(obj.file_size).to_s unless obj.file_size.blank?
           html << 'MB</span></p>'
-          html << '<p class="fileupload--dimension">'
-          html << "<strong>#{t 'binda.filedimension'}:</strong> "
-          html << '<span class="fileupload--width">'
-          html << obj.file_width.round.to_s unless obj.file_width.blank?
-          html << '</span> x <span class="fileupload--height">'
-          html << obj.file_height.round.to_s unless obj.file_height.blank?
-          html << '</span> px</p>'
+          html << '<p class="fileupload--dimension">' unless obj.svg.present?
+          html << "<strong>#{t 'binda.filedimension'}:</strong> " unless obj.svg.present?
+          html << '<span class="fileupload--width">' unless obj.svg.present?
+          html << obj.file_width.round.to_s unless obj.file_width.blank? unless obj.svg.present?
+          html << '</span> x <span class="fileupload--height">' unless obj.svg.present?
+          html << obj.file_height.round.to_s unless obj.file_height.blank? || obj.svg.present?
+          html << '</span> px</p>' unless obj.svg.present?
           html << '<p class="fileupload--previewlink"><a href="'
           html << obj.video.url if obj.video.present?
           html << obj.audio.url if obj.audio.present?
+          html << obj.svg.url if obj.svg.present?
           html << '" target="_blank"><i class="fas fa-external-link-alt"></i> <strong>'
           html << t('binda.filevideolink') if obj.class.name.demodulize == 'Video'
           html << t('binda.fileaudiolink') if obj.class.name.demodulize == 'Audio'
+          html << t('binda.filesvglink') if obj.class.name.demodulize == 'Svg'
           html << '</strong></a></p>'
 
           html << '</div>'

data/config/initializers/simple_form_custom.rb

@@ -119,7 +119,7 @@ SimpleForm.setup do |config|
     b.optional :maxlength
     b.optional :readonly
 
-    b.use :preview
+    b.use :preview 
     b.wrapper tag: 'div', class: 'fileupload--dashboard' do |bb|
       bb.use :label, class: 'control-label b-btn b-btn-primary', wrap_with: { tag: 'div', class: 'control-label-wrap' }
       bb.use :delete_button

data/config/locales/en.yml

@@ -59,6 +59,7 @@ en:
     filedimension: Dimension
     filevideolink: Preview video
     fileaudiolink: Preview audio
+    filesvglink: Preview svg
     select_placeholder: Select a option
     new_item_in_repeater: New %{arg1} item
     null_is_not_allowed: You need to select at least one choice

data/config/routes.rb

@@ -85,6 +85,11 @@ Binda::Engine.routes.draw do
       delete 'remove_image'
     end
   end
+  resources :svgs do
+    member do
+     delete 'remove_svg'  
+    end
+  end
   resources :repeaters
 
 end

data/db/migrate/1_create_binda_tables.rb

@@ -91,6 +91,7 @@ class CreateBindaTables < ActiveRecord::Migration[5.0]
       t.string           :video
       t.string           :image
       t.string           :audio
+      t.string           :svg
       t.belongs_to       :field_setting
       t.references       :fieldable, polymorphic: true, index: true
       t.string           :content_type

data/lib/binda/version.rb

@@ -1,3 +1,3 @@
 module Binda
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

data/lib/generators/binda/setup/setup_generator.rb

@@ -15,7 +15,11 @@ module Binda
       puts "Implement Binda settings"
       puts 
 
-      dashboard_structure = Structure.find_or_create_by( name: 'dashboard', slug: 'dashboard', instance_type: 'board' )
+      if Structure.find_by(slug: 'dashboard').nil?
+        dashboard_structure = Structure.create!(name: 'dashboard', slug: 'dashboard', instance_type: 'board')
+      else
+        dashboard_structure = Structure.find_by(slug: 'dashboard')
+      end
       @dashboard = dashboard_structure.board
 
       # By default each structure has a field group which will be used to store the default field settings

data/lib/tasks/update_image_details_task.rake

@@ -2,7 +2,7 @@ namespace :binda do
 	desc "Update all images with file details"
 	task :update_image_details => :environment do
 		Binda::Image.all.each do |image|
-			image.register_deatils
+			image.register_details
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: binda
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Alessandro Barbieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -680,6 +680,7 @@ files:
 - app/controllers/binda/manage/users_controller.rb
 - app/controllers/binda/repeaters_controller.rb
 - app/controllers/binda/structures_controller.rb
+- app/controllers/binda/svgs_controller.rb
 - app/controllers/binda/users/audios_controller.rb
 - app/controllers/binda/users/confirmations_controller.rb
 - app/controllers/binda/users/omniauth_callbacks_controller.rb
@@ -708,6 +709,7 @@ files:
 - app/models/binda/asset.rb
 - app/models/binda/audio.rb
 - app/models/binda/b.rb
+- app/models/binda/binda.rb
 - app/models/binda/board.rb
 - app/models/binda/category.rb
 - app/models/binda/checkbox.rb
@@ -726,6 +728,7 @@ files:
 - app/models/binda/selection.rb
 - app/models/binda/string.rb
 - app/models/binda/structure.rb
+- app/models/binda/svg.rb
 - app/models/binda/text.rb
 - app/models/binda/user.rb
 - app/models/binda/video.rb
@@ -733,10 +736,21 @@ files:
 - app/models/concerns/binda/deprecations.rb
 - app/models/concerns/binda/field_uniqueness.rb
 - app/models/concerns/binda/fieldable_association_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_audio_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_date_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_image_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_relation_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_repeater_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_selection_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_string_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_svg_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_text_helpers.rb
+- app/models/concerns/binda/fieldable_association_helpers/fieldable_video_helpers.rb
 - app/models/concerns/binda/fieldable_associations.rb
 - app/models/concerns/binda/fields.rb
 - app/uploaders/binda/audio/audio_uploader.rb
 - app/uploaders/binda/image/image_uploader.rb
+- app/uploaders/binda/svg_uploader.rb
 - app/uploaders/binda/video/video_uploader.rb
 - app/views/binda/assets/_form.html.erb
 - app/views/binda/assets/edit.html.erb
@@ -787,6 +801,7 @@ files:
 - app/views/binda/fieldable/_form_item_repeater.html.erb
 - app/views/binda/fieldable/_form_item_selections.html.erb
 - app/views/binda/fieldable/_form_item_string.html.erb
+- app/views/binda/fieldable/_form_item_svg.html.erb
 - app/views/binda/fieldable/_form_item_text.html.erb
 - app/views/binda/fieldable/_form_item_video.html.erb
 - app/views/binda/fieldable/_form_section.html.erb