contao 0.4.2 → 0.5.0

data/lib/contao/version.rb

@@ -1,3 +1,3 @@
 module Contao
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/lib/{contao/tasks → tasks}/contao.rake

@@ -17,20 +17,22 @@ def ask(what, options = {})
   end
 end
 
+def public_path
+  Pathname.new Rails.public_path
+end
+
 namespace :contao do
   desc "Link all contao files"
   task :bootstrap do
-    public = TechnoGate::Contao.expandify(TechnoGate::Contao::Application.config.contao_public_path)
-
     TechnoGate::Contao::Application.linkify
 
-    FileUtils.mkdir_p public.join('system/logs')
-    File.open(public.join('sitemap.xml'), 'w') {|f| f.write ''}
+    FileUtils.mkdir_p public_path.join('system/logs')
+    File.open(public_path.join('sitemap.xml'), 'w') {|f| f.write ''}
 
     Rake::Task['contao:generate_localconfig'].invoke
     Rake::Task['contao:generate_htaccess'].invoke
     Rake::Task['contao:apply_patches'].invoke
-    Rake::Task['assets:precompile'].invoke
+    Rake::Task['assets:precompile'].invoke if Rails.env.production?
     Rake::Task['contao:fix_permissions'].invoke
 
     TechnoGate::Contao::Notifier.notify("The contao folder has been bootstraped, Good Luck.", title: "Contao Bootstrap")
@@ -38,11 +40,11 @@ namespace :contao do
 
   desc 'Apply Patches'
   task :apply_patches do
-    path = File.expand_path "../../../contao_patches/#{TechnoGate::Contao.env}", __FILE__
+    path = File.expand_path "../../../contao_patches/#{Rails.env}", __FILE__
     Dir["#{path}/**/*.patch"].each do |patch|
       TechnoGate::Contao::Notifier.notify("Applying patch #{File.basename patch}", title: "Contao Bootstrap")
       result = system <<-CMD
-        cd #{TechnoGate::Contao.expandify(TechnoGate::Contao::Application.config.contao_public_path)}
+        cd #{public_path}
         patch -Nfp1 -i #{patch} --no-backup-if-mismatch
       CMD
 
@@ -57,7 +59,6 @@ namespace :contao do
   task :fix_permissions do
     require 'fileutils'
 
-    public = TechnoGate::Contao.expandify(TechnoGate::Contao::Application.config.contao_public_path)
     paths = [
       'system/html',
       'system/logs',
@@ -65,13 +66,13 @@ namespace :contao do
       'system/tmp',
       'system/cache',
       'system/config',
-    ].map {|p| public.join p}.reject {|p| !File.exists? p}
+    ].map {|p| public_path.join p}.reject {|p| !File.exists? p}
 
     FileUtils.chmod 0777, paths
 
-    FileUtils.chmod 0666, Dir["#{public}/system/config/**/*.php"]
+    FileUtils.chmod 0666, Dir["#{public_path}/system/config/**/*.php"]
 
-    Dir["#{public}/system/modules/efg/**/*"].each do |f|
+    Dir["#{public_path}/system/modules/efg/**/*"].each do |f|
       if File.directory?(f)
         FileUtils.chmod 0777, f
       else
@@ -79,7 +80,7 @@ namespace :contao do
       end
     end
 
-    FileUtils.chmod 0666, public.join('sitemap.xml')
+    FileUtils.chmod 0666, public_path.join('sitemap.xml')
 
     TechnoGate::Contao::Notifier.notify("The contao folder's permissions has been fixed.", title: "Contao Bootstrap")
   end
@@ -87,7 +88,7 @@ namespace :contao do
   desc "Generate the localconfig.php"
   task :generate_localconfig do
     require 'active_support/core_ext/object/blank'
-    config = TechnoGate::Contao::Application.config.global
+    config = TechnoGate::Contao::Application.config.contao_global_config
 
     if !config && config.install_password.blank? || config.encryption_key.blank?
       message = <<-EOS
@@ -99,12 +100,11 @@ namespace :contao do
       TechnoGate::Contao::Notifier.warn(message, title: "Contao Bootstrap")
     else
       config = config.clone
-      config.contao_env = TechnoGate::Contao.env
       config.application_name = TechnoGate::Contao::Application.name
-      config.mysql.database = config.application_name
+      config.mysql.database = TechnoGate::Contao::Application.name
 
-      localconfig_template = TechnoGate::Contao.expandify('config/examples/localconfig.php.erb')
-      localconfig_path = TechnoGate::Contao.expandify(TechnoGate::Contao::Application.config.contao_public_path).join('system/config/localconfig.php')
+      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)).result(binding)
       File.open(localconfig_path, 'w') {|f| f.write localconfig }
@@ -115,8 +115,7 @@ namespace :contao do
 
   desc "Generate the htaccess file"
   task :generate_htaccess do
-    public = TechnoGate::Contao.expandify(TechnoGate::Contao::Application.config.contao_public_path)
-    FileUtils.cp public.join('.htaccess.default'), public.join('.htaccess')
+    FileUtils.cp public_path.join('.htaccess.default'), public_path.join('.htaccess')
 
     TechnoGate::Contao::Notifier.notify("The .htaccess was successfully generated.", title: "Contao Bootstrap")
   end

data/spec/lib/contao/application_spec.rb

@@ -11,24 +11,22 @@ module TechnoGate
         subject.send :parse_global_config
       end
 
-      it_should_behave_like 'Config'
-
       describe "Global Config" do
 
         it "should parse the global config file if the file exists" do
-          subject.config.global.should_not be_empty
+          subject.config.contao_global_config.should_not be_empty
         end
 
         it "should correctly parse the global config" do
-          subject.config.global.install_password.should == 'some install password'
+          subject.config.contao_global_config.install_password.should == 'some install password'
         end
       end
 
       describe '#linkify' do
         it "should call #exhaustive_list_of_files_to_link" do
           subject.should_receive(:exhaustive_list_of_files_to_link).with(
-            Contao.expandify(Application.config.contao_path),
-            Contao.expandify(Application.config.contao_public_path)
+            Rails.root.join(Rails.application.config.contao_path),
+            Rails.public_path
           ).once.and_return []
 
           subject.linkify
@@ -63,7 +61,7 @@ module TechnoGate
 
         describe "without it being set in the configuration" do
           before :each do
-            TechnoGate::Contao::Application.configure do
+            Rails.config.tap do |config|
               config.application_name = nil
             end
           end
@@ -79,7 +77,7 @@ module TechnoGate
 
         describe "with it being set in the configuration" do
           before :each do
-            TechnoGate::Contao::Application.configure do
+            Rails.config.tap do |config|
               config.application_name = 'my_super_awesome_project'
             end
           end

data/spec/lib/contao/notifier_spec.rb

@@ -10,26 +10,26 @@ module TechnoGate
           @colored_output = "\e[0;34mContao>>\e[0m \e[0;32m#{@message}\e[0m"
           @options = {title: "Hello, World!"}
 
-          ::Guard::UI.stub(:color_enabled?).and_return(false)
+          UI.stub(:color_enabled?).and_return(false)
         end
 
         it {should respond_to :notify}
 
         it "should call guard ui" do
-          ::Guard::UI.should_receive(:info).with(@output, {})
+          UI.should_receive(:info).with(@output, {})
 
           subject.notify(@message)
         end
 
         it "should send whatever options passed to the info method" do
-          ::Guard::UI.should_receive(:info).with(@output, @options)
+          UI.should_receive(:info).with(@output, @options)
 
           subject.notify(@message, @options)
         end
 
         it "should use colors if enabled" do
-          ::Guard::UI.should_receive(:color_enabled?).once.and_return(true)
-          ::Guard::UI.should_receive(:info).with(@colored_output, @options)
+          UI.should_receive(:color_enabled?).once.and_return(true)
+          UI.should_receive(:info).with(@colored_output, @options)
 
           subject.notify(@message, @options)
         end
@@ -48,26 +48,26 @@ module TechnoGate
           @colored_output = "\e[0;34mContao>>\e[0m \e[0;33m#{@message}\e[0m"
           @options = {title: "Hello, World!"}
 
-          ::Guard::UI.stub(:color_enabled?).and_return(false)
+          UI.stub(:color_enabled?).and_return(false)
         end
 
         it {should respond_to :warn}
 
         it "should call guard ui" do
-          ::Guard::UI.should_receive(:info).with(@output, {})
+          UI.should_receive(:info).with(@output, {})
 
           subject.warn(@message)
         end
 
         it "should send whatever options passed to the info method" do
