ecrire 0.22.1 → 0.23.0

data/test/editor/models/title_test.rb

@@ -0,0 +1,31 @@
+require 'editor/test_helper'
+require 'byebug'
+
+class TitleTest < ActiveSupport::TestCase
+  test "length of name" do
+    title = Title.new(name: '', post: posts(:published))
+    assert !title.save
+    assert title.errors.has_key?(:name)
+
+    title.name = 'a'
+    assert title.save, title.errors.full_messages.to_sentence
+  end
+
+  test "uniqueness" do
+    persisted = titles(:draft)
+    title = Title.new(name: persisted.name, post: posts(:published))
+    assert !title.save, title.errors.full_messages.to_a
+    assert title.errors.has_key?(:uniqueness), title.errors.full_messages.to_a
+  end
+
+  test "editing only possible when it's a draft" do
+    title = titles(:draft)
+    title.name = "Changing it."
+    assert title.save, title.errors.full_messages.to_sentence
+
+    title = titles(:published_history)
+    title.name = "Shouldn't change"
+    assert !title.save
+  end
+
+end

data/test/editor/test_helper.rb

@@ -13,6 +13,7 @@ class ActiveSupport::TestCase
     Dir.chdir Dir.pwd + '/test/themes/template' do
       Ecrire::Application.initialize!
       ::User.first_or_create!(email: 'test@test.ca', password: 123456)
+
     end
     exit!
   end
@@ -21,6 +22,7 @@ class ActiveSupport::TestCase
 
   Dir.chdir Dir.pwd + '/test/themes/template' do
     Ecrire::Application.initialize!
+    Rails.application.secrets['s3'] ||= {}
   end
 
   include Warden::Test::Helpers

data/test/fixtures/posts.yml

@@ -5,12 +5,8 @@
 # below each fixture, per the syntax in the comments below
 #
 published:
-  title: "Test"
-  slug: "test"
   content: "Test"
   published_at: <%= 2.days.ago %>
 
 draft:
-  title: "A draft"
-  slug: "a-draft"
   content: "A draft"

data/test/fixtures/tags.yml

@@ -0,0 +1,2 @@
+ruby:
+  name: Ruby

data/test/fixtures/titles.yml

@@ -0,0 +1,11 @@
+published_history:
+  name: "An old title"
+  post: published
+
+published_current:
+  name: "Current Title"
+  post: published
+
+draft:
+  name: "A draft"
+  post: draft

data/test/initializations/railtie_test.rb

@@ -14,8 +14,8 @@ class RailtieTest < ActiveSupport::TestCase
     assert !Ecrire::Railtie.include?(Ecrire::Railtie::Theme)
   end
 
-  test 'not configured if no user is present in the database' do
-    Dir.chdir 'test/themes/template' do
+  test 'load the normal railtie if a secrets.yml can be found' do
+    Dir.chdir 'test/themes/onboarding' do
 
       require 'ecrire'
       Ecrire::Application.initialize!

data/test/themes/template/secrets.yml

@@ -0,0 +1,6 @@
+test:
+  adapter: postgresql
+  database: ecrire_test
+  user: postgres
+  secret_key: "2370 128u3o2ujwoi12jw122e12e"
+  secret_key_base: "'Mlkasj alskjkdsla jsdkaljsadlkjasd'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecrire
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Pier-Olivier Thibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies: []
 description: Blog engine on Rails
 email: pothibo@gmail.com
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENCE
 - README.md
@@ -26,26 +27,30 @@ files:
 - ecrire.gemspec
 - lib/ecrire.rb
 - lib/ecrire/app/assets/javascripts/admin.js
+- lib/ecrire/app/assets/javascripts/admin/editor.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/content.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/ext.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/extensions/clipboard.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/extensions/code.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/extensions/image.coffee
-- lib/ecrire/app/assets/javascripts/admin/editor/navigation/delete.js.coffee
-- lib/ecrire/app/assets/javascripts/admin/editor/navigation/draft.js.coffee
-- lib/ecrire/app/assets/javascripts/admin/editor/navigation/help.js.coffee
-- lib/ecrire/app/assets/javascripts/admin/editor/navigation/save.js.coffee
-- lib/ecrire/app/assets/javascripts/admin/editor/navigation/sticky.js.coffee
-- lib/ecrire/app/assets/javascripts/admin/editor/navigation/toggle.js.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/parsers/code.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/parsers/heading.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/parsers/image.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/parsers/link.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/parsers/lists.coffee
 - lib/ecrire/app/assets/javascripts/admin/editor/parsers/word.coffee
