ecrire 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ce26477b0912ec3e5e72cdfe31cd7ebaf91367b
-  data.tar.gz: 7cfef2c63d03495c04cc90b97adc668bc653266a
+  metadata.gz: 42ebfbcd7b234a8ed0eced636045769471049b42
+  data.tar.gz: fcf2461eb398ad52f848e08f4be8d2a8975ef354
 SHA512:
-  metadata.gz: bee627694b0efe4e26e5b1f23516714635f9fecbade81d20fa8c628c295a8fde2ce271869106608d345c2a5edabed12d00366088bea9cb39220ee7038a4a67eb
-  data.tar.gz: d34158b4a0a0ec3541afa55a2cf5cb222c20e12af7543725d59b5a9c819524704a54db7c18c97029e5ecb456e0bb9871754b46f9e742825a56762af363a9d5db
+  metadata.gz: 5fc4670039672091e34e0055e400063b5715c95f39375efc770f528d32d09435aff6cccc141be01e901d99cd9ba40aa05c4aebbc4ba9c76e04048eceace9c07d
+  data.tar.gz: 633ca19d3ad1b9d88a3da8f8419c737cd89b0750ea423b19a92de5593f98c0ce48668b523db7b2ccf04d3afc609e33411caa3b9eb47ff83bd3ec407e42d62d4f

data/.gitignore

@@ -18,4 +18,4 @@ tmp
 .DS_Store
 Gemfile.lock
 
-/lib/ecrire/template/secrets.yml
+secrets.yml

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

@@ -1,17 +1,73 @@
+##
+# Base controller for every controller in Ecrire (Theme & Admin)
+# Ecrire::ThemeController inherits from this class so there are no reason why
+# you should inherit from this class.
+#
+# The controller handles user authentication, and CSRF protection.
+#
+# It also provides a +url+ method to build complex URL using a
+# very light syntax.
+#
 class ApplicationController < ::ActionController::Base
   protect_from_forgery with: :exception
 
   helper_method :current_user, :signed_in?
   helper_method :warden, :post_path, :url
 
+  ##
+  # Return current signed +user+ or nil, if the user is not
+  # signed in
   def current_user
     warden.user
   end
 
+  ##
+  # Returns +true+ if the user is signed in
   def signed_in?
     !warden.user.nil?
   end
 
+
+  ##
+  # Returns a URL based on the path and options provided.
+  # It does not try to validate the URL, it only generates it and assume
+  # it's a valid URL.
+  #
+  # +path+: The relative path of the URL you want to build.
+  #
+  # +options+: Hash containing options for rendering the url.
+  #
+  #
+  # The +path+ and +options+ are linked together via a mapping construct
+  # that you can use to map records to part of the URL.
+  #
+  # To map records to the +path+, you need to specify the record & the method you want to use inside the path.
+  #
+  #   url('/admin/posts/:posts.id', post: @post) 
+  #   -> '/admin/posts/32'
+  #
+  # The method looks for every occurence of ":[key].[method]" and will look in +options+ for that key and call the given method on that key.
+  #
+  # This means the object can be anything as long as it handles the method.
+  #
+  # Here are a other examples:
+  #
+  #   url('/users/:user.id/tags/:tag.id/', user: @user, tag: @tag)
+  #   -> '/users/12/tags/12'
+  #
+  #   url('/users')
+  #   -> '/users'
+  #
+  # The +options+ also looks for the +absolute_path+ key. If it's set to +true+, the
+  # method will return an absolute path.
+  #
+  #   url('/users/:user.id/tags/:tag.id/', user: @user, tag: @tag, absolute_path: true)
+  #   -> 'http://localhost:3000/users/12/tags/12'
+  #
+  #   url('/users', absolute_path: true)
+  #   -> 'http://localhost:3000/users'
+  #
+  
   def url(path, options = {})
     records = options.with_indifferent_access
     regex = /(:([a-z]+)\.([a-z]+))/i
@@ -19,19 +75,18 @@ class ApplicationController < ::ActionController::Base
       records[$2].send($3)
     end
 
-    if options.delete(:full_path)
-      options[:path] = path
-      options[:host] ||= request.host
-      options[:protocol] ||= request.protocol
-      options[:port] ||= request.port
+    if options.delete(:absolute_path)
+      options[:path]        = path
+      options[:host]      ||= request.host
+      options[:protocol]  ||= request.protocol
+      options[:port]      ||= request.port
       ActionDispatch::Http::URL.full_url_for(options)
     else
       path
     end
   end
 
-
-  protected
+  private
 
   def authenticate!
     warden.authenticate!

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

@@ -1,4 +1,16 @@
 module Ecrire
+  ##
+  # The class any controller in a theme needs to inherit from
+  #
+  # +ThemeController+ provides boilerplate code so the blog handles a few cases
+  # for you.
+  #
+  # Ecrire will try to redirect to the homepage when it meets selected exceptions
+  # Currently, the following 3 exceptions are handled:
+  # - ActiveRecord::RecordNotFound
+  # - ActionController::RoutingError
+  # - ActionView::ActionViewError
+  #
   class ThemeController < ::ApplicationController
 
     unless Rails.env.development?
@@ -7,23 +19,10 @@ module Ecrire
       rescue_from ActionView::ActionViewError, with: :redirect_home
     end
 
-    before_action :pagination, only: :index
-    protect_from_forgery except: :index
-
-    def index
-      respond_to do |format|
-        format.html
-        format.rss
-        format.json do
-          headers['Access-Control-Allow-Origin'] = '*'
-        end
-      end
-    end
 
-    def show
-    end
+    before_action :pagination, only: :index
 
-    protected
+    private
 
     def pagination
       params[:per] ||= 10

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

@@ -1,5 +1,10 @@
+##
+# The Controller that renders static pages
+#
+# It looks for a a template matching the path provided.
+#
 class StaticController < Ecrire::ThemeController
   def show
-    render params[:view]
+    render "static/#{params[:view].to_s}"
   end
 end

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

@@ -1,6 +1,5 @@
 module Admin
   module PostsHelper
-    include ::PostsHelper
 
     def post_tags(post)
       tags = post.tags.map do |tag|

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

@@ -1,13 +1,35 @@
+##
+# +ApplicationHelper+ provides functions to help build a theme's layout
+#
 module ApplicationHelper
+
+  ##
+  # Render the admin navigation bar if a user is signed in.
+  #
+  # You don't have to check if the user is signed in before using this method
+  # Ecrire will check this automatically
+  #
   def admin_navigation
     return unless signed_in?
     render 'sessions/navigation'
   end
 
+  ##
+  # Render <title> tag
+  #
+  # The content of the title tag can be one of three things.
+  # In priority of order:
+  # 1. The value of content_for(:title) if it's set,
+  # 2. The title of the variable @post, if it's set,
+  # 3. The +title+ passed
+  #
+  # If you need more information about content_for and how to use it, please read:
+  # http://ecrire.io/posts/configure-layout-element-with-content_for
+  #
   def title_tag(title = 'Ecrire')
     content_tag :title do
-      if block_given?
-        yield
+      if content_for?(:title)
+        content_for(:title)
       elsif !@post.nil?
         @post.title
       else
@@ -16,28 +38,56 @@ module ApplicationHelper
     end
   end
 
-  def meta_informations_tags
-    [
-      content_tag(:link, nil, rel: 'alternate', type: 'application/rss+xml', title: 'RSS', href: '/feed'),
-      content_tag(:link, nil, rel: %w(shortcut icon), href: asset_url('favicon.ico')),
-      csrf_meta_tags
-    ].join.html_safe
+  ##
+  # Render a RSS auto-discovery tag
+  #
+  # You can pass another relative path if you want.
+  # Ecrire will render an absolute path using the +relative_path+
+  #
+  def rss_tag(relative_path = '/feed')
+    content_tag :link, nil, rel: 'alternate', type: 'application/rss+xml', title: 'RSS', href: url(relative_path, absolute_path: true)
   end
 
-  def description_meta_tag
-    if Rails.application.secrets.fetch(:meta, {}).has_key?(:description)
-      content_tag :meta, nil, name: 'description', content: Rails.application.secrets[:meta][:description]
-    end
-  end
 
-  def open_graph_type
-    if @post.nil?
-      'website'
-    else
-      'article'
-    end
+  ##
+  # Render the favicon tag
+  #
+  # Will generate the asset url given with the +name+ of your favicon.
+  #
+  def favicon_tag(name = 'favicon.ico')
+    content_tag :link, nil, rel: %w(shortcut icon), href: asset_url(name)
   end
 
+  ##
+  # Render the <main> tag
+  #
+  # The +html_options+ is a hash that will map to key/value for the tag.
+  # Unless you know what you are doing, you should not specify an id in +html_options+.
+  # Ecrire will generate one using the controller and action for the given request.
+  #
+  # You can also provide any key/value that you wish to see rendered in the main tag.
+  # 
+  # Example with posts#index (/posts):
+  #
+  #   <%= main_tag contentEditable: true do %>
+  #     Hello world!
+  #   <% end %>
+  #   
+  #   <main contentEditable=true id='PostsIndex'>
+  #     Hello world!
+  #   </main>
+  #
+  # Another example with posts#index (/posts):
+  #
+  #   <%= main_tag class: 'content' do %>
+  #     Hello World!
+  #   <% end %>
+  #
+  #   <main class='content' id='PostsIndex'>
+  #     Hello World!
+  #   </main>
+  #
+  #
   def main_tag(html_options = {}, &block)
     html_options[:id] ||= [controller_name, action_name].map(&:capitalize).join
     html_options[:class] = [html_options[:class]].compact.flatten

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

@@ -0,0 +1,26 @@
+##
+# This module overloads the +paginate+ method defined 
+# by Kaminari to force kaminari to use the routes provided by the theme.
+#
+# This might not be needed when Kaminari reaches 1.0 per https://github.com/amatsuda/kaminari/pull/636
+#
+module PaginationHelper
+  
+  ##
+  # Returns pagination for the given scope(record).
+  # 
+  # The argument list is the same as the one declared by kaminari
+  # to keep the expected behavior when calling ```super```
+  #
+  # Example:
+  #
+  # ``` erb
+  # <%= paginate(@posts) %>
+  # ```
+  #
+  def paginate(scope, options = {}, &block)
+    _with_routes Ecrire::Theme::Engine.routes do
+      super
+    end
+  end
+end

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

@@ -1,11 +1,28 @@
 require 'nokogiri'
 
+##
+# Posts written by users stored in database
+#
+# == Available scopes
+#
+# Scopes are builtin methods to facilitate retrieving posts
+# from the database. Scopes can also be chained to narrow your query
+# even more.
+#
+# +published+: Return posts that are published
+#
+# +drafted+: Return posts that are NOT published 
+#
+# +search_by_title+: Return all post that have a title that match 
+# the key you provide
+#
+# 
 class Post < ActiveRecord::Base
   has_one :header, class_name: Image
   has_many :titles, -> { order "titles.created_at DESC" }
 
-  store_accessor :properties, :labels
-
+  scope :published, lambda { status("published") }
+  scope :drafted, lambda { status("drafted") }
   scope :status, lambda {|status|
     if status.eql?("published")
       where "posts.published_at IS NOT NULL"
@@ -14,8 +31,11 @@ class Post < ActiveRecord::Base
     end
   }
 
-  scope :published, lambda { status("published") }
-  scope :drafted, lambda { status("drafted") }
+  scope :search_by_title, lambda {|title|
+    ids = Title.search_by_name(title).map(&:post_id).compact
+    Post.includes(:titles).where('posts.id in (?)', ids)
+  }
+
   scope :without, lambda { |post| where("posts.id != ?", post.id) }
 
   validates :titles, length: {minimum: 1}
@@ -24,6 +44,7 @@ class Post < ActiveRecord::Base
 
   attr_writer :tags
 
+  #:nodoc:
   def title=(new_title)
     if self.published?
       self.titles.new(name: new_title)
@@ -34,54 +55,102 @@ class Post < ActiveRecord::Base
     end
   end
 
+  ##
+  # Return the current title for this post
+  #
   def title
     (self.titles.first || self.titles.new).name
   end
 
+  ##
+  # Return the slug link to the current title
+  #
+  def slug
+    self.titles.first.slug
+  end
+
+  ##
+  # Returns the year this post was published
+  #
   def year
     published_at.year
   end
 
+  ##
+  # Returns the month this post was published
+  #
   def month
     published_at.month
   end
 
-  def slug
-    self.titles.first.slug
-  end
-
+  #:nodoc:
   def status=(new_status)
     if new_status.eql? "publish"
       publish!
     end
   end
 
+  ##
+  # Publish this post if it is not yet published
+  # 
+  # Update the database with the publish date
+  #
   def publish!
     return unless published_at.nil?
     self.published_at = DateTime.now
     save!
   end
 
+  ##
+  # Returns whether this post is published or not
+  #
   def published?
     !draft?
   end
 
+  ##
+  # The opposite of +published?+
+  #
   def draft?
     published_at.nil?
   end
 
+  ##
+  # Returns the content of this post. Depending on the current status
+  # of this post, it can be one of three things:
+  # 
+  # - Compiled content;
+  # - Markdown content;
+  # - Empty string.
+  #
+  # This method should be used when trying to render the body of a post
+  # to a page in HTML.
+  #
   def content
     (self.compiled_content || super || '').html_safe
   end
 
+  ##
+  # Returns the compiled excerpt for this post.
+  # The excerpt is based on content but only returns text.
+  #
+  # The excerpt is parsed from the content and it also 
+  # filters out images and header.
+  # 
   def excerpt
     (self.compiled_excerpt || "").html_safe
   end
 
+  ##
+  # Returns true if an image header was set for this post
+  #
   def header?
     !self.header.nil? && !self.header.url.blank?
   end
 
+  ##
+  # Returns the list of Tags link set for this post
+  #
   def tags
     @tags ||= Tag.where("tags.id in (?)", super || [])
   end

data/lib/ecrire/app/views/admin/posts/titles/_title.html.erb

@@ -1,5 +1,5 @@
 <% post = Post.new(titles: [title], published_at: title.post.published_at) %>
 <li>
   <%= content_tag :p, title.name %>
-  <%= link_to url(Ecrire::Theme::Engine.post_path, post: post, full_path: true), url(Ecrire::Theme::Engine.post_path, post: post, full_path: true) %>
+  <%= link_to url(Ecrire::Theme::Engine.post_path, post: post, absolute_path: true), url(Ecrire::Theme::Engine.post_path, post: post, absolute_path: true) %>
 </li>

data/lib/ecrire/application.rb

@@ -6,6 +6,21 @@ require 'observejs'
 require 'pg_search'
 
 module Ecrire
+  ##
+  # Ecrire::Application is the entry point when running
+  # a blog.
+  # 
+  # The big difference between this application and a normal Rails
+  # application is that Ecrire will look for +secrets.yml+ in the
+  # current working directory.
+  #
+  # If it doesn't find one, it will load the Onboarding process
+  # so the user can configure the database and the first user.
+  #
+  # If the application finds +secrets.yml+, it will load the Theme which is located
+  # in the current working directory.
+  #
+  #
   class Application < Rails::Application
     require 'ecrire/config/environment'
 
@@ -23,6 +38,13 @@ module Ecrire
       require 'ecrire/onboarding/engine'
     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
@@ -32,6 +54,10 @@ module Ecrire
        end
     end
 
+    ##
+    # Returns true if Ecrire::Onboarding::Engine is loaded
+    # in the application runtime
+    #
     def self.onboarding?
       defined?(Ecrire::Onboarding::Engine)
     end

data/lib/ecrire/config/environment.rb

@@ -22,7 +22,9 @@ Ecrire::Application.configure do
     lambda do |filename, path|
       path =~ /assets/ && !%w(.js .css).include?(File.extname(filename))
     end,
-    /^(admin|application)\.(css|js)$/
+    /^(admin|ecrire)\.(css|js)$/,
+    /^(application).(js|coffee)$/,
+    /^(browser|tablet|mobile).(css|scss)$/
   ]
 
   Warden::Manager.serialize_into_session do |user|

data/lib/ecrire/onboarding/views/layouts/application.html.erb

@@ -3,12 +3,13 @@
 
   <head>
     <%= title_tag 'Before you start blogging...' %>
-    <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
-    <%= javascript_include_tag "application", "base", "data-turbolinks-track" => true %>
+    <%= stylesheet_link_tag "ecrire", media: "all", "data-turbolinks-track" => true %>
+    <%= javascript_include_tag "ecrire", "base", "data-turbolinks-track" => true %>
 
     <%= stylesheet_link_tag "theme", media: "all", "data-turbolinks-track" => true %>
     <%= javascript_include_tag "theme", "base", "data-turbolinks-track" => true %>
