comfortable_mexican_sofa 1.4.3 → 1.4.4

data/.travis.yml

@@ -1,7 +1,10 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  - rbx
+  # - 1.9.3
   - rbx-2.0
   - ree
-  # - jruby
+  # - jruby
+gemfile:
+  - gemfiles/Gemfile.rails-3.0.x
+  - gemfiles/Gemfile.rails-3.1.x

data/VERSION

@@ -1 +1 @@
-1.4.3
+1.4.4

data/app/controllers/cms_admin/base_controller.rb

@@ -3,7 +3,7 @@ class CmsAdmin::BaseController < ApplicationController
   protect_from_forgery
 
   # Authentication module must have #authenticate method
-  include ComfortableMexicanSofa.config.authentication.to_s.constantize
+  include ComfortableMexicanSofa.config.admin_auth.to_s.constantize
 
   before_filter :authenticate,
                 :load_admin_site,

data/app/controllers/cms_content_controller.rb

@@ -1,9 +1,14 @@
 class CmsContentController < ApplicationController
-
+  
+  # Authentication module must have #authenticate method
+  include ComfortableMexicanSofa.config.public_auth.to_s.constantize
+  
   before_filter :load_cms_site
   before_filter :load_fixtures
-  before_filter :load_cms_page,   :only => :render_html
-  before_filter :load_cms_layout, :only => [:render_css, :render_js]
+  before_filter :load_cms_page, :authenticate,
+    :only => :render_html
+  before_filter :load_cms_layout,
+    :only => [:render_css, :render_js]
   
   def render_html(status = 200)
     if layout = @cms_page.layout

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.3"
+  s.version = "1.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-08-26}
+  s.date = %q{2011-08-30}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -198,7 +198,11 @@ Gem::Specification.new do |s|
     "db/seeds.rb",
     "doc/page_editing.png",
     "doc/sofa.png",
+    "gemfiles/Gemfile.rails-3.0.x",
+    "gemfiles/Gemfile.rails-3.1.x",
     "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/configuration.rb",
     "lib/comfortable_mexican_sofa/controller_methods.rb",
     "lib/comfortable_mexican_sofa/engine.rb",
@@ -210,7 +214,6 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/extensions/rails.rb",
     "lib/comfortable_mexican_sofa/fixtures.rb",
     "lib/comfortable_mexican_sofa/form_builder.rb",
-    "lib/comfortable_mexican_sofa/http_auth.rb",
     "lib/comfortable_mexican_sofa/tag.rb",
     "lib/comfortable_mexican_sofa/tags/asset.rb",
     "lib/comfortable_mexican_sofa/tags/field_datetime.rb",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -6,7 +6,12 @@ ComfortableMexicanSofa.configure do |config|
   
   # Module responsible for authentication. You can replace it with your own.
   # It simply needs to have #authenticate method. See http_auth.rb for reference.
-  #   config.authentication = 'ComfortableMexicanSofa::HttpAuth'
+  #   config.admin_auth = 'ComfortableMexicanSofa::HttpAuth'
+  
+  # Module responsible for public authentication. Similar to the above. You also
+  # will have access to @cms_site, @cms_layout, @cms_page so you can use them in
+  # your logic. Default module doesn't do anything.
+  #   config.public_auth = 'ComfortableMexicanSofa::DummyAuth'
   
   # Default url to access admin area is http://yourhost/cms-admin/ 
   # You can change 'cms-admin' to 'admin', for example. To disable admin area

data/gemfiles/Gemfile.rails-3.0.x

@@ -0,0 +1,14 @@
+source 'http://rubygems.org'
+
+gem 'rails',          '3.0.10'
+gem 'active_link_to', '>=1.0.0'
+gem 'paperclip',      '>=2.3.14'
+
+group :development do
+  # gem 'sqlite3'
+end
+
+group :test do
+  gem 'sqlite3'
+  gem 'jeweler', '>=1.4.0'
+end

data/gemfiles/Gemfile.rails-3.1.x

@@ -0,0 +1,14 @@
+source 'http://rubygems.org'
+
+gem 'rails',          '3.1.0.rc8'
+gem 'active_link_to', '>=1.0.0'
+gem 'paperclip',      '>=2.3.14'
+
+group :development do
+  # gem 'sqlite3'
+end
+
+group :test do
+  gem 'sqlite3'
+  gem 'jeweler', '>=1.4.0'
+end

data/lib/comfortable_mexican_sofa.rb

