comfortable_mexican_sofa 1.12.2 → 1.12.3

metadata

@@ -1,225 +1,245 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: plupload-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 description: ComfortableMexicanSofa is a powerful Rails 4 CMS Engine
 email:
 - oleg@khabarov.ca
@@ -227,8 +247,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -246,6 +266,8 @@ files:
 - app/assets/images/comfortable_mexican_sofa/icon_snippet.gif
 - app/assets/javascripts/comfortable_mexican_sofa/admin/application.js
 - app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee
+- app/assets/javascripts/comfortable_mexican_sofa/cms/files.js.coffee
+- app/assets/javascripts/comfortable_mexican_sofa/cms/uploader.js.coffee
 - app/assets/javascripts/comfortable_mexican_sofa/lib/bootstrap-datetimepicker.js
 - app/assets/javascripts/comfortable_mexican_sofa/lib/diff.js.coffee
 - app/assets/javascripts/comfortable_mexican_sofa/lib/diff/diff_match_patch.min.js
@@ -288,8 +310,9 @@ files:
 - app/views/comfy/admin/cms/categories/update.js.erb
 - app/views/comfy/admin/cms/files/_file.html.haml
 - app/views/comfy/admin/cms/files/_form.html.haml
-- app/views/comfy/admin/cms/files/_index.html.haml
+- app/views/comfy/admin/cms/files/_modal.html.haml
 - app/views/comfy/admin/cms/files/_page_form.html.haml
+- app/views/comfy/admin/cms/files/create.js.erb
 - app/views/comfy/admin/cms/files/destroy.js.coffee
 - app/views/comfy/admin/cms/files/edit.html.haml
 - app/views/comfy/admin/cms/files/index.html.haml
@@ -356,7 +379,7 @@ files:
 - app/views/kaminari/comfy/_prev_page.html.haml
 - app/views/layouts/comfy/admin/cms.html.haml
 - app/views/layouts/comfy/admin/cms/_body.html.haml
-- app/views/layouts/comfy/admin/cms/_center.html.haml
+- app/views/layouts/comfy/admin/cms/_flash.html.haml
 - app/views/layouts/comfy/admin/cms/_footer.html.haml
 - app/views/layouts/comfy/admin/cms/_footer_js.html.haml
 - app/views/layouts/comfy/admin/cms/_head.html.haml
@@ -373,6 +396,7 @@ files:
 - config/environments/test.rb
 - config/initializers/comfortable_mexican_sofa.rb
 - config/initializers/paperclip.rb
+- config/initializers/plupload.rb
 - config/initializers/secret_token.rb
 - config/locales/cs.yml
 - config/locales/da.yml
@@ -422,8 +446,9 @@ files:
 - db/upgrade_migrations/08_upgrade_to_1_12_0.rb
 - doc/preview.png
 - lib/comfortable_mexican_sofa.rb
-- lib/comfortable_mexican_sofa/authentication/dummy_auth.rb
-- lib/comfortable_mexican_sofa/authentication/http_auth.rb
+- lib/comfortable_mexican_sofa/access_control/admin_authentication.rb
+- lib/comfortable_mexican_sofa/access_control/admin_authorization.rb
+- lib/comfortable_mexican_sofa/access_control/public_authentication.rb
 - lib/comfortable_mexican_sofa/configuration.rb
 - lib/comfortable_mexican_sofa/engine.rb
 - lib/comfortable_mexican_sofa/error.rb
@@ -470,7 +495,11 @@ files:
 - lib/comfortable_mexican_sofa/view_hooks.rb
 - lib/comfortable_mexican_sofa/view_methods.rb
 - lib/generators/comfy/cms/README
+- lib/generators/comfy/cms/assets_generator.rb
 - lib/generators/comfy/cms/cms_generator.rb
+- lib/generators/comfy/cms/controllers_generator.rb
+- lib/generators/comfy/cms/models_generator.rb
+- lib/generators/comfy/cms/views_generator.rb
 - lib/generators/comfy/scaffold/scaffold_generator.rb
 - lib/generators/comfy/scaffold/templates/controller.rb
 - lib/generators/comfy/scaffold/templates/migration.rb
@@ -529,12 +558,17 @@ files:
 - test/gemfiles/Gemfile.rails.4.0
 - test/gemfiles/Gemfile.rails.4.1
 - test/gemfiles/Gemfile.rails.master
+- test/generators/cms_assets_generator_test.rb
+- test/generators/cms_controllers_generator_test.rb
 - test/generators/cms_generator_test.rb
