scribble_cms 0.90 → 0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52f719c1d5435827f95215313e5f4ccafe4ff18
-  data.tar.gz: d42303b14c769f0721648d59de3ae1b61fbe7418
+  metadata.gz: e0e6637e736753b83c6765682834efd36d6f7f68
+  data.tar.gz: 7d127aed8ab97e3eb2db56da390518b702f20af9
 SHA512:
-  metadata.gz: 1eb5cbe14e2c82fedc89e98c49ceb502d0e616d783fbfddc351acaa7b89f78025107069a3b0ead18130b61a1b031900343d5bfd0d48d8775d9e8af6d863d69d8
-  data.tar.gz: 77a035a8d80d0d1b51759ccc9b85627162abfbf18051fe82102c81b92bccbb8b96864e2a618c41ef2e2c7d8fe11a177491b63d4a4a8556edb7cc2c9fb1743e10
+  metadata.gz: bcdac4f8961d90314b6f1e76800a9454ea329d06716643e43ecaa65a6b275ec03ddc3f6f9ce8d926e7d8f6b8db86db2c5e10c2a5c576a2e0c9fdce7872d9ab9f
+  data.tar.gz: 0bd3515eb4f655bc2a91d2034b190ca0abcb856b5a8648ca7c1acd71c81c514a361111a600d003b34173872456099a60f8dd8f59d13f7f94b0e97915a7f583e6

data/app/assets/javascripts/ext/tinymce.min.js

