ecrire 0.31.1 → 0.31.2

data/lib/ecrire/commands/server.rb

@@ -18,8 +18,18 @@ module Ecrire
 
       def run!
         @server.tap do |server|
-          Dir.chdir(Ecrire::Application.root)
-          server.start
+          Ecrire::Theme.path = Pathname.new(Dir.pwd)
+          create_tmp_directories
+
+          Dir.chdir(Ecrire::Application.root) do
+            server.start
+          end
+        end
+      end
+
+      def create_tmp_directories
+        %w(cache pids sockets).each do |dir_to_make|
+          FileUtils.mkdir_p(File.join(Ecrire::Theme.path, "tmp", dir_to_make))
         end
       end
 

data/lib/ecrire/configuration.rb

@@ -0,0 +1,39 @@
+module Ecrire
+  class Configuration < Rails::Application::Configuration
+
+    def secret_key_base
+      SecureRandom.hex(16)
+    end
+
+    def secret_token
+      SecureRandom.hex(16)
+    end
+    
+    ##
+    # Return paths based off Rails default plus some customization.
+    #
+    # These paths are Ecrire's, not the users's theme.
+    #
+    # For the user's paths, look at Ecrire::Theme::Engine.paths
+    #
+    def paths
+      @paths ||= begin
+         paths = super
+         paths.add 'config/secrets', with: Ecrire::Theme.path + 'secrets.yml'
+         paths.add 'config/database', with: Ecrire::Theme.path + 'secrets.yml'
+         paths.add 'config/routes.rb', with: 'routes.rb'
+         paths.add 'config/locales', with: 'locales', glob: "**/*.{rb,yml}"
+
+         paths.add 'lib/tasks', with: 'tasks', glob: '**/*.rake'
+         paths
+       end
+    end
+
+    def database_configuration
+      {
+        Rails.env => Ecrire::Application.secrets.database
+      }
+    end
+
+  end
+end

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

@@ -15,6 +15,8 @@ class OnboardingController < ApplicationController
       config['development'] ||= {}
       config['production'] ||= {}
       config['development']['secret_key_base'] = config['production']['secret_key'] = Rails.application.secrets.secret_key_base
+      config['development']['secret_token'] = config['production']['secret_token'] = Rails.application.secrets.secret_token
+      config['onboarding'] = false
       file.write(config.to_yaml)
     end
   end

data/lib/ecrire/onboarding/engine.rb

@@ -5,10 +5,6 @@ module Ecrire
       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)

data/lib/ecrire/theme/engine.rb

@@ -44,7 +44,7 @@ module Ecrire
       #
       def paths
         @paths ||= begin
-          paths = Rails::Paths::Root.new(root_path)
+          paths = Rails::Paths::Root.new(Ecrire::Theme.path)
           paths.add 'app/views', with: 'views'
           paths.add 'app/controllers', with: 'controllers', eager_load: true
           paths.add 'app/assets', with: 'assets', glob: '*'
@@ -120,9 +120,9 @@ module Ecrire
       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
+        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
 
 

data/lib/ecrire/theme/template/Gemfile

@@ -3,24 +3,24 @@ source 'https://rubygems.org'
 gem 'ecrire'
 
 group :required do
-  gem 'rails',             '~> 4.2'
-  gem 'observejs',         git: 'https://github.com/pothibo/observejs'
-  gem 'written'
-  gem 'warden',            '~> 1.2'
-  gem 'bcrypt',            '~> 3.1'
-  gem 'nokogiri',          '~> 1.6'
-  gem 's3',                '~> 0.3'
-  gem 'pg',                '~> 0.17'
+  gem 'rails'
+  gem 'observejs',         git: 'https://github.com/pothibo/observejs.git'
+  gem 'written',           git: 'https://github.com/pothibo/written.git'
+  gem 'warden'
+  gem 'bcrypt'
+  gem 'nokogiri'
+  gem 's3'
+  gem 'pg'
   gem 'pg_search'
-  gem 'kaminari',          '~> 0.15'
+  gem 'kaminari'
 
-  gem 'sprockets-rails',   '~> 2.1'
-  gem 'sass-rails',        '~> 4.0', '>= 4.0.3'
-  gem 'coffee-rails',      '~> 4.0'
-  gem 'turbolinks',        '~> 2.2'
-  gem 'bourbon',           '~> 3.2'
-  gem 'uglifier',          '~> 2.5'
-  gem 'jbuilder',          '~> 2.2'
+  gem 'sprockets-rails'
+  gem 'sass-rails'
+  gem 'coffee-rails'
+  gem 'turbolinks'
+  gem 'bourbon'
+  gem 'uglifier'
+  gem 'jbuilder'
 end
 
 gem 'byebug', group: :development

data/lib/ecrire/version.rb

@@ -1,3 +1,3 @@
 module Ecrire
-  VERSION = '0.31.1'
+  VERSION = '0.31.2'
 end

data/test/configuration/postgresql.rb

@@ -4,40 +4,89 @@ class Ecrire::Test::Configuration::Postgresql
 
   attr_reader :user
 
-  def initialize(database, user)
-    @database = database
-    @user = User.new(user)
+  def initialize(app)
+    @app = app
+  end
+
+  def configure!
+    begin
+      unless configured?
+        puts "It seems you are running the development tests for the first time."
+        puts "Ecrire will try to configure postgresql for you..."
+
+        if user.new?
+          create_user!
+        end
+
+        if !user.superuser?
+          user.superuser!
+        end
+
+        if !user.login?
+          user.login!
+        end
+
+        puts "Done configuring postgresql."
+      end
+
+    rescue Ecrire::Test::Configuration::Error => e
+      puts "Ecrire couldn't configure postgresql."
+      puts "=> #{e.message}"
+      puts "To fix this issue, make sure you have a superuser for #{%x(whoami)}"
+      puts "createuser -l -s postgres"
+      exit
+    end
   end
 
   def configured?
-    %x(psql -c '' -d #{@database} -U #{@user.name} 2>&1)
+    %x(psql -c '' -d #{database} -U #{user.name} 2>&1)
     if $?.to_i != 0
       return false
     end
     return true
   end
 
+  def migrate!
+    path = @app.paths['db/migrate'].existent
+    ActiveRecord::Migrator.migrations_paths = path
+    if ActiveRecord::Migrator.needs_migration?
+      ActiveRecord::Migration.verbose = false
+      ActiveRecord::Migrator.migrate(path)
+    end
+    ActiveRecord::Migration.maintain_test_schema!
+    ActiveRecord::Base.clear_cache!
+  end
+
   def create_user!
-    puts "Creating user #{@user.name}..."
-    message = %x(psql -c 'CREATE ROLE #{@user.name} with superuser login' -d postgres -U postgres 2>&1)
+    puts "Creating user #{user.name}..."
+    message = %x(psql -c 'CREATE ROLE #{user.name} with superuser login' -d postgres -U postgres 2>&1)
     if $?.to_i != 0
       raise PSQLError.new message
     end
-    @user= User.new(@user.name)
-    puts "User #{@user.name} created."
+    puts "User #{user.name} created."
   end
 
   def reset_database!(silence = false)
     unless silence
-      puts "Resetting #{@database} if it exists..."
+      puts "Resetting #{database} if it exists..."
     end
 
-    ActiveRecord::Tasks::DatabaseTasks.drop({'adapter' => 'postgresql', 'database' => @database, 'user' => user.name})
-    ActiveRecord::Tasks::DatabaseTasks.create({'adapter' => 'postgresql', 'database' => @database, 'user' => user.name})
+    ActiveRecord::Tasks::DatabaseTasks.drop({'adapter' => 'postgresql', 'database' => database, 'user' => user.name})
+    ActiveRecord::Tasks::DatabaseTasks.create({'adapter' => 'postgresql', 'database' => database, 'user' => user.name})
+
+    migrate!
 
     unless silence
       puts "#{@database} configured."
     end
   end
 
+  def user
+    @user ||= User.new(@app.secrets.database[:username])
+  end
+
+  def database
+    @database ||= @app.secrets.database[:database]
+  end
+
 end

data/test/editor/initializers.rb

@@ -1,14 +1,24 @@
-Ecrire::Application.paths.add 'config/secrets', with: Dir.pwd + '/test/secrets.yml'
-Ecrire::Application.paths.add 'config/database', with: Dir.pwd + '/test/secrets.yml'
+require_relative '../configuration'
 
-Ecrire::Application.initializer 'ecrire.automigrate', after: "active_record.initialize_database" do |app|
-  path = app.paths['db/migrate'].existent
-  ActiveRecord::Migrator.migrations_paths = path
-  if ActiveRecord::Migrator.needs_migration?
-    ActiveRecord::Migration.verbose = false
-    ActiveRecord::Migrator.migrate(path)
-  end
-  ActiveRecord::Migration.maintain_test_schema!
+ENV[Ecrire::SECRET_ENVIRONMENT_KEY] = JSON.generate({
+  onboarding: false,
+  secret_key: "2370 128u3o2ujwoi12jw122e12e",
+  secret_key_base: "Mlkasj alskjkdsla jsdkaljsadlkjasd",
+  database:  {
+    adapter: 'postgresql',
+    database: 'ecrire_test',
+    username: 'ecrire_test'
+  },
+  s3: {
+    path: 'test'
+  }
+})
+
+Dir.chdir "test/editor/theme" do
+  Ecrire::Application.initialize!
+  postgresql = Ecrire::Test::Configuration::Postgresql.new(Ecrire::Application)
+  postgresql.configure!
+  postgresql.reset_database!
 end
 
 class ActiveSupport::TestCase
@@ -18,6 +28,3 @@ class ActiveSupport::TestCase
   fixtures :all
 end
 
-Dir.chdir "test/editor/theme" do
-  Ecrire::Application.initialize!
-end

data/test/editor/models/image_test.rb

@@ -11,7 +11,7 @@ class ImageTest < ActiveSupport::TestCase
   end
 
   test 'path should handle blank base_folder' do
-    Rails.application.secrets.s3['path'] = ""
+    Rails.application.secrets.s3[:path] = ""
     file = Struct::File.new('some_image.jpg')
 
     image = Admin::Image.new
@@ -21,7 +21,7 @@ class ImageTest < ActiveSupport::TestCase
   end
 
   test 'path should handle base_folder' do
-    Rails.application.secrets.s3['path'] = "my_blog"
+    Rails.application.secrets.s3[:path] = "my_blog"
     file = Struct::File.new('some_image.jpg')
 
     image = Admin::Image.new

data/test/editor/theme/secrets.yml

@@ -0,0 +1,9 @@
+onboarding: false
+secret_key: "2370 128u3o2ujwoi12jw122e12e"
+secret_key_base: "'Mlkasj alskjkdsla jsdkaljsadlkjasd'"
+database:
+  adapter: postgresql
+  database: ecrire_test
+  username: ecrire_test
+s3:
+  path: 'test'

data/test/onboarding/initializers.rb

@@ -1,5 +1,3 @@
-ENV['VERBOSE'] = 'false'
-
 class ActiveSupport::TestCase
   ActiveSupport.test_order = :random
 end

data/test/task.rb

@@ -1,38 +1,46 @@
 require 'rake/testtask'
 
-class Ecrire::Test::Task < Rake::TestTask
+module Ecrire
+  module Test
+    class Task < Rake::TestTask
 
-  def before(&block)
-    @callback = block
-  end
-
-  def define
-    desc @description
-    task @name do
+      def before(&block)
+        @before = block
+      end
 
-      unless @callback.nil?
-        @callback.call
+      def after(&block)
+        @after = block
       end
 
-      Rake::FileUtilsExt.verbose(@verbose) do
-        args = [
-          "#{ruby_opts_string} #{run_code} ",
-          "#{file_list_string} #{option_list}"
-        ]
+      def define
+        desc @description
+        task @name do
 
-        args << @name
+          unless @before.nil?
+            @before.call
+          end
 
-        ruby args.join 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}]"
+          Rake::FileUtilsExt.verbose(@verbose) do
+            args = [
+              "#{ruby_opts_string} #{run_code} ",
+              "#{file_list_string} #{option_list}"
+            ]
+
+            args << @name
+
+            ruby args.join 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
-    self
   end
-
 end

data/test/theme/initializers.rb

@@ -1,10 +1,20 @@
-Ecrire::Application.initializer 'ecrire.automigrate', after: "active_record.initialize_database" do |app|
-  path = app.paths['db/migrate'].existent
-  ActiveRecord::Migrator.migrations_paths = path
-  if ActiveRecord::Migrator.needs_migration?
-    ActiveRecord::Migrator.migrate(path)
-  end
-  ActiveRecord::Migration.maintain_test_schema!
+require_relative '../configuration'
+
+ENV[Ecrire::SECRET_ENVIRONMENT_KEY] = JSON.generate({
+  onboarding: false,
+  database: {
+    adapter: 'postgresql',
+    username: 'ecrire_test',
+    database: 'ecrire_test'
+  }
+})
+
+Dir.chdir "test/theme/theme" do
+  Ecrire::Application.initialize!
+  postgresql = Ecrire::Test::Configuration::Postgresql.new(Ecrire::Application)
+  postgresql.configure!
+  postgresql.reset_database!
+
 end
 
 class ActiveSupport::TestCase
@@ -14,9 +24,4 @@ class ActiveSupport::TestCase
   fixtures :all
 end
 
-Ecrire::Application.paths.add 'config/secrets', with: Dir.pwd + '/test/secrets.yml'
-Ecrire::Application.paths.add 'config/database', with: Dir.pwd + '/test/secrets.yml'
 
-Dir.chdir "test/theme/theme" do
-  Ecrire::Application.initialize!
-end