cheatset 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f28151b3283255cb45de365e5fe780d45a40d30
-  data.tar.gz: 56c4443a13322b2eebc99d16be10d28853b82f95
+  metadata.gz: ca0cc24cddcf9d78987370b974069d22aaa56dde
+  data.tar.gz: 0ec86bb8bad352172f30840555d225ba06206473
 SHA512:
-  metadata.gz: 928309b54495c39e848ffed4c4509dfbeee2fba8810f2cbb48f7a4a972be9b6757a3a860ba7b201ab7ba47e878f3b266c1f9c5bb61a3eedb817e68c628686dd3
-  data.tar.gz: 3d2a51abd1287d6f1bee3089ac7fa86e4094e322478b357191bd027737f6e62a08d668b971e5a8039a0eea751cc8ba12964fce3aee14bed64673ee98e3f0f0e8
+  metadata.gz: 898463cb1e2e65dd9b2e6f621a203e90a6eb97e783fcf04ee7cba96a90b24b205f321b656e8d099290a179d9d855d599a128594210395944dfa892501adbe6b0
+  data.tar.gz: 25f4ae59942847c6752b5f2de490d472a83375590f02422dee821bed83f8072751a015735d68d106818d12cf6940f16c90f9566344161673ff6f0c8e66f0734e

data/.gitignore

@@ -16,4 +16,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.sass-cache/
+.sass-cache/
+lib/cheatset/templates/template.html

data/lib/cheatset/creator.rb

@@ -6,8 +6,9 @@ require 'ostruct'
 require 'uri'
 
 class Cheatset::Creator
-  def initialize(cheatsheet)
+  def initialize(cheatsheet, filename)
     @cheatsheet = cheatsheet
+    @filename = filename
     @docset_path = "#{@cheatsheet.docset_file_name}.docset"
     @path = "#{@docset_path}/Contents/"
   end
@@ -39,7 +40,13 @@ class Cheatset::Creator
     FileUtils.cp("#{tpl_path}/style.css", doc_path)
 
     # resources
-    FileUtils.cp_r("#{tpl_path}/res", doc_path)
+    FileUtils.cp_r("#{tpl_path}/cheatset_resources", doc_path)
+    resources = @cheatsheet.resources
+    if !resources.empty?
+      base_dir = File.dirname(@filename)
+      resources_path = "#{base_dir}/#{resources}"
+      FileUtils.cp_r(resources_path, doc_path)
+    end
   end
 
   def generate_plist_file

data/lib/cheatset/dsl/base.rb

@@ -45,6 +45,23 @@ module Cheatset
           end
         end
       end
+      def self.define_markdown_list_attrs(*names)
+        names.each do |name|
+          define_method(name) do |val = nil|
+            if val
+              val = val.unindent
+              val = parse_markdown(val)
+              array = instance_variable_get("@#{name}")
+              if !array
+                instance_variable_set("@#{name}", [val])
+              else
+                instance_variable_set("@#{name}", array << val)
+              end
+            end
+            instance_variable_get("@#{name}")
+          end
+        end
+      end
       def self.define_markdown_attrs(*names)
         names.each do |name|
           define_method(name) do |val = nil|

data/lib/cheatset/dsl/category.rb

@@ -3,6 +3,7 @@ module Cheatset
     class Category < Base
       attr_reader :entries
       define_attrs :id, :hasEntry
+      define_list_attrs :header
 
       def initialize(&block)
         @entries = []

data/lib/cheatset/dsl/cheatsheet.rb

@@ -2,7 +2,7 @@ module Cheatset
   module DSL
     class Cheatsheet < Base
       attr_reader :categories
-      define_attrs :title, :docset_file_name, :keyword, :source_url, :platform, :style
+      define_attrs :title, :docset_file_name, :keyword, :source_url, :platform, :style, :resources
       define_markdown_attrs :introduction, :notes
 
       def initialize(&block)

data/lib/cheatset/dsl/context.rb

@@ -3,9 +3,10 @@ module Cheatset
     class Context
       def initialize(filename)
         instance_eval(File.read(filename))
+        @filename = filename
       end
       def generate
-        Cheatset::Creator.new(@data).generate
+        Cheatset::Creator.new(@data, @filename).generate
       end
       private
 

data/lib/cheatset/dsl/entry.rb

@@ -3,6 +3,7 @@ module Cheatset
     class Entry < Base
       define_list_attrs :command, :td_command
       define_markdown_attrs :name, :notes
+      define_markdown_list_attrs :td_notes
     end
   end
 end

data/lib/cheatset/templates/style.css

@@ -6,7 +6,7 @@ h1, h2, h3, p, blockquote {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 400;
-  src: local("Open Sans"), local("OpenSans"), url(res/Open_Sans.woff) format("woff"); }
+  src: local("Open Sans"), local("OpenSans"), url(cheatset_resources/Open_Sans.woff) format("woff"); }
 body {
   font-family: 'Open Sans', sans-serif;
   font-size: 14px;
@@ -95,12 +95,23 @@ td.td_command {
   text-align: center;
   border-right: 1px solid #666666; }
 
+td.td_notes {
+  border-left: 1px solid #666666; }
+
 td.description .name {
   font-size: 1.2em; }
 
 tr:nth-child(even) {
   background: #efefef; }
 
+th {
+  padding: 5px 2px 5px 8px;
+  text-align: left;
+  border-left: 1px solid #666666; }
+
+th:nth-child(1) {
+  border: none; }
+
 a {
   color: #666666; }
 

data/lib/cheatset/templates/style.scss

@@ -11,7 +11,7 @@ h1, h2, h3, p, blockquote {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 400;
-  src: local('Open Sans'), local('OpenSans'), url(res/Open_Sans.woff) format('woff');
+  src: local('Open Sans'), local('OpenSans'), url(cheatset_resources/Open_Sans.woff) format('woff');
 }
 
 body {
@@ -121,6 +121,10 @@ td.td_command {
   border-right: 1px solid $dark_gray;
 }
 
+td.td_notes {
+  border-left: 1px solid $dark_gray;
+}
+
 td.description {
   .name {
     font-size: 1.2em;
@@ -130,6 +134,16 @@ tr:nth-child(even) {
   background: $light_gray;
 }
 
+th {
+  padding:5px 2px 5px 8px;
+  text-align: left;
+  border-left: 1px solid $dark_gray;
+}
+
+th:nth-child(1) {
+  border:none;
+}
+
 a {
   color: $dark_gray;
 }

data/lib/cheatset/templates/template.haml

@@ -30,6 +30,11 @@
           %h2{id:"//dash_ref/Category/#{category.id.strip.gsub(/\//, '%2F')}/1"}
             = category.id
           %table
+            - if category.header
+              %tr
+                - category.header.each do |header|
+                  %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)}
                 - if entry.command
@@ -42,9 +47,14 @@
                     %td.td_command
                       - if !command.empty?
                         %code= CGI.escapeHTML(command)
-                %td.description{:colspan => ("2" unless entry.command || entry.td_command)}
+                %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
+                      - if !notes.empty?
+                        .td_notes~ notes
       - if notes
         %section.notes
           %h2 Notes

data/lib/cheatset/version.rb

@@ -1,3 +1,3 @@
 module Cheatset
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheatset
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Bogdan Popescu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ files:
 - lib/cheatset/dsl/context.rb
 - lib/cheatset/dsl/entry.rb
 - lib/cheatset/templates/.sass-cache/c0630dfea9543a0a71b68aca4887e98819b89684/style.scssc
-- lib/cheatset/templates/res/Open_Sans.woff
+- lib/cheatset/templates/cheatset_resources/Open_Sans.woff
 - lib/cheatset/templates/style.css
 - lib/cheatset/templates/style.scss
 - lib/cheatset/templates/template.haml