cms-fortress 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ea34716f7477f06e0b9978ea9300ba7c42d9461
-  data.tar.gz: 356bfa34ee22113eed9c2603b4a496aa4f1c7d06
+  metadata.gz: 23d3523efa51201588fedd394a1909352466a71f
+  data.tar.gz: 2b586ee061ddad839ca8dfe28829980e6f961490
 SHA512:
-  metadata.gz: 2a54bd45e9cef91ee7c6064d86d08b2ddd63941865c6fe11d1e226297c2fb398cada5c0b18ca2e335b1ad196a85239596377181f9bfc73b3d497ef518bfc8cf5
-  data.tar.gz: 2d6f7a655fa18f5571b68da8450d157ed021775be6d04ed3ffaa83c1652b10cacbd67e897100576e71bb9a3a70f6da5d200067741dceaa5a601dc64363251c4c
+  metadata.gz: 349ea67b8f8587de0efdd556b20e85337e7dae7304f1183c9e3cba8bcee5d70e1eaa33b9aaa944ce9d45b1b8916a85c56f6383b9fdf4748ceef728636287a8f5
+  data.tar.gz: 95a0ed41d08bd4711510fb98c291bdc94afe5832afd61841c135c960fb285f0771e36b4a9d5402d2d0a436030f580e423b3178c815f0bfbe81383eef62462c0a

data/Gemfile

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

data/Gemfile.lock

@@ -62,6 +62,7 @@ GEM
       sass-rails (>= 3.1.0)
     delayed_job (4.0.0)
       activesupport (>= 3.0, < 4.1)