-    <%= meta_informations_tags %>
+    <%= csrf_meta_tags %>
+    <%= favicon_tag %>
   </head>
 
   <body>

data/lib/ecrire/theme/engine.rb

@@ -1,25 +1,47 @@
 module Ecrire
+  ##
+  # Theme module links the user's theme with 
+  # Ecrire::Application. It uses Rails::Engine to hook
+  # itself up and split the codebase between the Gem and the user's
+  # Theme.
+  #
   module Theme
-    class Engine < Rails::Engine
-      attr_accessor :post_path
-
-      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
+    ##
+    # Engine is the foundation of Rails. It can be used
+    # to encapsulate part of the application and this is 
+    # exactly what it does here.
+    #
+    # Ecrire::Theme::Engine is the block that hooks into Ecrire::Application
+    # to provide Theme support.
+    #
+    # This class is the only element that the Gem includes at runtime.
+    # 
+    # Everything else is defined in the user's theme folder.
+    #
+    # This engine is the reason why it's possible to have 
+    # Ecrire as a gem and theme as user's folder.
+    #
+    class Engine < Rails::Engine
 
-      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
+      ##
+      # +post_path+ needs to be defined so Ecrire can link from the admin
+      # to a post. This is also needed when listing all the titles a post has
+      # and the URL they represent.
+      #
+      attr_accessor :post_path
 
+      ##
+      # Return paths for a theme. The paths
+      # follow the structure of the default theme.
+      #
+      # It creates a new Rails::Paths because 
+      # it's highly customized and it was less readable to
+      # disable and changes every paths.
+      #
+      # This could be modified in the user's theme.
+      #
+      #
       def paths
         @paths ||= begin
           paths = Rails::Paths::Root.new(root_path)
@@ -42,10 +64,30 @@ module Ecrire
         end
       end
 
+      ##
+      # Disables migration for now.
+      # Any Rails::Engine instance can support migrations
+      # which means that Theme could have their own
+      # models.
+      #
+      # It's likely that at some point this behavior is resumed but
+      # I want to make sure that I understand the implication before
+      # turning this back on.
+      #
+      # For example, I would like to make sure that the Admin is shelled from
+      # those future migrations. 
       def has_migrations?
         false
       end
 
+      ##
+      # Return the root_path for the current theme
+      #
+      # The method starts at the current working directory and moves from parent
+      # to parent until it either finds +config.ru+ or it reaches the root.
+      #
+      # Raise an error if it reaches the root and can't find +config.ru+.
+      #
       def root_path(file = 'config.ru')
         begin
           pathname = Pathname.pwd
@@ -62,6 +104,24 @@ module Ecrire
         end
       end
 
+      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
+
+
     end
   end
 end

data/lib/ecrire/theme/template/assets/stylesheets/browser.css.scss

@@ -1,3 +1,4 @@
+@import 'ecrire';
 @import 'bourbon';
 @import 'variables';
 @import 'shared/**/*';

data/lib/ecrire/theme/template/assets/stylesheets/mobile.css.scss

@@ -1,3 +1,4 @@
+@import 'ecrire';
 @import 'bourbon';
 @import 'variables';
 @import 'shared/**/*';

data/lib/ecrire/theme/template/assets/stylesheets/tablet.css.scss

@@ -1,3 +1,4 @@
+@import 'ecrire';
 @import 'bourbon';
 @import 'variables';
 @import 'shared/**/*';

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

@@ -8,7 +8,14 @@ class PostsController < Ecrire::ThemeController
       @posts = @posts.where.not(id: @latest.id)
     end
     @tags = Tag.all
-    super
+
+    respond_to do |format|
+      format.html
+      format.rss
+      format.json do
+        headers['Access-Control-Allow-Origin'] = '*'
+      end
+    end
   end
 
   def show

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

@@ -3,14 +3,17 @@
 
   <head>
     <%= title_tag %>
-    <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
-    <%= javascript_include_tag "application", "base", "data-turbolinks-track" => true %>
+
+    <%= javascript_include_tag "ecrire", "application", "data-turbolinks-track" => true %>
 
     <%= stylesheet_link_tag "browser", media: "(min-width: 1025px)", "data-turbolinks-track" => true %>
     <%= stylesheet_link_tag "tablet", media: "(min-width: 641px) and (max-width: 1024px)", "data-turbolinks-track" => true %>
     <%= stylesheet_link_tag "mobile", media: "(max-width: 640px)", "data-turbolinks-track" => true %>
 
-    <%= meta_informations_tags %>
+    <%= csrf_meta_tags %>
+
+    <%= favicon_tag %>
+    <%= rss_tag %>
   </head>
 
   <body>
@@ -31,21 +34,12 @@
           </ol>
         </nav>
 
-
-        <% if content_for?(:header) %>
-          <div class='content'>
-            <%= content_for :header %>
-          </div>
-        <% end %>
-
       </header>
 
       <article>
         <%= yield %>
       </article>
 
-      <footer>
-      </footer>
     <% end %>
   </body>
 </html>

data/lib/ecrire/version.rb

@@ -1,3 +1,3 @@
 module Ecrire
-  VERSION = '0.26.2'
+  VERSION = '0.26.3'
 end

data/lib/ecrire.rb

@@ -3,6 +3,10 @@ module Ecrire
   autoload :Application,        'ecrire/application'
   autoload :Markdown,           'ecrire/markdown'
 
+  ##
+  # Returns true if Ecrire could find 
+  # a Gemfile in the current working directory
+  #
   def self.bundle?
     ENV['BUNDLE_GEMFILE'] ||= Dir.pwd + '/Gemfile'
     File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/editor/models/post_test.rb

@@ -22,6 +22,18 @@ class PostTest < ActiveSupport::TestCase
     assert post.read_attribute(:tags).include?(tag.id)
   end
 
+  test 'find post by title' do
+    keyword = 'title'
+
+    posts = Title.search_by_name(keyword).map(&:post).uniq
+
+    assert posts.count == Post.search_by_title(keyword).count
+
+    Post.search_by_title(keyword).each do |post|
+      assert posts.include?(post)
+    end
+  end
+
   test "fetch published post" do
     @posts = Post.status("published")
     assert_equal @posts.count, Post.published.count

data/test/theme/helpers/application_helper_test.rb

@@ -25,6 +25,37 @@ class ApplicationHelperTest < ActionView::TestCase
     assert_select node(html), "#TestIndex"
   end
 
+  test 'title_tag should always render the tag' do
+    html = title_tag
+    assert_select node(html), 'title', 1
+  end
+
+  test 'title_tag content should always prioritize content_for' do
+    @post = Post.first
+    title = "A new title"
+    content_for :title, title
+    html = title_tag
+
+    assert_select node(html), 'title', title
+  end
+
+  test 'title_tag should render the post if content_for(:title) is not set' do
+    @post = Post.first
+    html = title_tag('yada')
+
+    assert_select node(html), 'title', @post.title
+
+  end
+
+  test 'title_tag should render the argument passed if nothing else is set' do
+    html = title_tag
+    assert_select node(html), 'title', 'Ecrire'
+
+    html = title_tag('Oops')
+    assert_select node(html), 'title', 'Oops'
+  end
+
+
   def node(html)
     Nokogiri::HTML::Document.parse(html)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecrire
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Pier-Olivier Thibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies: []
 description: Blog engine on Rails
 email: pothibo@gmail.com
@@ -48,7 +48,7 @@ files:
 - lib/ecrire/app/assets/javascripts/admin/posts/tag.js.coffee
 - lib/ecrire/app/assets/javascripts/admin/posts/title.coffee
 - lib/ecrire/app/assets/javascripts/admin/posts/toggle.js.coffee
-- lib/ecrire/app/assets/javascripts/application.js
+- lib/ecrire/app/assets/javascripts/ecrire.js
 - lib/ecrire/app/assets/javascripts/shared/overlay.js.coffee
 - lib/ecrire/app/assets/javascripts/shared/popup.js.coffee
 - lib/ecrire/app/assets/javascripts/vendor/moment.js
@@ -65,7 +65,7 @@ files:
 - lib/ecrire/app/assets/stylesheets/admin/save.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/application.css.scss
+- lib/ecrire/app/assets/stylesheets/ecrire.css.scss
 - lib/ecrire/app/assets/stylesheets/editor/code.css.scss
 - lib/ecrire/app/assets/stylesheets/editor/content.css.scss
 - lib/ecrire/app/assets/stylesheets/editor/figure.css.scss
@@ -77,40 +77,29 @@ 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/partials_controller.rb
 - lib/ecrire/app/controllers/admin/posts/tags_controller.rb
 - lib/ecrire/app/controllers/admin/posts/titles_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/ecrire/theme_controller.rb
-- lib/ecrire/app/controllers/images_controller.rb
-- lib/ecrire/app/controllers/partials_controller.rb
 - lib/ecrire/app/controllers/sessions_controller.rb
 - lib/ecrire/app/controllers/static_controller.rb
 - lib/ecrire/app/forms/admin/image_builder.rb
 - lib/ecrire/app/forms/admin/partial_builder.rb
 - lib/ecrire/app/forms/admin/post_builder.rb
 - lib/ecrire/app/helpers/admin/images_helper.rb
-- lib/ecrire/app/helpers/admin/labels_helper.rb
 - lib/ecrire/app/helpers/admin/posts_helper.rb
 - lib/ecrire/app/helpers/application_helper.rb
 - lib/ecrire/app/helpers/content_tag_helper.rb
-- lib/ecrire/app/helpers/open_graph_helper.rb
-- lib/ecrire/app/helpers/posts_helper.rb
+- lib/ecrire/app/helpers/pagination_helper.rb
 - 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/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
@@ -239,7 +228,6 @@ files:
 - lib/ecrire/theme/template/Procfile
 - lib/ecrire/theme/template/Rakefile
 - lib/ecrire/theme/template/assets/images/.keep
-- lib/ecrire/theme/template/assets/javascripts/theme.js.coffee
 - lib/ecrire/theme/template/assets/stylesheets/browser.css.scss
 - lib/ecrire/theme/template/assets/stylesheets/browser/base.css.scss
 - lib/ecrire/theme/template/assets/stylesheets/mobile.css.scss
@@ -256,7 +244,6 @@ files:
 - lib/ecrire/theme/template/controllers/tags_controller.rb
 - lib/ecrire/theme/template/helpers/blog_helper.rb
 - lib/ecrire/theme/template/routes.rb
-- lib/ecrire/theme/template/secrets.yml
 - lib/ecrire/theme/template/views/layouts/application.html.erb
 - lib/ecrire/theme/template/views/posts/_latest.html.erb
 - lib/ecrire/theme/template/views/posts/_post.html.erb

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

@@ -1,43 +0,0 @@
-module Admin
-  class PartialsController < Admin::ApplicationController
-
-    def index
-      @partials = Admin::Partial.page(params[:page]).per(params[:per_page])
-
-      respond_to do |format|
-        format.js
-        format.html
-      end
-    end
-
-    def new
-      @partial = Admin::Partial.new
-    end
-
-    def edit
-      @partial = Admin::Partial.find(params[:id].to_i)
-    end
-
-    def create
-      @partial = Admin::Partial.create(partial_params)
-      respond_to do |format|
-        format.html do
-          redirect_to edit_admin_partial_path(@partial)
-        end
-      end
-    end
-
-    def update
-      @partial = Admin::Partial.find(params[:id].to_i)
-      @partial.update(partial_params)
-      redirect_to edit_admin_partial_path(@partial) and return
-    end
-
-    protected
-
-    def partial_params
-      params.require(:admin_partial).permit(:title, :content, :javascript, :stylesheet)
-    end
-
-  end
-end

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

@@ -1,35 +0,0 @@
-module Admin
-  class PropertiesController < Admin::ApplicationController
-    INSTANCES = {
-      label: Property::Label,
-      image: Property::Image
-    }.with_indifferent_access
-
-    helper_method :post
-
-    def create
-      instance = instance_for_property(params[:property])
-      @property = instance.create(params)
-      render "admin/properties/#{instance.name}/create"
-    end
-
-    def destroy
-      instance = instance_for_property(params[:property])
-      @property = instance.destroy(params)
-      render "admin/properties/#{instance.name}/destroy"
-    end
-
-    protected
-
-    def post
-      @post ||= Admin::Post.find(params[:post_id])
-    end
-
-    def instance_for_property(name)
-      instance = INSTANCES[name].new
-      instance.post = post
-      instance
-    end
-
-  end
-end

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

@@ -1,2 +0,0 @@
-class ImagesController < ApplicationController
-end

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

@@ -1,8 +0,0 @@
-class PartialsController < ApplicationController
-  def show
-    @partial = Partial.find(params[:id].to_i)
-    respond_to do |format|
-      format.html { render layout: false }
-    end
-  end
-end

data/lib/ecrire/app/helpers/admin/labels_helper.rb

@@ -1,26 +0,0 @@
-module Admin::LabelsHelper
-  def create_label_button(label, post)
-    button_to label.name.capitalize,
-      admin_post_properties_path(post.id),
-      remote: true,
-      form: {id: "label-#{label.id}"},
-    form_class: %w(create label),
-      params: {
-      property: :label,
-      value: label.name
-    }
-  end
-
-  def destroy_label_button(label, post)
-    button_to label.name.capitalize,
-      admin_post_properties_path(post.id),
-      form: {id: "label-#{label.id}"},
-    form_class: %w(destroy label),
-      method: :delete,
-      remote: true,
-      params: {
-        property: :label,
-        value: label.name
-      }
-  end
-end

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

@@ -1,45 +0,0 @@
-module OpenGraphHelper
-  # OpenGraph is in meta tags. First I thought it would bring problem if meta tags wouldn't change between page load.
-  # Thinking it through, it doesn't matter if open graph tags aren't changed between pages as it's needed by crawler that does full page load
-  # So the tags will always match the content.
-  # I doubt this will change in the future as turbolinks checks for crawlers and disable itself when it meets one.
-  #
-
-  def open_graph_tags
-    if @post.nil?
-      og_website
-    else
-      og_article(@post)
-    end
-  end
-
-  protected
-
-  def og_website
-    [
-      og_title,
-      og_type('website')
-    ].join.html_safe
-  end
-
-  def og_article(post)
-    raise OGNoArticleError if post.nil?
-    [
-      og_title,
-      og_type('article'),
-      content_tag(:meta, nil, property: 'og:article:published_time', content: post.published_at.iso8601)
-    ].join.html_safe
-
-  end
-
-  def og_type(value)
-    content_tag :meta, nil, property: 'og:type', content: value
-  end
-
-  def og_title
-    content_tag :meta, nil, property: 'og:title', content: title
-  end
-
-  class OGNoArticleError < StandardError; end
-
-end

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

@@ -1,13 +0,0 @@
-module PostsHelper
-  def edit_post_link(options = {})
-    return unless signed_in?
-
-    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/models/admin/partial.rb

@@ -1,4 +0,0 @@
-module Admin
-  class Partial < ::Partial
-  end
-end

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

@@ -1,3 +0,0 @@
-class Partial < ActiveRecord::Base
-  validates_presence_of :title
-end

data/lib/ecrire/app/models/property/image.rb

@@ -1,30 +0,0 @@
-module Property
-  class Image
-    attr_accessor :post
-
-    def name
-      "image"
-    end
-
-    def create(params)
-      unless post.header.nil?
-        post.header.destroy
-      end
-      img = post.images.build
-      img.file = params[:admin_image][:file]
-      img.save
-      post.header = img
-      post.save
-    end
-
-    # TODO:
-    # 3. Remove id in post properties
-    def destroy(value)
-      return if post.header.nil?
-      img = post.header
-      img.destroy
-    end
-
-  end
-end
-

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

@@ -1,28 +0,0 @@
-module Property
-  class Label
-    attr_accessor :post
-
-    def name
-      "label"
-    end
-
-    def create(params)
-      new_label = ::Label.find_or_create_by!(name: params[:value])
-      labels = post.labels
-      labels << new_label
-      post.labels = labels
-      post.save!
-      new_label
-    end
-
-    def destroy(params)
-      label = ::Label.find_by!(name: params[:value])
-      labels = post.labels
-      labels.delete(label)
-      post.labels = labels
-      post.save!
-      label
-    end
-
-  end
-end

data/lib/ecrire/theme/template/assets/javascripts/theme.js.coffee

@@ -1 +0,0 @@
-#= require_tree .

data/lib/ecrire/theme/template/secrets.yml

@@ -1,11 +0,0 @@
----
-development: &1
-  adapter: postgresql
-  database: ecrire
-  user: pothibo
-  password: 3dbdbc10bdf7bd7d8ad7b6dbcf4bb26c
-  encoding: utf8
-  secret_key: 43fce5ef5993544ba39821911080adfa
-  secret_key_base: 43fce5ef5993544ba39821911080adfa
-test: *1
-production: *1