cheatset 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 287b19e5092a86f311ac04482869208985284075
-  data.tar.gz: 42bb3abd7ca555231ea61f562e07c306fe8532a0
+  metadata.gz: 6ff7c204890ac4b633dd4d8f6e572552ad729668
+  data.tar.gz: d528124246da08fec16b427f9b45be02ada11b9c
 SHA512:
-  metadata.gz: 880142429021cdcb6ba297bd43cb326ccaa7e2a366036e14e56cd1c6b892be2d3acb018e1be8fccbbfbcc3ceed9c581401e66db32f252b29a8c7241821a52b85
-  data.tar.gz: 10f45dbf94feaba424ea11ab49999f46afbdd2532a81e33aa0849930e408ee81c41ec21778da6b91c51b2f3feb65c5cf5fc93b35fd559ad0ac2217b05d877cfe
+  metadata.gz: ab416caa56ba8d044075c7d70d8ef51a44245695aa10a47a49c6a4a04394a7b49795dcf11dbcba1370c222e4c999ff10eda3a7b6e9b13bb7d91ad4930a09a4fb
+  data.tar.gz: abf59ef9dde9210cb76c9723cd385e496cc65efa0a74094aa03465900fbdef884b4dc8e6608a4d24f65d1983c340be31c78f2cf898487fde06f41c61c51c1d94

data/README.md

@@ -16,7 +16,7 @@ Write a file (here `sample.cheatsheet`) containing your cheatsheet data, e.g.:
 
 ```ruby
 cheatsheet do
-  title 'Sample Cheatsheet'  # Will be displayed by Dash in the docset list
+  title 'Sample'  # Will be displayed by Dash in the docset list
   short_name 'sample'  # Used for the filename of the docset
   introduction 'My *awesome* cheatsheet'  # Can contain markdown and multiple lines
 
@@ -26,7 +26,7 @@ cheatsheet do
 
     entry do
       command 'CMD-n'        # Optional
-      command 'CMD-N'        # Can have more than one command
+      command 'CMD-N'        # Multiple commands are supported
       name 'Create window'   # A short name, can contain markdown
       notes 'Some notes'     # Optional longer explanation, can contain markdown
     end

data/lib/cheatset/creator.rb

@@ -3,6 +3,7 @@ require 'sqlite3'
 require 'fileutils'
 require 'haml'
 require 'ostruct'
+require 'uri'
 
 class Cheatset::Creator
   def initialize(cheatsheet)
@@ -67,7 +68,7 @@ class Cheatset::Creator
       CREATE UNIQUE INDEX anchor ON searchIndex (name, type, path);
     SQL
     @cheatsheet.categories.each do |category|
-      category_strip = category.id.strip.gsub(/\//, '%2F');
+      category_strip = URI.escape(category.id.strip).gsub(/\//, '%252F');
       sql = 'INSERT INTO searchIndex(name, type, path) VALUES (?, ?, ?)'
       db.execute(sql, category.id, 'Category',
                  "index.html\#//dash_ref/Category/#{category_strip}/1")
@@ -75,11 +76,13 @@ class Cheatset::Creator
         if entry.command
           entry.command.each do |command|
             db.execute(sql, command.strip, 'Command',
-                       "index.html\#//dash_ref_#{category_strip}/Entry/#{entry.tags_stripped_name.strip.gsub(/\//, '%2F')}/0")
+                       "index.html\#//dash_ref_#{category_strip}/Entry/#{URI.escape(entry.tags_stripped_name.strip).gsub(/\//, '%252F')}/0")
           end
         end
-        db.execute(sql, entry.tags_stripped_name.strip, 'Entry',
-                   "index.html\#//dash_ref_#{category_strip}/Entry/#{entry.tags_stripped_name.strip.gsub(/\//, '%2F')}/0")
+        if entry.name
+          db.execute(sql, entry.tags_stripped_name.strip, 'Entry',
+                   "index.html\#//dash_ref_#{category_strip}/Entry/#{URI.escape(entry.tags_stripped_name.strip).gsub(/\//, '%252F')}/0")
+        end
       end
     end
   end

data/lib/cheatset/templates/style.css

@@ -79,7 +79,8 @@ td.command {
   width: 1%;
   white-space: nowrap;
   vertical-align: top;
-  padding: 8px 8px 0 7px; }
+  padding: 8px 8px 4px 7px;
+  text-align: right; }
   td.command code {
     padding: .1em .6em;
     box-shadow: 0 1px 0px rgba(0, 0, 0, 0.2), 0 0 0 2px white inset;

data/lib/cheatset/templates/style.scss

@@ -97,7 +97,8 @@ td.command {
   width: 1%;
   white-space: nowrap;
   vertical-align: top;
-  padding: 8px 8px 0 7px;
+  padding: 8px 8px 4px 7px;
+  text-align:right;
   code {
     // Nice key styling:
     // https://developers.google.com/chrome-developer-tools/docs/shortcuts

data/lib/cheatset/templates/template.haml

@@ -7,7 +7,8 @@
     - categories.each do |category|
       %link{href: "//dash_ref/Category/#{category.id.strip.gsub(/\//, '%2F')}/1"}
       - category.entries.each_with_index do |entry, index|
-        %link{href: "//dash_ref_#{category.id.strip.gsub(/\//, '%2F')}/Entry/#{entry.tags_stripped_name.strip.gsub(/\//, '%2F')}/0"}
+        - if entry.name
+          %link{href: "//dash_ref_#{category.id.strip.gsub(/\//, '%2F')}/Entry/#{entry.tags_stripped_name.strip.gsub(/\//, '%2F')}/0"}
   %body
     %header
       %h1= title
@@ -21,13 +22,13 @@
             = category.id
           %table
             - 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"}
+              %tr{id: ("//dash_ref_#{category.id.strip.gsub(/\//, '%2F')}/Entry/#{entry.tags_stripped_name.strip.gsub(/\//, '%2F')}/0" if entry.name)}
                 - if entry.command
                   %td.command
                     - entry.command.each do |command|
                       %p
-                        %code= command
-                %td.description
+                        %code= CGI.escapeHTML(command)
+                %td.description{:colspan => ("2" unless entry.command)}
                   .name~ entry.name
                   .notes~ entry.notes
       - if notes
@@ -36,6 +37,6 @@
           ~ notes
     %footer
       - if source_url
-        You can modify and improve this cheatsheet <a href="#{source_url}">here</a>.
+        You can modify and improve this cheatsheet <a onclick="window.dash.openExternal_(this.href); return false;" href="#{source_url}">here</a>.
       - else
-        Generated with <a href='https://github.com/Kapeli/cheatset#readme'>cheatset</a>.
+        Generated with <a onclick="window.dash.openExternal_(this.href); return false;" href='https://github.com/Kapeli/cheatset#readme'>cheatset</a>.

data/lib/cheatset/version.rb

@@ -1,3 +1,3 @@
 module Cheatset
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheatset
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Bogdan Popescu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler