journal-chr 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a00a6a1237651ff13a7538e103a87a7ddcecd9d1
-  data.tar.gz: f68c81a417f8cc974d5ef4d1d66a54682cfda975
+  metadata.gz: 5f20361e316ff91793a6d95cb050a5dd7b02c8df
+  data.tar.gz: e7411a029fb14f0f78f57919932185d3522d12b0
 SHA512:
-  metadata.gz: 55f7b46f1448079b508faa64050d9447fbd473a2a7645741a9b41dba978e3227397289a9264df1310eb59a89569f8b3b20325676be766adc28608fdc1aeca5f1
-  data.tar.gz: 0a42d7abb1722477c0212fb8f4a89c8fb83350d215ba6e29bc470c0a8bc8c6fd674552c6ef8d8b9a84734c20dd39e05f187b3f2f5000f5e1903f5206c9eee1f0
+  metadata.gz: 45ba95c370271890eae0ee874a4ea7b918d4a3dc128ca38138d45e726cdd78627ab50fc843d74bfc785b3a174446b753ef94f599eba05bf7b9c3bfcee8bdf0ce
+  data.tar.gz: 6046fe9876c1e051f10155ea19e625468f379739dbc8d728625ca56ce11a8e571f0ee86e5940d8d766918c35992f017da242aa25bb20ceb67b3a3cc80cfba86e

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    journal-chr (0.3.8)
-      ants (>= 0.3.13)
-      chr (>= 0.5.7)
-      loft (>= 0.3.1)
+    journal-chr (0.4.0)
+      chr (>= 0.5.8)
+      loft (>= 0.4.1)
       mongosteen (>= 0.2.0)
 
 GEM
@@ -45,7 +44,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ants (0.3.13)
+    ants (0.3.14)
       devise
       meta-tags
       mongoid (>= 4.0)
@@ -66,11 +65,11 @@ GEM
       carrierwave (>= 0.8.0, < 0.11.0)
       mongoid (>= 3.0, < 6.0)
       mongoid-grid_fs (>= 1.3, < 3.0)
-    chr (0.5.7)
+    chr (0.5.8)
       bourbon
       coffee-rails (>= 4.0)
       font-awesome-rails
-      formagic (>= 0.3.9)
+      formagic (>= 0.3.10)
       jquery-rails
       rails (~> 4.2.5)
       sass-rails
@@ -95,7 +94,7 @@ GEM
     fast-stemmer (1.0.2)
     font-awesome-rails (4.5.0.0)
       railties (>= 3.2, < 5.0)
-    formagic (0.3.9)
+    formagic (0.3.10)
       bourbon (>= 3.2)
       normalize-rails (>= 3.0)
     globalid (0.3.6)
@@ -117,15 +116,15 @@ GEM
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    loft (0.3.1)
-      ants (>= 0.3.10)
+    loft (0.4.1)
+      ants (>= 0.3.14)
       carrierwave-mongoid (>= 0.7.1)
-      chr (>= 0.5.4)
+      chr (>= 0.5.8)
       mini_magick (>= 4.1.0)
       mongoid-autoinc (>= 4.0.0)
       mongoid-grid_fs (>= 2.1.0)
       mongoid_search (>= 0.3)
-      mongosteen (>= 0.1.8)
+      mongosteen (>= 0.2.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)

data/README.md

@@ -47,9 +47,9 @@ pages:   new JournalPages()
 ## Journal family
 
 - [Character](https://github.com/slate-studio/chr): Powerful javascript CMS for apps
-- [Mongosteen](https://github.com/slate-studio/mongosteen): An easy way to add restful actions for mongoid models
-- [Inverter](https://github.com/slate-studio/inverter): An easy way to connect Rails templates content to CMS
+- [Mongosteen](https://github.com/slate-studio/mongosteen): Add CRUD actions for Mongoid models with one line
 - [Loft](https://github.com/slate-studio/loft): Media assets manager for Character CMS
+- [Inverter](https://github.com/slate-studio/inverter): An easy way to connect Rails templates content to CMS
 
 
 ## License

data/app/assets/javascripts/journal.coffee

@@ -1,2 +1,2 @@
-#= require formagic/inputs/markdown
+#= require formagic/inputs/ace-markdown
 #= require_tree ./journal

data/app/assets/javascripts/journal/categories.coffee

@@ -1,6 +1,8 @@
-class @JournalCategories
-  constructor: (@title="Categories", @apiPath="/admin") ->
-    @showWithParent = true
+class @JournalCategories extends AntsContent
+  constructor: (title="Categories", @apiPath="/admin") ->
+    super("Category")
+
+    @title = title
 
     @arrayStore = new RailsArrayStore({
       resource: "journal_category"
@@ -8,12 +10,14 @@ class @JournalCategories
       reorderable: { positionFieldName: "_position" }
     })
 
-    @formSchema =
-      generic:
-        type: "group"
-        groupClass: "group-panel"
-        inputs:
-          title:
-            type: "string"
-            placeholder: "Category Title"
-          slug: new AntsSlugInput("#{location.origin}/")
+# PRIVATE =====================================================================
+
+  _path: (object) ->
+    "#{location.origin}/"
+
+  _preview_url: (object) ->
+    slug = object.slug
+    if object.hidden
+      "/#{slug}/preview"
+    else
+      "/#{slug}"

data/app/assets/stylesheets/journal.scss

@@ -19,6 +19,17 @@
   }
 }
 
+.categories .content_panel {
+  .input-markdown {
+    margin-top: -1px;
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+  .input-markdown .label {
+    display: none;
+  }
+}
+
 /* Tablet ----------------------------------------------------------------- */
 @media #{$tablet} {
   .list.posts,

data/app/controllers/admin/journal_categories_controller.rb

@@ -2,7 +2,7 @@ module Admin
   class JournalCategoriesController < Admin::BaseController
     mongosteen
 
-    json_config methods: %w(slug),
+    json_config methods: %w(slug opengraph_image_url meta_title meta_description),
                 actions: {
                   index: {
                     except: %w(body_markdown body_html),

data/app/controllers/journal_categories_controller.rb

@@ -0,0 +1,27 @@
+class JournalCategoriesController < ApplicationController
+  before_action :set_params
+
+  def show
+    @category = JournalCategory.not_hidden.find(@slug)
+    @posts = posts
+    render @category.template_name || "show"
+  end
+
+  def preview
+    @category = JournalCategory.find(@slug)
+    @posts = posts
+    render @category.template_name || "show"
+  end
+
+  private
+
+  def posts
+    @category.posts.not_hidden.published.page(@page).per(@perPage)
+  end
+
+  def set_params
+    @slug = params[:slug]
+    @page = params[:page].try(:to_i) || 1
+    @perPage = 15
+  end
+end

data/app/controllers/journal_pages_controller.rb

@@ -3,10 +3,11 @@ class JournalPagesController < ApplicationController
 
   def show
     @page = JournalPage.not_hidden.find(params[:slug])
+    render @page.template_name || "show"
   end
 
   def preview
     @page = JournalPage.find(params[:slug])
-    render "journal_pages/show"
+    render @page.template_name || "show"
   end
 end

data/app/controllers/journal_posts_controller.rb

@@ -1,5 +1,4 @@
 class JournalPostsController < ApplicationController
-  before_filter :set_all_posts, only: %w( index show )
   before_action :authenticate_admin_user!, only: %w( preview )
 
   def index
@@ -15,35 +14,21 @@ class JournalPostsController < ApplicationController
 
   def show
     @post = published_post_by_int_id
-  end
-
-  def redirect
-    @post = published_post_by_int_id
-    redirect_to show_journal_post_path(@post.hex, @post.slug)
+    render @post.template_name || "show"
   end
 
   def preview
     @post = post_by_int_id
-    render "journal_posts/show"
+    render @post.template_name || "show"
   end
 
-  def category
-    @slug = params[:slug]
-    @page = params[:page].try(:to_i) || 1
-    @perPage = 15
-
-    category = JournalCategory.find(@slug)
-    @posts = category.posts.not_hidden.published.page(@page).per(@perPage)
-
-    render "journal_posts/index"
+  def redirect
+    @post = published_post_by_int_id
+    redirect_to show_journal_post_path(@post.hex, @post.slug)
   end
 
   private
 
-  def set_all_posts
-    @posts = JournalPost.not_hidden
-  end
-
   def int_id
     params[:hex].to_i(16)
   end

data/app/models/journal_category.rb

@@ -1,6 +1,14 @@
 class JournalCategory
   include Ants::Content
   include Ants::Orderable
+  include Mongoid::Autoinc
+
+  ## Attributes
+  field :template_name, default: "show"
+
+  ## Autoinc
+  field :int_id, type: Integer
+  increments :int_id
 
   ## Relations
   has_and_belongs_to_many :posts, class_name: "JournalPost", inverse_of: :categories, index: true

data/app/models/journal_page.rb

@@ -1,4 +1,12 @@
 class JournalPage
   include Ants::Content
   include Ants::Orderable
+  include Mongoid::Autoinc
+
+  ## Attributes
+  field :template_name, default: "show"
+
+  ## Autoinc
+  field :int_id, type: Integer
+  increments :int_id
 end

data/app/models/journal_post.rb

@@ -4,6 +4,9 @@ class JournalPost
   include Ants::Featurable
   include Mongoid::Autoinc
 
+  ## Attributes
+  field :template_name, default: "show"
+
   ## Autoinc
   field :int_id, type: Integer
   increments :int_id

data/app/views/journal_categories/_aside.html.erb

@@ -0,0 +1 @@
+<%# This is a placeholder to be overriden in the project%>

data/app/views/journal_categories/_content.html.erb

@@ -0,0 +1,5 @@
+<% if @category.body_html.presence %>
+  <section class="journal-category-content">
+    <%= @category.body_html.html_safe %>
+  </section>
+<% end %>

data/app/views/journal_categories/show.html.erb

@@ -0,0 +1,6 @@
+<% content_meta_tags @category %>
+<% content_for :extra_body_classes do %>category-<%= @category.int_id %><% end %>
+<%= render partial: 'aside' %>
+<%= render partial: 'content' %>
+<%= render partial: 'journal_posts/post', collection: @posts %>
+<%= paginate @posts %>

data/app/views/journal_pages/_aside.html.erb

@@ -0,0 +1 @@
+<%# This is a placeholder to be overriden in the project%>

data/app/views/journal_pages/show.html.erb

@@ -1,5 +1,6 @@
 <% content_meta_tags @page %>
-
+<% content_for :extra_body_classes do %>page-<%= @page.int_id %><% end %>
+<%= render partial: 'aside' %>
 <article class='journal-page'>
   <header class='journal-page-header'>
     <h1><%= @page.title %></h1>

data/app/views/journal_posts/_aside_index.html.erb

@@ -0,0 +1 @@
+<%# This is a placeholder to be overriden in the project%>

data/app/views/journal_posts/_aside_show.html.erb

@@ -0,0 +1 @@
+<%# This is a placeholder to be overriden in the project%>

data/app/views/journal_posts/index.html.erb

@@ -1,3 +1,4 @@
+<%= render partial: 'aside_index' %>
 <% if @featured && @featured.size > 0 %>
   <section class='journal-featured-posts'>
     <%= render partial: 'post', collection: @featured %>

data/app/views/journal_posts/show.html.erb

@@ -1,5 +1,6 @@
 <% content_meta_tags @post %>
-
+<% content_for :extra_body_classes do %>post-<%= @post.hex %><% end %>
+<%= render partial: 'aside_show' %>
 <article class='journal-page'>
   <header class='journal-page-header'>
     <h1>
@@ -14,20 +15,4 @@
   <section class='journal-page-body'>
     <%= @post.body_html.html_safe %>
   </section>
-
-  <!--
-  <footer class='journal-page-footer'>
-    <% if @disqus_shortname %>
-      <%= link_to 'Show comments', '#', class: 'journal-show-comments' %>
-    <% end %>
-  </footer>
-  -->
 </article>
-
-<!--
-<% if @disqus_shortname %>
-  <div class='journal-comments' style='display:none;'>
-    <div id='disqus_thread' class='journal-disqus' data-shortname='<%= @disqus_shortname %>'></div>
-  </div>
-<% end %>
--->

data/journal-chr.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "~> 1.9"
   s.add_development_dependency "rake", "~> 10.0"
 
-  s.add_dependency "chr", ">= 0.5.7"
-  s.add_dependency "ants", ">= 0.3.13"
-  s.add_dependency "loft", ">= 0.3.1"
+  s.add_dependency "chr", ">= 0.5.8"
+  s.add_dependency "loft", ">= 0.4.1"
   s.add_dependency "mongosteen", ">= 0.2.0"
 end

data/lib/constraints/categories.rb

@@ -2,7 +2,11 @@ module Constraints
   class JournalCategories
     def self.matches?(request)
       begin
-        JournalCategory.find(request.params[:slug])
+        if request.path.end_with? "/preview"
+          JournalCategory.find(request.params[:slug])
+        else
+          JournalCategory.not_hidden.find(request.params[:slug])
+        end
       rescue
        false
       end

data/lib/journal/routing.rb

@@ -33,7 +33,10 @@ module ActionDispatch::Routing
     end
 
     def mount_journal_categories
-      get '/:slug' => 'journal_posts#category',
+      get '/:slug/preview' => 'journal_categories#preview',
+          as: :preview_journal_category,
+          constraints: ::Constraints::JournalCategories
+      get '/:slug' => 'journal_categories#show',
           as: :show_journal_category,
           constraints: ::Constraints::JournalCategories
     end

data/lib/journal/version.rb

@@ -1,3 +1,3 @@
 module Journal
-  VERSION = "0.3.8"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journal-chr
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexander Kravets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,42 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
-- !ruby/object:Gem::Dependency
-  name: ants
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.13
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: loft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: mongosteen
   requirement: !ruby/object:Gem::Requirement
@@ -114,13 +100,20 @@ files:
 - app/controllers/admin/journal_categories_controller.rb
 - app/controllers/admin/journal_pages_controller.rb
 - app/controllers/admin/journal_posts_controller.rb
+- app/controllers/journal_categories_controller.rb
 - app/controllers/journal_pages_controller.rb
 - app/controllers/journal_posts_controller.rb
 - app/helpers/journal_helper.rb
 - app/models/journal_category.rb
 - app/models/journal_page.rb
 - app/models/journal_post.rb
+- app/views/journal_categories/_aside.html.erb
+- app/views/journal_categories/_content.html.erb
+- app/views/journal_categories/show.html.erb
+- app/views/journal_pages/_aside.html.erb
 - app/views/journal_pages/show.html.erb
+- app/views/journal_posts/_aside_index.html.erb
+- app/views/journal_posts/_aside_show.html.erb
 - app/views/journal_posts/_post.html.erb
 - app/views/journal_posts/index.html.erb
 - app/views/journal_posts/show.html.erb