ecrire 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76b1ffb5a76e8b346bdd15ab2fc6b2b9ddffcbf
-  data.tar.gz: 996185339a3a617b693bc5781891d926d3334f73
+  metadata.gz: 5491fb6276085642111510a2bf4885d7ccd4402c
+  data.tar.gz: b85b3e9c8f2bc19192fa81af08d19f528b2e742d
 SHA512:
-  metadata.gz: 36e7377ebb0b601c51dfeed39a3b12a8eb4af0bf5068cb2acd2e5b033969473e4560a8b374b6ffca757259e9dcd8ea6768840327b9abbefbee9fa36d02656c9b
-  data.tar.gz: d8bf17c5c38fb86e482d44f8d30e809142617a81decd9a2340ba5c4b4378ee45c195d7589843f2538a6b3688617a1361ead70f23105141225012c83620c831a2
+  metadata.gz: 4ae319240cb15d7bc70b16ef3492e5c7ff32f099c97c203a1fd6199ac4f715166d521a2e625d10b08560a6db3893936a8b1bebca7bb31f67c85dd494051c8862
+  data.tar.gz: e312c1b38f18775a2edd4472d5433576a217c7268461aa21fe7a89ae27fd7a327579f14396cb0f4d7e1432dd11b9ae8849544e898e2ce93017394dc8f8cd4fe6

data/Rakefile

@@ -2,71 +2,39 @@ $:.push File.expand_path("../lib", __FILE__)
 
 ENV['RAILS_ENV'] ||= 'test'
 
-require 'rake/testtask'
 require 'ecrire'
+require_relative 'test/test_task'
 
 task default: :test
 
 namespace :database do
 
-  task initialize: %w(configure) do
-
-    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
-    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."
-    end
-  end
-
-  task :configure do
-    Dir.chdir Dir.pwd + '/test/themes/template' do
-      Ecrire::Application.initialize!
-    end
-  end
-
   task :purge do
     [User, Post, Image, Partial, Title].each(&:delete_all)
   end
 
 end
 
-desc 'Configure postgres and run all tests'
-
-task :test do
-  %w(test:initializations test:editor test:themes).each do |name|
-    Rake::Task[name].invoke
-  end
-end
-
 namespace :test do
-
-  tasks = %w(initializations editor themes).each do |name|
-    Rake::TestTask.new(name) do |t|
+  ['editor', 'onboarding'].each do |name|
+    task = Ecrire::TestTask.new(name) do |t|
+      t.theme = Dir.pwd + "/test/#{name}/theme"
       t.libs << "test"
       t.test_files = FileList["test/#{name}/**/*_test.rb"]
-      t.verbose = false
-      Rake::Task['database:initialize'].invoke
+      t.verbose = true
     end
+  end
 
-    Rake::Task["test:#{name}"].enhance do
-      Rake::Task['database:purge'].invoke
-    end
+end
+
+task :test do
+  %w(test:editor test:onboarding).each do |name|
+    Rake::Task[name].invoke
   end
 end
 
 at_exit do
-  Rake::Task['database:purge'].invoke
+  unless Ecrire::Application.onboarding?
+    Rake::Task['database:purge'].invoke
+  end
 end

data/lib/ecrire/app/controllers/application_controller.rb

@@ -23,7 +23,7 @@ class ApplicationController < ::ActionController::Base
 
     options[:id] = (options.delete(:title) || post.titles.first).slug
 
-    url_for options
+    theme.url_for options
   end
 
 

data/lib/ecrire/app/controllers/ecrire/{posts_controller.rb → theme_controller.rb}

@@ -1,5 +1,5 @@
 module Ecrire
-  class PostsController < ::ApplicationController
+  class ThemeController < ::ApplicationController
 
     before_action :pagination, only: :index
     protect_from_forgery except: :index

data/lib/ecrire/app/controllers/sessions_controller.rb

@@ -2,7 +2,7 @@ class SessionsController < ApplicationController
   before_action :authenticate!, except: [:failed, :new]
 
   def create
-    redirect_to :root
+    redirect_to '/'
   end
 
   def destroy

data/lib/ecrire/app/controllers/static_controller.rb

@@ -1,4 +1,4 @@
-class StaticController < ApplicationController
+class StaticController < Ecrire::ThemeController
   def show
     render params[:view]
   end

data/lib/ecrire/app/helpers/posts_helper.rb

@@ -4,4 +4,10 @@ module PostsHelper
 
     link_to t('posts.edit'), edit_admin_post_path(post.id), options
   end
+
+  def paginate(scope, options = {}, &block)
+    _with_routes Ecrire::Theme::Engine.routes do
+      super
+    end
+  end
 end

data/lib/ecrire/app/views/layouts/admin/application.html.erb

@@ -13,7 +13,7 @@
       <%= content_tag :nav, id: 'Menu', class: ['admin', controller_name] do %>
         <section>
           <div class='back'>
-            <%= link_to 'Home', :root %>
+            <%= link_to 'Home', '/' %>
           </div>
           <div class='posts'>
             <h4>

data/lib/ecrire/application.rb

@@ -7,12 +7,33 @@ require 'observejs'
 module Ecrire
   class Application < Rails::Application
     require 'ecrire/config/environment'
-    require 'ecrire/railtie'
 
-    # Let's not put anything in here. Because Rails instantiate the class as soon as it's defined,
-    # it's impossible to rely on any declaration made here.
-    #
-    # Instead, defined any configuration in config/environment.rb
+    alias :require_environment! :initialize!
+
+    initializer 'ecrire.secrets', before: :bootstrap_hook do |app|
+      app.paths.add 'config/secrets', with: Dir.pwd + '/secrets.yml'
+    end
+
+    Rails.application.paths.add 'config/database', with: Dir.pwd + '/secrets.yml'
+
+    if File.exist?(Dir.pwd + '/secrets.yml')
+      require 'ecrire/theme/engine'
+    else
+      require 'ecrire/onboarding/engine'
+    end
+
+    def paths
+      @paths ||= begin
+         paths = super
+         paths.add 'config/routes.rb', with: 'routes.rb'
+         paths.add 'config/locales', with: 'locales', glob: "*.{rb,yml}"
+         paths
+       end
+    end
+
+    def self.onboarding?
+      defined?(Ecrire::Onboarding::Engine)
+    end
 
   end
 end

data/lib/ecrire/commands/console.rb

@@ -12,7 +12,6 @@ module Ecrire
 
         shift_argv!
         Ecrire::Application.require_environment!
-        Ecrire::Application.initialize!
 
         Rails::Console.start(Ecrire::Application, *ARGV)
       end

data/lib/ecrire/commands/new.rb

@@ -30,7 +30,7 @@ module Ecrire
       def generate!
         Dir.mkdir @path
         Dir.chdir @path
-        template = File.expand_path '../../template/*', __FILE__
+        template = File.expand_path '../../theme/template/*', __FILE__
         FileUtils.cp_r(Dir[template], @path)
       end
 

data/lib/ecrire/config/environment.rb

@@ -1,4 +1,4 @@
-Rails.application.configure do
+Ecrire::Application.configure do
   config = self.config
   config.eager_load = true
 

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

@@ -0,0 +1,63 @@
+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 :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

data/lib/ecrire/{app → onboarding}/controllers/onboarding_controller.rb

@@ -1,4 +1,5 @@
 class OnboardingController < ApplicationController
+  include Ecrire::Onboarding::Engine.routes.url_helpers
 
   def index
     if File.exist?(Rails.application.paths['config/secrets'].expanded.last)
@@ -18,3 +19,4 @@ class OnboardingController < ApplicationController
   end
 
 end
+

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

@@ -0,0 +1,30 @@
+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

data/lib/ecrire/onboarding/engine.rb

