contao 0.6.1 → 0.6.2

data/lib/contao/generators/application.rb

@@ -1,4 +1,5 @@
 require 'contao/generators/base'
+require 'contao/application'
 require 'contao/system'
 
 module TechnoGate

data/lib/contao/generators/base.rb

@@ -2,6 +2,8 @@ module TechnoGate
   module Contao
     module Generators
       class Base
+        attr_reader :options
+
         def initialize(options = {})
           @options = options
         end

data/lib/contao/generators/contao_initializer.rb

@@ -10,7 +10,7 @@ module TechnoGate
         def generate
           config = build_config
           File.open initializer_path, 'w' do |f|
-            f.write ERB.new(File.read TEMPLATE).result(binding)
+            f.write ERB.new(File.read(TEMPLATE), nil, '-').result(binding)
           end
         end
 

data/lib/contao/generators/localconfig.rb

@@ -0,0 +1,29 @@
+require 'contao/generators/base'
+
+module TechnoGate
+  module Contao
+    module Generators
+      class Localconfig < Base
+        class LocalconfigRequired < RuntimeError; end
+
+        def generate
+          require_localconfig
+
+          config = Contao::Application.config
+          File.open localconfig_path, 'w' do |f|
+            f.write ERB.new(File.read(options[:template]), nil, '-').result(binding)
+          end
+        end
+
+        protected
+        def require_localconfig
+          raise LocalconfigRequired unless options[:template]
+        end
+
+        def localconfig_path
+          Pathname.new(Rails.public_path).join 'system/config/localconfig.php'
+        end
+      end
+    end
+  end
+end

data/lib/contao/templates/contao_initializer.rb.erb

@@ -21,7 +21,7 @@ module ContaoTemplate
 
     # Enable SMTP ?
     config.contao.smtp.enabled = <%= config.smtp_enabled %>
-    <% if config.smtp_enabled %>
+    <%- if config.smtp_enabled %>
     # SMTP Host
     config.contao.smtp.host = '<%= config.smtp_host %>'
 
@@ -36,6 +36,6 @@ module ContaoTemplate
 
     # SMTP Port
     config.contao.smtp.port = <%= config.smtp_port %>
-    <% end %>
+    <%- end %>
   end
 end

data/lib/contao/version.rb

@@ -1,3 +1,3 @@
 module Contao
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/tasks/contao.rake

@@ -96,21 +96,12 @@ namespace :contao do
 
   desc "Generate the localconfig.php"
   task :generate_localconfig => :environment do
-    require 'active_support/core_ext/object/blank'
-    config = Rails.application.config.contao.dup
+    require 'contao/generators/localconfig'
 
-    config.db_server_app = 'mysql'
-    config.db_hostname   = config.global.mysql.host
-    config.db_port       = config.global.mysql.port
-    config.db_username   = config.global.mysql.user
-    config.db_password   = config.global.mysql.pass
-    config.db_database   = config.application_name
-
-    localconfig_template = Rails.root.join 'config/examples/localconfig.php.erb'
-    localconfig_path = public_path.join 'system/config/localconfig.php'
-
-    localconfig = ERB.new(File.read(localconfig_template), nil, '-').result(binding)
-    File.open(localconfig_path, 'w') {|f| f.write localconfig }
+    TechnoGate::Contao::Generators::Localconfig.new(
+      path: Rails.root,
+      template: Rails.root.join('config/examples/localconfig.php.erb'),
+    ).generate
 
     TechnoGate::Contao::Notifier.notify 'The configuration file localconfig.php was generated successfully.'
   end

data/spec/lib/contao/generators/contao_initializer_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'contao/generators/contao_initializer.rb'
+require 'contao/generators/contao_initializer'
 
 module TechnoGate
   module Contao

data/spec/lib/contao/generators/localconfig_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'contao/generators/localconfig'
+
+module TechnoGate
+  module Contao
+    module Generators
+      describe Localconfig, :fakefs => true do
+        let(:klass) { Localconfig }
+
+        subject {
+          klass.new path: @path, template: @template
+        }
+
+        before :each do
+          @path = '/root/my_awesome_project'
+          @template = "#{@path}/config/examples/localconfig.php.erb"
+
+          stub_filesystem! :global_config => {
+            'mysql' => {
+              'host' => 'localhost',
+              'user' => 'myuser',
+              'pass' => 'mypass',
+              'port' => 3306,
+            },
+          }
+
+          Contao::Application.send :load_global_config!
+        end
+
+        it_should_behave_like 'Generator'
+
+        describe '#generate' do
+          it 'should require a template' do
+            expect do
+              klass.new(path: @path).generate
+            end.to raise_error Localconfig::LocalconfigRequired
+          end
+
+          it 'should generate a localconfig file' do
+            subject.generate
+            File.exists?('/root/my_awesome_project/public/system/config/localconfig.php').should be_true
+          end
+        end
+      end
+    end
+  end
+end

data/spec/support/filesystem_mock.rb

@@ -3,12 +3,14 @@ def stub_filesystem!(options = {})
 
     '/root/my_awesome_project/config',
     '/root/my_awesome_project/config/initializers',
+    '/root/my_awesome_project/config/examples',
     '/root/my_awesome_project/app/assets/javascripts',
     '/root/my_awesome_project/app/assets/stylesheets',
     '/root/my_awesome_project/app/assets/images',
     '/root/my_awesome_project/contao/non_existing_folder',
     '/root/my_awesome_project/contao/system/modules/some_extension',
     '/root/my_awesome_project/public/resources',
+    '/root/my_awesome_project/public/system/config',
     '/root/my_awesome_project/public/system/modules/frontend',
     '/root/my_awesome_project/vendor/assets/javascripts',
     '/tmp',
@@ -22,6 +24,86 @@ def stub_filesystem!(options = {})
 
   stub_global_config_file!(options[:global_config] || {})
   stub_config_application!(options[:application_name])
+  stub_localconfig!
+end
+
+def stub_localconfig!
+  localconfig_path = '/root/my_awesome_project/config/examples/localconfig.php.erb'
+  File.open localconfig_path, 'w' do |f|
+    f.write <<-EOS
+<?php if (!defined('TL_ROOT')) die('You cannot access this file directly!');
+
+/**
+ * Contao Open Source CMS
+ * Copyright (C) 2005-2011 Leo Feyer
+ *
+ * Formerly known as TYPOlight Open Source CMS.
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, please visit the Free
+ * Software Foundation website at <http://www.gnu.org/licenses/>.
+ *
+ * PHP version 5
+ * @copyright  Leo Feyer 2005-2011
+ * @author     Leo Feyer <http://www.contao.org>
+ * @package    Config
+ * @license    LGPL
+ * @filesource
+ */
+
+### INSTALL SCRIPT START ###
+$GLOBALS['TL_CONFIG']['websitePath']          = '';
+$GLOBALS['TL_CONFIG']['licenseAccepted']      = true;
+$GLOBALS['TL_CONFIG']['installPassword']      = '<%= config.install_password %>';
+$GLOBALS['TL_CONFIG']['installCount']         = 0;
+$GLOBALS['TL_CONFIG']['encryptionKey']        = '<%= config.encryption_key %>';
+<% if config.db_server_app == 'mysql' -%>
+$GLOBALS['TL_CONFIG']['dbDriver']             = 'MySQL';
+<% end -%>
+$GLOBALS['TL_CONFIG']['dbHost']               = '<%= config.db_hostname || 'localhost' %>';
+$GLOBALS['TL_CONFIG']['dbPort']               = <%= config.db_port || 3306 %>;
+$GLOBALS['TL_CONFIG']['dbUser']               = '<%= config.db_username %>';
+$GLOBALS['TL_CONFIG']['dbPass']               = '<%= config.db_password %>';
+$GLOBALS['TL_CONFIG']['dbDatabase']           = '<%= config.db_database %>';
+$GLOBALS['TL_CONFIG']['dbPconnect']           = false;
+$GLOBALS['TL_CONFIG']['dbCharset']            = 'UTF8';
+$GLOBALS['TL_CONFIG']['adminEmail']           = '<%= config.admin_email %>';
+$GLOBALS['TL_CONFIG']['cron_weekly']          = 201126;
+$GLOBALS['TL_CONFIG']['latestVersion']        = '2.11.3';
+$GLOBALS['TL_CONFIG']['cron_daily']           = 20110701;
+$GLOBALS['TL_CONFIG']['timeZone']             = '<%= config.time_zone %>';
+$GLOBALS['TL_CONFIG']['rewriteURL']           = true;
+$GLOBALS['TL_CONFIG']['allowedTags']          = '<a><abbr><acronym><address><area><article><aside><b><big><blockquote><br><base><bdo><button><caption><cite><code><col><colgroup><dd><del><div><dfn><dl><dt><em><figure><figcaption><form><fieldset><footer><header><hr><h1><h2><h3><h4><h5><h6><i><iframe><img><input><ins><label><legend><li><link><map><nav><object><ol><optgroup><option><p><pre><param><q><section><select><small><span><strong><sub><sup><style><table><tbody><td><textarea><tfoot><th><thead><tr><tt><u><ul>';
+<% if config.smtp.enabled -%>
+$GLOBALS['TL_CONFIG']['useSMTP']              = true;
+$GLOBALS['TL_CONFIG']['smtpHost']             = '<%= config.smtp.host %>';
+$GLOBALS['TL_CONFIG']['smtpUser']             = '<%= config.smtp.user %>';
+$GLOBALS['TL_CONFIG']['smtpPass']             = '<%= config.smtp.pass %>';
+<% end -%>
+<% if config.smtp.ssl -%>
+$GLOBALS['TL_CONFIG']['smtpEnc']              = 'ssl';
+$GLOBALS['TL_CONFIG']['smtpPort']             = <%= config.smtp.port || 465 %>;
+<% end -%>
+<% unless Rails.env.production? -%>
+$GLOBALS['TL_CONFIG']['cacheMode']            = 'none';
+$GLOBALS['TL_CONFIG']['displayErrors']        = true;
+$GLOBALS['TL_CONFIG']['disableRefererCheck']  = true;
+<% end -%>
+### INSTALL SCRIPT STOP ###
+
+?>
+    EOS
+  end
 end
 
 def stub_global_config_file!(config = {})

data/spec/support/stub_rails.rb

@@ -6,6 +6,18 @@ module Rails
   end
 
   def self.env
+    self
+  end
+
+  def self.production?
+    false
+  end
+
+  def self.to_s
+    @@env
+  end
+
+  def self.to_str
     @@env
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contao
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -166,6 +166,7 @@ files:
 - lib/contao/generators/base.rb
 - lib/contao/generators/config.rb
 - lib/contao/generators/contao_initializer.rb
+- lib/contao/generators/localconfig.rb
 - lib/contao/notifier.rb
 - lib/contao/password.rb
 - lib/contao/railties.rb
@@ -181,6 +182,7 @@ files:
 - spec/lib/contao/generators/base_spec.rb
 - spec/lib/contao/generators/config_spec.rb
 - spec/lib/contao/generators/contao_initializer_spec.rb
+- spec/lib/contao/generators/localconfig_spec.rb
 - spec/lib/contao/notifier_spec.rb
 - spec/lib/contao/password_spec.rb
 - spec/spec_helper.rb
@@ -209,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -745897341125477947
+      hash: 775829207634762625
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -227,6 +229,7 @@ test_files:
 - spec/lib/contao/generators/base_spec.rb
 - spec/lib/contao/generators/config_spec.rb
 - spec/lib/contao/generators/contao_initializer_spec.rb
+- spec/lib/contao/generators/localconfig_spec.rb
 - spec/lib/contao/notifier_spec.rb
 - spec/lib/contao/password_spec.rb
 - spec/spec_helper.rb