ecrire 0.23.0 → 0.24.0

data/test/editor/test_helper.rb

@@ -1,30 +1,34 @@
-require 'rails/all'
-require 'ecrire'
-require 'rails/test_help'
-
 class ActiveSupport::TestCase
-  ActiveSupport.test_order = :sorted
-  self.fixture_path = "#{Dir.pwd}/test/fixtures"
-  fixtures :all
-
-  # Need to quick boot an instance of Ecrire to check if a user
-  # exists. It creates a new user if none exists so the editor can be launched
-  pid = fork do
-    Dir.chdir Dir.pwd + '/test/themes/template' do
-      Ecrire::Application.initialize!
-      ::User.first_or_create!(email: 'test@test.ca', password: 123456)
+  begin
+    # ActiveRecord's configuration assignation is done at the same time as the connection is tried
+    # If it fails, the configurations aren't set in AR::Base.
+    # This is why this is set here
+    ActiveRecord::Base.configurations = Rails.application.config.database_configuration
 
+    path = Rails.application.paths['db/migrate'].existent
+    ActiveRecord::Migrator.migrations_paths = path
+    if ActiveRecord::Migrator.needs_migration?
+      ActiveRecord::Migrator.migrate(path)
     end
-    exit!
+  rescue ActiveRecord::NoDatabaseError
+    puts 'Database does not exist. Creating...'
+    ActiveRecord::Tasks::DatabaseTasks.create_current
+    puts 'Database created, migrating now...'
+    ActiveRecord::Migrator.migrate(path)
+    puts "Migration completed."
+  ensure
+    ActiveRecord::Migration.maintain_test_schema!
+    include ActiveRecord::TestFixtures
+    self.fixture_path = "#{Dir.pwd}/test/fixtures/"
+    fixtures :all
+    Post.reset_column_information
   end
 
-  Process.wait2(pid)
 
-  Dir.chdir Dir.pwd + '/test/themes/template' do
-    Ecrire::Application.initialize!
-    Rails.application.secrets['s3'] ||= {}
-  end
+end
 
-  include Warden::Test::Helpers
+ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
 
+def create_fixtures(*fixture_set_names, &block)
+  FixtureSet.create_fixtures(ActiveSupport::TestCase.fixture_path, fixture_set_names, {}, &block)
 end

data/test/editor/theme/routes.rb

@@ -0,0 +1,8 @@
+Ecrire::Theme::Engine.routes.draw do
+  get '/:year/:month/:id', controller: :posts, action: :show, constraints: { year: /\d+/, month: /\d+/ }, as: "post"
+  get '/feed', controller: :posts, action: :index, defaults: { format: :rss }
+
+  resources :posts, only: [:index]
+
+  root 'posts#index'
+end

data/test/{themes/template → editor/theme}/secrets.yml

@@ -4,3 +4,5 @@ test:
   user: postgres
   secret_key: "2370 128u3o2ujwoi12jw122e12e"
   secret_key_base: "'Mlkasj alskjkdsla jsdkaljsadlkjasd'"
+  s3:
+    path: 'yada'

data/test/initializations/{railtie_test.rb → engine_test.rb}

@@ -1,5 +1,3 @@
-require "isolation"
-
 class RailtieTest < ActiveSupport::TestCase
   include ActiveSupport::Testing::Isolation
 
@@ -10,8 +8,8 @@ class RailtieTest < ActiveSupport::TestCase
   test 'Ecrire onboards by default' do
     require 'ecrire'
     Ecrire::Application.initialize!
-    assert Ecrire::Railtie.include?(Ecrire::Railtie::Onboarding)
-    assert !Ecrire::Railtie.include?(Ecrire::Railtie::Theme)
+    assert defined?(Ecrire::Onboarding::Engine)
+    assert !defined?(Ecrire::Theme::Engine)
   end
 
   test 'load the normal railtie if a secrets.yml can be found' do
@@ -20,8 +18,8 @@ class RailtieTest < ActiveSupport::TestCase
       require 'ecrire'
       Ecrire::Application.initialize!
 
-      assert Ecrire::Railtie.include?(Ecrire::Railtie::Onboarding)
-      assert !Ecrire::Railtie.include?(Ecrire::Railtie::Theme)
+      assert defined?(Ecrire::Onboarding::Engine)
+      assert !defined?(Ecrire::Theme::Engine)
     end
   end
 
@@ -37,8 +35,8 @@ class RailtieTest < ActiveSupport::TestCase
       require 'ecrire'
       Ecrire::Application.initialize!
 
-      assert !Ecrire::Railtie.include?(Ecrire::Railtie::Onboarding)
-      assert Ecrire::Railtie.include?(Ecrire::Railtie::Theme)
+      assert !defined?(Ecrire::Onboarding::Engine)
+      assert defined?(Ecrire::Theme::Engine)
       # Need to destroy the user here because parallelization is fubar'ed
       # and it's the most stable way I found it.
       # All other options seemed to introduce racing conditions.

data/test/onboarding/controllers/databases_controller_test.rb

@@ -0,0 +1,4 @@
+require 'test_controller'
+
+class DatabasesControllerTest < TestController
+end

data/test/{editor/controllers/base_controller_test.rb → test_controller.rb}

@@ -1,8 +1,12 @@
-require 'editor/test_helper'
-require 'byebug'
+require 'test_helper'
+require 'warden'
 
-class BaseControllerTest < ActionController::TestCase
-  include Warden::Test::Helpers
+class TestController < ActionController::TestCase
+
+  def setup
+    @routes = Rails.application.routes
+    @controller.env['warden'] = @request.env['warden'] = Warden::Proxy.new(@request.env, self.class.manager)
+  end
 
   def self.manager
     @manager ||= Warden::Manager.new(self,
@@ -12,10 +16,6 @@ class BaseControllerTest < ActionController::TestCase
       })
   end
 
-  def setup
-    @controller.env['warden'] = @request.env['warden'] = Warden::Proxy.new(@request.env, self.class.manager)
-  end
-
   def teardown
     Warden.test_reset!
   end
@@ -25,3 +25,4 @@ class BaseControllerTest < ActionController::TestCase
   end
 
 end
+

data/test/test_helper.rb

@@ -0,0 +1,31 @@
+require 'ecrire'
+require 'rails/all'
+
+require 'active_support/testing/autorun'
+require 'active_support/test_case'
+require 'action_controller'
+require 'action_controller/test_case'
+require 'action_dispatch/testing/integration'
+require 'rails/generators/test_case'
+
+require 'warden'
+require 'byebug'
+
+Dir.chdir ARGV.pop do
+  Ecrire::Application.initialize!
+end
+
+
+class ActiveSupport::TestCase
+  ActiveSupport.test_order = :sorted
+end
+
+class ActionController::TestCase
+  include Warden::Test::Helpers
+
+  setup do
+    @routes = Rails.application.routes
+  end
+end
+
+

data/test/test_task.rb

@@ -0,0 +1,28 @@
+require 'rake/testtask'
+
+class Ecrire::TestTask < Rake::TestTask
+  attr_accessor :theme
+
+  def define
+    desc @description
+    task @name do
+      Rake::FileUtilsExt.verbose(@verbose) do
+        args =
+          "#{ruby_opts_string} #{run_code} " +
+          "#{file_list_string} #{option_list}" +
+          "#{theme}"
+
+        ruby args do |ok, status|
+          if !ok && status.respond_to?(:signaled?) && status.signaled?
+            raise SignalException.new(status.termsig)
+          elsif !ok
+            fail "Command failed with status (#{status.exitstatus}): " +
+              "[ruby #{args}]"
+          end
+        end
+      end
+    end
+    self
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecrire
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Pier-Olivier Thibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies: []
 description: Blog engine on Rails
 email: pothibo@gmail.com
@@ -90,12 +90,8 @@ files:
 - lib/ecrire/app/controllers/admin/tags_controller.rb
 - lib/ecrire/app/controllers/admin/titles_controller.rb
 - lib/ecrire/app/controllers/application_controller.rb
-- lib/ecrire/app/controllers/concerns/.keep
-- lib/ecrire/app/controllers/ecrire/posts_controller.rb
+- lib/ecrire/app/controllers/ecrire/theme_controller.rb
 - lib/ecrire/app/controllers/images_controller.rb
-- lib/ecrire/app/controllers/onboarding/databases_controller.rb
-- lib/ecrire/app/controllers/onboarding/users_controller.rb
-- lib/ecrire/app/controllers/onboarding_controller.rb
 - lib/ecrire/app/controllers/partials_controller.rb
 - lib/ecrire/app/controllers/sessions_controller.rb
 - lib/ecrire/app/controllers/static_controller.rb
@@ -175,8 +171,6 @@ files:
 - lib/ecrire/config/environment/development.rb
 - lib/ecrire/config/environment/production.rb
 - lib/ecrire/config/environment/test.rb
-- lib/ecrire/config/onboarding_routes.rb
-- lib/ecrire/config/routes.rb
 - lib/ecrire/db/migrate/20131111222709_create_posts.rb
 - lib/ecrire/db/migrate/20131113200949_create_users.rb
 - lib/ecrire/db/migrate/20131114205041_add_excerpt_to_post.rb
@@ -213,45 +207,48 @@ files:
 - lib/ecrire/onboarding/assets/stylesheets/terminal.css.scss
 - lib/ecrire/onboarding/assets/stylesheets/variables.css.scss
 - lib/ecrire/onboarding/assets/stylesheets/welcome.css.scss
+- lib/ecrire/onboarding/controllers/databases_controller.rb
+- lib/ecrire/onboarding/controllers/onboarding_controller.rb
+- lib/ecrire/onboarding/controllers/users_controller.rb
+- lib/ecrire/onboarding/engine.rb
+- lib/ecrire/onboarding/routes.rb
+- lib/ecrire/onboarding/views/databases/index.html.erb
 - lib/ecrire/onboarding/views/layouts/application.html.erb
 - lib/ecrire/onboarding/views/onboarding/complete.html.erb
-- lib/ecrire/onboarding/views/onboarding/databases/index.html.erb
-- lib/ecrire/onboarding/views/onboarding/users/index.html.erb
 - lib/ecrire/onboarding/views/onboarding/welcome.html.erb
-- lib/ecrire/railtie.rb
-- lib/ecrire/railtie/onboarding.rb
-- lib/ecrire/railtie/theme.rb
+- lib/ecrire/onboarding/views/users/index.html.erb
+- lib/ecrire/routes.rb
 - lib/ecrire/tasks/assets.rake
 - lib/ecrire/tasks/database.rake
-- lib/ecrire/tasks/routes.rake
-- lib/ecrire/template/Gemfile
-- lib/ecrire/template/Procfile
-- lib/ecrire/template/Rakefile
-- lib/ecrire/template/assets/images/.keep
-- lib/ecrire/template/assets/javascripts/base.js.coffee
-- lib/ecrire/template/assets/stylesheets/base.css.scss
-- lib/ecrire/template/assets/stylesheets/code.css.scss
-- lib/ecrire/template/assets/stylesheets/footer.css.scss
-- lib/ecrire/template/assets/stylesheets/header.css.scss
-- lib/ecrire/template/assets/stylesheets/home.css.scss
-- lib/ecrire/template/config.ru
-- lib/ecrire/template/controllers/posts_controller.rb
-- lib/ecrire/template/helpers/blog_helper.rb
-- lib/ecrire/template/views/layouts/application.html.erb
-- lib/ecrire/template/views/posts/_post.html.erb
-- lib/ecrire/template/views/posts/index.html.erb
-- lib/ecrire/template/views/posts/show.html.erb
-- lib/ecrire/template/views/static/about.html
-- lib/ecrire/template/views/static/customize.html
-- lib/ecrire/template/views/static/customize/_helper.html
-- lib/ecrire/template/views/static/customize/_helper_used.html
-- lib/ecrire/template/views/static/customize/_image.html
-- lib/ecrire/template/views/static/customize/_index.html
-- lib/ecrire/template/views/static/customize/_javascript.html
-- lib/ecrire/template/views/static/customize/_layout.html.erb
-- lib/ecrire/template/views/static/customize/_post.html
+- lib/ecrire/theme/engine.rb
+- lib/ecrire/theme/template/Gemfile
+- lib/ecrire/theme/template/Procfile
+- lib/ecrire/theme/template/Rakefile
+- lib/ecrire/theme/template/assets/images/.keep
+- lib/ecrire/theme/template/assets/javascripts/base.js.coffee
+- lib/ecrire/theme/template/assets/stylesheets/base.css.scss
+- lib/ecrire/theme/template/assets/stylesheets/code.css.scss
+- lib/ecrire/theme/template/assets/stylesheets/footer.css.scss
+- lib/ecrire/theme/template/assets/stylesheets/header.css.scss
+- lib/ecrire/theme/template/assets/stylesheets/home.css.scss
+- lib/ecrire/theme/template/config.ru
+- lib/ecrire/theme/template/controllers/posts_controller.rb
+- lib/ecrire/theme/template/helpers/blog_helper.rb
+- lib/ecrire/theme/template/routes.rb
+- lib/ecrire/theme/template/views/layouts/application.html.erb
+- lib/ecrire/theme/template/views/posts/_post.html.erb
+- lib/ecrire/theme/template/views/posts/index.html.erb
+- lib/ecrire/theme/template/views/posts/show.html.erb
+- lib/ecrire/theme/template/views/static/about.html
+- lib/ecrire/theme/template/views/static/customize.html
+- lib/ecrire/theme/template/views/static/customize/_helper.html
+- lib/ecrire/theme/template/views/static/customize/_helper_used.html
+- lib/ecrire/theme/template/views/static/customize/_image.html
+- lib/ecrire/theme/template/views/static/customize/_index.html
+- lib/ecrire/theme/template/views/static/customize/_javascript.html
+- lib/ecrire/theme/template/views/static/customize/_layout.html.erb
+- lib/ecrire/theme/template/views/static/customize/_post.html
 - lib/ecrire/version.rb
-- test/editor/controllers/base_controller_test.rb
 - test/editor/controllers/sessions_controller_test.rb
 - test/editor/helpers/base_helper_test.rb
 - test/editor/models/image_test.rb
@@ -259,23 +256,27 @@ files:
 - test/editor/models/title_test.rb
 - test/editor/models/user_test.rb
 - test/editor/test_helper.rb
+- test/editor/theme/Gemfile
+- test/editor/theme/assets/javascripts/blog.js.coffee
+- test/editor/theme/assets/javascripts/post.js.coffee
+- test/editor/theme/assets/stylesheets/blog.css.scss
+- test/editor/theme/assets/stylesheets/post.css.scss
+- test/editor/theme/config.ru
+- test/editor/theme/routes.rb
+- test/editor/theme/secrets.yml
+- test/editor/theme/views/layouts/application.html.erb
+- test/editor/theme/views/posts/index.html.erb
 - test/fixtures/images.yml
 - test/fixtures/posts.yml
 - test/fixtures/tags.yml
 - test/fixtures/titles.yml
 - test/fixtures/users.yml
-- test/initializations/railtie_test.rb
-- test/isolation.rb
-- test/themes/onboarding/.keep
-- test/themes/template/Gemfile
-- test/themes/template/assets/javascripts/blog.js.coffee
-- test/themes/template/assets/javascripts/post.js.coffee
-- test/themes/template/assets/stylesheets/blog.css.scss
-- test/themes/template/assets/stylesheets/post.css.scss
-- test/themes/template/config.ru
-- test/themes/template/secrets.yml
-- test/themes/template/views/layouts/application.html.erb
-- test/themes/template/views/posts/index.html.erb
+- test/initializations/engine_test.rb
+- test/onboarding/controllers/databases_controller_test.rb
+- test/onboarding/theme/.keep
+- test/test_controller.rb
+- test/test_helper.rb
+- test/test_task.rb
 homepage: http://pothibo.com
 licenses:
 - MIT

data/lib/ecrire/app/controllers/onboarding/databases_controller.rb

@@ -1,67 +0,0 @@
-require_relative '../onboarding_controller'
-
-module Onboarding
-  class DatabasesController < OnboardingController
-
-    helper_method :user, :password, :database
-
-    def index; end;
-
-    def create
-      info ||= {
-        'adapter' => 'postgresql',
-        'database' => database,
-        'user' => user,
-        'password' => password,
-        'encoding' => 'utf8'
-      }
-      begin
-        ActiveRecord::Base.configurations = {
-          'development' => info,
-          'production' => info
-        }
-        ActiveRecord::Base.establish_connection
-        ActiveRecord::Base.connection
-        migrate!
-      rescue Exception => e
-        @exception = e
-        ActiveRecord::Base.clear_all_connections!
-        render 'index' and return
-      end
-
-      redirect_to :onboarding_users
-    end
-
-    protected
-
-    private
-
-    def migrate!
-      ActiveRecord::Tasks::DatabaseTasks.database_configuration = ActiveRecord::Base.configurations
-      ActiveRecord::Migrator.migrations_paths = ActiveRecord::Tasks::DatabaseTasks.migrations_paths
-      ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil) do |migration|
-        ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
-      end
-    end
-
-    def db_params
-      params.fetch(:database, {})
-    end
-
-    def user
-      @user ||= "ecrire#{SecureRandom.hex(2)}"
-      db_params.fetch(:user, @user)
-    end
-
-    def password
-      @password ||= SecureRandom.hex(16)
-      db_params.fetch(:password, @password)
-    end
-
-    def database
-      @database ||= "ecrire"
-      db_params.fetch(:name, @database)
-    end
-  end
-end

data/lib/ecrire/app/controllers/onboarding/users_controller.rb

@@ -1,32 +0,0 @@
-module Onboarding
-  class UsersController < OnboardingController
-
-    helper_method :user
-
-    def index;end;
-
-    def create
-      @user = User.find_or_initialize_by(email: user_params[:email])
-      @user.update(user_params)
-      
-      if user.errors.blank?
-        save_configurations!
-        redirect_to :root
-      else
-        render 'index'
-      end
-    end
-
-    protected
-
-
-    def user_params
-      params.require(:user).permit(:email, :password, :password_confirmation)
-    end
-
-    def user
-      @user ||= User.new
-    end
-
-  end
-end

data/lib/ecrire/config/onboarding_routes.rb

@@ -1,11 +0,0 @@
-Ecrire::Application.routes.draw do
-
-  root 'onboarding#index'
-
-  namespace :onboarding, only: :index do
-    resources :databases, only: [:index, :create]
-    resources :users, only: [:index, :create]
-  end
-end
-
-

data/lib/ecrire/config/routes.rb

@@ -1,32 +0,0 @@
-Ecrire::Application.routes.draw do
-  root 'posts#index'
-
-  get '/:year/:month/:id', controller: :posts, action: :show, constraints: { year: /\d+/, month: /\d+/ }, as: "post"
-  get '/feed', controller: :posts, action: :index, defaults: { format: :rss }
-
-  resources :posts, only: [:index]
-
-  resource :session, only: [:new, :create, :destroy]
-
-  resources :partials, only: [:show]
-
-  namespace :admin do
-    root 'posts#index'
-    resources :posts do
-      collection do
-        get 'help', controller: :posts, action: :help
-      end
-      resources :tags, only: [:index, :create, :update], module: 'posts'
-      resources :titles, shallow: true
-      resource :image, shallow: true
-      resource :properties, only: [:create, :destroy]
-    end
-
-    namespace :configurations do
-      resource :images, only: [:show, :create]
-    end
-  end
-
-  get '/:view', to: 'static#show'
-
-end

data/lib/ecrire/railtie/onboarding.rb

@@ -1,63 +0,0 @@
-class Ecrire::Railtie
-  module Onboarding
-    extend ActiveSupport::Concern
-    included do
-      Rails.application.config.active_record.migration_error = :none
-      ActiveRecord::Base.configurations = {}
-
-      initializer 'ecrire.onboarding.dynamic_settings' do |app|
-        app.config.secret_key_base = SecureRandom.hex(16)
-      end
-
-      initializer 'ecrire.onboarding.routes' do |app|
-        app.routes.clear!
-
-        app.paths.add 'config/routes.rb', with: 'config/onboarding_routes.rb'
-
-        paths = app.paths['config/routes.rb'].existent
-        app.routes_reloader.paths.clear.unshift(*paths)
-        app.routes_reloader.route_sets << app.routes
-      end
-
-      initializer 'ecrire.view_paths' do |app|
-        ActionController::Base.prepend_view_path paths['onboarding:views'].existent
-      end
-
-      initializer 'ecrire.assets' do |app|
-        app.config.assets.paths.concat paths['onboarding:assets'].existent
-      end
-
-      def paths
-        @paths ||= begin
-          paths = Rails::Paths::Root.new(root_path)
-          paths.add 'onboarding:views', with: 'views'
-          paths.add 'onboarding:assets', with: 'assets', glob: '*'
-          paths
-        end
-      end
-
-      def root_path
-        Pathname.new(__FILE__).dirname + '../onboarding/'
-      end
-
-      # This hack is done because ActiveRecord raise an error that makes
-      # Ecrire exit which makes it impossible to have an instance working without a
-      # database. By doing this, it becomes possible to Ecrire to load the server and
-      # serve the onboarding theme for the user.
-      ActiveRecord::Railtie.initializers.select do |initializer|
-        initializer.name.eql? 'active_record.initialize_database'
-      end.first.instance_variable_set :@block, Proc.new { |app|
-        ActiveSupport.on_load(:active_record) do
-          begin
-            establish_connection
-          rescue ActiveRecord::NoDatabaseError, ActiveRecord::AdapterNotSpecified => e
-            app.config.middleware.delete 'ActiveRecord::QueryCache'
-            app.config.middleware.delete 'ActiveRecord::ConnectionAdapters::ConnectionManagement'
-          end
-        end
-      }
-
-
-    end
-  end
-end

data/lib/ecrire/railtie/theme.rb

@@ -1,69 +0,0 @@
-class Ecrire::Railtie
-  module Theme
-    extend ActiveSupport::Concern
-
-    included do
-
-      initializer 'ecrire.logs', before: :initialize_logger do |app|
-        unless Rails.env.test?
-          app.paths.add "log", with: "log/#{Rails.env}.log"
-        end
-      end
-
-      initializer 'ecrire.locales' do |app|
-        config.i18n.railties_load_path.concat(paths['user:locales'].existent)
-      end
-
-      initializer 'ecrire.controllers' do |app|
-        if paths['user:controllers'].existent.any?
-          app.paths['app/controllers'].concat paths['user:controllers'].existent
-        end
-      end
-
-      initializer 'ecrire.helpers' do |app|
-        if paths['user:helpers'].existent.any?
-          app.paths['app/helpers'].concat paths['user:helpers'].existent
-        end
-      end
-
-      initializer 'ecrire.view_paths' do |app|
-        ActionController::Base.prepend_view_path paths['user:views'].existent
-      end
-
-      initializer 'ecrire.assets' do |app|
-        app.config.assets.paths.concat paths['user:assets'].existent
-      end
-
-      def paths
-        @paths ||= begin
-          paths = Rails::Paths::Root.new(root_path)
-          paths.add 'user:views', with: 'views'
-          paths.add 'user:controllers', with: 'controllers', eager_load: true
-          paths.add 'user:assets', with: 'assets', glob: '*'
-          paths.add 'user:locales', with: 'locales', glob: '**/*.{rb,yml}'
-          paths.add 'user:helpers', with: 'helpers', eager_load: true
-          paths.add 'public', with: 'tmp/public'
-          paths
-        end
-      end
-
-      def root_path(file = 'config.ru')
-        begin
-          pathname = Pathname.pwd
-
-          while !(pathname + file).exist? do
-            pathname = pathname.parent
-            if pathname.root?
-              raise "Could not find #{file}. Type 'ecrire new blog_name' to create a new blog"
-              break
-            end
-          end
-
-          pathname
-        end
-      end
-
-
-    end
-  end
-end