promethee 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0dc296374c813a4bcc4a553fc5db6b8dfbb0713
-  data.tar.gz: f1a82615609bc4c13c08405838b331aaceb455f4
+  metadata.gz: 44d867fcd71fae583eb50ba8eb6593eaa1162c7e
+  data.tar.gz: 324128142799a00e45d000b25967c3edc01722c4
 SHA512:
-  metadata.gz: f8044bfca87fef65222f683a39ae6cb843c90c270ac3c9b8532b6b9e47070c3b043b386f107ec33edcc1e4ec754a67b84f11f4344a34543a0300aef6562f32ef
-  data.tar.gz: 20a8b093c8f55c820f465be847d73030aa587e4111e0f983ced8eb93a8ba5564a1a20aa403761bffe334190d0844ed15e22e96e9a7111056050f0abd5e7e8358
+  metadata.gz: 1c73fe2e2d4d7b37b52195ca9d57147b5a059fbf9dbc5d5a245640deb098340fe87d20081af53bcbc59217e96d823bf047e3f3224cb5e895bcb8ec06315fd5c1
+  data.tar.gz: 0db18fd16d4ff3d2fed9cd413aff093c4393afddce21e602d21a25cac8241843e607a1a499d93b30d8d3222cf56b76c77ecb36a219a65b37cdc494b1969ba745

data/README.md

@@ -132,8 +132,6 @@ With javascript set:
 //= require angular-animate
 //= require angular-ui-bootstrap
 //= require angular-summernote
-//= require promethee
-//= require promethee-edit
 ```
 
 With stylesheets set:
@@ -248,6 +246,45 @@ This would do quite the same thing:
   <input type="submit">
 </form>
 ```
+
+## Database 
+
+### PostgreSQL
+
+To generate the standard models, you might use this:
+```
+rails g scaffold Page title:string data:jsonb
+rails g scaffold Localization page:references data:jsonb
+```
+Usually, the Localization will reference a language or a locale, or maybe use a locale stored as a String ("fr-FR").
+
+Add the null false, default '{}' like this:
+```
+class CreatePages < ActiveRecord::Migration[5.1]
+  def change
+    create_table :pages do |t|
+      t.string :title
+      t.jsonb :data, null: false, default: {}
+
+      t.timestamps
+    end
+  end
+end
+```
+and this:
+```
+class CreateLocalizations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :localizations do |t|
+      t.references :page, foreign_key: true
+      t.jsonb :data, null: false, default: {}
+
+      t.timestamps
+    end
+  end
+end
+```
+
 ### SQLite (or other not native json storage)
 
 Prométhée takes a ruby hash.
@@ -276,6 +313,10 @@ JSON.parse(data, symbolize_names: true)
 - ~~Preview in iframe~~
 - ~~Preview~~
 - ~~Fullscreen~~
+- ~~Cover~~
+- ~~Chapter (or maybe it's a cover too? *Yes it is, but see next line*)~~
+- ~~Grid background helper~
+- Section (in order to organize page contents within distincts parts which can be referenced. eg: scrollspy, hyperlink, tabs, ...)
 - Hooks (needed for image and video)
 - promethee-i18n
 - Component versioning
@@ -285,11 +326,7 @@ JSON.parse(data, symbolize_names: true)
 - Menu
 - Tab
 - Better col sizing/positioning UX
-- Grid background helper
 - File upload?
-- ~~Cover~~
-- ~~Chapter (or maybe it's a cover too? *Yes it is, but see next line*)~~
-- Section (in order to organize page contents within distincts parts which can be referenced. eg: scrollspy, hyperlink, tabs, ...)
 - Utils rake tasks (generate, destroy, override, ...)
 - Doc (to be updated in terms of the new component concept and structure)
 

data/app/views/promethee/components/cover/_edit.write.html.erb

@@ -26,7 +26,7 @@
 </script>
 
 <script>
-  promethee.controller('CoverController', ['$scope', function($scopen) {
+  promethee.controller('CoverController', ['$scope', function($scope) {
     $scope.options = {
       toolbar: [
         ['headline', ['style']],

data/lib/promethee/data.rb

@@ -3,7 +3,8 @@ module Promethee
   class Data
     def initialize(data, options = {})
       @master_data = hashify data
-      @localization_data_raw = hashify options[:localization_data] if options.include? :localization_data
+      @localization_data_raw = hashify(options[:localization_data]) if options.include? :localization_data
+      check_master_integrity
       prepare_localization_data
       localize_master_data
     end
@@ -23,8 +24,21 @@ module Promethee
 
     protected
 
-    def hashify(string_or_hash)
-      string_or_hash.is_a?(String) ? JSON.parse(string_or_hash, symbolize_names: true) : string_or_hash
+    def hashify(data)
+      case data.class.to_s
+      when 'Hash'
+        h = data
+      when 'String'
+        h = JSON.parse data
+      when 'NilClass'
+        h = {}
+      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 
     end
 
     # We merge the localization data in the components from the master data.

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.2.3'
+    VERSION = '1.2.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Julien Dargelos
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -167,20 +167,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -195,20 +181,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: annotate
-  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: 
 email:
 - contact@juliendargelos.com