@@ -0,0 +1,73 @@
+module Ecrire
+  module Onboarding
+    class Engine < Rails::Engine
+
+      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.load_paths', before: :bootstrap_hook do |app|
+        ActiveSupport::Dependencies.autoload_paths.unshift(*self.paths.autoload_paths)
+        ActiveSupport::Dependencies.autoload_once_paths.unshift(*self.paths.autoload_once)
+      end
+
+      initializer 'ecrire.append_paths', before: :set_autoload_paths do |app|
+        app.config.eager_load_paths.unshift *paths.eager_load
+        app.config.autoload_once_paths.unshift *paths.autoload_once
+        app.config.autoload_paths.unshift *paths.autoload_paths
+      end
+
+
+      def paths
+        @paths ||= begin
+          paths = Rails::Paths::Root.new(root_path)
+          paths.add 'config/routes.rb', with: 'routes.rb'
+          paths.add 'app/views', with: 'views'
+          paths.add 'app/controllers', with: 'controllers', eager_load: true
+          paths.add 'app/assets', with: 'assets', glob: '*'
+          paths.add 'app/helpers', with: 'helpers', eager_load: true
+
+          paths.add 'config/routes.rb', with: 'routes.rb'
+          paths.add 'config/locales', with: 'locales', glob: '**/*.{rb,yml}'
+          paths.add 'config/environments', with: 'environments', glob: "#{Rails.env}.rb"
+
+          paths.add 'public', with: 'tmp/public'
+
+          paths.add "lib/assets",          glob: "*"
+          paths.add "vendor/assets",       glob: "*"
+          paths.add "lib/tasks"
+          paths
+        end
+      end
+
+      def has_migrations?
+        false
+      end
+
+      def root_path
+        Pathname.new(__FILE__).dirname
+      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/onboarding/routes.rb

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

data/lib/ecrire/onboarding/views/{onboarding/databases → databases}/index.html.erb

@@ -15,7 +15,7 @@
   </div>
 
 
-  <%= form_tag onboarding_databases_path, method: :post do %>
+  <%= form_tag databases_path, method: :post do %>
 
     <% unless @exception.nil? %>
       <div class='error' as='Message'>

data/lib/ecrire/onboarding/views/onboarding/welcome.html.erb

@@ -7,6 +7,6 @@
 
 
 <section class='welcome'>
-  <%= link_to 'Configure', onboarding_databases_path, class: %w(button) %>
+  <%= link_to 'Configure', databases_path, class: %w(button) %>
 </section>
 

data/lib/ecrire/onboarding/views/{onboarding/users → users}/index.html.erb

@@ -2,7 +2,7 @@
 <section>
   <h2>Create a user</h2>
 
-  <%= form_for [:onboarding, user], url: onboarding_users_path, method: :post do |f| %>
+  <%= form_for user, method: :post do |f| %>
     <% if user.errors.any? %>
       <%= content_tag :div, class: %w(error), as: 'Message' do %>
         <%= content_tag :p, user.errors.full_messages.first %>

data/lib/ecrire/routes.rb

@@ -0,0 +1,29 @@
+Ecrire::Application.routes.draw do
+
+  if defined?(Ecrire::Theme::Engine)
+    resource :session, only: [:new, :create, :destroy]
+
+    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
+
+    mount Ecrire::Theme::Engine => '/', as: 'theme'
+  else
+    mount Ecrire::Onboarding::Engine => '/'
+  end
+
+end
+

data/lib/ecrire/theme/engine.rb

@@ -0,0 +1,66 @@
+module Ecrire
+  module Theme
+    class Engine < Rails::Engine
+
+      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.load_paths', before: :bootstrap_hook do |app|
+        ActiveSupport::Dependencies.autoload_paths.unshift(*self.paths.autoload_paths)
+        ActiveSupport::Dependencies.autoload_once_paths.unshift(*self.paths.autoload_once)
+      end
+
+      initializer 'ecrire.append_paths', before: :set_autoload_paths do |app|
+        app.config.eager_load_paths.unshift *paths.eager_load
+        app.config.autoload_once_paths.unshift *paths.autoload_once
+        app.config.autoload_paths.unshift *paths.autoload_paths
+      end
+
+      def paths
+        @paths ||= begin
+          paths = Rails::Paths::Root.new(root_path)
+          paths.add 'app/views', with: 'views'
+          paths.add 'app/controllers', with: 'controllers', eager_load: true
+          paths.add 'app/assets', with: 'assets', glob: '*'
+          paths.add 'app/helpers', with: 'helpers', eager_load: true
+
+          paths.add 'config/routes.rb', with: 'routes.rb'
+          paths.add 'config/locales', with: 'locales', glob: '**/*.{rb,yml}'
+          paths.add 'config/environments', with: 'environments', glob: "#{Rails.env}.rb"
+
+          paths.add 'public', with: 'tmp/public'
+
+          paths.add "lib/assets",          glob: "*"
+          paths.add "vendor/assets",       glob: "*"
+          paths.add "lib/tasks"
+
+          paths
+        end
+      end
+
+      def has_migrations?
+        false
+      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

