cms-fortress 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2bca720ab1f1da2525484105683827daabd9a25
-  data.tar.gz: 95d00bdc7e0a0f2e23b7ed3e5512060d1b084a38
+  metadata.gz: a13acd911a9ef0db5c70a5ccbf643782534640a9
+  data.tar.gz: 8b55c888dae432288aa63d897f67061335d01200
 SHA512:
-  metadata.gz: 7f3fd08e8942bd50309526206a530c9c32c0075202053083269f7440ff3c1b696050fe86ae03904a49ec8f55e36d142eeb3cc4a37763a455ba2f5a0be7b50239
-  data.tar.gz: f99d3f5f81118ea2f369c998ed5a12be1d241a2fb49f02400481f53f8541076c5a18151b9b286ecb65370301efcc8e338f8cb9209df4b5d2ae459a3fb46dceee
+  metadata.gz: 82136cf0dca738409b1fce5d250e3046f822e7461c4a6ece7db42023e9887e4ef22aa076e1e2dd57bd17445392e2e6487290b0da0de1a8e3a03fefeb1e8a2914
+  data.tar.gz: ba5e42e00022efe3613f30ccc20446d29f0eb3649c7617fba3f6704fbbf9bb28340292e72de79d9b15830575a193a1dbc37f86966ce2342264779c5ba7f5545f

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 2.1.5
+
+install: bundle install --jobs=3 --retry=3  --path=${BUNDLE_PATH:-vendor/bundle}
+
+branches:
+  only:
+    - master
+
+cache: bundler

data/CONTRIBUTING.rdoc

@@ -0,0 +1,9 @@
+= Contributing to cms-fortress
+
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cms-fortress (1.3.6)
+    cms-fortress (1.3.7)
       aasm (~> 4.0)
       cancancan (~> 1.9)
       comfortable_mexican_sofa (~> 1.12, >= 1.12.5)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aasm (4.0.8)
+    aasm (4.1.0)
     actionmailer (4.0.13)
       actionpack (= 4.0.13)
       mail (~> 2.5, >= 2.5.4)
@@ -43,21 +43,21 @@ GEM
       tzinfo (~> 0.3.37)
     ansi (1.5.0)
     arel (4.0.2)
-    autoprefixer-rails (5.0.0.3)
+    autoprefixer-rails (5.1.7.1)
       execjs
       json
-    bcrypt (3.1.9)
-    bootstrap-sass (3.3.3)
+    bcrypt (3.1.10)
+    bootstrap-sass (3.3.4.1)
       autoprefixer-rails (>= 5.0.0.1)
       sass (>= 3.2.19)
-    bootstrap_form (2.2.0)
+    bootstrap_form (2.3.0)
     builder (3.1.4)
     cancancan (1.10.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.5)
+    cocaine (0.5.7)
       climate_control (>= 0.0.3, < 1.0)
-    codemirror-rails (4.8)
+    codemirror-rails (5.0)
       railties (>= 3.0, < 5)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
@@ -65,8 +65,8 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
-    comfortable_mexican_sofa (1.12.6)
+    coffee-script-source (1.9.1)
+    comfortable_mexican_sofa (1.12.7)
       active_link_to (>= 1.0.0)
       bootstrap-sass (>= 3.2.0)
       bootstrap_form (>= 2.2.0)
@@ -92,16 +92,16 @@ GEM
       warden (~> 1.2.3)
     docile (1.1.5)
     erubis (2.7.0)
-    execjs (2.2.2)
+    execjs (2.4.0)
     haml (4.0.6)
       tilt
-    haml-rails (0.7.0)
+    haml-rails (0.9.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
+      haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hashie (3.3.2)
+    hashie (3.4.0)
     hike (1.2.3)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
@@ -115,7 +115,7 @@ GEM
     jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
     json (1.8.2)
-    kramdown (1.5.0)
+    kramdown (1.6.0)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
@@ -130,12 +130,12 @@ GEM
       builder
       minitest (>= 2.12, < 5.0)
       powerbar
-    minitest-spec-rails (4.7.7)
+    minitest-spec-rails (4.7.8)
       minitest (~> 4.7)
       rails (>= 3.0, < 4.1)
     minitest-test (1.1.0)
       minitest (~> 4.0)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
@@ -160,7 +160,7 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.0.13)
       sprockets-rails (~> 2.0)
