promethee 1.3.7 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b4d9a4512c42d8731062cf61acce1d96fd0e73
-  data.tar.gz: f5707c5375d68c7c975f6018a73f075c7afee603
+  metadata.gz: df76ca52499900498a2ff40350dae10ceadb8727
+  data.tar.gz: 983fdb405ee1e2cb7de785b6246f5d2b32f77320
 SHA512:
-  metadata.gz: 5751b7d854521e47695b54de6d4d0a8805cf5e9583035c914de2b7321878fc94d1e9a9b24739a221138b034c046a822aaee1b6056f8c2476d6c82021625b000a
-  data.tar.gz: 972382e131cb399a4c605b82a0b181c5865eac49c36972044139f9d87a093ce5f0057ebc445e9b92a79325442dd31289227c5329dcf52edca5f5268730fb49f2
+  metadata.gz: fd489fa650db088fb8c99deb76b9021697cc04f2d9df416bb4b6ebac9a529f55371ecb3bf1437f7f8246aa33aa1853b994a50af6f17c82270d940a3e95226cf4
+  data.tar.gz: e7bd37fb63c2df0fa1503e44f0f4fb399c1f4f17268bb70cad4c75e7d6233cfb1b453cae3123fbccabf84e148119642f3343141e644a9bc0a444ce46f6b10611

data/README.md

@@ -129,7 +129,6 @@ With javascript set:
 //= require summernote
 //= require angular
 //= require angular-animate
-//= require angular-ui-bootstrap
 //= require angular-summernote
 //= require ui-sortable
 ```
@@ -284,6 +283,13 @@ class CreateLocalizations < ActiveRecord::Migration[5.1]
 end
 ```
 
+In the controllers, don't forget to change the params to convert the data from json to a hash:
+```
+  def page_params
+    params.require(:page).permit(:name, :metier, :position, :parent_id, :data).tap { |permitted| permitted[:data] = JSON.parse(params[:page][:data]) }
+  end
+```
+
 ### SQLite (or other not native json storage)
 
 Prométhée takes a ruby hash.

data/app/views/promethee/_edit.html.erb

@@ -5,7 +5,9 @@ logo = File.read "#{__dir__}/../../assets/images/icon-promethee.svg"
 
 <script type="text/javascript">
 var promethee = angular
-  .module('Promethee', ['summernote', 'ngAnimate', 'ui.sortable'])
+  .module('Promethee', ['summernote', 'ngAnimate', 'ui.sortable'], ['$rootScopeProvider', function($rootScopeProvider) {
+    $rootScopeProvider.digestTtl(15);
+  }])
   .value('definitions', [])
   .value('presets', []);
 </script>
@@ -20,13 +22,18 @@ var promethee = angular
 
 <script type="text/javascript">
 promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'presets', 'identifier', function($scope, summernoteConfig, presets, identifier) {
+  $scope.data = <%= promethee_data.to_json.html_safe %>;
 
   // Data (TODO use Adder and probably page definition to init)
-  if ($scope.data === null || $scope.data === '') {
+  if (typeof $scope.data !== 'object' || $scope.data === null || $scope.data.type !== 'page') {
     $scope.data = {
       id: '',
       type: 'page',
       version: 1,
+      attributes: {
+        title: 'New page',
+        description: ''
+      },
       children: []
     };
   }
@@ -83,9 +90,6 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
   };
 
   $scope.summernoteConfig = summernoteConfig;
-
-  $scope.promethee.data = <%= promethee_data.to_json.html_safe %>;
-
   $scope.sendPreviewData('thumb-preview');
 }]);
 </script>

data/app/views/promethee/_localize.html.erb

@@ -39,7 +39,7 @@ promethee_data = Promethee::Data.new master_data, localization_data: localizatio
     <ng-include src="'promethee/components/' + component.type + '/localize'"></ng-include>
   </script>
   
-  <input type="hidden" name="localization[data]" id="page_data" value="{{data}}" />
+  <input type="hidden" name="<%= object_name %>[<%= method_name %>]" id="page_data" value="{{data}}" />
 
   <% Dir["#{__dir__}/components/*/_localize.html.erb"].map do |file| %>
     <% partial = file.split('app/views/').last.gsub('.html.erb', '').gsub('/_', '/') %>

data/app/views/promethee/components/cover/_localize.html.erb

@@ -1,13 +1,13 @@
 <script type="text/ng-template" id="promethee/components/cover/localize">
   <div class="row">
-    <div class="col-md-6">
-      <b>Local</b>
-      <summernote config="options" ng-model="component.attributes.body"></summernote>
-    </div>
     <div class="col-md-6">
       <b>Master</b>
       <div class="promethee-edit__wrapper" ng-bind-html="component.master.attributes.body | htmlSafe"></div>
     </div>
+    <div class="col-md-6">
+      <b>Local</b>
+      <summernote config="options" ng-model="component.attributes.body"></summernote>
+    </div>
   </div>
   <hr>
 </script>

data/app/views/promethee/components/image/_localize.html.erb

@@ -1,16 +1,16 @@
 <script type="text/ng-template" id="promethee/components/image/localize">
   <div class="row">
-    <div class="col-md-6">
-      <b>Local</b>
-      <input ng-model="component.attributes.alt" type="text" class="form-control">
-      <summernote config="options" ng-model="component.attributes.caption"></summernote>
-    </div>
     <div class="col-md-6">
       <b>Master</b>
       <img ng-src="{{component.master.attributes.src}}" class="img-responsive" />
       <input ng-model="component.master.attributes.alt" type="text" class="form-control" disabled/>
       <div class="promethee-edit__wrapper" ng-bind-html="component.master.attributes.caption | htmlSafe"></div>
     </div>
+    <div class="col-md-6">
+      <b>Local</b>
+      <input ng-model="component.attributes.alt" type="text" class="form-control">
+      <summernote config="options" ng-model="component.attributes.caption"></summernote>
+    </div>
   </div>
   <hr>
 </script>

data/app/views/promethee/components/page/_edit.inspect.html.erb

@@ -0,0 +1,11 @@
+<script type="text/ng-template" id="promethee/components/page/edit/inspect">
+  <div class="form-group">
+    <label class="label-control">Title</label>
+    <input class="form-control" ng-model="promethee.inspected.attributes.title">
+  </div>
+
+  <div class="form-group">
+    <label class="label-control">Description</label>
+    <input class="form-control" ng-model="promethee.inspected.attributes.description">
+  </div>
+</script>

data/app/views/promethee/components/page/_edit.move.html.erb

@@ -0,0 +1,19 @@
+<script type="text/ng-template" id="promethee/components/page/edit/move">
+  <div ng-click="inspect(component, $event)"
+      ng-class="{'promethee-edit__component--selected': promethee.inspected === component}"
+      class="<%= promethee_bem_classes 'promethee-edit__component', "--page" %>">
+    <div class="promethee-edit__component__inner">
+      <div class="header">Page</div>
+
+      <div class="promethee-edit__move__columns">
+        <div class="row">
+          <% 12.times do %>
+            <div class="col col-md-1"><div class="color"></div></div>
+          <% end %>
+        </div>
+      </div>
+
+      <ng-include src="'promethee/move/components'"></ng-include>
+    </div>
+  </div>
+</script>

data/app/views/promethee/components/page/_localize.html.erb

@@ -0,0 +1,3 @@
+<script type="text/ng-template" id="promethee/components/page/localize">
+
+</script>

data/app/views/promethee/components/page/_show.html.erb

@@ -0,0 +1 @@
+<%= render 'promethee/show/components', components: component[:children] %>

data/app/views/promethee/components/text/_localize.html.erb

@@ -1,13 +1,13 @@
 <script type="text/ng-template" id="promethee/components/text/localize">
   <div class="row">
-    <div class="col-md-6">
-      <b>Local</b>
-      <summernote config="options" ng-model="component.attributes.body"></summernote>
-    </div>
     <div class="col-md-6">
       <b>Master</b>
       <div class="promethee-edit__wrapper" ng-bind-html="component.master.attributes.body | htmlSafe"></div>
     </div>
+    <div class="col-md-6">
+      <b>Local</b>
+      <summernote config="options" ng-model="component.attributes.body"></summernote>
+    </div>
   </div>
   <hr>
 </script>

data/app/views/promethee/edit/_move.html.erb

@@ -9,7 +9,7 @@ promethee
           revertDuration: 0,
           scroll: true,
           refreshPositions: true,
-          cursor: 'move', 
+          cursor: 'move',
           cursorAt: { top: 50, left: 50 },
           helper: 'clone',
           appendTo: '.promethee-edit__move',
@@ -123,32 +123,32 @@ promethee
     }
   }]);
 
-promethee.controller('AdderController',
-  ['$scope', '$rootScope', 'definitions', 'identifier',
-  function($scope, $rootScope, definitions, identifier) {
+// promethee.controller('AdderController',
+//   ['$scope', '$rootScope', 'definitions', 'identifier',
+//   function($scope, $rootScope, definitions, identifier) {
 
-  $scope.adding = false;
-  $scope.childrenToAddTo = null;
-  $scope.definitions = definitions;
+//   $scope.adding = false;
+//   $scope.childrenToAddTo = null;
+//   $scope.definitions = definitions;
 
-  $scope.close = function() {
-    $scope.adding = false;
-    $scope.addingToChildren = null;
-  };
+//   $scope.close = function() {
+//     $scope.adding = false;
+//     $scope.addingToChildren = null;
+//   };
 
-  $scope.pushComponent = function(definition) {
-    var definition = angular.copy(definition.data);
-    definition.id = identifier.generate();
-    $scope.childrenToAddTo.push(definition);
-    $scope.close();
-  };
+//   $scope.pushComponent = function(definition) {
+//     var definition = angular.copy(definition.data);
+//     definition.id = identifier.generate();
+//     $scope.childrenToAddTo.push(definition);
+//     $scope.close();
+//   };
 
-  $rootScope.addComponentTo = function(components) {
-    $scope.adding = true;
-    $scope.childrenToAddTo = components;
-  };
+//   $rootScope.addComponentTo = function(components) {
+//     $scope.adding = true;
+//     $scope.childrenToAddTo = components;
+//   };
 
-}])
+// }])
 </script>
 
 <div class="promethee-edit__move" ng-show="promethee.mode == 'move'">
@@ -180,16 +180,8 @@ promethee.controller('AdderController',
     </div>
   </div>
 
-  <div class="promethee-edit__move__columns">
-    <div class="row">
-      <% 12.times do %>
-        <div class="col col-md-1"><div class="color"></div></div>
-      <% end %>
-    </div>
-  </div>
-
   <div class="promethee-edit__move__page">
-    <ng-include src="'promethee/move/components'"></ng-include>
+    <ng-include src="'promethee/move/component'"></ng-include>
   </div>
 
   <div class="promethee-edit__inspect" ng-show="promethee.inspected.type">
@@ -200,6 +192,7 @@ promethee.controller('AdderController',
       {{promethee.inspected.type}}
     </div>
     <div class="promethee-edit__inspect-content">
+      <ng-include src="'promethee/components/page/edit/inspect'" ng-show="promethee.inspected.type == 'page'"></ng-include>
       <div ng-repeat="definition in promethee.definitions">
         <ng-include src="'promethee/components/' + definition.data.type + '/edit/inspect'"
                     ng-show="promethee.inspected.type == definition.data.type"></ng-include>

data/lib/promethee/core_ext/tags.rb

@@ -17,7 +17,13 @@ module ActionView
           localization_data = object.send @method_name unless object.nil?
           localization_data = @options[:value] if @options.include? :value
           master_data = @options[:master]
-          ApplicationController.renderer.render partial: 'promethee/localize', locals: { localization_data: localization_data, master_data: master_data }
+          ApplicationController.renderer.render partial: 'promethee/localize', 
+                                                locals: { 
+                                                  object_name: @object_name,
+                                                  method_name: @method_name,
+                                                  localization_data: localization_data, 
+                                                  master_data: master_data 
+                                                }
         end
       end
     end

data/lib/promethee/data.rb

@@ -20,25 +20,24 @@ module Promethee
     # The data acts as a hash
     def [](value)
       @master_data[value]
-    end 
+    end
 
     protected
 
     def hashify(data)
-      case data.class.to_s
-      when 'Hash'
-        h = data
-      when 'String'
-        h = JSON.parse data
-      when 'NilClass'
-        h = {}
-      end
+      # https://github.com/bbatsov/ruby-style-guide#indent-conditional-assignment
+      h = case data.class.to_s
+          when 'Hash', 'ActiveSupport::HashWithIndifferentAccess' then data
+          when 'String' then JSON.parse data
+          else {}
+          end
+
       h.deep_symbolize_keys
     end
 
     def check_master_integrity
       @master_data[:version] = 1 unless @master_data.include? :version
-      @master_data[:children] = [] unless @master_data.include? :children 
+      @master_data[:children] = [] unless @master_data.include? :children
     end
 
     # We merge the localization data in the components from the master data.
@@ -103,4 +102,4 @@ module Promethee
       end
     end
   end
-end
+end

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.3.7'
+    VERSION = '1.3.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.9
 platform: ruby
 authors:
 - Julien Dargelos
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -183,6 +183,10 @@ files:
 - app/views/promethee/components/image/_icon.svg
 - app/views/promethee/components/image/_localize.html.erb
 - app/views/promethee/components/image/_show.html.erb
+- app/views/promethee/components/page/_edit.inspect.html.erb
+- app/views/promethee/components/page/_edit.move.html.erb
+- app/views/promethee/components/page/_localize.html.erb
+- app/views/promethee/components/page/_show.html.erb
 - app/views/promethee/components/row/_edit.define.html.erb
 - app/views/promethee/components/row/_edit.inspect.html.erb
 - app/views/promethee/components/row/_edit.move.html.erb