+- lib/ecrire/app/assets/javascripts/admin/navigation/delete.js.coffee
+- lib/ecrire/app/assets/javascripts/admin/navigation/draft.js.coffee
+- lib/ecrire/app/assets/javascripts/admin/navigation/help.js.coffee
+- lib/ecrire/app/assets/javascripts/admin/navigation/save.js.coffee
+- lib/ecrire/app/assets/javascripts/admin/navigation/sticky.js.coffee
+- lib/ecrire/app/assets/javascripts/admin/navigation/toggle.js.coffee
 - lib/ecrire/app/assets/javascripts/admin/posts/header.coffee
 - lib/ecrire/app/assets/javascripts/admin/posts/new.js.coffee
+- lib/ecrire/app/assets/javascripts/admin/posts/tag.js.coffee
+- lib/ecrire/app/assets/javascripts/admin/posts/tags.js.coffee
 - lib/ecrire/app/assets/javascripts/admin/posts/title.coffee
+- lib/ecrire/app/assets/javascripts/admin/tags/list.js.coffee
 - lib/ecrire/app/assets/javascripts/application.js
 - lib/ecrire/app/assets/javascripts/shared/overlay.js.coffee
 - lib/ecrire/app/assets/javascripts/shared/popup.js.coffee
@@ -58,7 +63,6 @@ files:
 - lib/ecrire/app/assets/stylesheets/admin/editor/base.css.scss
 - lib/ecrire/app/assets/stylesheets/admin/editor/content.css.scss
 - lib/ecrire/app/assets/stylesheets/admin/editor/header.css.scss
-- lib/ecrire/app/assets/stylesheets/admin/editor/image.css.scss
 - lib/ecrire/app/assets/stylesheets/admin/editor/publish.css.scss
 - lib/ecrire/app/assets/stylesheets/admin/editor/save.css.scss
 - lib/ecrire/app/assets/stylesheets/admin/images.css.scss
@@ -67,6 +71,8 @@ files:
 - lib/ecrire/app/assets/stylesheets/admin/mixins/form.css.scss
 - lib/ecrire/app/assets/stylesheets/admin/navigation.css.scss
 - lib/ecrire/app/assets/stylesheets/admin/posts.css.scss
+- lib/ecrire/app/assets/stylesheets/admin/tags.css.scss
+- lib/ecrire/app/assets/stylesheets/admin/title.css.scss
 - lib/ecrire/app/assets/stylesheets/admin/variables.css.scss
 - lib/ecrire/app/assets/stylesheets/application.css.scss
 - lib/ecrire/app/assets/stylesheets/sessions.css.scss
@@ -77,10 +83,12 @@ files:
 - lib/ecrire/app/controllers/admin/application_controller.rb
 - lib/ecrire/app/controllers/admin/configurations/images_controller.rb
 - lib/ecrire/app/controllers/admin/images_controller.rb
-- lib/ecrire/app/controllers/admin/labels_controller.rb
 - lib/ecrire/app/controllers/admin/partials_controller.rb
+- lib/ecrire/app/controllers/admin/posts/tags_controller.rb
 - lib/ecrire/app/controllers/admin/posts_controller.rb
 - lib/ecrire/app/controllers/admin/properties_controller.rb
+- 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
@@ -104,35 +112,54 @@ files:
 - lib/ecrire/app/models/admin/image.rb
 - lib/ecrire/app/models/admin/partial.rb
 - lib/ecrire/app/models/admin/post.rb
+- lib/ecrire/app/models/admin/tag.rb
+- lib/ecrire/app/models/admin/title.rb
 - lib/ecrire/app/models/concerns/.keep
 - lib/ecrire/app/models/image.rb
-- lib/ecrire/app/models/label.rb
 - lib/ecrire/app/models/partial.rb
 - lib/ecrire/app/models/post.rb
 - lib/ecrire/app/models/property/image.rb
 - lib/ecrire/app/models/property/label.rb
+- lib/ecrire/app/models/tag.rb
+- lib/ecrire/app/models/title.rb
 - lib/ecrire/app/models/user.rb
 - lib/ecrire/app/strategies/password_strategy.rb
 - lib/ecrire/app/views/admin/configurations/images/complete.html.erb
 - lib/ecrire/app/views/admin/configurations/images/show.html.erb
 - lib/ecrire/app/views/admin/images/_errors.html.erb
 - lib/ecrire/app/views/admin/images/_form.html.erb
+- lib/ecrire/app/views/admin/images/create.js.erb
 - lib/ecrire/app/views/admin/images/destroy.js.erb
-- lib/ecrire/app/views/admin/images/errors.js.erb
-- lib/ecrire/app/views/admin/images/update.js.erb
+- lib/ecrire/app/views/admin/images/errors.json.jbuilder
 - lib/ecrire/app/views/admin/posts/_documentation.html.erb
 - lib/ecrire/app/views/admin/posts/_list.html.erb
 - lib/ecrire/app/views/admin/posts/_post.html.erb
 - lib/ecrire/app/views/admin/posts/edit.html.erb
+- lib/ecrire/app/views/admin/posts/header/_dropping.html.erb
+- lib/ecrire/app/views/admin/posts/header/_error.html.erb
+- lib/ecrire/app/views/admin/posts/header/_uploading.html.erb
 - lib/ecrire/app/views/admin/posts/help.js.erb
 - lib/ecrire/app/views/admin/posts/index.js.erb
-- lib/ecrire/app/views/admin/posts/title.html.erb
+- lib/ecrire/app/views/admin/posts/new.html.erb
+- lib/ecrire/app/views/admin/posts/tags/_tag.html.erb
+- lib/ecrire/app/views/admin/posts/tags/create.js.erb
+- lib/ecrire/app/views/admin/posts/tags/dialog/_tag.html.erb
+- lib/ecrire/app/views/admin/posts/tags/dialog/_tags.html.erb
+- lib/ecrire/app/views/admin/posts/tags/index.js.erb
+- lib/ecrire/app/views/admin/posts/tags/update.js.erb
 - lib/ecrire/app/views/admin/posts/update/content.js.erb
 - lib/ecrire/app/views/admin/posts/update/title.js.erb
 - lib/ecrire/app/views/admin/properties/image/create.js.erb
 - lib/ecrire/app/views/admin/properties/image/destroy.js.erb
 - lib/ecrire/app/views/admin/properties/label/create.js.erb
 - lib/ecrire/app/views/admin/properties/label/destroy.js.erb
+- lib/ecrire/app/views/admin/titles/_title.html.erb
+- lib/ecrire/app/views/admin/titles/_titles.html.erb
+- lib/ecrire/app/views/admin/titles/create.js.erb
+- lib/ecrire/app/views/admin/titles/edit.js.erb
+- lib/ecrire/app/views/admin/titles/errors.js.erb
+- lib/ecrire/app/views/admin/titles/index.js.erb
+- lib/ecrire/app/views/admin/titles/update.js.erb
 - lib/ecrire/app/views/layouts/admin/application.html.erb
 - lib/ecrire/app/views/partials/show.html.erb
 - lib/ecrire/app/views/sessions/_form.html.erb
@@ -161,6 +188,8 @@ files:
 - lib/ecrire/db/migrate/20140618321984_add_properties_to_posts.rb
 - lib/ecrire/db/migrate/20150113839713_convert_markdown_in_post_content.rb
 - lib/ecrire/db/migrate/20150120093481_add_preview_to_posts.rb
+- lib/ecrire/db/migrate/20150305123321_move_labels_to_titles.rb
+- lib/ecrire/db/migrate/20150318549479_create_tags.rb
 - lib/ecrire/db/schema.rb
 - lib/ecrire/locales/admin/configurations/images/en.yml
 - lib/ecrire/locales/admin/en.yml
@@ -200,7 +229,6 @@ files:
 - lib/ecrire/template/Rakefile
 - lib/ecrire/template/assets/images/.keep
 - lib/ecrire/template/assets/javascripts/base.js.coffee
-- lib/ecrire/template/assets/javascripts/post.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
@@ -223,32 +251,29 @@ files:
 - lib/ecrire/template/views/static/customize/_layout.html.erb
 - lib/ecrire/template/views/static/customize/_post.html
 - lib/ecrire/version.rb
-- test/editor/controllers/admin/images_controller_test.rb
-- test/editor/controllers/admin/posts_controller_test.rb
 - test/editor/controllers/base_controller_test.rb
-- test/editor/controllers/images_controller_test.rb
-- test/editor/controllers/partials_controller_test.rb
-- test/editor/controllers/posts_controller_test.rb
 - test/editor/controllers/sessions_controller_test.rb
 - test/editor/helpers/base_helper_test.rb
-- test/editor/helpers/posts_helper_test.rb
 - test/editor/models/image_test.rb
-- test/editor/models/partial_test.rb
 - test/editor/models/post_test.rb
+- test/editor/models/title_test.rb
 - test/editor/models/user_test.rb
 - test/editor/test_helper.rb
 - test/fixtures/images.yml
-- test/fixtures/partials.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
 homepage: http://pothibo.com
@@ -271,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Blog engine

data/lib/ecrire/app/assets/stylesheets/admin/editor/image.css.scss

@@ -1,58 +0,0 @@
-[as='Post.Header'] {
-  @include display(flex);
-  @include flex-direction(column);
-  @include align-items(center);
-  @include justify-content(center);
-
-  height: 320px;
-  margin-bottom: 4em;
-  cursor: pointer;
-  background-color: rgb(232, 232, 232);
-  background-size: cover;
-  position: relative;
-
-  &.dropping div.drop.zone {
-    border: 7px dashed #FAFAFA;
-  }
-  &.dropping div.wrapper {
-    background-blend-mode: darken;
-  }
-
-  &:hover {
-    background-color: rgb(200, 200, 200);
-  }
-
-  input {
-    visibility: hidden;
-    position: absolute;
-  }
-
-  div.drop.zone {
-    border-radius: 3px;
-    @include transition(border 0.3s);
-    border: 7px dashed transparent;
-    position: absolute;
-    top: 8px;
-    left: 8px;
-    right: 8px;
-    bottom: 8px;
-  }
-
-  p {
-    text-align: center;
-  }
-
-  form.clear {
-    position: absolute;
-    right: 0;
-    bottom: -2em;
-
-    button {
-      color: rgb(145, 4, 4);
-      text-decoration: underline;
-      &:active {
-        color: #E80000;
-      }
-    }
-  }
-}

data/lib/ecrire/app/controllers/admin/labels_controller.rb

@@ -1,18 +0,0 @@
-module Admin
-  class LabelsController < Admin::ApplicationController
-    def create
-      Admin::Label.create(label_param)
-    end
-
-    protected
-
-    def label_param
-      params.require(:admin_label).permit(:name)
-    end
-
-    def post
-      @post ||= Post.find(params[:post_id])
-    end
-
-  end
-end

data/lib/ecrire/app/models/label.rb

@@ -1,3 +0,0 @@
-class Label < ActiveRecord::Base
-  validates_presence_of :name, unique: true
-end

data/lib/ecrire/app/views/admin/images/errors.js.erb

@@ -1 +0,0 @@
-e.ErrorHTML = "<%= j render('errors', errors: @image.errors ) %>".toHTML()

data/lib/ecrire/app/views/admin/posts/title.html.erb

@@ -1,10 +0,0 @@
-<%= form_for Admin::Post.new, as: 'post', html: { class: %w(post new title), as: 'Posts.New' } do |f| %>
-
-  <fieldset class="transparent">
-    <%= f.text_field :title, placeholder: t('admin.posts.new.title') %>
-  </fieldset>
-  <%= content_tag :p, t('admin.posts.new.editable'), class: %w(transparent) %>
-
-  <%= f.button :submit, class: %w(hidden) %>
-
-<% end %>

data/test/editor/controllers/admin/images_controller_test.rb

@@ -1,6 +0,0 @@
-require_relative '../base_controller_test'
-
-module Admin
-  class ImagesControllerTest < BaseControllerTest
-  end
-end

data/test/editor/controllers/admin/posts_controller_test.rb