-          ::Guard::UI.should_receive(:info).with(@output, @options)
+          UI.should_receive(:info).with(@output, @options)
 
           subject.warn(@message, @options)
         end
 
         it "should use colors if enabled" do
-          ::Guard::UI.should_receive(:color_enabled?).once.and_return(true)
-          ::Guard::UI.should_receive(:info).with(@colored_output, @options)
+          UI.should_receive(:color_enabled?).once.and_return(true)
+          UI.should_receive(:info).with(@colored_output, @options)
 
           subject.warn(@message, @options)
         end
@@ -86,26 +86,26 @@ module TechnoGate
           @colored_output = "\e[0;34mContao>>\e[0m \e[0;31m#{@message}\e[0m"
           @options = {title: "Hello, World!"}
 
-          ::Guard::UI.stub(:color_enabled?).and_return(false)
+          UI.stub(:color_enabled?).and_return(false)
         end
 
         it {should respond_to :error}
 
         it "should call guard ui" do
-          ::Guard::UI.should_receive(:info).with(@output, {})
+          UI.should_receive(:info).with(@output, {})
 
           subject.error(@message)
         end
 
         it "should send whatever options passed to the info method" do
-          ::Guard::UI.should_receive(:info).with(@output, @options)
+          UI.should_receive(:info).with(@output, @options)
 
           subject.error(@message, @options)
         end
 
         it "should use colors if enabled" do
-          ::Guard::UI.should_receive(:color_enabled?).once.and_return(true)
-          ::Guard::UI.should_receive(:info).with(@colored_output, @options)
+          UI.should_receive(:color_enabled?).once.and_return(true)
+          UI.should_receive(:info).with(@colored_output, @options)
 
           subject.error(@message, @options)
         end

data/spec/spec_helper.rb

@@ -21,23 +21,15 @@ RSpec.configure do |c|
   c.include FakeFS::SpecHelpers, :fakefs
 
   c.before :each do
-    ::TechnoGate::Contao.env  = @env  = :development
-    ::TechnoGate::Contao.root = @root = "/root/my_awesome_project"
-    ::TechnoGate::Contao::Application.configure do
-      config.application_name   = 'my_awesome_project'
-      config.javascripts_path   = ['vendor/assets/javascripts', 'lib/assets/javascripts', 'app/assets/javascripts']
-      config.stylesheets_path   = 'app/assets/stylesheets'
-      config.images_path        = 'app/assets/images'
-      config.contao_path        = 'contao'
-      config.contao_public_path = 'public'
-      config.assets_public_path = 'public/resources'
+    Rails.env = 'development'
+    Rails.root = @root = '/root/my_awesome_project'
+
+    Rails.config.tap do |config|
+      config.contao_path = 'contao'
     end
 
     silence_warnings do
-      ::Compass::Commands::UpdateProject = stub("Compass Update Project").as_null_object
-      ::Compass::Commands::CleanProject = stub("Compass Clea Project").as_null_object
-      ::Uglifier = stub("Uglifier").as_null_object
-      ::Guard::UI = stub('Guard UI').as_null_object
+      TechnoGate::Contao::UI = stub('Guard UI').as_null_object
     end
   end
 end

data/spec/support/filesystem_mock.rb

@@ -42,17 +42,46 @@ def stub_config_application!(application_name = 'my_awesome_project')
     f.write(<<-EOS)
 require File.expand_path('../boot', __FILE__)
 
-# Initialize the application
-Dir["#{TechnoGate::Contao.root.join('config', 'initializers')}/**/*.rb"].each {|f| require f}
-
-TechnoGate::Contao::Application.configure do
-  config.application_name   = '#{application_name}'
-  config.javascripts_path   = ["vendor/assets/javascripts", "lib/assets/javascripts", "app/assets/javascripts"]
-  config.stylesheets_path   = 'app/assets/stylesheets'
-  config.images_path        = 'app/assets/images'
-  config.contao_path        = 'contao'
-  config.contao_public_path = 'public'
-  config.assets_public_path = 'public/resources'
+# Pick the frameworks you want:
+require "sprockets/railtie"
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
+module ContaoTemplate
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # The application name
+    config.application_name = '#{application_name}'
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(\#{config.root}/extras)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Enable escaping HTML in JSON.
+    config.active_support.escape_html_entities_in_json = true
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Change the prefix of the assets
+    config.assets.prefix = 'resources'
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+
+    # Contao configurations
+    config.contao_path = 'contao'
+  end
 end
     EOS
   end

data/spec/support/stub_rails.rb

@@ -0,0 +1,29 @@
+module Rails
+  def self.env=(env)
+    @@env = env
+  end
+
+  def self.env
+    @@env
+  end
+
+  def self.root=(root)
+    @@root = Pathname.new root
+  end
+
+  def self.root
+    @@root
+  end
+
+  def self.config
+    @config ||= OpenStruct.new
+  end
+
+  def self.application
+    self
+  end
+
+  def self.public_path
+    root.join 'public'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contao
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,54 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: oily_png
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: uglifier
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -91,38 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
@@ -155,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -203,8 +107,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Contao Integration with Compass, Sass, Coffee-script, Rake, Guard with
-  asset pre-compiler and asset-manifest generator
+description: Contao Integration with Rails.
 email:
 - wael.nasreddine@gmail.com
 executables:
@@ -224,44 +127,31 @@ files:
 - lib/contao.rb
 - lib/contao/application.rb
 - lib/contao/cli.rb
-- lib/contao/coffeescript_compiler.rb
 - lib/contao/commands/application.rb
 - lib/contao/commands/help.rb
-- lib/contao/compiler.rb
 - lib/contao/core_ext/object.rb
 - lib/contao/generators/application.rb
 - lib/contao/generators/base.rb
 - lib/contao/generators/config.rb
-- lib/contao/javascript_compiler.rb
 - lib/contao/notifier.rb
-- lib/contao/stylesheet_compiler.rb
+- lib/contao/railtie.rb
 - lib/contao/system.rb
-- lib/contao/tasks/assets.rake
-- lib/contao/tasks/contao.rake
-- lib/contao/tasks/jasmine.rake
-- lib/contao/tasks/whitespace.rake
+- lib/contao/ui.rb
 - lib/contao/version.rb
 - lib/contao_patches/development/development_htaccess.patch
-- lib/guard/assets.rb
-- lib/monkey_patches.rb
-- lib/monkey_patches/compass/urls.rb
+- lib/tasks/contao.rake
+- lib/tasks/whitespace.rake
 - spec/lib/contao/application_spec.rb
-- spec/lib/contao/coffeescript_compiler_spec.rb
 - spec/lib/contao/generators/application_spec.rb
 - spec/lib/contao/generators/base_spec.rb
 - spec/lib/contao/generators/config_spec.rb
-- spec/lib/contao/javascript_compiler_spec.rb
 - spec/lib/contao/notifier_spec.rb
-- spec/lib/contao/stylesheet_compiler_spec.rb
-- spec/lib/contao_spec.rb
-- spec/lib/guard/assets_spec.rb
 - spec/spec_helper.rb
-- spec/support/compiler_shared_examples.rb
-- spec/support/config_shared_examples.rb
 - spec/support/filesystem_mock.rb
 - spec/support/generator_shared_examples.rb
 - spec/support/singleton_shared_example.rb
-homepage: ''
+- spec/support/stub_rails.rb
+homepage: http://technogate.github.com/contao
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -281,10 +171,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2585699756949260143
+      hash: -3507000943758228058
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This gem will help you to quickly generate an application using Contao CMS
@@ -295,18 +185,12 @@ summary: This gem will help you to quickly generate an application using Contao
   and even upload media such as images and PDFs all from the command line using Capistrano.
 test_files:
 - spec/lib/contao/application_spec.rb
-- spec/lib/contao/coffeescript_compiler_spec.rb
 - spec/lib/contao/generators/application_spec.rb
 - spec/lib/contao/generators/base_spec.rb
 - spec/lib/contao/generators/config_spec.rb
-- spec/lib/contao/javascript_compiler_spec.rb
 - spec/lib/contao/notifier_spec.rb
-- spec/lib/contao/stylesheet_compiler_spec.rb
-- spec/lib/contao_spec.rb
-- spec/lib/guard/assets_spec.rb
 - spec/spec_helper.rb
-- spec/support/compiler_shared_examples.rb
-- spec/support/config_shared_examples.rb
 - spec/support/filesystem_mock.rb
 - spec/support/generator_shared_examples.rb
 - spec/support/singleton_shared_example.rb
+- spec/support/stub_rails.rb