@@ -6,7 +6,8 @@ end
 [ 'comfortable_mexican_sofa/version',
   'comfortable_mexican_sofa/error',
   'comfortable_mexican_sofa/configuration',
-  'comfortable_mexican_sofa/http_auth',
+  'comfortable_mexican_sofa/authentication/http_auth',
+  'comfortable_mexican_sofa/authentication/dummy_auth',
   'comfortable_mexican_sofa/controller_methods',
   'comfortable_mexican_sofa/view_hooks',
   'comfortable_mexican_sofa/view_methods',

data/lib/comfortable_mexican_sofa/authentication/dummy_auth.rb

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

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -6,7 +6,10 @@ class ComfortableMexicanSofa::Configuration
   attr_accessor :cms_title
   
   # Module that will handle authentication to access cms-admin area
-  attr_accessor :authentication
+  attr_accessor :admin_auth
+  
+  # Module that will handle authentication for public pages
+  attr_accessor :public_auth
   
   # Default url to access admin area is http://yourhost/cms-admin/ 
   # You can change 'cms-admin' to 'admin', for example.
@@ -43,7 +46,8 @@ class ComfortableMexicanSofa::Configuration
   # Configuration defaults
   def initialize
     @cms_title              = 'ComfortableMexicanSofa MicroCMS'
-    @authentication         = 'ComfortableMexicanSofa::HttpAuth'
+    @admin_auth             = 'ComfortableMexicanSofa::HttpAuth'
+    @public_auth            = 'ComfortableMexicanSofa::DummyAuth'
     @seed_data_path         = nil
     @admin_route_prefix     = 'cms-admin'
     @admin_route_redirect   = ''

data/test/integration/authentication_test.rb

@@ -2,8 +2,20 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class AuthenticationTest < 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.authentication
+    assert_equal 'ComfortableMexicanSofa::HttpAuth', ComfortableMexicanSofa.config.admin_auth
     get '/cms-admin/sites'
     assert_response :unauthorized
     get '/'
@@ -16,7 +28,7 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
   end
   
   def test_get_with_changed_default_config
-    assert_equal 'ComfortableMexicanSofa::HttpAuth', ComfortableMexicanSofa.config.authentication
+    assert_equal 'ComfortableMexicanSofa::HttpAuth', ComfortableMexicanSofa.config.admin_auth
     ComfortableMexicanSofa::HttpAuth.username = 'newuser'
     ComfortableMexicanSofa::HttpAuth.password = 'newpass'
     http_auth :get, '/cms-admin/sites'
@@ -24,4 +36,13 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
     http_auth :get, '/cms-admin/sites', {}, 'newuser', 'newpass'
     assert_response :success
   end
+  
+  def test_get_public_with_custom_auth
+    CmsContentController.send :include, TestLockPublicAuth
+    get '/'
+    assert_response :redirect
+    assert_redirected_to '/lockout'
+    # reset auth module
+    CmsContentController.send :include, TestUnlockPublicAuth
+  end
 end

data/test/test_helper.rb

@@ -17,7 +17,8 @@ class ActiveSupport::TestCase
   def reset_config
     ComfortableMexicanSofa.configure do |config|
       config.cms_title              = 'ComfortableMexicanSofa MicroCMS'
-      config.authentication         = 'ComfortableMexicanSofa::HttpAuth'
+      config.admin_auth             = 'ComfortableMexicanSofa::HttpAuth'
+      config.public_auth            = 'ComfortableMexicanSofa::DummyAuth'
       config.admin_route_prefix     = 'cms-admin'
       config.admin_route_redirect   = ''
       config.allow_irb              = false

data/test/unit/configuration_test.rb

@@ -7,7 +7,8 @@ class ConfigurationTest < ActiveSupport::TestCase
   def test_configuration_presense
     assert config = ComfortableMexicanSofa.configuration
     assert_equal 'ComfortableMexicanSofa MicroCMS', config.cms_title
-    assert_equal 'ComfortableMexicanSofa::HttpAuth', config.authentication
+    assert_equal 'ComfortableMexicanSofa::HttpAuth', config.admin_auth
+    assert_equal 'ComfortableMexicanSofa::DummyAuth', config.public_auth
     assert_equal 'cms-admin', config.admin_route_prefix
     assert_equal '', config.admin_route_redirect
     assert_equal false, config.allow_irb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000 -04:00
+date: 2011-08-30 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70185365145420 !ruby/object:Gem::Requirement
+  requirement: &70319984307860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70185365145420
+  version_requirements: *70319984307860
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70185365144940 !ruby/object:Gem::Requirement
+  requirement: &70319984307380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70185365144940
+  version_requirements: *70319984307380
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70185365144460 !ruby/object:Gem::Requirement
+  requirement: &70319984306900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70185365144460
+  version_requirements: *70319984306900
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -235,7 +235,11 @@ files:
 - db/seeds.rb
 - doc/page_editing.png
 - doc/sofa.png
+- gemfiles/Gemfile.rails-3.0.x
+- gemfiles/Gemfile.rails-3.1.x
 - 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/configuration.rb
 - lib/comfortable_mexican_sofa/controller_methods.rb
 - lib/comfortable_mexican_sofa/engine.rb
@@ -247,7 +251,6 @@ files:
 - lib/comfortable_mexican_sofa/extensions/rails.rb
 - lib/comfortable_mexican_sofa/fixtures.rb
 - lib/comfortable_mexican_sofa/form_builder.rb
-- lib/comfortable_mexican_sofa/http_auth.rb
 - lib/comfortable_mexican_sofa/tag.rb
 - lib/comfortable_mexican_sofa/tags/asset.rb
 - lib/comfortable_mexican_sofa/tags/field_datetime.rb
@@ -344,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4262236515429772675
+      hash: 4080205680426409607
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: