help_kit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cfcd1ac51f8782a5a8f4b0db2c7756ce21314df
-  data.tar.gz: 3d8fb80a1ab86a89af2d316379bd1e19f7292ede
+  metadata.gz: 7084e32bbb5f95b81127ad18e8f2cf09e6bcf500
+  data.tar.gz: 2da5fc2973e6bdf27669d0ad75d15adc0528fb6b
 SHA512:
-  metadata.gz: 29519c99b279490f13ef8a3dcd03848e63ff7312a256726768be1107851c4cd16bf31808d0896f129282f1d19928f17c93f862c66adab74389297c95df182d85
-  data.tar.gz: b1128ab05a16182ad04fb33844f43f7a53406f74d61068dacff63f78eefc246abba7a64c9d3309d5c78f6318e5844d59bea7a4ce0af33c21b0e319cd502cfb0b
+  metadata.gz: 85267fc0953084589bea06b92d87d8168e134abb4aef3d957db2d7376fbdaf205a8a1beb30e8ead63e3151813a17823737f7f3bea51b3cdc0bd45d2bb542007f
+  data.tar.gz: 293affd8f01969bc1555f0992c8f46b91034f4301f99633bcc5e69555b99eb5e4ffafa21f0ec58631839ee6a899fd7bebd0cfeb5a44651e4b8ec04cb36fb6a56

data/app/assets/stylesheets/help_kit/article.scss

@@ -1,4 +1,3 @@
-
 .breadcrumb {
   ul {
     li {
@@ -32,9 +31,10 @@
   @include clearfix;
   margin-top: 10px;
   margin-bottom: 25px;
-  background: #f3f3f3;
+  background: #f9f9f9;
   padding: 4px 8px;
   border-radius: 4px;
+  border-bottom: 1px solid #eee;
   .breadcrumb {
     float: left;
   }
@@ -94,6 +94,7 @@
   }
 }
 .article {
+
   font-size: 0.9em;
   h1 {
     font-family: 'Open Sans', sans-serif;
@@ -116,11 +117,14 @@
     margin-top: 40px;
     margin-bottom: 5px;
   }
-  h3 {
+  h3,h4 {
     font-weight: bold;
     font-size: 1.1em;
     margin-top: 20px;
   }
+  h4 {
+    font-size: 0.9em;
+  }
   ol,ul {
     margin-left: 40px;
     margin-bottom: 15px;
@@ -129,7 +133,20 @@
     list-style-type: decimal;
   }
   ul {
-    list-style-type: disc;
+    list-style: none;
+    padding: 0px;
+    margin-left: 5px;
+    li {
+      margin-top: 1px;
+      border-left: 4px solid #e0e0e0;
+      padding: 3px 10px;
+      ul {
+        li {
+          padding: 0px;
+          border-left: none;
+        }
+      }
+    }
   }
   pre {
     padding: 15px;
@@ -141,6 +158,11 @@
     background: #f9f9f9;
     border-bottom: 1px solid #ddd;
   }
+  code {
+    display: inline-block;
+    border: 1px solid #ccc;
+    padding: 1px 2px;
+  }
 }
 
 .article-list {

data/app/controllers/help_kit/admin/categories_controller.rb

@@ -6,7 +6,7 @@ module HelpKit
     before_action :set_category, only: [:show, :edit, :update, :destroy]
 
     def index
-      @categories = Category.all
+      @categories = Category.roots
     end
 
     def new

data/app/helpers/help_kit/article_helper.rb

@@ -26,6 +26,9 @@ module HelpKit
     def render_markdown(content)
       markdown = Redcarpet::Markdown.new(PygmentizeHTML,
                                          autolink: true,
+                                         no_intra_emphasis: true,
+                                         superscript: true,
+                                         footnotes: true,
                                          tables: true,
                                          fenced_code_blocks: true)
       markdown.render(content)

data/app/helpers/help_kit/nested_set_helper.rb

@@ -1,35 +1,17 @@
 module HelpKit
   module NestedSetHelper
     def nested_li(objects, &block)
-      objects = objects.order(:lft) if objects.is_a? Class
-
-      return '' if objects.size == 0
-
-      output = '<ul><li>'
-      path = [nil]
-
-      objects.each_with_index do |o, i|
-        if o.parent_id != path.last
-          # We are on a new level, did we descend or ascend?
-          if path.include?(o.parent_id)
-            # Remove the wrong trailing path elements
-            while path.last != o.parent_id
-              path.pop
-              output << '</li></ul>'
-            end
-            output << '</li><li>'
-          else
-            path << o.parent_id
-            output << '<ul><li>'
+      output = "<ul>"
+      objects.each do |o|
+        output += content_tag(:li) {
+          concat(capture(o, &block))
+          unless o.leaf?
+            concat(nested_li(o.children, &block))
           end
-        elsif i != 0
-          output << '</li><li>'
-        end
-        output << capture(o, path.size - 1, &block)
+        }
       end
-
-      output << '</li></ul>' * path.length
-      output.html_safe
-    end 
+      output += "</ul>"
+      return output.html_safe
+    end
   end
 end

data/lib/help_kit/configuration.rb

@@ -10,7 +10,7 @@ module HelpKit
 
   def self.authorization_method=(val);@authorization_method=val;end
   def self.authorization_method
-    @authorization_method ||= lambda { True }
+    @authorization_method ||= lambda { true }
   end
 
 

data/lib/help_kit/version.rb

@@ -1,3 +1,3 @@
 module HelpKit
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/help_kit.rb

@@ -8,7 +8,6 @@ require 'awesome_nested_set'
 require 'font-awesome-sass'
 require 'simple_form'
 require 'select2-rails'
-require 'tinymce-rails'
 require 'coffee-rails'
 require 'redcarpet'
 require 'pygmentize'

data/spec/controllers/help_kit/admin/categories_controller_spec.rb

@@ -4,11 +4,17 @@ module HelpKit
   RSpec.describe Admin::CategoriesController, :type => :controller do
 
     describe "#index" do
-      before { get :index }
       let(:category) { create(:category) }
+      before {
+        create(:category, parent_id:category.id)
+        get :index
+      }
       it "should assing @categories" do
         expect(assigns(:categories)).to eq([category])
       end
+      it "should not contain sub category" do
+        expect(assigns(:categories).count).to eq(1)
+      end
       it { should render_template('index') }
     end
 

data/spec/dummy/config/initializers/assets.rb

@@ -8,7 +8,4 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w(tinymce/themes/modern/theme.js)
-Rails.application.config.assets.precompile += %w(tinymce/skins/light/skin.min.css)
-Rails.application.config.assets.precompile += %w(tinymce/skins/light/content.min.css)
 Rails.application.config.assets.precompile += %w(help_kit/article_compiled.css)