cms-fortress 1.2.1 → 1.2.2

data/Gemfile

@@ -6,6 +6,7 @@ source "http://rubygems.org"
   gem 'cancan', '>=1.6.9'
   gem 'delayed_job', '~>4'
   gem 'tinymce-rails', '~>4.0.0'
+  gem 'tinymce-rails-langs', '~>4.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -50,7 +50,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    comfortable_mexican_sofa (1.12.0)
+    comfortable_mexican_sofa (1.12.1)
       active_link_to (>= 1.0.0)
       bootstrap-sass (~> 3.1.0)
       bootstrap_form (~> 2.1.1)
@@ -61,8 +61,8 @@ GEM
       jquery-ui-rails (>= 4.0.0)
       kaminari (>= 0.14.0)
       kramdown (>= 1.0.0)
-      paperclip (>= 3.4.0)
-      rails (~> 4.0)
+      paperclip (>= 4.0.0)
+      rails (>= 4.0.0)
       rails-i18n (~> 4.0.0)
       sass-rails (>= 4.0.3)
       tinymce-rails (>= 4.0.0)
@@ -78,7 +78,7 @@ GEM
       warden (~> 1.2.3)
     docile (1.1.3)
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.1.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     git (1.2.6)
@@ -116,8 +116,7 @@ GEM
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.1)
-    jwt (0.1.13)
-      multi_json (>= 1.5)
+    jwt (1.0.0)
     kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -128,14 +127,14 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.6.0)
     minitest (5.3.4)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
-    oauth2 (0.9.3)
+    oauth2 (0.9.4)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
@@ -191,14 +190,16 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    tinymce-rails (4.0.19)
+    tinymce-rails (4.0.26)
       railties (>= 3.1.1)
+    tinymce-rails-langs (4.20140129)
+      tinymce-rails (~> 4.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.1.0)
+    tzinfo (1.2.0)
       thread_safe (~> 0.1)
     warden (1.2.3)
       rack (>= 1.0)
@@ -217,3 +218,4 @@ DEPENDENCIES
   rdoc
   simplecov
   tinymce-rails (~> 4.0.0)
+  tinymce-rails-langs (~> 4.0)

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/app/assets/javascripts/cms/fortress/themes/wide.js.coffee.erb

@@ -0,0 +1,5 @@
+#= require tinymce-jquery
+
+window.CMS.wysiwyg = ->
+  `<%= tinymce_init %>`
+

data/app/assets/stylesheets/cms/fortress/admin_overrides.css

@@ -5,6 +5,13 @@
   color: #3c763d;
 }
 
+.alert-error {
+  background-color: #f2dede;
+  border-color: #eed3d7;
+  color: #b94a48;
+  text-align: center;
+}
+
 .alert-notice hr {
   border-top-color: #c9e2b3;
 }
@@ -12,3 +19,7 @@
 .alert-notice .alert-link {
   color: #2b542c;
 }
+
+.current-site-info {
+  margin-top: -1.2em;
+}

data/app/controllers/cms/fortress/roles_controller.rb

@@ -60,7 +60,12 @@ class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
   # POST /cms/fortress/roles.json
   def create
     @cms_fortress_role = Cms::Fortress::Role.new(role_params)
-    @cms_fortress_role.load_defaults
+    begin
+      @cms_fortress_role.load_defaults
+    rescue Error::MissingRoleConfigurationFile
+      flash[:error] = @cms_fortress_role.errors.messages[:base].first
+      render action: "new" and return
+    end
 
     respond_to do |format|
       if @cms_fortress_role.save

data/app/helpers/cms/fortress/application_helper.rb

@@ -1,7 +1,7 @@
 module Cms::Fortress::ApplicationHelper
   def role_display(command)
     res = command.split(".")
-    raw "#{content_tag(:strong, res.first.titleize) } / #{ res[1..-1].map {|r| r.titleize}.join(" - ") }"
+    raw "#{content_tag(:strong, t("cms.fortress.roles.#{res.first}")) } / #{ res[1..-1].map {|r| t("cms.fortress.roles.#{r}")}.join(" - ") }"
   end
 
   def theme_name