-    rails-i18n (4.0.3)
+    rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
     railties (4.0.13)
@@ -173,21 +173,21 @@ GEM
       json (~> 1.4)
     responders (1.1.2)
       railties (>= 3.2, < 4.2)
-    ruby_parser (3.6.4)
+    ruby_parser (3.6.5)
       sexp_processor (~> 4.1)
-    sass (3.4.10)
+    sass (3.4.13)
     sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    sexp_processor (4.4.5)
-    simplecov (0.9.1)
+    sexp_processor (4.5.0)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -199,13 +199,13 @@ GEM
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     tinymce-rails (4.1.6)
       railties (>= 3.1.1)
     tinymce-rails-langs (4.20140129)
       tinymce-rails (~> 4.0)
-    tzinfo (0.3.42)
+    tzinfo (0.3.43)
     warden (1.2.3)
       rack (>= 1.0)
 

data/README.rdoc

@@ -1,10 +1,11 @@
 {<img src="https://badge.fury.io/rb/cms-fortress.png" alt="Gem Version" />}[http://badge.fury.io/rb/cms-fortress]
 {<img src="https://gemnasium.com/melvinsembrano/cms-fortress.png" alt="Dependencies" />}[https://gemnasium.com/melvinsembrano/cms-fortress]
 {<img src="https://codeclimate.com/github/melvinsembrano/cms-fortress.png" alt="Code Climate" />}[https://codeclimate.com/github/melvinsembrano/cms-fortress]
+{<img src="https://travis-ci.org/melvinsembrano/cms-fortress.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/melvinsembrano/cms-fortress]
 
 = cms-fortress
 
-An extension for the awesome Comfortable Mexican Sofa (https://github.com/comfy/comfortable-mexican-sofa) CMS Engine
+An extension for the awesome ComfortableMexicanSofa (https://github.com/comfy/comfortable-mexican-sofa) CMS Engine
 
 * Added Role Management for proper workflow
 * Added Devise for User and Session Management
@@ -22,7 +23,7 @@ An extension for the awesome Comfortable Mexican Sofa (https://github.com/comfy/
 
 Add gem defintion to your Gemfile:
 
-  gem 'cms-fortress', '~> 1.3.0'
+  gem 'cms-fortress', '~> 1.3.6'
 
 Then from the Rails project's root run:
 
@@ -84,13 +85,13 @@ You can create a custom role ability via a three-step process.
         :path => 'admin_my_role_details_path',
         :super_user => true
       }
-      
+
       # adding a divider menu item (Wide Theme only)
       config.content_resources << {name: 'divider'}
-      
+
       #adding a menu header item (Wide Theme only)
       config.content_resources << {name: 'dropdown-header', title: "i18n.my.header.label"}
-      
+
     end
 
 The path is eval'd at runtime, so you can use Rails helper methods such as
@@ -117,9 +118,9 @@ Below are the fetures for wide theme:
 * Compact Layout and Menus
 * Responsive Layout
 * Fullcreen Editing
-* Integrated image file attachement
+* Integrated image file attachment
 * Integrated video file attachment
-* Integrated link file attachement
+* Integrated link file attachment
 
 http://raw.github.com/melvinsembrano/cms-fortress/master/docs/screens/compact-layout-01.png
 
@@ -140,15 +141,9 @@ Afterwards you can run the tests by calling
 
     rake test
 
-== Contributing to cms-fortress
+== Contributing
 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+Please see {CONTRIBUTING.rdoc}[https://github.com/melvinsembrano/cms-fortress/blob/master/CONTRIBUTING.rdoc] for details.
 
 == Copyright
 

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

@@ -1,11 +1,14 @@
-//= require tinymce-jquery
-//= require '../site_selector'
-
-
-window.CMS.wysiwyg = function () {
-  return <%= tinymce_init %>
-}
+<% config = Cms::Fortress::Settings.new(:global_settings).to_h %>
 
+//= require '../site_selector'
 $(document).ready( function() {
   $('.dropdown-toggle').dropdown();
 });
+
+<% if config[:use_tinymce] %>
+  //= require tinymce-jquery
+  window.CMS.wysiwyg = function () {
+    return <%= tinymce_init %>
+  }
+<% end %>
+

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

@@ -5,8 +5,16 @@ class Cms::Fortress::User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
+  # manually add :validatable validations because uniqueness does not include :site_id
+  validates_presence_of   :email, if: :email_required?
+  validates_uniqueness_of :email, scope: :site_id, allow_blank: true, if: :email_changed?
+  validates_format_of     :email, with: Devise.email_regexp, allow_blank: true, if: :email_changed?
+  validates_presence_of     :password, if: :password_required?
+  validates_confirmation_of :password, if: :password_required?
+  validates_length_of       :password, within: Devise.password_length, allow_blank: true
   devise :database_authenticatable,
-         :recoverable, :rememberable, :trackable, :validatable, :timeoutable
+         :recoverable, :rememberable, :trackable, :timeoutable,
+         :authentication_keys => [:email, :site_id]
 
   belongs_to :role
   belongs_to :site, class_name: "Comfy::Cms::Site", foreign_key: :site_id
@@ -20,6 +28,10 @@ class Cms::Fortress::User < ActiveRecord::Base
     }
   end
 
+  def self.find_for_authentication(warden_conditions)
+    where(:email => warden_conditions[:email], :site_id => warden_conditions[:site_id]).first || where(:email => warden_conditions[:email]).first
+  end
+
   def type
     self.class.types[type_id]
   end
@@ -27,4 +39,15 @@ class Cms::Fortress::User < ActiveRecord::Base
   def display_name
     "#{ email } (#{ type.to_s.titleize })"
   end
+
+protected
+
+  def password_required?
+    !persisted? || !password.nil? || !password_confirmation.nil?
+  end
+
+  def email_required?
+    true
+  end
+
 end

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

@@ -65,6 +65,6 @@
             %span.caret
           %ul.dropdown-menu(role="menu")
             %li
-              = link_to t('cms.fortress.logout'), destroy_cms_fortress_user_session_path, :method => 'get'
+              = link_to t('cms.fortress.logout'), destroy_cms_fortress_user_session_path, :method => 'delete'
 
 

data/app/views/cms/fortress/users/sessions/new.html.haml

@@ -10,6 +10,9 @@
         .form-group
           = f.label :password
           = f.password_field :password, :placeholder => t('cms.fortress.users.sessions.new.password'), :class => "form-control"
+        .form-group
+          = f.label :site
+          = f.select :site_id, Comfy::Cms::Site.all.collect{ |s| [s.label, s.id] }, :class => "form-control"
 
         - if devise_mapping.rememberable?
           .checkbox

data/app/views/layouts/comfy/admin/cms/_head.html.haml

@@ -3,20 +3,26 @@
   %title= settings.title
   = csrf_meta_tag
 
-  = stylesheet_link_tag 'comfy/admin/cms/application'
-
-  = stylesheet_link_tag "cms/fortress/admin_overrides"
+  = stylesheet_link_tag 'comfy/admin/cms/application', 'data-turbolinks-track' => true
+  = stylesheet_link_tag "cms/fortress/admin_overrides", 'data-turbolinks-track' => true
 
   - unless default_theme?
     = stylesheet_link_tag "cms/fortress/themes/#{ theme_name }"
 
 
-  = javascript_include_tag 'comfy/admin/cms/application'
-  = javascript_include_tag 'cms/fortress/media'
+  = javascript_include_tag 'comfy/admin/cms/application', 'data-turbolinks-track' => true
+  = javascript_include_tag 'cms/fortress/media', 'data-turbolinks-track' => true
 
   - unless default_theme?
     = javascript_include_tag "cms/fortress/themes/#{ theme_name }"
 
+  - if @site && @site.persisted? && !settings.use_tinymce
+
+    :javascript
+      CMS.file_upload_path  = '#{comfy_admin_cms_site_files_path(@site)}';
+      CMS.pages_path        = '#{comfy_admin_cms_site_pages_path(@site)}';
+      CMS.locale            = '#{I18n.locale}';
+
 
   = yield :head
 

data/cms-fortress.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name      = "cms-fortress"
-  s.version   = "1.3.6"
+  s.version   = "1.3.7"
 
   s.authors           = ["Melvin Sembrano"]
-  s.date              = "2015-01-24"
+  s.date              = "2015-03-21"
   s.description       = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email             = "melvinsembrano@gmail.com"
   s.extra_rdoc_files  = [ "LICENSE.txt", "README.rdoc" ]

data/config/cms/fortress/global_settings.yml

@@ -1,6 +1,7 @@
 default: &default
   title: "CMS Fortress"
   title_link: "#"
+  use_tinymce: true
 
 development:
   <<: *default

data/config/locales/da.yml

@@ -147,4 +147,4 @@ da:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/de.yml

@@ -133,14 +133,14 @@ de:
         slug: URL-Pfad
 
   login:
-    forgot_your_password: Forgot your password?
-    send_me_reset_password_instructions: Send me reset password instructions
-    change_your_password: Change your password
-    new_password: New password
-    confirm_new_password: Confirm new password
-    change_my_password: Change my password
-    log_in: Log in
-    sign_up: Sign up
-    didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
-    didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    forgot_your_password: Passwort vergessen?
+    send_me_reset_password_instructions: Passwort-Reset Anweisungen senden
+    change_your_password: Ändern Sie Ihr Passwort
+    new_password: neues Passwort
+    confirm_new_password: Neuse Passwort bestätigen
+    change_my_password: Passwort ändern
+    log_in: Einloggen
+    sign_up: Registrieren
+    didnt_receive_confirmation_instructions: Sie haben keine Passwort-Reset Anweisungen erhalten?
+    didnt_receive_unlock_instructions: Sie haben keine Anweisungen zum entsperren erhalten?
+    sign_in_with: Anmelden mit #{provider.to_s.titleize}

data/config/locales/devise.de.yml

@@ -0,0 +1,58 @@
+de:
+  devise:
+    confirmations:
+      confirmed: "Vielen Dank für Ihre Registrierung. Bitte melden Sie sich jetzt an."
+      confirmed_and_signed_in: "Vielen Dank für Ihre Registrierung. Sie sind jetzt angemeldet."
+      send_instructions: "Sie erhalten in wenigen Minuten eine E-Mail, mit der Sie Ihre Registrierung bestätigen können."
+      send_paranoid_instructions: "Falls Ihre E-Mail-Adresse in unserer Datenbank existiert erhalten Sie in wenigen Minuten eine E-Mail mit der Sie Ihre Registrierung bestätigen können."
+    failure:
+      already_authenticated: "Sie sind bereits angemeldet."
+      inactive: "Ihr Account ist nicht aktiv."
+      invalid: "Ungültige Anmeldedaten."
+      invalid_token: "Der Anmelde-Token ist ungültig."
+      locked: "Ihr Account ist gesperrt."
+      not_found_in_database: "E-Mail-Adresse oder Passwort ungültig."
+      timeout: "Ihre Sitzung ist abgelaufen, bitte melden Sie sich erneut an."
+      unauthenticated: "Sie müssen sich anmelden oder registrieren, bevor Sie fortfahren können."
+      unconfirmed: "Sie müssen Ihren Account bestätigen, bevor Sie fortfahren können."
+    mailer:
+      confirmation_instructions:
+        subject: "Anleitung zur Bestätigung Ihres Accounts"
+      reset_password_instructions:
+        subject: "Anleitung um Ihr Passwort zurückzusetzen"
+      unlock_instructions:
+        subject: "Anleitung um Ihren Account freizuschalten"
+    omniauth_callbacks:
+      failure: "Sie konnten nicht mit Ihrem %{kind}-Account angemeldet werden, weil '%{reason}'."
+      success: "Sie haben sich erfolgreich mit Ihrem %{kind}-Account angemeldet."
+    passwords:
+      no_token: "Sie können diese Seite nur von dem Link aus einer E-Mail zum Passwort-Zurücksetzen aufrufen. Wenn Sie einen solchen Link aufgerufen haben, stellen Sie bitte sicher, dass Sie die vollständige Adresse aufrufen."
+      send_instructions: "Sie erhalten in wenigen Minuten eine E-Mail mit der Anleitung, wie Sie Ihr Passwort zurücksetzen können."
+      send_paranoid_instructions: "Falls Ihre E-Mail-Adresse in unserer Datenbank existiert erhalten Sie in wenigen Minuten eine E-Mail mit der Anleitung, wie Sie Ihr Passwort zurücksetzen können."
+      updated: "Ihr Passwort wurde geändert. Sie sind jetzt angemeldet."
+      updated_not_active: "Ihr Passwort wurde geändert."
+    registrations:
+      destroyed: "Ihr Account wurde gelöscht."
+      signed_up: "Sie haben sich erfolgreich registriert."
+      signed_up_but_inactive: "Sie haben sich erfolgreich registriert. Wir konnten Sie noch nicht anmelden, da Ihr Account inaktiv ist."
+      signed_up_but_locked: "Sie haben sich erfolgreich registriert. Wir konnten Sie noch nicht anmelden, da Ihr Account gesperrt ist."
+      signed_up_but_unconfirmed: "Sie haben sich erfolgreich registriert. Wir konnten Sie noch nicht anmelden, da Ihr Account noch nicht bestätigt ist. Sie erhalten in Kürze eine E-Mail mit der Anleitung, wie Sie Ihren Account freischalten können."
+      update_needs_confirmation: "Ihre Daten wurden aktualisiert, aber Sie müssen Ihre neue E-Mail-Adresse bestätigen. Sie erhalten in wenigen Minuten eine E-Mail, mit der Sie die Änderung Ihrer E-Mail-Adresse abschliessen können."
+      updated: "Ihre Daten wurden aktualisiert."
+    sessions:
+      signed_in: "Erfolgreich angemeldet."
+      signed_out: "Erfolgreich abgemeldet."
+    unlocks:
+      send_instructions: "Sie erhalten in wenigen Minuten eine E-Mail mit der Anleitung, wie Sie Ihren Account entsperren können."
+      send_paranoid_instructions: "Falls Ihre E-Mail-Adresse in unserer Datenbank existiert erhalten Sie in wenigen Minuten eine E-Mail mit der Anleitung, wie Sie Ihren Account entsperren können."
+      unlocked: "Ihr Account wurde entsperrt. Sie sind jetzt angemeldet."
+  errors:
+    messages:
+      already_confirmed: "wurde bereits bestätigt"
+      confirmation_period_expired: "muss innerhalb %{period} bestätigt werden, bitte fordern Sie einen neuen Link an"
+      expired: "ist abgelaufen, bitte neu anfordern"
+      not_found: "nicht gefunden"
+      not_locked: "ist nicht gesperrt"
+      not_saved:
+        one: "Konnte %{resource} nicht speichern: ein Fehler."
+        other: "Konnte %{resource} nicht speichern: %{count} Fehler."

data/config/locales/en.yml

@@ -146,4 +146,4 @@ en:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/es.yml

@@ -147,4 +147,4 @@ es:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/fr.yml

@@ -147,4 +147,4 @@ fr:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/it.yml

@@ -147,4 +147,4 @@ it:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/ja.yml

@@ -147,4 +147,4 @@ ja:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/nl.yml

@@ -147,4 +147,4 @@ nl:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/pl.yml

@@ -147,4 +147,4 @@ pl:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/pt-BR.yml

@@ -147,4 +147,4 @@ pt-BR:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/ru.yml

@@ -148,4 +148,4 @@ ru:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/sv.yml

@@ -147,4 +147,4 @@ sv:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/zh-CN.yml

@@ -147,4 +147,4 @@ zh-CN:
     sign_up: Sign up
     didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
     didnt_receive_unlock_instructions: Didn't receive unlock instructions?
-    sign_in_with: Sign in with #{provider.to_s.titleize}
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/db/migrate/08_relax_user_uniqueness_on_email_and_site_id.rb

@@ -0,0 +1,6 @@
+class RelaxUserUniquenessOnEmailAndSiteId < ActiveRecord::Migration
+  def change
+    remove_index :cms_fortress_users, :email
+    add_index :cms_fortress_users, [:email, :site_id], :unique => true
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 7) do
+ActiveRecord::Schema.define(version: 8) do
 
   create_table "cms_fortress_role_details", force: true do |t|
     t.string   "name"
@@ -54,7 +54,7 @@ ActiveRecord::Schema.define(version: 7) do
     t.integer  "site_id"
   end
 
-  add_index "cms_fortress_users", ["email"], name: "index_cms_fortress_users_on_email", unique: true
+  add_index "cms_fortress_users", ["email", "site_id"], name: "index_cms_fortress_users_on_email_and_site_id", unique: true
   add_index "cms_fortress_users", ["reset_password_token"], name: "index_cms_fortress_users_on_reset_password_token", unique: true
 
   create_table "comfy_cms_blocks", force: true do |t|

data/lib/cms/fortress/application_controller_methods.rb

@@ -46,6 +46,8 @@ module Cms
       def self.included(base)
         base.class_eval do
 
+          before_action :configure_permitted_parameters, if: :devise_controller?
+
           rescue_from CanCan::AccessDenied do |ex|
             # if cannot view page check if can on files
             if controller_name.eql?('pages')
@@ -71,6 +73,12 @@ module Cms
             end
           end
 
+          protected
+          
+          def configure_permitted_parameters
+            devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:email, :password, :remember_me, :site_id) }
+          end
+
         end
       end
 

data/lib/generators/cms/fortress/upgrade/upgrade_generator.rb

@@ -11,12 +11,12 @@ class Cms::Fortress::UpgradeGenerator < Rails::Generators::Base
       'config/cms/fortress/global_settings.yml'
     ]
     files.each do |file|
-      copy_file file, file
+      copy_file file, file unless File.exist?(file)
     end
   end
 
   def done
-    puts "\r\n\r\n!!! IMPORTANT NOTE: Review your existing users since they set to super users as default. Review and assign site roles accordingly."
+    # puts "\r\n\r\n!!! IMPORTANT NOTE: Review your existing users since they set to super users as default. Review and assign site roles accordingly."
     puts "Upgrade complete..."
     puts "\r\n\r\n"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -268,6 +268,8 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".gitignore"
+- ".travis.yml"
+- CONTRIBUTING.rdoc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -359,6 +361,7 @@ files:
 - config/initializers/secret_token.rb
 - config/locales/da.yml
 - config/locales/de.yml
+- config/locales/devise.de.yml
 - config/locales/devise.en.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -381,6 +384,7 @@ files:
 - db/migrate/05_add_caching_info_to_pages.rb
 - db/migrate/06_add_type_to_users.rb
 - db/migrate/07_integrate_workflow_into_cms_pages.rb
+- db/migrate/08_relax_user_uniqueness_on_email_and_site_id.rb
 - db/schema.rb
 - docs/screens/compact-layout-01.png
 - docs/screens/compact-layout-02.png