+    descendants_tracker (0.0.3)
     devise (3.2.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -71,17 +72,18 @@ GEM
     docile (1.1.1)
     erubis (2.7.0)
     execjs (2.0.2)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     formatted_form (2.1.2)
       rails (>= 3.1)
     git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
+    github_api (0.11.2)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
       hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
     haml (4.0.5)
       tilt
@@ -93,15 +95,14 @@ GEM
     hashie (2.0.5)
     highline (1.6.20)
     hike (1.2.3)
-    httpauth (0.2.0)
     i18n (0.6.9)
-    jeweler (1.8.8)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
     jquery-rails (3.1.0)
@@ -110,7 +111,7 @@ GEM
     jquery-ui-rails (4.2.0)
       railties (>= 3.2.16)
     json (1.8.1)
-    jwt (0.1.8)
+    jwt (0.1.11)
       multi_json (>= 1.5)
     kaminari (0.15.1)
       actionpack (>= 3.0.0)
@@ -120,16 +121,17 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
+    mini_portile (0.5.2)
     minitest (4.7.5)
     multi_json (1.8.4)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     orm_adapter (0.5.0)
@@ -159,7 +161,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
-    rdoc (4.0.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     sass (3.2.14)
     sass-rails (4.0.1)
@@ -184,7 +186,7 @@ GEM
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
-    tinymce-rails (4.0.12)
+    tinymce-rails (4.0.16)
       railties (>= 3.1.1)
     treetop (1.4.15)
       polyglot
@@ -206,4 +208,4 @@ DEPENDENCIES
   rails (>= 4.0.0)
   rdoc
   simplecov
-  tinymce-rails (= 4.0.12)
+  tinymce-rails (~> 4.0.0)

data/README.rdoc

@@ -1,4 +1,7 @@
 {<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]
+
 = cms-fortress
 
 An extension for the awesome Comfortable Mexican Sofa (https://github.com/comfy/comfortable-mexican-sofa) CMS Engine

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/app/assets/javascripts/cms/fortress/media.js.coffee

@@ -62,7 +62,9 @@ window.media =
     this.ed.selection.setContent(img)
     this.ed.nodeChanged()
 
+window.CmsFortress = window.CmsFortress || {}
 
+window.CmsFortress.media = media
 
 $(document).ready ->
-  media.init()
+  CmsFortress.media.init()

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

@@ -6,19 +6,19 @@ window.CMS.wysiwyg = ->
     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: media.othersUrl()
+    link_list: CmsFortress.media.othersUrl()
     setup: (ed) ->
       ed.addButton 'image',
         title: 'Insert Image'
         onclick: ->
-          media.showImageDialog(ed)
+          CmsFortress.media.showImageDialog(ed)
 
       ed.addButton 'fmedia',
         tooltip: 'Insert Video'
         icon: 'media'
         stateSelector: ['img[data-mce-object=video]', 'img[data-mce-object=iframe]']
         onclick: ->
-          media.showVideoDialog(ed)
+          CmsFortress.media.showVideoDialog(ed)
 
 
 

data/app/views/cms/fortress/shared/_mediaboxes.html.haml

@@ -10,8 +10,8 @@
       Click the thumbnail to insert item to the selected editor.
 
 :coffeescript
-  media.imagesPath = "#{ media_files_path(:image) }"
-  media.videosPath = "#{ media_files_path(:video) }"
-  media.othersPath = "#{ media_files_path(:others) }"
+  CmsFortress.media.imagesPath = "#{ media_files_path(:image) }"
+  CmsFortress.media.videosPath = "#{ media_files_path(:video) }"
+  CmsFortress.media.othersPath = "#{ media_files_path(:others) }"
 
 

data/cms-fortress.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cms-fortress"
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2014-02-21"
+  s.date = "2014-02-26"
   s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email = "melvinsembrano@gmail.com"
   s.extra_rdoc_files = [
@@ -144,7 +144,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<devise>, ["~> 3.2"])
       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.12"])
+      s.add_runtime_dependency(%q<tinymce-rails>, ["~> 4.0.0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -155,7 +155,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<devise>, ["~> 3.2"])
       s.add_dependency(%q<cancan>, [">= 1.6.9"])
       s.add_dependency(%q<delayed_job>, ["~> 4"])
-      s.add_dependency(%q<tinymce-rails>, ["= 4.0.12"])
+      s.add_dependency(%q<tinymce-rails>, ["~> 4.0.0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -167,7 +167,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<devise>, ["~> 3.2"])
     s.add_dependency(%q<cancan>, [">= 1.6.9"])
     s.add_dependency(%q<delayed_job>, ["~> 4"])
-    s.add_dependency(%q<tinymce-rails>, ["= 4.0.12"])
+    s.add_dependency(%q<tinymce-rails>, ["~> 4.0.0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/cms/fortress/application_controller_methods.rb

@@ -2,13 +2,30 @@
 module Cms
   module Fortress
     module ApplicationControllerMethods
+
       def after_sign_in_path_for(resource)
-        admin_cms_path
+        if resource.class.eql?(Cms::Fortress::User)
+          admin_cms_path
+        else
+          begin
+            stored_location_for(resource) || send("after_sign_in_path_for_#{ resource.class.name.underscore }", resource)
+          rescue
+            raise "Cannot find `after_sign_in_path_for_#{ resource.class.name.underscore }` in your ApplicationController class."
+          end
+        end
       end
 
       def after_sign_out_path_for(resource_or_scope)
         # request.referrer
-        admin_cms_path
+        if resource_or_scope.eql?(:cms_fortress_user)
+          admin_cms_path
+        else
+          begin
+            stored_location_for(resource_or_scope) || send("after_sign_out_path_for_#{ resource_or_scope.to_s }", resource_or_scope)
+          rescue
+            raise "Cannot find `after_sign_out_path_for_#{ resource.class.name.underscore }` in your ApplicationController class."
+          end
+        end
       end
 
       def ability_class

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

@@ -47,7 +47,7 @@ module Cms
       end
 
       initializer :assets do |config|
-        Rails.application.config.assets.precompile += %w( cms/fortress/bootstrap.js cms/fortress/admin_overrides.css cms/fortress/session.css cms/fortress/themes/wide.css cms/fortress/themes/wide.js cms/fortress/media.js)
+        Rails.application.config.assets.precompile += %w( cms/fortress/bootstrap.css cms/fortress/bootstrap-responsive.css cms/fortress/bootstrap.js cms/fortress/admin_overrides.css cms/fortress/session.css cms/fortress/themes/wide.css cms/fortress/themes/wide.js cms/fortress/media.js)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,16 @@ dependencies:
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.12
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.12
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement