binda 0.0.6 → 0.0.7

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

@@ -0,0 +1,35 @@
+<h4><%= "#{ t :setting }".pluralize.capitalize %></h4>
+
+<% if @structure.has_categories %>
+
+	<% if @structure.categories.any? %>
+	  <h5><%= t(:category).capitalize %></h5>
+	  <%= f.association :categories, as: :radio_buttons, collection: @structure.categories ,checked: @instance.category_ids, include_blank: false %>
+	<% end %>
+
+	<% if @instance.slug.nil? %>
+	  <h5>
+	    <%= t( :hint_create_parent_before_child, arg1: "#{ t :category }", arg2: "#{ t :instance }" ).capitalize %>  
+	  </h5>
+	<% else %>
+	  <a class="main-header--link btn btn-default" href="<%= new_structure_category_path( @structure ) %>">
+	    <%= "#{ t :new }".capitalize %> <%= t :category %>  
+	  </a>
+	<% end %>
+
+<% end %>
+
+<hr>
+
+<% if @instance.respond_to? :publish_state %>
+	<h5><%= t(:publish_settings).capitalize %></h5>
+	<%= f.input :publish_state, as: :radio_buttons, collection: [ 'draft', 'published' ], checked: f.object.publish_state %>
+	<hr>
+<% end %>
+
+<%= f.button :submit, 'Save changes', class: 'btn btn-primary' %>
+
+
+<% unless @instance.new_record? || @instance.structure.instance_type == 'board' %>
+	<a class="form-body--delete btn btn-default" href="<%= url_for([@structure, @instance]) %>" data-method="delete" data-confirm="This operation will delete this <%= @structure.name %> and there is no coming back. Are you ok with that?">Delete <%= @structure.name.capitalize %> <span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
+<% end %>

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

@@ -40,10 +40,16 @@
             <div class="form-section--narrow-container row">
               <div class="col-sm-12">
                 <h4><%= "#{ t :publish }".capitalize %></h4>
+                <h5><%= "#{ t :structure_instance_type }".capitalize %></h5>
+                <%= f.input :instance_type, as: :radio_buttons, collection: ['component','board'] %>
                 <h5><%= "#{ t :structure_has_categories }".capitalize %></h5>
                 <%= f.input :has_categories, as: :radio_buttons %>
                 <hr>
                 <%= f.button :submit, 'Save changes', class: 'btn btn-primary' %>
+
+                <% unless @structure.new_record? %>
+                  <a class="form-body--delete btn btn-default" href="<%= url_for([@structure]) %>" data-method="delete" data-confirm="This operation will delete this structure and there is no coming back. Are you ok with that?">Delete Structure <span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
+                <% end %>
               </div>
             </div>
             

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

@@ -4,7 +4,7 @@
 <%# - - - - - - - - - - - - %>
 <%# FORM ITEM               %>
 <%# - - - - - - - - - - - - %>
-<%= f.simple_fields_for :field_groups, f.object.field_groups.order( :position ) do |ff| %>
+<%= f.simple_fields_for :field_groups, f.object.field_groups.order( :position, :name ) do |ff| %>
 
   <div class="form-item">
 

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

@@ -1,4 +1,7 @@
 <% content_for :header do %>
+  <div class="main-header--buttons">
+    <%= link_to 'New Structure', new_structure_path, class: 'main-header--link btn btn-primary' %>    
+  </div>
   <h3>Editing Structure</h3>
   <a href="<%= structures_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> Back to list</a>
 <% end %>

data/app/views/binda/structures/index.html.erb

@@ -27,6 +27,8 @@
         <tbody>
       </table>
     
+    <%= paginate @structures %>
+
     <%= link_to 'New Structure', new_structure_path, class: 'main-header--link btn btn-default' %>    
         
   </div>

data/app/views/layouts/binda/_flash.html.erb

@@ -3,8 +3,8 @@
   	<div class="alert alert-success col-sm-12">
 			<%= notice if notice.is_a? String %>
 			<% if notice.is_a? Hash %>
-				<% notice.each do |key, message| %>
-					<p><%= key.humanize.capitalize %> <%= message.to_sentence %></p>
+				<% notice.each do |key, message| %>				
+					<p><%= key.split('.').map{|k| k.humanize.capitalize }.join(': ') %> <%= message.to_sentence %></p>
 				<% end %>
 			<% end %>
 		</div>
@@ -17,7 +17,7 @@
 			<%= alert if alert.is_a? String %>
 			<% if alert.is_a? Hash %>
 				<% alert.each do |key, message| %>
-					<p><%= key.humanize.capitalize %> <%= message.to_sentence %></p>
+					<p><%= key.split('.').map{|k| k.humanize.capitalize }.join(': ') %> <%= message.to_sentence %></p>
 				<% end %>
 			<% end %>
 		</div>

data/app/views/layouts/binda/_sidebar.html.erb

@@ -1,5 +1,5 @@
 <%
-# If this partial is run from Devise 
+# If this partial is run from Devise controller
 # keep in mind to add "binda." to path helpers
 # 
 # https://github.com/plataformatec/devise/wiki/How-To:-Use-devise-inside-a-mountable-engine#path-helpers 
@@ -11,22 +11,27 @@
     <li class = "main-sidebar--brand">
       <h3><%= link_to get_website_name, '/' %></h3>
     </li>
-    <li>
-      <a href="<%= dashboard_path %>">
-        <span class="glyphicon glyphicon-home" aria-hidden="true"></span> Dashboard
-      </a>
-    </li>
     <% Binda::Structure.all.order(:position).each_with_index do |structure, index| %>
-      <li class="main-sidebar--structure <%= 'main-sidebar--first-structure' if index == 0 %>">
-        <a href="<%= structure_components_path( structure.slug ) %>">
-          <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span> <%= structure.name.humanize.pluralize %> 
-        </a>
-        <% if structure.has_categories %>
-          <a class="main-sidebar--sub-link" href="<%= structure_categories_path( structure.slug ) %>">
-            <span class="glyphicon glyphicon-tags" aria-hidden="true"></span> <%= structure.name.humanize %> <%= t(:category).capitalize.pluralize %>
+      <% if structure.instance_type == 'component' %>
+        <li class="main-sidebar--structure <%= 'main-sidebar--first-structure' if index == 0 %>">
+          <a href="<%= structure_components_path( structure ) %>">
+            <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span> 
+            <%= structure.name.humanize.pluralize  %> 
           </a>
-        <% end %>
-      </li>
+          <% if structure.has_categories %>
+            <a class="main-sidebar--sub-link" href="<%= structure_categories_path( structure.slug ) %>">
+              <span class="glyphicon glyphicon-tags" aria-hidden="true"></span> <%= structure.name.humanize %> <%= t(:category).capitalize.pluralize %>
+            </a>
+          <% end %>
+        </li>
+      <% else %>
+        <li class="main-sidebar--structure <%= 'main-sidebar--first-structure' if index == 0 %>">
+          <a href="<%= structure_board_path( structure, structure.board ) %>">
+            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
+            <%= structure.name.humanize %>
+          </a>
+        </li>
+      <% end %>
     <% end %>
     <% if current_user.is_superadmin %>
       <li>

data/config/locales/en.yml

@@ -14,6 +14,7 @@ en:
   create: create
   delete: delete
   setting: setting
+  board: board
   back_to_index: back to list
   back_to: back to
   slug_disable_hint: 'Editing slug is not possible. If you want a specific slug create a new item and a slug will be extracted from the title.'
@@ -42,3 +43,6 @@ en:
   default_choice: default choice
   default_choice_description: if you have added/removed any choice you need to click save to update the list of choices
   allow_null: allow null?
+  instance: instance
+  structure_instance_type: 'This structure is for:'
+  null_is_not_allowed: You need to select at least one choice

data/config/routes.rb

@@ -4,10 +4,10 @@ Binda::Engine.routes.draw do
   # ----
   # https://github.com/plataformatec/devise/wiki/How-To:-Require-authentication-for-all-components
   # authenticated :user, class_name: "Binda::User", module: :devise do
-  #   root to: 'settings#dashboard', as: :authenticated_root
+  #   root to: 'boards#dashboard', as: :authenticated_root
   # end
   # root to: 'users/sessions#new'
-  root to: 'settings#dashboard'
+  root to: 'boards#dashboard'
 
   # DEVISE
   # ------
@@ -31,38 +31,35 @@ Binda::Engine.routes.draw do
 
   # ADMINISTRATION PANEL
   # --------------------
-  get  'dashboard', to: 'settings#dashboard',         as: :dashboard
-  post 'dashboard', to: 'settings#update_dashboard'
-  resources :settings
+  get  'dashboard', to: 'boards#dashboard', as: :dashboard
 
   post 'structures/sort'
   resources :structures do
-
-    resources :categories
-
-    post 'components/sort'
-    resources :components do
-      post 'sort_repeaters'
-      post 'new_repeater'
-    end
-
     post 'field_groups/sort'
     post 'field_groups/add_child'
     resources :field_groups do
-
       post 'field_settings/add_child'
       post 'field_settings/sort'
       resources :field_settings
-
     end
+    resources :boards do
+      post 'sort_repeaters'
+      post 'new_repeater'
+    end
+    post 'components/sort'
+    resources :components do
+      post 'sort_repeaters'
+      post 'new_repeater'
+    end
+    resources :categories
   end
 
   resources :choices, only: [:destroy]
   
-  resources :texts
-  resources :bindings
-  resources :assets
-  resources :repeaters
-  resources :dates
+  # resources :texts
+  # resources :bindings
+  # resources :assets
+  resources :repeaters, only: [:destroy]
+  # resources :dates
   
 end

data/db/migrate/1_create_binda_tables.rb

@@ -1,13 +1,12 @@
 class CreateBindaTables < ActiveRecord::Migration[5.0]
   def change
 
-    create_table :binda_settings do |t|
+    create_table :binda_boards do |t|
     	t.string           :name, null: false
     	t.string           :slug
   		t.index            :slug, unique: true
-    	t.text             :content
     	t.integer          :position
-      t.boolean          :is_true, default: false
+      t.belongs_to       :structure
     end
 
     create_table :binda_components do |t|
@@ -26,6 +25,7 @@ class CreateBindaTables < ActiveRecord::Migration[5.0]
       t.integer          :position
       t.boolean          :has_categories, default: true
       t.index            :slug, unique: true
+      t.string           :instance_type, null: false, default: 'component'
       t.timestamps
     end
 
@@ -52,7 +52,7 @@ class CreateBindaTables < ActiveRecord::Migration[5.0]
       t.belongs_to       :field_group
       t.string           :ancestry
       t.index            :ancestry
-      t.boolean          :allow_null
+      t.boolean          :allow_null, default: false
       t.references       :default_choice, index: true
       t.timestamps
     end
@@ -69,6 +69,7 @@ class CreateBindaTables < ActiveRecord::Migration[5.0]
       t.integer          :position
       t.belongs_to       :field_setting
       t.references       :fieldable, polymorphic: true, index: true
+      t.string           :type
       t.timestamps
     end
 
@@ -97,11 +98,16 @@ class CreateBindaTables < ActiveRecord::Migration[5.0]
       t.string           :label
       t.string           :value
       t.belongs_to       :field_setting
-      t.references       :selectable, polymorphic: true, index: true
       t.timestamps
     end
 
-    create_table :binda_selects do |t|
+    create_table :binda_choices_selections do |t|
+      t.belongs_to :choice, index: true
+      t.belongs_to :selection, index: true
+      t.timestamps
+    end
+    
+    create_table :binda_selections do |t|
       t.belongs_to       :field_setting
       t.references       :fieldable, polymorphic: true, index: true
       t.string           :type

data/lib/binda/engine.rb

@@ -6,12 +6,16 @@ require 'coffee-rails'
 require 'colorize'
 require 'friendly_id'
 require 'aasm'
-require 'ffaker'
 require 'simple_form'
 require 'tinymce-rails'
 require 'carrierwave'
 require 'mini_magick'
 require 'ancestry'
+require 'kaminari'
+# require 'bullet'
+# require 'rails-perftest'
+# require 'ruby-prof'
+# require 'test-unit'
 
 module Binda
   class Engine < ::Rails::Engine

data/lib/binda/version.rb

@@ -1,3 +1,3 @@
 module Binda
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/generators/binda/install/install_generator.rb

@@ -20,6 +20,15 @@ module Binda
         route "mount Binda::Engine => '/admin_panel'"
       end
 
+      def add_helpers
+        ac_path = Rails.root.join('app', 'controllers', 'application_controller.rb' )
+        unless File.readlines(ac_path).grep(/::Binda::DefaultHelpers/).size > 0
+          inject_into_file ac_path, after: "ActionController::Base" do 
+            "\n  include ::Binda::DefaultHelpers"
+          end
+        end
+      end
+
       def copy_migrations
         return if Rails.env.production?
 

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

@@ -2,6 +2,13 @@ require 'colorize'
 require 'securerandom'
 
 module Binda
+  # Setup initial settings for the application.
+  # 
+  # This is setup is mandatory as sets the initial super admin user and 
+  #   the default dashboard where are stored the main application settings.
+  #   It is useful also when Binda has been already installed once but the
+  #   database has been reset. Runnin `rails g binda:setup` will populate 
+  #   the application database with new default settings.
   class SetupGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
@@ -13,27 +20,63 @@ module Binda
       puts 
       puts "We need few details. Don't worry you can modify them later. \n\n"
 
+      dashboard_structure = ::Binda::Structure.find_or_create_by( name: 'dashboard', slug: 'dashboard', instance_type: 'board' )
+      @dashboard = dashboard_structure.board
+
+      # By default each structure has a field group which will be used to store the default field settings
+      field_settings = dashboard_structure.field_groups.first.field_settings
+
+
       # MAINTENANCE MODE
-      ::Binda::Setting.find_or_create_by( name: 'Maintenance Mode' )
+      puts "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' )
+        # make sure slug works
+        maintenance_mode.update_attributes( slug: 'maintenance-mode' )
+        disabled = maintenance_mode.choices.create!( label: 'disabled', value: 'false' )
+        active   = maintenance_mode.choices.create!( label: 'active', value: 'true' )
+        @dashboard.radios.find_or_create_by!( field_setting_id: maintenance_mode.id )
+      end
+      puts "The maintenance-mode option has been set up."
+      puts
+
 
       # WEBSITE NAME
-      @website_name = ask("What would you like to name your website? ['MySite']\n").presence || 'MySite'
-      ::Binda::Setting.find_or_create_by( name: 'Website Name' ).update_attribute( :content, @website_name )
+      puts "Setting up website name"
+
+      website_name_obj = field_settings.find_by(slug: 'website-name')
+      unless website_name_obj.present?
+        website_name_obj = field_settings.create!( name: 'Website Name', field_type: 'string' )
+        # make sure slug works
+        website_name_obj.update_attribute( 'slug', 'website-name' )
+      end
+      website_name = ask("How would you like to name your website? ['MySite']\n").presence || 'MySite'
+      @dashboard.strings.find_or_create_by( field_setting_id: website_name_obj.id ).update_attribute('content', website_name )
 
       # WEBSITE CONTENT
-      @website_description = ask("What is it about? ['A website about the world']\n").presence || 'A website about the world'
-      ::Binda::Setting.find_or_create_by( name: 'Website Description' ).update_attribute( :content, @website_description )
+      puts "Setting up website description"
+
+      website_description_obj = field_settings.find_by(slug: 'website-description')
+      unless website_description_obj.present?
+        website_description_obj = field_settings.find_or_create_by( name: 'Website Description', field_type: 'text' )
+        # make sure slug works
+        website_description_obj.update_attribute( 'slug', 'website-description' )
+      end
+      website_description = ask("What is your website about? ['A website about the world']\n").presence || 'A website about the world'
+      @dashboard.texts.find_or_create_by!( field_setting_id: website_description_obj.id ).update_attribute( 'content', website_description )
     end
 
     def create_credentials
-      rake 'binda_create_initial_user'
+      rake 'binda:create_superadmin_user'
     end
 
     def feedback
       puts
       puts "============================================================================="
       puts
-      puts "                Binda CMS has been succesfully installed! ".colorize(:green)
+      puts "                Binda CMS has been succesfully installed! "
       puts
       puts "============================================================================="
       puts

data/lib/tasks/binda.rake

@@ -1,25 +1,79 @@
-# desc "Explaining what the task does"
-# task :binda do
-#   # Task goes here
-# end
-
-desc "Create first user"
-task :binda_create_initial_user => :environment do
-	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?
-  Binda::User.create!( email: username, password: password, password_confirmation: password, is_superadmin: true )
-end
-
-desc "Update Binda::Page to Binda::Component"
-task :binda_update_page_to_component => :environment do
-	ActiveRecord::Base.connection.execute("UPDATE binda_assets SET fieldable_type = 'Binda::Component' WHERE  fieldable_type = 'Binda::Page'")
-	ActiveRecord::Base.connection.execute("UPDATE binda_texts SET fieldable_type = 'Binda::Component' WHERE  fieldable_type = 'Binda::Page'")
-	ActiveRecord::Base.connection.execute("UPDATE binda_dates SET fieldable_type = 'Binda::Component' WHERE  fieldable_type = 'Binda::Page'")
-	ActiveRecord::Base.connection.execute("UPDATE binda_galleries SET fieldable_type = 'Binda::Component' WHERE  fieldable_type = 'Binda::Page'")
-	ActiveRecord::Base.connection.execute("UPDATE binda_repeaters SET fieldable_type = 'Binda::Component' WHERE  fieldable_type = 'Binda::Page'")
-	p "Binda has been updated"
+require 'colorize'
+
+namespace :binda do 
+
+	desc "Create super admin user"
+	task :create_superadmin_user => :environment do
+		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?
+	  Binda::User.create!( email: username, password: password, password_confirmation: password, is_superadmin: true )
+	end
+
+	desc "Update Binda to v0.0.7"
+	task :upgrade_to_v007 => :environment do
+
+		# Make sure Binda hasn't been upgraded already
+		check_structure = Binda::Structure.where(slug: 'dashboard').any?
+		check_field_settings = Binda::FieldSetting.where(slug: ['maintenance-mode', 'website-name', 'website-description']).length == 3
+		if check_structure && check_field_settings
+			puts "It seems you have already upgraded to v0.0.7".colorize(:red)
+			exit
+		end
+
+		if Binda::Structure.where(slug: 'dashboard').any?
+			puts "A Binda::Structure with `slug = 'dashboard'` has been detected in your database.".colorize(:red)
+			puts "In order to upgrade Binda, the structure's name and slug will be set to 'dashboard-backup'".colorize(:red)
+			Binda::Structure.where(slug: 'dashboard').update_all(name: 'dashboard-backup')
+		end
+		# DASHBOARD
+		dashboard_structure = Binda::Structure.create( name: 'dashboard', slug: 'dashboard', instance_type: 'board' )
+		unless dashboard_structure.board.nil?
+		  @dashboard = dashboard_structure.board
+		else
+		  @dashboard = dashboard_structure.create_board( name: 'dashboard' )
+		end
+		# By default each structure has a field group which will be used to store the default field settings
+		field_settings = dashboard_structure.field_groups.first.field_settings
+
+		# MAINTENANCE MODE
+		puts "Setting up maintenance mode"
+		unless Binda::FieldSetting.where(slug: 'maintenance-mode').any?
+			maintenance_mode = field_settings.create( name: 'Maintenance Mode', field_type: 'radio')
+			maintenance_mode.update_attributes( slug: 'maintenance-mode' )
+			active   = maintenance_mode.choices.create( label: 'active', value: 'true' )
+			disabled = maintenance_mode.choices.create( label: 'disabled', value: 'false' )
+			@dashboard.radios.find_or_create_by( field_setting_id: maintenance_mode.id ).choices << disabled
+		end
+
+
+		# WEBSITE NAME
+		puts "Setting up website name"
+		unless Binda::FieldSetting.where(slug: 'website-name').any?
+			website_name = field_settings.create( name: 'Website Name', field_type: 'string' )
+			website_name.update_attributes( slug: 'website-name' )
+			old_name_record = Binda::Board.where(slug: 'website-name')
+			if old_name_record.any?
+				@dashboard.texts.find_or_create_by( field_setting_id: website_name.id ).update_attributes(content: old_name_record.first.content )
+			else
+				@dashboard.texts.find_or_create_by( field_setting_id: website_name.id ).update_attributes(content: 'MySite' )
+			end
+		end
+
+		# WEBSITE CONTENT
+		puts "Setting up website description"
+		unless Binda::FieldSetting.where(slug: 'website-description').any?
+			website_description = field_settings.create( name: 'Website Description', field_type: 'string' )
+			website_description.update_attributes( slug: 'website-description' )
+			old_description_record = Binda::Board.where(slug: 'website-name')
+			if old_description_record.any?
+				@dashboard.texts.find_or_create_by( field_setting_id: website_description.id ).update_attributes( content: old_description_record.first.content )
+			else
+				@dashboard.texts.find_or_create_by( field_setting_id: website_description.id ).update_attributes( content: 'A website about the world' )
+			end
+		end
+	end
 end