cheatset 1.2.14 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04f1e290e5231b919577c5162b33f41362b5e371
-  data.tar.gz: 4f7b1dd7a9f0c5c8b36654e36d1d2de323db27a4
+  metadata.gz: 543d5b532d6c40d2194f9657a38738716e0f3255
+  data.tar.gz: 2c8364567d3982eceb92abbd30627e96671204e3
 SHA512:
-  metadata.gz: 0ae1667b4ef9fc263f834d9e451605811432e38aa7dc0370222fff79e0f5c27f3e21a7577d2e77378b288e129009f6be9c113aa1c45b94c97e72a0bc6ef39be5
-  data.tar.gz: 97dc3f688ee74434cc844e93d6831bf804df118901b74d0698c6acf65693610f2a6c1fbe519dbbcf76a827242701e3eb41cffb8d13437f485215356d5fc432a4
+  metadata.gz: b0d709062d3517643dc61f00638e637eec0d86250238bf885fd4ffe37ab95df96c948531aff84b460d910fd80ce4c77aab1becf119a2ee5bbd329a658d4f87ba
+  data.tar.gz: d2d690590d3a05c48c409adb6df43e3d5c8d8e5556a893d36f8d181956cbceb2ef901f45b51e4ced7249b953f48d3cbad849dcf1db2408d421fbc3006324cca0

data/lib/cheatset/creator.rb

@@ -90,25 +90,23 @@ class Cheatset::Creator
       db.execute(sql, category.id, 'Category',
                  "index.html\#//dash_ref/Category/#{category_strip}/1")
       category.entries.each_with_index do |entry, index|
+        href = (entry.name || entry.index_name) ? "index.html\#//dash_ref_#{category_strip}/Entry/#{URI.escape((entry.name) ? entry.tags_stripped_name.strip : entry.index_name.strip).gsub(/\//, '%252F')}/0" : ""
         if entry.command
           entry.command.each do |command|
             if(!command.strip.empty?)
-              db.execute(sql, command.strip, 'Command',
-                       "index.html\#//dash_ref_#{category_strip}/Entry/#{URI.escape(entry.tags_stripped_name.strip).gsub(/\//, '%252F')}/0")
+              db.execute(sql, command.strip, 'Command', href)
             end
           end
         end
         if entry.td_command
           entry.td_command.each do |command|
             if(!command.strip.empty?)
-              db.execute(sql, command.strip, 'Command',
-                       "index.html\#//dash_ref_#{category_strip}/Entry/#{URI.escape(entry.tags_stripped_name.strip).gsub(/\//, '%252F')}/0")
+              db.execute(sql, command.strip, 'Command', href)
             end
           end
         end
-        if entry.name
-          db.execute(sql, (entry.index_name) ? entry.index_name.strip : entry.tags_stripped_name.strip, 'Entry',
-                 "index.html\#//dash_ref_#{category_strip}/Entry/#{URI.escape(entry.tags_stripped_name.strip).gsub(/\//, '%252F')}/0")
+        if entry.name || entry.index_name
+          db.execute(sql, (entry.index_name) ? entry.index_name.strip : entry.tags_stripped_name.strip, 'Entry', href)
         end
       end
     end

data/lib/cheatset/templates/template.haml

@@ -10,9 +10,9 @@
       %link{href: "//dash_ref/Category/#{category.id.strip.gsub(/\//, '%2F')}/1"}
       - category.hasEntry(false)
       - category.entries.each_with_index do |entry, index|
-        - if entry.name
+        - if entry.name || entry.index_name
           - category.hasEntry(true)
-          %link{href: "//dash_ref_#{category.id.strip.gsub(/\//, '%2F')}/Entry/#{entry.tags_stripped_name.strip.gsub(/\//, '%2F')}/0"}
+          %link{href: "//dash_ref_#{category.id.strip.gsub(/\//, '%2F')}/Entry/#{(entry.name) ? entry.tags_stripped_name.strip.gsub(/\//, '%2F') : entry.index_name.strip.gsub(/\//, '%2F')}/0"}
       - if !category.hasEntry
         %link{href: "//dash_ref/Entry/#{category.id.strip.gsub(/\//, '%2F')}/0"}
 
@@ -36,7 +36,7 @@
                   %th~ header
 
             - category.entries.each_with_index do |entry, index|
-              %tr{id: ("//dash_ref_#{category.id.strip.gsub(/\//, '%2F')}/Entry/#{entry.tags_stripped_name.strip.gsub(/\//, '%2F')}/0" if entry.name)}
+              %tr{id: ("//dash_ref_#{category.id.strip.gsub(/\//, '%2F')}/Entry/#{(entry.name) ? entry.tags_stripped_name.strip.gsub(/\//, '%2F') : entry.index_name.strip.gsub(/\//, '%2F')}/0" if (entry.name || entry.index_name) )}
                 - if entry.command
                   %td.command
                     - entry.command.each do |command|
@@ -47,9 +47,10 @@
                     %td.td_command
                       - if !command.empty?
                         %code= CGI.escapeHTML(command)
-                %td.description{:colspan => ("2" unless entry.command || entry.td_command || entry.td_notes)}
-                  .name~ entry.name
-                  .notes~ entry.notes
+                - if entry.name || entry.notes
+                  %td.description{:colspan => ("2" unless entry.command || entry.td_command || entry.td_notes)}
+                    .name~ entry.name
+                    .notes~ entry.notes
                 - if entry.td_notes
                   - entry.td_notes.each do |notes|
                     %td.td_notes

data/lib/cheatset/version.rb

@@ -1,3 +1,3 @@
 module Cheatset
-  VERSION = '1.2.14'
+  VERSION = '1.2.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheatset
 version: !ruby/object:Gem::Version
-  version: 1.2.14
+  version: 1.2.15
 platform: ruby
 authors:
 - Bogdan Popescu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler