binda 0.1.3 → 0.1.4

data/config/tinymce.yml

@@ -1,5 +1,5 @@
 toolbar:
-  - styleselect | bold italic | undo redo | link image
+  - bold italic | link image insert | undo redo | code
 plugins:
   - link
   - paste
@@ -11,5 +11,5 @@ plugins:
 forced_root_block: false
 paste_text_sticky_default: true
 paste_text_sticky: true
-menubar: edit format tools
+menubar: edit format
 selector: '.tinymce'

data/db/migrate/1_create_binda_tables.rb

@@ -53,7 +53,7 @@ class CreateBindaTables < ActiveRecord::Migration[5.0]
       t.belongs_to       :field_group
       t.string           :ancestry
       t.index            :ancestry
-      t.boolean          :allow_null, default: false
+      t.boolean          :allow_null, default: true
       t.references       :default_choice, index: true
       t.timestamps
     end

data/lib/binda/version.rb

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

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

@@ -34,14 +34,14 @@ module Binda
       # 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 )
-        # make sure slug works
-        maintenance_mode.update_attributes( slug: 'maintenance-mode' )
         # create active and disabled choices
         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' )
       end
       puts "The maintenance-mode option has been set up."
       puts 

data/lib/tasks/add_default_choice_to_all_selections_with_no_choices_task.rake

@@ -0,0 +1,6 @@
+namespace :binda do
+	desc "Fix Binda::Selection records that has no choice selected but where their field setting requires at least one."
+	task :add_default_choice_to_all_selections_with_no_choices => :environment do
+		Binda::Selection.add_default_choice_to_all_selections_with_no_choices
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: binda
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alessandro Barbieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.8'
   type: :runtime
@@ -135,7 +135,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.8'
 - !ruby/object:Gem::Dependency
@@ -312,16 +312,22 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.21'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.21'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -558,6 +564,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.52.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.52.1
+- !ruby/object:Gem::Dependency
+  name: mry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -597,7 +631,6 @@ files:
 - app/assets/stylesheets/binda/components/fileupload.scss
 - app/assets/stylesheets/binda/components/form_item.scss
 - app/assets/stylesheets/binda/components/form_item_choices.scss
-- app/assets/stylesheets/binda/components/form_item_image.scss
 - app/assets/stylesheets/binda/components/form_item_video.scss
 - app/assets/stylesheets/binda/components/login.scss
 - app/assets/stylesheets/binda/components/main_container.scss
@@ -666,6 +699,7 @@ files:
 - app/models/binda/choice.rb
 - app/models/binda/component.rb
 - app/models/binda/date.rb
+- app/models/binda/deprecation.rb
 - app/models/binda/field_group.rb
 - app/models/binda/field_setting.rb
 - app/models/binda/gallery.rb
@@ -681,6 +715,8 @@ files:
 - app/models/binda/user.rb
 - app/models/binda/video.rb
 - app/models/concerns/binda/default_helpers.rb
+- app/models/concerns/binda/deprecations.rb
+- app/models/concerns/binda/fieldable_association_helpers.rb
 - app/models/concerns/binda/fieldable_associations.rb
 - app/uploaders/binda/image/image_uploader.rb
 - app/uploaders/binda/video/video_uploader.rb
@@ -700,10 +736,19 @@ files:
 - app/views/binda/components/sort_index.html.erb
 - app/views/binda/field_groups/_form_body.html.erb
 - app/views/binda/field_groups/_form_item.html.erb
-- app/views/binda/field_groups/_form_item_choice.erb
 - app/views/binda/field_groups/_form_section.html.erb
 - app/views/binda/field_groups/_form_section_repeater.html.erb
 - app/views/binda/field_groups/edit.html.erb
+- app/views/binda/field_groups/form_item/_form_item_choice_editor.html.erb
+- app/views/binda/field_groups/form_item/_form_item_editor.html.erb
+- app/views/binda/field_groups/form_item/_form_item_header.html.erb
+- app/views/binda/field_groups/form_item/_form_item_new_editor.html.erb
+- app/views/binda/field_groups/form_item/_form_item_persisted_editor.html.erb
+- app/views/binda/field_groups/form_item/form_item_choice/_form_item_allow_null_choice.html.erb
+- app/views/binda/field_groups/form_item/form_item_choice/_form_item_choice_header.html.erb
+- app/views/binda/field_groups/form_item/form_item_choice/_form_item_default_choice.html.erb
+- app/views/binda/field_groups/form_item/form_item_choice/_form_item_new_choice.html.erb
+- app/views/binda/field_groups/form_item/form_item_choice/_form_item_persisted_choices.html.erb
 - app/views/binda/field_groups/new.html.erb
 - app/views/binda/field_settings/_form_body.html.erb
 - app/views/binda/field_settings/edit.html.erb
@@ -723,6 +768,9 @@ files:
 - app/views/binda/fieldable/_form_section.html.erb
 - app/views/binda/fieldable/_form_section_repeater.html.erb
 - app/views/binda/fieldable/_form_sidebar.html.erb
+- app/views/binda/fieldable/form_item_selections/_form_item_checkbox.html.erb
+- app/views/binda/fieldable/form_item_selections/_form_item_radio.html.erb
+- app/views/binda/fieldable/form_item_selections/_form_item_selection.html.erb
 - app/views/binda/galleries/_form.html.erb
 - app/views/binda/galleries/edit.html.erb
 - app/views/binda/galleries/index.html.erb
@@ -763,6 +811,7 @@ files:
 - app/views/kaminari/_paginator.html.erb
 - app/views/kaminari/_prev_page.html.erb
 - app/views/layouts/binda/_flash.html.erb