@@ -1,90 +0,0 @@
-module Admin
-  class PostsControllerTest < BaseControllerTest
-
-    def setup
-      super
-      proxy.set_user users(:pothibo)
-    end
-
-    test 'Validations: Error should be shown when missing the title' do
-    end
-
-    test 'Create a post' do
-      data = {
-        title: 'A new published post',
-        content: 'Some Blah blah',
-        stylesheet: 'h1 {\n  text-align: center;\n }'
-      }
-
-      put :create, post: data
-      @post = assigns(:post)
-
-      assert_equal data[:title], @post.title
-      assert_equal data[:content], @post.content
-      assert_equal data[:stylesheet], @post.stylesheet
-      assert_equal data[:title].parameterize, @post.slug
-    end
-
-    test 'Update a post' do
-      data = {
-        title: 'A new published post',
-        content: 'Some Blah blah',
-        stylesheet: 'h1 {\n  text-align: center;\n }'
-      }
-
-      put :update, id: posts(:published).id, post: data
-      @post = assigns(:post)
-
-      assert_equal data[:title], @post.title
-      assert_equal data[:content], @post.content
-      assert_equal data[:stylesheet], @post.stylesheet
-      assert_equal posts(:published).slug, @post.slug
-
-
-      data[:slug] = ""
-
-      put :update, id: posts(:published).id, post: data
-      @post = assigns(:post)
-
-      assert_equal data[:title], @post.title
-      assert_equal data[:content], @post.content
-      assert_equal data[:stylesheet], @post.stylesheet
-      assert_equal @post.title.parameterize, @post.slug
-    end
-
-    test 'Saving a post should redirect to keep editing the post' do
-      post :create, post: {'title' => 'Just a test'}
-      record = assigns(:post)
-      assert_redirected_to edit_admin_post_path(record.id)
-
-      put :update, id: record.id, post: {'content' => 'Something to say'}
-      assert_redirected_to edit_admin_post_path(record.id)
-    end
-
-    test 'Saving a published article should redirect to the post edit' do
-      @post = posts(:published)
-      put :update, id: @post.id, post: {'content' => 'Oh em G'}
-
-      assert_redirected_to edit_admin_post_path(@post.id)
-    end
-
-    test 'Publishing redirects to the blog post' do
-      data = {
-        title: 'A new published post',
-        content: 'Some Blah blah',
-        stylesheet: 'h1 {\n  text-align: center;\n }'
-      }
-      put :update, id: posts(:published).id, post: data, button: 'publish'
-      assert assigns(:post).published?
-      assert_redirected_to post_path(assigns(:post).published_at.year, assigns(:post).published_at.month, assigns(:post).slug)
-    end
-
-    test 'Show draft posts' do
-      xhr :get, :index
-      assigns(:posts).each do |post|
-        assert !post.published?
-      end
-    end
-
-  end
-end

data/test/editor/controllers/images_controller_test.rb

@@ -1,2 +0,0 @@
-class ImagesControllerTest < BaseControllerTest
-end

data/test/editor/controllers/partials_controller_test.rb

@@ -1,2 +0,0 @@
-class PartialsControllerTest < BaseControllerTest
-end

data/test/editor/controllers/posts_controller_test.rb

@@ -1,21 +0,0 @@
-class PostsControllerTest < BaseControllerTest
-
-  test "redirect if the post isn't published" do
-    @post = posts(:draft)
-    get :show, year: 2003, month: 1, id: @post.id
-    assert_redirected_to :root
-  end
-
-  test "redirect if the post doesn't exist" do
-    get :show, year: 2003, month: 1, id: -1
-    assert_redirected_to :root
-  end
-
-  test 'Only published posts should be listed in the index' do
-    get :index
-    posts.each do |post|
-      assert post.published?
-    end
-  end
-
-end

data/test/editor/helpers/posts_helper_test.rb

@@ -1,3 +0,0 @@
-class PostsHelperTest < BaseHelperTest
-end
-

data/test/editor/models/partial_test.rb

@@ -1,4 +0,0 @@
-require 'editor/test_helper'
-
-class PartialTest < ActiveSupport::TestCase
-end

data/test/fixtures/partials.yml

@@ -1,9 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
-
-# This model initially had no columns defined.  If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-# column: value
-#
-#  column: value