binda 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a0ed652cd145d7bd16c1e6488c5fdd9a3177018
-  data.tar.gz: ae29ad9b71bd43ba1a40eeb67b69ab9c919fe847
+  metadata.gz: 6690ffecf6e02f102a52ba0adb48e57914e6daa3
+  data.tar.gz: 3a29b2ed21beea482e4d4f069ee882595ab321b9
 SHA512:
-  metadata.gz: 00f4c1845cfeb066332494f6213d92abccdc41f5d6f8be0a7d2901b9b06f7d47a3a61a1ef324a08665db8d0f998f71bca1868a149ed3e33bbca002e72bb2285f
-  data.tar.gz: 738f6490b90e4efd030938c372f70ba1fb8e65150571e02204a11e3221a1b051c07ad18785cd80bedbc72074953221461a7f081a716f2c2eb2d1aa2b690a5975
+  metadata.gz: 084e2b3bb8e2e52676cc381e8eb6daaceb15a2127da3fe78889bcf3d36054b2adfcb2948fd042afa12e6446f45a6709722b702eb97dbb5419e4ae06b937b599f
+  data.tar.gz: 29cd68ff87c402662711569bfdef44c4951e39f36a112f900ced53a5c325bbc8a2819818a27292a40212c4dcfe665b980f1ebaf9015d29d2b6db343ba2b2b50e

data/README.md

@@ -1,5 +1,5 @@
 # Binda
-A modular CMS for Ruby on Rails 5.
+A modular CMS for Ruby on Rails 5.1.
 
 [![Code Climate](https://codeclimate.com/github/lacolonia/binda/badges/gpa.svg)](https://codeclimate.com/github/lacolonia/binda)
 [![Issue Count](https://codeclimate.com/github/lacolonia/binda/badges/issue_count.svg)](https://codeclimate.com/github/lacolonia/binda)
@@ -10,15 +10,17 @@ A modular CMS for Ruby on Rails 5.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'binda', '~> 0.0.6'
+gem 'binda', '~> 0.0.7'
 ```
 
 Then execute:
+
 ```bash
 $ bundle
 ```
 
 To install Binda run the installer from terminal. 
+
 ``` bash
 $ rails g binda:install
 ```

data/Rakefile

@@ -32,6 +32,7 @@ require 'bundler/gem_tasks'
 #   t.libs << 'test'
 #   t.pattern = 'test/**/*_test.rb'
 #   t.verbose = false
+#   t.warning = false
 # end
 # task default: :test
 
@@ -40,4 +41,4 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec')
 # If you want to make this the default task
-task :default => :spec
+task default: :spec

data/app/assets/javascripts/binda/dist/binda.bundle.js

@@ -63,7 +63,7 @@
 /******/ 	__webpack_require__.p = "";
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 5);
+/******/ 	return __webpack_require__(__webpack_require__.s = 6);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -71,7 +71,67 @@
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__form_item_editor__ = __webpack_require__(6);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _FormItemEditor; });
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+///- - - - - - - - - - - - - - - - - - - -
+/// FORM ITEM
+///- - - - - - - - - - - - - - - - - - - -
+
+var FormItemEditor = function () {
+	function FormItemEditor() {
+		_classCallCheck(this, FormItemEditor);
+
+		this.target = '.form-item--editor';
+	}
+
+	_createClass(FormItemEditor, [{
+		key: 'isSet',
+		value: function isSet() {
+			if ($(this.target).length > 0) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}, {
+		key: 'setEvents',
+		value: function setEvents() {
+			var _this = this;
+
+			// run resize to set initial size
+			this.resize();
+			// run resize on each of these events
+			$(window).resize(function () {
+				_this.resize();
+			});
+		}
+	}, {
+		key: 'resize',
+		value: function resize() {
+			$(this.target).each(function () {
+				// If the form item edito is closed don't go any further
+				if ($(this).height() === 0) return;
+				// otherwise update the max-height which is needed for the CSS transition
+				// NOTE you need to remove the max-height (inside 'style' attribute) to get the real height
+				$(this).css("max-height", $(this).removeAttr('style').height());
+			});
+		}
+	}]);
+
+	return FormItemEditor;
+}();
+
+var _FormItemEditor = new FormItemEditor();
+
+/***/ }),
+/* 1 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__form_item_editor__ = __webpack_require__(0);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _FormItem; });
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -148,7 +208,7 @@ function addNewItem(event) {
 }
 
 /***/ }),
-/* 1 */
+/* 2 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -191,11 +251,11 @@ var FormItemAsset = function () {
 var _FormItemAsset = new FormItemAsset();
 
 /***/ }),
-/* 2 */
+/* 3 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__form_item_editor__ = __webpack_require__(6);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__form_item_editor__ = __webpack_require__(0);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _FormItemChoice; });
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -266,11 +326,11 @@ var FormItemChoice = function () {
 var _FormItemChoice = new FormItemChoice();
 
 /***/ }),
-/* 3 */
+/* 4 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__form_item_editor__ = __webpack_require__(6);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__form_item_editor__ = __webpack_require__(0);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _FormItemRepeater; });
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -355,7 +415,7 @@ function addNewItem(event) {
 }
 
 /***/ }),
-/* 4 */
+/* 5 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -398,17 +458,17 @@ function addNewItem(event) {
 };
 
 /***/ }),
-/* 5 */
+/* 6 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__components_form_item__ = __webpack_require__(0);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__components_form_item_repeater__ = __webpack_require__(3);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__components_form_item_asset__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__components_form_item_choice__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__components_form_item_editor__ = __webpack_require__(6);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__components_sortable__ = __webpack_require__(4);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__components_form_item__ = __webpack_require__(1);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__components_form_item_repeater__ = __webpack_require__(4);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__components_form_item_asset__ = __webpack_require__(2);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__components_form_item_choice__ = __webpack_require__(3);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__components_form_item_editor__ = __webpack_require__(0);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__components_sortable__ = __webpack_require__(5);
 ///- - - - - - - - - - - - - - - - - - - -
 /// INDEX OF BINDA'S SCRIPTS
 ///- - - - - - - - - - - - - - - - - - - -
@@ -439,65 +499,5 @@ $(document).ready(function () {
 	__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__components_sortable__["a" /* default */])();
 });
 
-/***/ }),
-/* 6 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _FormItemEditor; });
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-///- - - - - - - - - - - - - - - - - - - -
-/// FORM ITEM
-///- - - - - - - - - - - - - - - - - - - -
-
-var FormItemEditor = function () {
-	function FormItemEditor() {
-		_classCallCheck(this, FormItemEditor);
-
-		this.target = '.form-item--editor';
-	}
-
-	_createClass(FormItemEditor, [{
-		key: 'isSet',
-		value: function isSet() {
-			if ($(this.target).length > 0) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}, {
-		key: 'setEvents',
-		value: function setEvents() {
-			var _this = this;
-
-			// run resize to set initial size
-			this.resize();
-			// run resize on each of these events
-			$(window).resize(function () {
-				_this.resize();
-			});
-		}
-	}, {
-		key: 'resize',
-		value: function resize() {
-			$(this.target).each(function () {
-				// If the form item edito is closed don't go any further
-				if ($(this).height() === 0) return;
-				// otherwise update the max-height which is needed for the CSS transition
-				// NOTE you need to remove the max-height (inside 'style' attribute) to get the real height
-				$(this).css("max-height", $(this).removeAttr('style').height());
-			});
-		}
-	}]);
-
-	return FormItemEditor;
-}();
-
-var _FormItemEditor = new FormItemEditor();
-
 /***/ })
 /******/ ]);

data/app/assets/stylesheets/binda/settings/common.scss

@@ -90,4 +90,8 @@ body#tinymce {
 	&:first-child {
 		margin-top: 0 !important;
 	}
+}
+
+.pagination {
+	width: 100%;
 }

data/app/controllers/binda/application_controller.rb

@@ -5,7 +5,7 @@ module Binda
 
 		before_action :authenticate_user!
 
-		include ComponentControllerHelper
+		include DefaultHelpers
 
 		# _ indicates that we are not using the argument in the method
 	  def after_sign_in_path_for(_)

data/app/controllers/binda/boards_controller.rb

@@ -0,0 +1,73 @@
+require_dependency "binda/application_controller"
+
+module Binda
+  class BoardsController < ApplicationController
+    before_action :set_board, only: [:edit, :update, :destroy, :new_repeater ]
+    before_action :set_structure, only: [:edit, :update, :destroy, :new_repeater ]
+
+    include FieldableHelpers
+
+    def show
+      redirect_to action: :edit
+    end
+
+    def edit
+    end
+
+    def update
+      if @board.update(board_params)
+        redirect_to structure_board_path( @structure.slug, @board.slug ), notice: 'Setting was successfully updated.'
+      else
+        redirect_to edit_structure_board_path( @structure.slug, @board.slug ), flash: { alert: @board.errors }
+      end
+    end
+
+    def destroy
+      @board.destroy
+      redirect_to root_url, notice: 'Setting was successfully destroyed.'
+    end
+
+    def new_repeater
+      @repeater_setting = FieldSetting.find( params[:repeater_setting_id] )
+      position = @instance.repeaters.find_all{|r| r.field_setting_id = @repeater_setting.id }.length + 1
+      @repeater = @instance.repeaters.create( field_setting: @repeater_setting, position: position )
+      render 'binda/fieldable/_form_item_new_repeater', layout: false
+    end
+
+    def sort_repeaters
+      params[:repeater].each_with_index do |id, i|
+        Repeater.find( id ).update({ position: i + 1 })
+      end
+      head :ok
+    end
+
+    def dashboard
+      @structure = Structure.friendly.find('dashboard')
+      @board = Board.friendly.find('dashboard')
+      @instance = @board
+      render action: :edit
+    end
+
+    private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_board
+        id ||= params[:id]
+        id ||= params[:board_id] 
+        @board = Board.friendly.find(id)
+        # The following variable will be used as wildcard by fieldable views
+        @instance = @board
+      end
+
+      def set_structure
+        @structure = Structure.friendly.find(params[:structure_id])
+      end
+
+      # Only allow a trusted parameter "white list" through.
+      def board_params
+        default_params = params.require(:board).permit( 
+          :name, :slug, :position, :structure_id,
+          { structure_attributes:  [ :id ] },
+          *fieldable_params )
+      end
+  end
+end

data/app/controllers/binda/components_controller.rb

@@ -6,8 +6,10 @@ module Binda
     before_action :set_component, only: [:show, :edit, :update, :destroy, :new_repeater]
     before_action :set_position, only: [:create]
 
+    include FieldableHelpers
+
     def index
-      @components = @structure.components.order('position').all
+      @components = @structure.components.order('position').all.page params[:page]
     end
 
     def show
@@ -16,6 +18,8 @@ module Binda
 
     def new
       @component = @structure.components.build()
+      # The following variable will be used as wildcard by fieldable views
+      @instance = @component
     end
 
     def edit
@@ -33,7 +37,7 @@ module Binda
 
     def update
       if @component.update(component_params)
-        redirect_to structure_component_path( @structure.slug, @component.slug ), notice: "A #{ @component.name } was successfully updated."
+        redirect_to structure_component_path( @structure.slug, @component.slug ), notice: "#{ @component.name.capitalize } was successfully updated."
       else
         redirect_to edit_structure_component_path( @structure.slug, @component.slug ), flash: { alert: @component.errors }
       end
@@ -41,14 +45,14 @@ module Binda
 
     def destroy
       @component.destroy
-      redirect_to structure_components_url( @structure.slug ), notice: "A #{ @component.name } was successfully destroyed."
+      redirect_to structure_components_url( @structure.slug ), notice: "#{ @component.name.capitalize } was successfully destroyed."
     end
 
     def new_repeater
       @repeater_setting = FieldSetting.find( params[:repeater_setting_id] )
-      position = @component.repeaters.find_all{|r| r.field_setting_id=@repeater_setting.id }.length + 1
-      @repeater = @component.repeaters.create( field_setting: @repeater_setting, position: position )
-      render 'binda/components/_form_item_new_repeater', layout: false
+      position = @instance.repeaters.find_all{|r| r.field_setting_id=@repeater_setting.id }.length + 1
+      @repeater = @instance.repeaters.create( field_setting: @repeater_setting, position: position )
+      render 'binda/fieldable/_form_item_new_repeater', layout: false
     end
 
     def sort_repeaters
@@ -57,6 +61,7 @@ module Binda
       end
       head :ok
     end
+    
 
     def sort
       params[:component].each_with_index do |id, i|
@@ -72,50 +77,19 @@ module Binda
       end
 
       def set_component
-        if params[:component_id].nil?
-          return @component = Component.friendly.find(params[:id])
-        else
-          return @component = Component.friendly.find(params[:component_id])
-        end
+        id ||= params[:id]
+        id ||= params[:component_id] 
+        @component = Component.friendly.find(id)
+        # The following variable will be used as wildcard by fieldable views
+        @instance = @component
       end
 
       # Only allow a trusted parameter "white list" through.
       def component_params
         params.require(:component).permit( 
           :name, :slug, :position, :publish_state, :structure_id, :category_ids,
-          structure_attributes:  [ :id ], 
-          categories_attributes: [ :id, :category_id ], 
-          texts_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :content ], 
-          assets_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :image ], 
-          dates_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :date ], 
-          galleries_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id ],
-          radios_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],
-          selects_attributes:    [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ],
-          checkboxes_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ],
-          repeaters_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :field_group_id,
-            texts_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ], 
-            assets_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ], 
-            dates_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ], 
-            galleries_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id ], 
-            repeaters_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :field_group_id ],
-            radios_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],
-            selects_attributes:    [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ],
-            checkboxes_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ]
-          ])
-      end
-
-      def repeater_params
-        params.require(:repeater).permit( 
-          new_repeaters_attributes: [ :id, :field_setting_id, :field_group_id, :fieldable_type, :fieldable_id,
-            texts_attributes:         [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :content ], 
-            assets_attributes:        [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :image ], 
-            dates_attributes:         [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :date ], 
-            galleries_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id ], 
-            repeaters_attributes:     [ :id, :field_setting_id, :field_group_id, :fieldable_type, :fieldable_id ],
-            radios_attributes:        [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],
-            selects_attributes:       [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ],
-            checkboxes_attributes:    [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ]
-          ])
+          {structure_attributes:  [ :id ]}, 
+          {categories_attributes: [ :id, :category_id ]}, *fieldable_params )
       end
 
       def set_position