+- app/views/layouts/binda/_form_errors.html.erb
 - app/views/layouts/binda/_header.html.erb
 - app/views/layouts/binda/_popup_warning.html.erb
 - app/views/layouts/binda/_sidebar.html.erb
@@ -800,6 +849,7 @@ files:
 - lib/generators/binda/maintenance/templates/config/initializers/maintenance.rb
 - lib/generators/binda/setup/USAGE
 - lib/generators/binda/setup/setup_generator.rb
+- lib/tasks/add_default_choice_to_all_selections_with_no_choices_task.rake
 - lib/tasks/add_default_helpers_class_task.rake
 - lib/tasks/add_video_feature_task.rake
 - lib/tasks/remove_orphan_fields_task.rake

data/app/views/binda/field_groups/_form_item_choice.erb

@@ -1,104 +0,0 @@
-<%# - - - - - - - - - - - - %>
-<%# CHOICES                 %>
-<%# - - - - - - - - - - - - %>
-<div class="field-setting-choices--header field-settings-header">
-	<a href="#" class="field-setting-choices--toggle-choice field-setting-choices--add-choice" data-choices-id="field-setting-choices-<%= ff.object.id %>">
-		<i class="fa fa-plus" aria-hidden="true"></i> <%= t(:add_choice).capitalize %>
-	</a>
-	<p class="control-label"><%= t(:choices).capitalize %></p>
-</div>
-
-<div id="field-setting-choices-<%= ff.object.id %>" class="field-setting-choices">
-	
-	<%# - - - - - - - - - - - - %>
-	<%# NEW CHOICE              %>
-	<%# - - - - - - - - - - - - %>
-	<%= f.simple_fields_for "new_choices[]", ff.object.choices.build(), defaults: {label: false}  do |fff| %>
-	  <div class="field-setting-choices--choice field-setting-choices--new-choice">
-			<%= fff.association :field_setting, as: :hidden %>
-	  	<div class="field-setting-choices--choice-label">
-				<%= fff.input :label, placeholder: t('binda.choice_label') %>
-			</div>
-			<div class="field-setting-choices--choice-value">
-				<%= fff.input :value, placeholder: t('binda.choice_value')  %>
-			</div>
-			<a href="#" class="field-setting-choices--toggle-choice field-setting-choices--js-delete-choice">
-				<i class="far fa-trash-alt"></i>
-			</a>
-			<div class="clearfix"></div>
-	  </div>
-	<% end %>
-
-	<%= ff.simple_fields_for :choices, ff.object.choices.order( :label ), defaults: {label: false} do |fff| %>
-	  <div id="field-setting-choices--choice-<%= fff.object.id %>" class="field-setting-choices--choice">
-			<%= fff.input :id, as: :hidden %>
-			<%= fff.association :field_setting, as: :hidden %>
-	  	<div class="field-setting-choices--choice-label">
-				<%= fff.input :label, placeholder: t('binda.choice_label') %>
-			</div>
-			<div class="field-setting-choices--choice-value">
-				<%= fff.input :value, placeholder: t('binda.choice_value')  %>
-			</div>
-			<a href="<%= choice_path( fff.object ) %>" class="field-setting-choices--delete-choice">
-				<i class="far fa-trash-alt"></i>
-			</a>
-			<div class="clearfix"></div>
-	  </div>
-	<% end %>
-
-	<%# - - - - - - - - - - - - %>
-	<%# DEFAULT INITIAL CHOICE  %>
-	<%# - - - - - - - - - - - - %>
-	<% unless ff.object.choices.find_all{|c| c.persisted? }.any? %>
-		<%= f.simple_fields_for "new_choices[]", ff.object.choices.build(), defaults: {label: false} do |fff| %>
-		  <div class="field-setting-choices--choice">
-				<%= fff.association :field_setting, as: :hidden %>
-		  	<div class="field-setting-choices--choice-label">
-					<%= fff.input :label, placeholder: t('binda.choice_label') %>
-				</div>
-				<div class="field-setting-choices--choice-value">
-					<%= fff.input :value, placeholder: t('binda.choice_value')  %>
-				</div>
-				<a href="#" class="field-setting-choices--toggle-choice field-setting-choices--js-delete-choice">
-					<i class="far fa-trash-alt"></i>
-				</a>
-				<div class="clearfix"></div>
-		  </div>
-		<% end %>
-	<% end %>
-
-</div>
-
-<div class="clearfix"></div>
-
-
-<%# - - - - - - - - - - - - %>
-<%# DEFAULT CHOICE          %>
-<%# - - - - - - - - - - - - %>
-<% if ff.object.choices.find_all{|c| c.persisted? }.any? %>
-	<div class="form-item--full-size">
-		<%= ff.input :default_choice_id, 
-		    as: :select, collection: ff.object.choices.find_all{|c| c.persisted? }, 
-		    label_method: :label, 
-		    include_blank: false, 
-		    selected: ff.object.default_choice_id, 
-		    hint: t(:default_choice_description),
-		    input_html: {class: 'select2-item'} %>
-	</div>
-<% end %>
-
-
-<% if ff.object.field_type == 'checkbox' %>
-	<%# - - - - - - - - - - - - %>
-	<%# ALLOW NULL              %>
-	<%# - - - - - - - - - - - - %>
-	<div class="form-item--full-size standard-form--checkbox field-setting-choices--allow-null">
-		<%= ff.input :allow_null, 
-				as: :radio_buttons,
-				label: t('binda.allow_null'),
-				collection: [[t('binda.allow_null_true'), true], [t('binda.allow_null_false'), false]],
-				label_method: -> (x){ "<span class=\"standard-form--input-box\"></span>#{x[0]}".html_safe },
-		    checked: ff.object.allow_null, 
-		    default: false %>
-	</div>
-<% end %>