data/lib/ecrire/{template → theme/template}/Gemfile

@@ -4,7 +4,7 @@ gem 'ecrire',               path: '~/Develop/ecrire'
 
 group :required do
   gem 'rails',             '~> 4.2'
-  gem 'observejs',         '~> 0.0'
+  gem 'observejs',         git: 'https://github.com/pothibo/observejs'
   gem 'warden',            '~> 1.2'
   gem 'bcrypt',            '~> 3.1'
   gem 'nokogiri',          '~> 1.6'
@@ -19,7 +19,7 @@ group :required do
   gem 'turbolinks',        '~> 2.2'
   gem 'bourbon',           '~> 3.2'
   gem 'uglifier',          '~> 2.5'
-  gem 'jbuilder'           '~> 2.2'
+  gem 'jbuilder',          '~> 2.2'
 end
 
 group :server do

data/lib/ecrire/{template → theme/template}/assets/stylesheets/code.css.scss

@@ -13,6 +13,7 @@ div.file.preview {
     padding: 1em;
     background: rgb(242, 239, 232);
     border-bottom: 1px solid #CDCBC8;
+    box-shadow: inset 0 -1px 0 0 #F9F4EA;
     text-align: center;
     word-break: break-all;
   }

data/lib/ecrire/theme/template/controllers/posts_controller.rb

@@ -0,0 +1,2 @@
+class PostsController < Ecrire::ThemeController
+end

data/lib/ecrire/theme/template/routes.rb

@@ -0,0 +1,14 @@
+Ecrire::Theme::Engine.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]
+
+  resources :tags
+
+  get '/:view', to: 'static#show'
+
+end
+

data/lib/ecrire/{template → theme/template}/views/layouts/application.html.erb

@@ -12,7 +12,7 @@
     <main>
       <%= admin_navigation %>
       <header>
-        <h1><%= link_to 'E', :root %></h1>
+        <h1><%= link_to 'E', '/' %></h1>
         <nav>
           <%= link_to 'Customize', '/customize' %>
           <% if !signed_in? %>

data/lib/ecrire/version.rb

@@ -1,3 +1,3 @@
 module Ecrire
-  VERSION = '0.23.0'
+  VERSION = '0.24.0'
 end

data/test/editor/controllers/sessions_controller_test.rb

@@ -1,8 +1,11 @@
-class SessionsControllerTest < BaseControllerTest
+require 'test_controller'
+require 'editor/test_helper'
+
+class SessionsControllerTest < TestController
   test 'should be able to log in' do
     post :create, session: {email: "pothibo@gmail.com", password: "123456789"}
     assert !proxy.user.nil?, "#{users(:pothibo).email} should be logged in"
-    assert_redirected_to root_path
+    assert_redirected_to '/'
   end
 
 

data/test/editor/helpers/base_helper_test.rb

@@ -1,3 +1,5 @@
+require 'editor/test_helper'
+
 class BaseHelperTest < ActionView::TestCase
   include Rails.application.routes.url_helpers
 

data/test/editor/models/image_test.rb

@@ -1,3 +1,4 @@
+require 'test_helper'
 require 'editor/test_helper'
 
 class ImageTest < ActiveSupport::TestCase

data/test/editor/models/post_test.rb

@@ -1,3 +1,4 @@
+require 'test_helper'
 require 'editor/test_helper'
 
 class PostTest < ActiveSupport::TestCase

data/test/editor/models/title_test.rb

@@ -1,5 +1,5 @@
+require 'test_helper'
 require 'editor/test_helper'
-require 'byebug'
 
 class TitleTest < ActiveSupport::TestCase
   test "length of name" do

data/test/editor/models/user_test.rb

@@ -1,3 +1,4 @@
+require 'test_helper'
 require 'editor/test_helper'
 
 class UserTest < ActiveSupport::TestCase