+- test/generators/cms_models_generator_test.rb
+- test/generators/cms_views_generator_test.rb
 - test/generators/scaffold_generator_test.rb
-- test/integration/authentication_test.rb
+- test/integration/access_control_test.rb
 - test/integration/fixtures_test.rb
 - test/integration/mirrors_test.rb
 - test/integration/render_cms_test.rb
+- test/integration/routing_test.rb
 - test/integration/sites_test.rb
 - test/integration/view_hooks_test.rb
 - test/lib/configuration_test.rb
@@ -588,17 +622,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails 4 CMS Engine

data/app/views/comfy/admin/cms/files/_index.html.haml

@@ -1,11 +0,0 @@
-.box.file-uploader
-  = form_for :file, :url => comfy_admin_cms_site_files_path(@site, :ajax => true), :html => {:multipart => true, :target => 'file-upload-frame'} do |form|
-    %span.btn.btn-sm.btn-default.btn-file
-      = t('.button')
-      = form.file_field :file, :multiple => true, :id => nil
-  
-  .uploaded-files
-    - @site.files.not_page_file.order(:label).each do |file|
-      = render :partial => 'comfy/admin/cms/files/file', :object => file
-      
-  %iframe#file-upload-frame{:name => 'file-upload-frame', :src => ''}

data/lib/comfortable_mexican_sofa/authentication/dummy_auth.rb

@@ -1,8 +0,0 @@
-module ComfortableMexicanSofa::DummyAuth
-
-  # Will always let you in
-  def authenticate
-    true
-  end
-  
-end

data/lib/comfortable_mexican_sofa/authentication/http_auth.rb

@@ -1,25 +0,0 @@
-module ComfortableMexicanSofa::HttpAuth
-  # Set username and password in config/initializers/comfortable_mexican_sofa.rb
-  # Like this:
-  #   ComfortableMexicanSofa::HttpAuth.username = 'myname'
-  #   ComfortableMexicanSofa::HttpAuth.password = 'mypassword'
-  #
-  # You can even use bcrypt (gem 'bcrypt-ruby'):
-  #   require 'bcrypt'
-  #   ComfortableMexicanSofa::HttpAuth.username = 'myname'
-  #   ComfortableMexicanSofa::HttpAuth.password = BCrypt::Password.new '... bcrypt hash ...'
-  # Create the bcrypt hash with:
-  #   BCrypt::Password.create('password').to_s
-  mattr_accessor  :username,
-                  :password
-
-  # Simple http_auth. When implementing some other form of authentication
-  # this method should return +true+ if everything is great, or redirect user
-  # to some other page, thus denying access to cms admin section.
-  def authenticate
-    authenticate_or_request_with_http_basic do |username, password|
-      self.username == username && self.password == password
-    end
-  end
-
-end

data/test/integration/authentication_test.rb

@@ -1,48 +0,0 @@
-require_relative '../test_helper'
-
-class AuthenticationIntegrationTest < ActionDispatch::IntegrationTest
-  
-  module TestLockPublicAuth
-    def authenticate
-      return redirect_to('/lockout')
-    end
-  end
-  
-  module TestUnlockPublicAuth
-    def authenticate
-      true
-    end
-  end
-  
-  def test_get_with_unauthorized_access
-    assert_equal 'ComfortableMexicanSofa::HttpAuth', ComfortableMexicanSofa.config.admin_auth
-    get '/admin/sites'
-    assert_response :unauthorized
-    get '/'
-    assert_response :success
-  end
-  
-  def test_get_with_authorized_access
-    http_auth :get, '/admin/sites'
-    assert_response :success
-  end
-  
-  def test_get_with_changed_default_config
-    assert_equal 'ComfortableMexicanSofa::HttpAuth', ComfortableMexicanSofa.config.admin_auth
-    ComfortableMexicanSofa::HttpAuth.username = 'newuser'
-    ComfortableMexicanSofa::HttpAuth.password = 'newpass'
-    http_auth :get, '/admin/sites'
-    assert_response :unauthorized
-    http_auth :get, '/admin/sites', {}, 'newuser', 'newpass'
-    assert_response :success
-  end
-  
-  def test_get_public_with_custom_auth
-    Comfy::Cms::ContentController.send :include, TestLockPublicAuth
-    get '/'
-    assert_response :redirect
-    assert_redirected_to '/lockout'
-    # reset auth module
-    Comfy::Cms::ContentController.send :include, TestUnlockPublicAuth
-  end
-end