@@ -28137,14 +28137,15 @@
                 return a.getParam("max_height", 65535)
             },
             r = function(b) {
-                var c = b.settings,
-                    d = c.skin,
-                    e = c.skin_url;
-                if (d !== !1) {
-                    var f = d ? d : "lightgray";
-                    e = e ? b.documentBaseURI.toAbsolute(e) : a.baseURL + "/skins/" + f
-                }
-                return e
+                //var c = b.settings,
+                //    d = c.skin,
+                //    e = c.skin_url;
+                //if (d !== !1) {
+                //    var f = d ? d : "lightgray";
+                //    e = e ? b.documentBaseURI.toAbsolute(e) : a.baseURL + "/skins/" + f
+                //}
+                //return e
+                return null
             },
             s = function(a) {
                 return a.settings.skin === !1

data/app/assets/javascripts/scribbler.js.coffee.erb

@@ -0,0 +1,50 @@
+window.initScribblerTinyMce = ->
+  tinymce.remove("textarea")
+  $('textarea').not('.plain').not(".mini-editor").tinymce
+    <% ScribbleCms::TinyMceCustomConfig.settings.base.to_h.each do |key, value| %>
+    <% if value.is_a?(String) %>
+    <%= key %>: "<%= value %>"
+    <% else %>
+    <%= key %>: <%= value %>
+    <% end %>
+    <% end %>
+    
+    plugins: "autolink code colorpicker hr image link lists paste table textcolor autoresize"
+    toolbar: "undo redo | styleselect | bold italic | link unlink image | alignleft aligncenter alignright alignjustify | bullist numlist table | forecolor fontsizeselect | removeformat code"
+    
+    <% settings_for_full = ScribbleCms::TinyMceCustomConfig.settings.default.to_h.merge(ScribbleCms::TinyMceCustomConfig.settings.full.to_h) %>
+    <% settings_for_full.each do |key, value| %>
+    <% if value.is_a?(String) %>
+    <%= key %>: "<%= value %>"
+    <% else %>
+    <%= key %>: <%= value %>
+    <% end %>
+    <% end %>
+
+  
+  $('textarea.mini-editor').tinymce
+    <% ScribbleCms::TinyMceCustomConfig.settings.base.to_h.each do |key, value| %>
+    <% if value.is_a?(String) %>
+    <%= key %>: "<%= value %>"
+    <% else %>
+    <%= key %>: <%= value %>
+    <% end %>
+    <% end %>
+    
+    plugins: "autolink link lists paste autoresize"
+    toolbar: "bold italic | link unlink | bullist numlist | removeformat code"
+    
+    <% settings_for_mini = ScribbleCms::TinyMceCustomConfig.settings.default.to_h.merge(ScribbleCms::TinyMceCustomConfig.settings.mini.to_h) %>
+    <% settings_for_mini.each do |key, value| %>
+    <% if value.is_a?(String) %>
+    <%= key %>: "<%= value %>"
+    <% else %>
+    <%= key %>: <%= value %>
+    <% end %>
+    <% end %>
+
+$(document).ready ->
+  window.initScribblerTinyMce()
+
+$(document).ajaxComplete ->
+  window.initScribblerTinyMce()

data/app/helpers/scribbler_content_helper.rb

@@ -8,9 +8,9 @@ module ScribblerContentHelper
     yield(container)
   end
 
-  def scribbler_group(container, group, &block)
+  def scribbler_group(container, group, options = {}, &block)
     scribbler_container(container) do |c|
-      c.scribbler_group(group) do |g|
+      c.scribbler_group(group, options) do |g|
         yield(g)
       end
     end
@@ -23,14 +23,19 @@ module ScribblerContentHelper
     
     if options[:i18n]
       group = "#{group}-#{I18n.locale}"
+      options[:locale] = I18n.locale
+      options[:localized] = true
+    else
+      options[:locale] = nil
+      options[:localized] = false
     end
-
-    scribbler_group(container.to_s, group.to_s) do |g|
+    
+    scribbler_group(container.to_s, group.to_s, options.slice(:locale, :localized, :default)) do |g|
       v = g.send(type.to_s, name.to_s, options)
       if v.blank? && options[:default]
-        options[:default]
+        options[:default].try(:html_safe) || options[:default]
       else
-        return v
+        return v.try(:html_safe) || v
       end
     end
   end

data/app/models/scribbler_container.rb

@@ -18,7 +18,6 @@ class ScribblerContainer < ActiveRecord::Base
         validates_uniqueness_of :name, :on => :create, :message => "must be unique"
 
         #=== Callbacks
-        before_create { self.description = self.name }
 
 
     # => END
@@ -27,16 +26,25 @@ class ScribblerContainer < ActiveRecord::Base
       self.groups.sort_by {|g| g.human_name.to_s }
     end
 
-  def scribbler_group(name, &block)
-    yield(self.get_group(name))
+  def scribbler_group(name, options = {}, &block)
+    yield(self.get_group(name, options))
   end
 
-  def get_group(name)
-    ScribblerGroup.where(:name => name, :container_id => self.id).first || ScribblerGroup.create(:name => name, :container_id => self.id)
+  def get_group(name, options = {})
+    data = {:name => name, :container_id => self.id}.merge(options.except(:default))
+    ScribblerGroup.find_or_create_by(data)
   end
 
-  def description
-    I18n.t(self.name, :scope => "scribbler.container_names", :default => self.name.humanize)
+  def description(l = I18n.locale)
+    d = self.try("name_#{l}")
+    if d.blank?
+      d = self.try(I18n.default_locale)
+    end
+    if d.blank?
+      return I18n.t(self.name, :scope => "scribbler.container_names", :default => self.name.humanize)
+    else
+      return d
+    end
   end
 
 

data/app/models/scribbler_group.rb

@@ -157,7 +157,7 @@ class ScribblerGroup < ActiveRecord::Base
     end
 
     def human_name
-      I18n.t(self.name, :scope => "scribbler.group_names", :default => self.name.humanize) rescue self.name
+      self.human_name_de.presence || (I18n.t(self.name, :scope => "scribbler.group_names", :default => self.name.humanize) rescue self.name)
     end
 
     def container_description

data/db/migrate/003_add_names_to_database.rb

@@ -0,0 +1,18 @@
+class AddNamesToDatabase < ActiveRecord::Migration
+  def change
+    add_column :scribbler_containers, :human_name_de, :string
+    add_column :scribbler_containers, :human_name_en, :string
+    add_column :scribbler_containers, :description_de, :text
+    add_column :scribbler_containers, :description_en, :text
+    
+    remove_column :scribbler_containers, :description
+    
+    add_column :scribbler_groups, :human_name_de, :string
+    add_column :scribbler_groups, :human_name_en, :string
+    add_column :scribbler_groups, :localized, :boolean, :default => false
+    add_column :scribbler_groups, :locale, :string
+    
+    add_column :scribbler_texts, :human_name_de, :string
+    add_column :scribbler_texts, :human_name_en, :string
+  end
+end

data/db/migrate/004_add_locale_to_image.rb

@@ -0,0 +1,6 @@
+class AddLocaleToImage < ActiveRecord::Migration
+  def change
+    add_column :scribbler_images, :locale, :string
+    add_column :scribbler_images, :localized, :boolean, default: false
+  end
+end

data/lib/scribble_cms.rb

@@ -18,6 +18,32 @@ module ScribbleCms
   def self.css_files
     ['ext/tinymce.skin.css', 'ext/tinymce.content.min.css']
   end
+  
+  module TinyMceCustomConfig
+    mattr_accessor :settings
+    @@settings = OpenStruct.new
+    
+    @@settings.base = {
+      mode: 'textareas',
+      theme: 'modern',
+      skin: false,
+      menubar: '',
+      elementpath: false,
+      statusbar: true,
+      valid_elements: '*[*]',
+      fontsize_formats: "8px 10px 12px 14px 16px 18px 24pt 36px 48px",
+      convert_urls: false
+    }
+    
+    # appplies to both full and mini editor
+    @@settings.default = OpenStruct.new
+    
+    #applies to full editor only
+    @@settings.full = OpenStruct.new
+    
+    # applies to mini editor only
+    @@settings.mini = OpenStruct.new
+  end
 
 end
 
@@ -30,7 +56,7 @@ String.class_eval do
     vars.each do |var_name, var_content|
       r = r.gsub("*#{var_name}*", var_content.to_s)
     end
-    return r
+    return r.html_safe
   end
 
 end

data/lib/scribble_cms/scribbler_controller_plugin.rb

@@ -10,8 +10,8 @@ module ScribbleCms
       def scribbler_cms_controller(options = {})
 
         self.send(:include, InstanceMethods)
-        self.send :before_filter, :get_container, :only => %w(container_edit container_update container_add_item)
-        self.send :before_filter, :get_group, :only => %w(group_edit group_update group_destroy)
+        self.send :before_action, :get_container, :only => %w(container_edit container_update container_add_item)
+        self.send :before_action, :get_group, :only => %w(group_edit group_update group_destroy)
         self.cattr_accessor :hide_scribbler_edit_status
 
         self.hide_scribbler_edit_status = (options[:hide_scribbler_edit_status] == true)
@@ -63,7 +63,7 @@ module ScribbleCms
       def group_update
         @group.process_group_data(params.require(:scribbler_group).permit!)
         flash[:notice] = "Änderungen wurden gespeichert"
-        redirect_to :back
+        redirect_to :action => "group_edit", id: @group.id
       end
 
       def group_destroy

data/lib/scribble_cms/scribbler_element_setup.rb

@@ -4,7 +4,6 @@ module ScribbleCms
     def self.included(base)
       base.send(:belongs_to, :group, :class_name => "ScribblerGroup", :foreign_key => "group_id", :touch => true)
       base.send(:validates_presence_of, :group_id)
-      base.send(:before_save, :check_uniqueness)
       base.send(:smart_search, :on => [
           {:field_name => :human_name, :boost => 0.7}, {:field_name => "group.human_name", :boost => 0.5}, {:field_name => :searchable_content, :boost => 1}
         ],
@@ -14,11 +13,6 @@ module ScribbleCms
     end
 
 
-    def check_uniqueness
-      items = self.class.where(:name => self.name, :group_id => self.group_id, :released => self.released)
-      items.empty? || items.size == 1
-    end
-
     def element_type
       if self.is_a?(ScribblerLink)
         return :link
@@ -47,13 +41,17 @@ module ScribbleCms
     end
 
     def human_name
-      s = "scribbler.element_names.#{self.group.name}.#{self.name}"
-
-      if I18n.exists?(s)
-        I18n.t(s)
-      else
-        I18n.t(self.name, scope: "scribbler.element_names_default")
-      end
+      if self[:"human_name_#{I18n.locale}"].present?
+        self[:"human_name_#{I18n.locale}"]
+      else  
+        s = "scribbler.element_names.#{self.group.name}.#{self.name}"
+
+        if I18n.exists?(s)
+          I18n.t(s)
+        else
+          I18n.t(self.name, scope: "scribbler.element_names_default")
+        end
+      end  
     end
 
     def hint

data/lib/tasks/scribbler.rake

@@ -4,7 +4,10 @@ namespace :scribbler do
   task :export_scribbler_data => :environment do
     config = ActiveRecord::Base.connection_config
     tables = ActiveRecord::Base.connection.tables.grep(/scribbler_/)
-    `mysqldump -h#{config[:host]} -u#{config[:username]} --password='#{config[:password]}' #{config[:database]} #{tables.join(' ')} > '#{Rails.root}/tmp/scribbler_#{Time.now.to_i}.sql'`
+    out_path = "#{Rails.root}/tmp/scribbler_#{Time.now.to_i}.sql"
+    `mysqldump -h#{config[:host]} -u#{config[:username]} --password='#{config[:password]}' #{config[:database]} #{tables.join(' ')} > '#{out_path}'`
+    puts "scribbler data exported:"
+    puts out_path
   end
   
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: scribble_cms
 version: !ruby/object:Gem::Version
-  version: '0.90'
+  version: '0.91'
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.91
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.91
 description: Easy-to-use tool for placing user-editable content in your pages
 email:
 - florian.eck@el-digital.de
@@ -72,7 +72,7 @@ files:
 - app/assets/javascripts/ext/jquery.Jcrop.min.js
 - app/assets/javascripts/ext/jquery.tinymce.min.js
 - app/assets/javascripts/ext/tinymce.min.js
-- app/assets/javascripts/scribbler.js
+- app/assets/javascripts/scribbler.js.coffee.erb
 - app/assets/stylesheets/ext/jquery.Jcrop.css
 - app/assets/stylesheets/ext/tinymce.content.min.css
 - app/assets/stylesheets/ext/tinymce.skin.scss
@@ -105,6 +105,8 @@ files:
 - config/scribble_cms.rb
 - db/migrate/001_create_scribblers.rb
 - db/migrate/002_add_description_to_scribbler_containers.rb
+- db/migrate/003_add_names_to_database.rb
+- db/migrate/004_add_locale_to_image.rb
 - lib/admin/scribbler_groups.rb.template
 - lib/scribble_cms.rb
 - lib/scribble_cms/engine.rb

data/app/assets/javascripts/scribbler.js

@@ -1,38 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
-
-window.initScribblerTinyMce = function(){
-  tinymce.remove("textarea")
-  $('textarea').not('.plain').not(".mini-editor").tinymce({
-    mode: 'textareas',
-    theme: 'modern',
-    plugins: "autolink code colorpicker hr image link lists paste table textcolor autoresize",
-    menubar: '',
-    toolbar: "undo redo | styleselect | bold italic | link unlink image | alignleft aligncenter alignright | bullist numlist table | textcolor fontsizeselect | code",
-    valid_elements : '*[*]',
-    elementpath: false,
-    statusbar: true,
-    fontsize_formats: "8px 10px 12px 14px 16px 18px 24pt 36px 48px",
-    convert_urls: false
-  });
-  
-  $('textarea.mini-editor').tinymce({
-    mode: 'textareas',
-    theme: 'modern',
-    plugins: "autolink link lists paste textcolor autoresize",
-    menubar: '',
-    toolbar: "bold italic | link unlink | bullist numlist | code",
-    valid_elements : '*[*]',
-    elementpath: false,
-    statusbar: true,
-    fontsize_formats: "8px 10px 12px 14px 16px 18px 24pt 36px 48px"
-  });
-}
-
-$(document).ready(function() {
-  window.initScribblerTinyMce()
-});
-
-$(document).ajaxComplete(function() {
-  window.initScribblerTinyMce()
-});