data/app/helpers/cms/fortress/sprocket_helper.rb

@@ -0,0 +1,49 @@
+module Cms::Fortress::SprocketHelper
+  include TinyMCE::Rails::Helper
+
+  def tinymce_init
+    path = File.join(Rails.root, 'config', 'tinymce.yml')
+    if File.exist?(path)
+      config = YAML.load_file(path)
+    else
+      config = {}
+    end
+
+    options = {
+      menubar: 'tools format view',
+      toolbar1: 'insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table | fullscreen code',
+      toolbar2: '',
+      plugins: "['code', 'fullscreen', 'media', 'link', 'table']",
+      language: 'en'
+    }.stringify_keys.merge(config)
+
+  <<-EOF
+  tinymce.init({
+      selector: 'textarea[data-cms-rich-text]',
+      menubar: '#{ options['menubar'] }',
+      toolbar1: '#{ options['toolbar1'] } | image fmedia link',
+      toolbar2: '#{ options['toolbar2'] }',
+      plugins: #{ options['plugins'] },
+      link_list: CmsFortress.media.othersUrl(),
+      language: '#{ options['language'] }',
+      setup: function(ed) {
+        ed.addButton('image', {
+          title: 'Insert Image',
+          onclick: function() {
+            return CmsFortress.media.showImageDialog(ed);
+          }
+        });
+        return ed.addButton('fmedia', {
+          tooltip: 'Insert Video',
+          icon: 'media',
+          stateSelector: ['img[data-mce-object=video]', 'img[data-mce-object=iframe]'],
+          onclick: function() {
+            return CmsFortress.media.showVideoDialog(ed);
+          }
+        });
+      }
+    });
+  EOF
+  end
+
+end

data/app/models/cms/fortress/role.rb

@@ -10,10 +10,10 @@ class Cms::Fortress::Role < ActiveRecord::Base
     # load user custom roles
     if File.exist?(file = File.join(Rails.root, "config", "roles.yml"))
       load_from_file(file)
+    else
+      errors[:base] << I18n.t('cms.fortress.admin.errors.missing_roles_yaml_file')
+      raise Error::MissingRoleConfigurationFile
     end
-
-    file = File.expand_path(File.join(File.dirname(__FILE__), "../../../../", "config", "roles.yml"))
-    load_from_file(file)
   end
 
   private
@@ -36,3 +36,5 @@ class Cms::Fortress::Role < ActiveRecord::Base
 
   end
 end
+
+

data/app/models/error/missing_role_configuration_file.rb

@@ -0,0 +1,12 @@
+module Error
+  # log error to the Rails log
+  def self.log_error(name, message)
+    Rails.logger.fatal("[ERROR:] in #{name} with message: #{message}\n\n")
+  end
+
+  class MissingRoleConfigurationFile < StandardError
+    def initialize
+      Error.log_error(self, "missing the roles.yml file in config/roles.yml")
+    end
+  end
+end

data/app/views/cms/fortress/roles/show.html.haml

@@ -8,7 +8,6 @@
 
 
 = form_for @cms_fortress_role, :html => {:class => ''} do |f|
-
   %table.table
     %tr
       %th

data/app/views/cms/fortress/themes/wide/_body.html.haml

@@ -1,3 +1,8 @@
+- unless @site.nil? || @site.new_record?
+  .container.current-site-info
+    %span.label.label-primary
+      = @site.label
+
 .container.wide-body
   - if controller_name.eql?('revisions')
     .row

