binda 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0595e8ebcd16b13684f90a7329163fee69a897f7
-  data.tar.gz: df0c48d8da9db4f7fb62a08ac1e45c29419b09f7
+  metadata.gz: 9698551271bf5efe2fbaa045f9fd93b6c5edf49b
+  data.tar.gz: 7e4772d16ce867877f8059f31c66648aebdb8700
 SHA512:
-  metadata.gz: ddec158c8a7577054ae0f190f712a1bed77cd856e8347b3b2e0b7e0d3674d3b3bb55bc574990264144f244f45439be03087cf18bf2882b46809449b0d66a2d1f
-  data.tar.gz: 632f2a5422638d97db475735c4e0af4a0aa9801abe52b7ec3ec5687cea0490d38bea4d19ecebb8888496b3ea5892ee74fc060a071057e8b6db7aef0b9f20cee2
+  metadata.gz: 23a18574bd5b641433165fd1954bf3a52e65aa44d5b98be39bbb8554d2813756b054461e8e41fc6c69769fe6701cb4d22bcb7c082c097765c24c452794242c50
+  data.tar.gz: d1a3ca511d47479cd569e9fd716afed73183d391085994a752ffa32c9fc62756ca14a15c2b631d793accc60632c8e8e0b2b1adcbc059787d5eb84464a1c11f58

data/README.md

@@ -1,6 +1,7 @@
 # Binda
 A modular CMS for Ruby on Rails 5.1.
 
+[![Gem Version](https://badge.fury.io/rb/binda.svg)](https://badge.fury.io/rb/binda)
 [![Code Climate](https://codeclimate.com/github/lacolonia/binda/badges/gpa.svg)](https://codeclimate.com/github/lacolonia/binda)
 [![Build Status](https://travis-ci.org/a-barbieri/binda.svg?branch=master)](https://travis-ci.org/lacolonia/binda)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/5dc62774a6b8b63aa72b/test_coverage)](https://codeclimate.com/github/lacolonia/binda/test_coverage)
@@ -72,15 +73,12 @@ Now you are good to go. Good job!
 
 Binda is totally bound to its database in order to let you structure your CMS directly from the admin panel. The recommended workflow is:
 
-1. Install and develop the application locally
-2. Migrate server and database to production once ready
-3. For any update sync your local database with the production one
+1. **Install** and develop the application locally
+2. **Migrate** server and database to production once ready
+3. **Restart** after having synched the database. This ensure settings are cached correctly
+4. Rinse and repeat 😀
 
-This ensure the application structure remains the same.
-
-If you want to avoid copying the entire database you can just refer to the following `binda_structures`
-
-## Reset credentials and initial settings
+## Reset initial settings
 
 If you need to re-install Binda and reset initial database settings (such as username and password for example) execute the following command from the application root.
 
@@ -88,6 +86,16 @@ If you need to re-install Binda and reset initial database settings (such as use
 rails generate binda:setup
 ```
 
+## Credentials
+
+If you have lost your username/password you can run 
+
+```
+rails binda:create_superadmin_user
+```
+
+This lets you create another temporary super admin user.
+
 ## Specific needs
 In order to use Carrierwave to process images you need to run MiniMagik. Please refer to [Carrierwave documentation](https://github.com/carrierwaveuploader/carrierwave#using-minimagick) to find more information.
 
@@ -382,7 +390,10 @@ For example the following line will create a _field setting_, but under the hood
 # => <Binda::FieldSetting id: 1, ...>
 
 # You don't have to create a text field for each component, it's alreay been done for you
+# WARNING! You won't find immediately the text record associated, you need to reload!
 @structure.components.first.texts.first
+# => nil
+@structure.reload.components.first.texts.first
 # => <Binda::Text id: 1, field_setting_id: 1, ...>
 ```
 
@@ -426,14 +437,17 @@ You can retrieve field content from a instance of `Binda::Component`, `Binda::Bo
 |`has_image`| Returns `true/false`.| [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:has_image) |
 |`get_image_url(size)`| Returns the url of the image. A thumbnail version (200x200) by specifying `thumb` size. If no size is provided the method will return the original image size. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_image_url) |
 |`get_image_path(size)`| Returns the path of the image. A thumbnail version (200x200) by specifying `thumb` size. If no size is provided the method will return the original image size. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_image_path) |
+|`get_image_size`| Returns the image size in MB. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_image_size) |
+|`get_image_dimension`| Returns a hash { width: xxx, height: xxx } with image dimension. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_image_dimension) |
+|`get_image_mime_type`| Returns the mime type of the image. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_image_mime_type) |
 |`has_video`| Returns `true/false`.| [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:has_video) |
 |`get_video_url`| Returns the url of the video. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_video_url) |
 |`get_video_path`| Returns the path of the video. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_image_path) |
 |`has_date`| Returns `true/false` | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:has_date) |
 |`get_date`| Returns the date in `datetime` format. Use [`strftime`](https://apidock.com/rails/ActiveSupport/TimeWithZone/strftime) to change date format. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_date) |
-|`has_repeater`| Returns `true/false`| [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:has_repeater) |
-|`get_repeater`| Returns an array of repeaters. See next session for more details. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_repeater) |
-|`get_selection_choice`| Returns an hash with label and value of the selected choice. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_selection_choice) |
+|`has_repeaters`| Returns `true/false`| [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:has_repeaters) |
+|`get_repeaters`| Returns an array of repeaters. See next session for more details. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_repeaters) |
+|`get_selection_choices`| Returns an hash with label and value of the selected choice. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_selection_choices) |
 |`get_radio_choice`| Returns an hash with label and value of the selected choice. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_radio_choice) |
 |`get_checkbox_choices`| Returns an array of label/value pairs of all the selected choices. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:get_checkbox_choices) |
 |`has_related_components`| Check if has related components. | [source](http://www.rubydoc.info/gems/binda/Binda/FieldableAssociations:has_related_components) |
@@ -589,9 +603,9 @@ Here a list of useful plugins:
 
 
 
-# Upgrade
+# Upgrade from a previous version
 
-If you are going to upgrade from a previous version please check the guidelines attached to the version release which can be found on this [Github page](https://github.com/lacolonia/binda/releases).
+If you are going to upgrade from a previous version of Binda please check the guidelines attached to the version release which can be found on this [Github page](https://github.com/lacolonia/binda/releases).
 
 ---
 

data/app/models/binda/choice.rb

@@ -49,8 +49,8 @@ module Binda
 			# Make sure you are referring to the updated ActiveRecord object where the choice has already been deleted
 			#	Infact: self.field_setting != FieldSetting.find( self.field_setting.id )
 			field_setting = FieldSetting.find(self.field_setting.id)
-
 			if field_setting.default_choice_id.nil? && !field_setting.allow_null?
+				# if field_setting.field_type = 'radio' 
 				field_setting.default_choice_id = self.id
 				unless field_setting.save
 					raise "It hasn't been possible to set the default choice for the current setting (#{field_setting.slug})."
@@ -60,6 +60,10 @@ module Binda
 		end
 
 		# Assign a choice to `Binda::Selection` items belonging to a specific field setting.
+		# 
+		# TODO it shouldn't be possible to add another choice to a radio button. 
+		#   The only reasonable way is to change has_many association in a has_one
+		# 
 		# @param field_setting [Binda::FieldSetting]
 		# @param new_default_choice [Binda::Choice]
 		def assign_choice_to_selections(field_setting, new_default_choice)

data/app/models/binda/image.rb

@@ -4,5 +4,26 @@ module Binda
 
     mount_uploader :image, ImageUploader
 
+    def register_deatils
+      if !self.image.present?
+        puts "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)
+      else
+        file = MiniMagick::Image.open(self.image.url)
+        register_details_of(file)
+      end
+    end
+
+    def register_details_of(file)
+      self.file_width = file.width
+      self.file_height = file.height
+      self.content_type = file.mime_type if file.mime_type
+      self.file_size = file.size
+      self.save!
+      puts "Updated image details for Binda::Image id=#{self.id}"
+    end
+
   end
 end

data/app/models/binda/selection.rb

@@ -175,17 +175,13 @@ module Binda
 
 		# Check all Binda::Selection records which are required to have a choice.
 		# 
-		# The purpose of this method is to check, not to update. You don't won't to decide which choice 
-		#   must be selected if the selection is required to have one. You just want the user to know that
-		#   it's not possible to leave it without any.
-		# 
 		# @param field_setting [ActiveRecord Object]
 		def self.check_all_selections_depending_on(field_setting)
 			# Make sure Active Record object of field setting is updated
 			field_setting.reload
 
 			# Don't bother if field setting allow having no choice or if default_choice isn't set
-			return if field_setting.allow_null? || field_setting.default_choice_id.nil?
+			return if field_setting.allow_null? || !field_setting.default_choice.present?
 
 			# Get all selection related to this field setting which have an issue with choices
 			selections = Selection.get_selections_which_must_have_a_choice_but_have_none(field_setting)

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

@@ -1,6 +1,8 @@
 Binda::Deprecation
 	.new
 	.deprecate_methods(
-  	Binda::FieldableAssociations, 
-  	get_selection_choice: :get_selection_choices
+  	Binda::FieldableAssociationHelpers, 
+  	get_selection_choice: :get_selection_choices,
+  	has_repeater: :has_repeaters,
+  	get_repeater: :get_repeaters,
   )

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

@@ -139,17 +139,36 @@ module Binda
 			end
 		end
 
-		def get_image_dimension(field_slug)
+		# Get image size
+		# 
+		# @param field_slug [string] The slug of the field setting
+		# @return [string] 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)
+		end
 
-			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)
-					obj.image.send(size).send(info)
-			elsif obj.image.present?
-				obj.image.send(info)
-			else
-				raise "Looks like the image you are looking for isn't present. See field setting with slug=\"#{field_slug}\" on component with id=\"self.id\""
-			end
+    # Convert bytes to megabites
+    def bytes_to_megabytes bytes
+      (bytes.to_f / 1.megabyte).round(2)
+    end
+
+		# Get image type
+		# 
+		# @param field_slug [string] The slug of the field setting
+		# @return [string] with image type
+		def get_image_mime_type(field_slug)
+			obj = self.images.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) }
+     	return obj.content_type
+		end
+
+		# Get image dimension
+		# 
+		# @param field_slug [string] The slug of the field setting
+		# @return [hash] with width and height
+		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 }
 		end
 
 		# Check if the field has an attached video
@@ -231,21 +250,27 @@ module Binda
 		# 
 		# @param field_slug [string] The slug of the field setting
 		# @return [boolean]
-		def has_repeater(field_slug)
+		def has_repeaters(field_slug)
 			obj = self.repeaters.find_all{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) }
 			raise ArgumentError, "There isn't any repeater associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller if obj.nil?
 			return obj.present?
 		end
+		def has_repeater(field_slug)
+			has_repeaters(field_slug)
+		end
 
 		# Get the all repeater instances sorted by position
 		# 
 		# @param field_slug [string] The slug of the field setting
 		# @return [array] An array of repeater items which have all sorts of fields attached
-		def get_repeater(field_slug)
+		def get_repeaters(field_slug)
 			obj = self.repeaters.find_all{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) }
 			raise ArgumentError, "There isn't any repeater associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller if obj.nil?
 			obj.sort_by(&:position)
 		end
+		def get_repeater(field_slug)
+			get_repeaters(field_slug)
+		end
 
 		# Get the radio choice
 		# 

data/app/uploaders/binda/image/image_uploader.rb

@@ -5,6 +5,9 @@ module Binda
     # include CarrierWave::RMagick
     include CarrierWave::MiniMagick
 
+    process :register_image_details
+    process :register_details
+
     # Choose what kind of storage to use for this uploader:
     # storage :file
     # storage :fog
@@ -64,6 +67,20 @@ module Binda
     #   "something.jpg" if original_filename
     # end
 
+    # @see https://github.com/carrierwaveuploader/carrierwave/wiki/How-to%3A-Get-image-dimensions
+    def register_image_details
+      if file && model
+        model.file_width, model.file_height = ::MiniMagick::Image.open(file.file)[:dimensions]
+      end
+    end
+
+    # @see https://github.com/carrierwaveuploader/carrierwave/wiki/how-to:-store-the-uploaded-file-size-and-content-type
+    def register_details
+      if file && model
+        model.content_type = file.content_type if file.content_type
+        model.file_size = file.size
+      end
+    end
 
     # Generating medium and large version creates slowness if the uploaded file is a gif.
     #   Conditional versioning could be a solution, but you might want to do it in your 

data/app/uploaders/binda/video/video_uploader.rb

@@ -5,6 +5,8 @@ module Binda
     # include CarrierWave::RMagick
     # include CarrierWave::MiniMagick
 
+    process :register_details
+
     # Choose what kind of storage to use for this uploader:
     # storage :file
     # storage :fog
@@ -47,5 +49,14 @@ module Binda
     #   "something.jpg" if original_filename
     # end
 
+
+    # @see https://github.com/carrierwaveuploader/carrierwave/wiki/how-to:-store-the-uploaded-file-size-and-content-type
+    def register_details
+        if file && model
+            model.content_type = file.content_type if file.content_type
+            model.file_size = file.size
+        end
+    end
+
   end
 end

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

@@ -52,7 +52,7 @@
 <%# REPEATER                %>
 <%# - - - - - - - - - - - - %>
 <% elsif field_setting.field_type == 'repeater' %>
-  <% repeaters = @instance.repeaters.where( field_setting: field_setting ).order('position') %>
+  <% repeaters = @instance.repeaters.where( field_setting: field_setting ).order('position DESC') %>
   <%= render 'binda/fieldable/form_item_repeater', f: f, repeater_setting: field_setting, repeaters: repeaters %>
 
 

data/config/initializers/devise.rb

@@ -16,6 +16,7 @@ Devise.setup do |config|
   # by default. You can change it below and use your own secret key.
   # config.secret_key = 'a8395fa034e067da620d70f7f39ad4765d163e44ce05d5c243393e1bbfdc10f9a464aaf34fcac3291a6746424ea2b9f9564a01c31820e28bf1737c16d139cd5c'
   # binda.hook.1
+  config.secret_key = '81113efa8b7abba0674471b5b4429cb9da5182d3eab248be196f58f62f8de2c3a7174fcf0f17fbf32bb0e76ba46c02410fecef1101d9da64c010bab2104aba6e'
   config.secret_key = '940fcbf616f851acdbcfb5af5629435e0ce550b51a0bf1db4cfb609b537d93b98a9ddefbf03a8274fa59a6483fe82df3aa1a6609a8ca0e62ae3269a91374cccd'
 
   # ==> Mailer Configuration
@@ -114,6 +115,7 @@ Devise.setup do |config|
   # Set up a pepper to generate the hashed password.
   # config.pepper = '124ef1b08a92f891a392a9594b868887c945ca8438bd7852f8ac4d91e51f2cc699b8b6c7b12057c0f0e6dc03d04f8ee4eab72278b0f948e2c1e43f8b449c2262'
   # binda.hook.2
+  config.pepper = '03af0d695bb86b8274e1f93261a7f885ca85f0e2356cd3fd279ad13ac70af811a1f7d221de07c137aadc327e1f95b3b00ca6ed8836d09010893631c1eb01a36c'
   config.pepper = '0586297a053d9c535c607464fb45c15325e4faa6f31f1b5361a431c1978c2dce2776047cef7b89500600bbfa82818b853ab896ad8b48334656bb907a06c8a9bb'
 
   # Send a notification email when the user's password is changed

data/config/initializers/simple_form__fileupload.rb

@@ -72,14 +72,6 @@ module SimpleForm
         @detail ||= begin
           obj = options[:object]
 
-          if obj.image.present?
-            if CarrierWave::Uploader::Base.storage == CarrierWave::Storage::File
-              image = MiniMagick::Image.open(::Rails.root.join(obj.image.path))
-            else
-              image = MiniMagick::Image.open(obj.image.url)
-            end
-          end
-
           html = '<div class="fileupload--details'
           html << ' fileupload--details--hidden' unless obj.image.present? || obj.video.present?
           html << '"><p class="fileupload--name">'
@@ -91,15 +83,15 @@ module SimpleForm
           html << '<p class="fileupload--size">'
           html << "<strong>#{t 'binda.filesize'}:</strong> "
           html << '<span class="fileupload--filesize">'
-          html << bytes_to_megabytes(obj.image.size).to_s if obj.image.present?
-          html << bytes_to_megabytes(obj.video.size).to_s if obj.video.present?
+          html << bytes_to_megabytes(obj.file_size).to_s if obj.image.present? && !obj.file_size.blank?
+          html << bytes_to_megabytes(obj.file_size).to_s if obj.video.present? && !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 << image[:width].to_s unless image.nil?
+          html << obj.file_width.round.to_s unless obj.image.present? && obj.file_width.blank?
           html << '</span> x <span class="fileupload--height">'
-          html << image[:height].to_s unless image.nil?
+          html << obj.file_height.round.to_s unless obj.image.present? && obj.file_height.blank?
           html << '</span> px</p>'
           html << '<p class="fileupload--videolink"><a href="'
           html << obj.video.url if obj.video.present?

data/db/migrate/1_create_binda_tables.rb

@@ -92,6 +92,10 @@ class CreateBindaTables < ActiveRecord::Migration[5.0]
       t.string           :image
       t.belongs_to       :field_setting
       t.references       :fieldable, polymorphic: true, index: true
+      t.string           :content_type
+      t.float            :file_size
+      t.float            :file_width
+      t.float            :file_height
       t.timestamps
     end
 

data/lib/binda/version.rb

@@ -1,3 +1,3 @@
 module Binda
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

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

@@ -32,16 +32,16 @@ module Binda
       puts "2) Setting up maintenance mode"
 
       # Use radio field_type untill truefalse isn't available
-      unless @field_settings.find_by(slug: 'maintenance-mode').present?
-        maintenance_mode = @field_settings.create!( name: 'Maintenance Mode', field_type: 'radio', position: 1 )
+      unless FieldSetting.find_by(slug: 'maintenance-mode').present?
+        maintenance_mode = @field_settings.create!( name: 'Maintenance Mode', field_type: 'radio', position: 1, allow_null: false )
         # create active and disabled choices
+        disabled = maintenance_mode.choices.create!( label: 'disabled', value: 'false' )
         maintenance_mode.choices.create!( label: 'active', value: 'true' )
-        maintenance_mode.choices.create!( label: 'disabled', value: 'false' )
-        radio = @dashboard.radios.find_or_create_by!( field_setting_id: maintenance_mode.id )
-        radio.choices << maintenance_mode.choices.last
-        radio.save!
-        # make sure slug works
-        maintenance_mode.update_attributes( slug: 'maintenance-mode' )
+
+        # assign disabled choice and remove the temporary choice
+        @dashboard.reload
+        @dashboard.radios.first.choices << disabled
+        @dashboard.radios.first.choices.select{|choice| choice.label != 'disabled'}.first.destroy
       end
       puts "The maintenance-mode option has been set up."
       puts 
@@ -49,7 +49,7 @@ module Binda
 
     def setup_website_name 
       puts "3) Setting up website name"
-      puts "We need few details. Don't worry you can modify them later."
+      puts "Don't worry you can modify it later."
 
       website_name_obj = @field_settings.find_by(slug: 'website-name')
       unless website_name_obj.present?
@@ -63,6 +63,7 @@ module Binda
 
     def setup_website_content
       puts "4) Setting up website description"
+      puts "Don't worry you can modify it later."
 
       website_description_obj = @field_settings.find_by(slug: 'website-description')
       unless website_description_obj.present?

data/lib/tasks/update_image_details_task.rake

@@ -0,0 +1,8 @@
+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
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: binda
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alessandro Barbieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -582,16 +582,16 @@ dependencies:
   name: mry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.52'
 description: A modular CMS for Ruby on Rails 5 with an intuitive out-of-the-box interface
   to manage and customize components. Use Binda if you want to speed up your setup
   process and concentrate directly on what your application is about. Please read
@@ -854,6 +854,7 @@ files:
 - lib/tasks/add_video_feature_task.rake
 - lib/tasks/remove_orphan_fields_task.rake
 - lib/tasks/set_repeater_position_task.rake
+- lib/tasks/update_image_details_task.rake
 - lib/tasks/upgrade_to_v007_task.rake
 - lib/tasks/user_tasks.rake
 - lib/templates/erb/scaffold/_form.html.erb