data/cms-fortress.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cms-fortress"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2014-05-25"
+  s.date = "2014-06-01"
   s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email = "melvinsembrano@gmail.com"
   s.extra_rdoc_files = [
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/assets/javascripts/cms/fortress/cms_fortress.js",
     "app/assets/javascripts/cms/fortress/media.js.coffee",
-    "app/assets/javascripts/cms/fortress/themes/wide.js.coffee",
+    "app/assets/javascripts/cms/fortress/themes/wide.js.coffee.erb",
     "app/assets/javascripts/html5shiv.js",
     "app/assets/stylesheets/cms/fortress/admin_overrides.css",
     "app/assets/stylesheets/cms/fortress/session.css",
@@ -37,12 +37,14 @@ Gem::Specification.new do |s|
     "app/controllers/cms/fortress/users_controller.rb",
     "app/helpers/cms/fortress/application_helper.rb",
     "app/helpers/cms/fortress/roles_helper.rb",
+    "app/helpers/cms/fortress/sprocket_helper.rb",
     "app/models/cms/fortress.rb",
     "app/models/cms/fortress/role.rb",
     "app/models/cms/fortress/role_detail.rb",
     "app/models/cms/fortress/user.rb",
     "app/models/cms/page_workflow.rb",
     "app/models/cms_ability.rb",
+    "app/models/error/missing_role_configuration_file.rb",
     "app/views/cms/fortress/admin/_left_contents_nav.html.haml",
     "app/views/cms/fortress/admin/_left_designs_nav.html.haml",
     "app/views/cms/fortress/admin/_left_nav.html.haml",
@@ -141,6 +143,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<cancan>, [">= 1.6.9"])
       s.add_runtime_dependency(%q<delayed_job>, ["~> 4"])
       s.add_runtime_dependency(%q<tinymce-rails>, ["~> 4.0.0"])
+      s.add_runtime_dependency(%q<tinymce-rails-langs>, ["~> 4.0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -152,6 +155,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cancan>, [">= 1.6.9"])
       s.add_dependency(%q<delayed_job>, ["~> 4"])
       s.add_dependency(%q<tinymce-rails>, ["~> 4.0.0"])
+      s.add_dependency(%q<tinymce-rails-langs>, ["~> 4.0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -164,6 +168,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<cancan>, [">= 1.6.9"])
     s.add_dependency(%q<delayed_job>, ["~> 4"])
     s.add_dependency(%q<tinymce-rails>, ["~> 4.0.0"])
+    s.add_dependency(%q<tinymce-rails-langs>, ["~> 4.0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/config/locales/de.yml

@@ -30,6 +30,8 @@ de:
         design_related_information: Diese Seite wird Design spezifische Einstellungen zeigen.
         content_dashboard: Dashboard für Inhalte
         content_related_information: "Diese Seite wird Inhalt spezifische Einstellungen zeigen (Historie, Graphen, Analytics und andere.)"
+        errors:
+          missing_roles_yaml_file: "Die Konfigurationsdatei config/roles.yml ist nicht vorhanden."
 
       roles:
         title: Rollen
@@ -45,12 +47,25 @@ de:
         description: Beschreibung
         show_access_rights: Zugriffsrechte anzeigen
         name: Name
+        contents: Inhalte
+        designs: Designs
+        settings: Einstellungen
+        files: Dateien
+        page: Seite
+        publish: publizieren
+        review: reviewen
+        pages: Seiten
+        layouts: Layouts
+        snippets: Schnipsel
+        roles: Rollen
+        sites: Seiten
+        users: Benutzer
 
       users:
         title: Benutzer
         new_link: Neuer Benutzer
         edit_title: Benutzer bearbeiten
-        new_title: Neuen benutzer erstellen
+        new_title: Neuen Benutzer erstellen
         last_name: Nachname
         first_name: Vorname
         email: E-Mail
@@ -61,3 +76,19 @@ de:
             email_address: E-Mail Adresse
             password: Password
             remember_me: Angemeldet bleiben
+
+  activerecord:
+    attributes:
+      cms/fortress/user:
+        last_name: Nachname
+        first_name: Vorname
+        email: E-Mail
+        role_id: Rolle
+        password: Passwort
+        password_confirmation: Passwort Bestätigung
+      cms/fortress/role:
+        name: Name
+        description: Beschreibung
+      cms/fortress/role_detail:
+        contents: Inhalte
+

data/config/locales/en.yml

@@ -30,6 +30,8 @@ en:
         design_related_information: This page will show design related information.
         content_dashboard: Content Dashboard
         content_related_information: "This page will show contents related information (history, graphs, analytics and etc.)"
+        errors:
+          missing_roles_yaml_file: "The configuration file config/roles.yml is missing."
 
       roles:
         title: Roles
@@ -45,6 +47,19 @@ en:
         description: Description
         show_access_rights: Show Access Rights
         name: Name
+        contents: Contents
+        designs: Designs
+        settings: Settings
+        files: Files
+        page: Page
+        publish: publish
+        review: review
+        pages: Pages
+        layouts: Layouts
+        snippets: Snippets
+        roles: Roles
+        sites: Sites
+        users: Users
 
       users:
         title: Users
@@ -61,3 +76,13 @@ en:
             email_address: Email Address
             password: Password
             remember_me: Remember me
+
+  activerecord:
+    attributes:
+      cms/fortress/user:
+        last_name: Lastname
+        first_name: Firstname
+        email: Email
+        role_id: Role
+        password: Password
+        password_confirmation: Password Confirmation

data/lib/cms/fortress/rails/engine.rb

@@ -7,6 +7,8 @@ module Cms
           # Devise::SessionsController.layout "cms/fortress/session"
           ApplicationController.helper(Cms::Fortress::ApplicationHelper)
 
+          Sprockets::Context.send :include, Cms::Fortress::SprocketHelper
+
           Comfy::Cms::ContentController.send(:include, Cms::Fortress::ContentRenderer)
           Comfy::Cms::Page.send(:include, Cms::Fortress::PageMethods)
           Comfy::Cms::File.send(:include, Cms::Fortress::FileMethods)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: tinymce-rails-langs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +204,7 @@ files:
 - VERSION
 - app/assets/javascripts/cms/fortress/cms_fortress.js
 - app/assets/javascripts/cms/fortress/media.js.coffee
-- app/assets/javascripts/cms/fortress/themes/wide.js.coffee
+- app/assets/javascripts/cms/fortress/themes/wide.js.coffee.erb
 - app/assets/javascripts/html5shiv.js
 - app/assets/stylesheets/cms/fortress/admin_overrides.css
 - app/assets/stylesheets/cms/fortress/session.css
@@ -199,12 +215,14 @@ files:
 - app/controllers/cms/fortress/users_controller.rb
 - app/helpers/cms/fortress/application_helper.rb
 - app/helpers/cms/fortress/roles_helper.rb
+- app/helpers/cms/fortress/sprocket_helper.rb
 - app/models/cms/fortress.rb
 - app/models/cms/fortress/role.rb
 - app/models/cms/fortress/role_detail.rb
 - app/models/cms/fortress/user.rb
 - app/models/cms/page_workflow.rb
 - app/models/cms_ability.rb
+- app/models/error/missing_role_configuration_file.rb
 - app/views/cms/fortress/admin/_left_contents_nav.html.haml
 - app/views/cms/fortress/admin/_left_designs_nav.html.haml
 - app/views/cms/fortress/admin/_left_nav.html.haml
@@ -301,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4381613348191105399
+      hash: -2597146753711526027
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/assets/javascripts/cms/fortress/themes/wide.js.coffee

@@ -1,24 +0,0 @@
-#= require tinymce-jquery
-
-window.CMS.wysiwyg = ->
-  tinymce.init
-    selector: 'textarea[data-cms-rich-text]'
-    menubar: 'tools format view'
-    toolbar1: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | fullscreen code | image fmedia link"
-    plugins: ['code', 'fullscreen', 'media', 'link']
-    link_list: CmsFortress.media.othersUrl()
-    setup: (ed) ->
-      ed.addButton 'image',
-        title: 'Insert Image'
-        onclick: ->
-          CmsFortress.media.showImageDialog(ed)
-
-      ed.addButton 'fmedia',
-        tooltip: 'Insert Video'
-        icon: 'media'
-        stateSelector: ['img[data-mce-object=video]', 'img[data-mce-object=iframe]']
-        onclick: ->
-          CmsFortress.media.showVideoDialog(ed)
-
-
-