dasheets 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjJjMWNkOTYwMzU1N2Q5ZTZiMGYxYzE3NGVhMDk2OWM0NjNjOTAzNA==
-  data.tar.gz: !binary |-
-    NDliZTI5ODcwOGRmNjVlNjc5NjYyNGU3ODcyMTAzMWU2MDIzYTZlNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OTM2YmFiMGI0MTczOWQzOTMxNWQzOGUxNDI1ZjAwZDdiMDZmMWU2ZDgzZTlk
-    ZWFiNWFmMGNlNzgzZDA1NTk5YjZiZjkwOGJmMTI4ZTA4M2I1OTU4N2YwMzUy
-    NTJhMTdjNzk2NWRmNjg3ZDA5MDU3MDE1NDI3MWRhOTIzNGQ2Y2M=
-  data.tar.gz: !binary |-
-    ZmNlOGY4Y2FjYjFlZGFiNDk5N2E2YWZmOGUxNzkzZDJmNGM5ZmZmZGZjN2Jh
-    ZmYxNjcyYzAxNjdhMGJkYzNlYWU4Njc5MGRmZmQ3OTVlNzQ4NGQwNDYzODRj
-    OGYyZGUyNDFjZTllOGVjZjcyYTM3YTg3ZGUyZDgwNmMwOTRmNjY=
+SHA1:
+  metadata.gz: 62b108dde9128cfabd4d010435fde4a59112ed8a
+  data.tar.gz: c15937f60fe7ff9d2292969895ef551059b6c0f9
+SHA512:
+  metadata.gz: be969821c53733a94677b70dc1584afaad22448ecbc803d14d5147c1d865f08a44825e166cfe54bf6deff56f975365019baf2eaee7b00e0c153ef06a48dbd472
+  data.tar.gz: 20d90d53c701d30dfcd18f28198ed55c41f2b41b52b38fecb65de9f906ee36d1ea348a444cecf495ca4bd67ab9bbd7c473d125ee36164f65ea22c324e2af71a0

data/TODO

@@ -1,5 +1,5 @@
 TODO
 * Better documentation, more examples, ...
-* Render nice HTML
+* Even nicer HTML ;-)
 * Icon
-* minidown
+* http://badge.fury.io/for/rb/dasheets

data/dasheets.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'haml', '~> 4.0.3'
   spec.add_dependency 'sqlite3', '~> 1.3.8'
   spec.add_dependency 'plist', '~> 3.1.0'
+  spec.add_dependency 'minidown', '~> 1.0.0'
 end

data/lib/dasheets/dsl/cheatsheet.rb

@@ -17,5 +17,12 @@ class Dasheets::DSL::Cheatsheet
     @short_name = s if s
     @short_name
   end
+  def introduction(i = nil)
+    @introduction = Minidown.parse(i).to_html if i
+    @introduction
+  end
+  def notes(n = nil)
+    @notes = Minidown.parse(n).to_html if n
+    @notes
+  end
 end
-

data/lib/dasheets/dsl/entry.rb

@@ -1,9 +1,15 @@
+require 'minidown'
+
+# TODO: Refactor Minidown usage?
+
 class Dasheets::DSL::Entry
   def initialize(&block)
     instance_eval(&block)
   end
   def name(name = nil)
-    @name = name if name
+    if name
+      @name = Minidown.parse(name).to_html
+    end
     @name
   end
   def command(c = nil)
@@ -11,7 +17,9 @@ class Dasheets::DSL::Entry
     @command
   end
   def notes(n = nil)
-    @notes = n if n
+    if n
+      @notes = Minidown.parse(n).to_html
+    end
     @notes
   end
 end

data/lib/dasheets/templates/style.css

@@ -1,16 +1,10 @@
-/* wkhmtmltopdf needs true-type fonts */
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf) format('truetype');
-}
-@font-face {
-  font-family: 'Droid Sans Mono';
-  font-style: normal;
-  font-weight: 400;
-  src: url(http://themes.googleusercontent.com/static/fonts/droidsansmono/v4/ns-m2xQYezAtqh7ai59hJYW_AySPyikQrZReizgrnuw.ttf) format('truetype');
-}
+/*
+#050405
+#041F38
+#1C4E70
+#40738F
+#E8F0F8
+*/
 
 h1, h2, h3, p, blockquote {
   margin: 0;
@@ -18,20 +12,46 @@ h1, h2, h3, p, blockquote {
 }
 body {
   font-family: 'Open Sans', sans-serif;
-  font-size: 10px;
-  line-height: 13px;
-  color: black;
-  background-color: white;
-  margin: 10px 13px;
+  font-size: 14px;
+  line-height: 1.5em;
+  color: #050405;
+  background-color: #E8F0F8;
+  margin: 0;
+}
+
+header {
+  color: #E8F0F8;
+  background-color: #041F38;
+  padding: 1em;
+}
+article {
+  margin: 1em;
+}
+footer {
+  margin: 1em;
+  background-color: #1C4E70;
+  color: #E8F0F8;
+  padding: .5em;
+  border-radius: .5em;
+  text-align: center;
 }
+footer a {
+  color: #E8F0F8;
+}
+
 table {
-  margin: 10px 0 15px 0;
   border-collapse: collapse;
-  font-size: 10px;
+  border: 2px solid #40738F;
+  border-radius: 10px;
+  margin-bottom: .1em;
+  width: 100%;
 }
+
 td, th {
-  border: 1px solid #ddd;
-  padding: 1px 10px;
+  padding: .1em .1em 2em .1em;
+}
+td.command {
+  min-width: 25%;
 }
 
 a {
@@ -41,34 +61,33 @@ p {
   margin-bottom: 9px;
 }
 h1, h2, h3 {
-  color: #404040;
   line-height: 36px;
+  margin: 1em 0 .5em 0;
 }
 h1 {
-  margin-bottom: 18px;
-  font-size: 30px;
+  font-family: Lobster, sans-serif;
+  font-size: 48px;
 }
 h2 {
   font-size: 24px;
 }
 h3 {
-  font-size: 18px;
+  font-size: 1.2em;
 }
 
 code, pre {
-    font-family: 'Droid Sans Mono', monospace;
+  font-family: 'Droid Sans Mono', monospace;
 }
 code {
-    background-color: #fee9cc;
-    color: black;
-    padding: 1px 3px;
-    font-size: 10px;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-}
-table, pre {
-  page-break-inside: avoid;
+  background-color: #40738F;
+  color: #E8F0F8;
+  padding: .1em .3em;
+  border-radius: .5em;
+  font-size: 1.5em;
 }
 
+th {
+  color: #E8F0F8;
+  background-color: #40738F;
+}
 

data/lib/dasheets/templates/template.haml

@@ -3,20 +3,31 @@
   %head
     %meta{charset: 'utf-8'}
     %title= title
+    %link{href: 'http://fonts.googleapis.com/css?family=Droid+Sans+Mono|Lobster|Open+Sans',
+          rel: 'stylesheet', type: 'text/css'}
     %link{rel: 'stylesheet', href: 'style.css'}
   %body
+    %header
+      %h1= title
 
-    %h1= title
-    - categories.each do |category|
-      %h2= category.id
-      %table
-        %tr
-          %th command
-          %th name
-          %th notes
-        - category.entries.each_with_index do |entry, index|
-          %tr{id: "#{category.id}-#{index}"}
-            %td
-              %code= entry.command
-            %td= entry.name
-            %td= entry.notes
+    %article
+      %p= introduction
+
+      - categories.each do |category|
+        %table
+          %tr
+            %th{colspan: 2}
+              %h2= category.id
+          - category.entries.each_with_index do |entry, index|
+            %tr{id: "#{category.id}-#{index}"}
+              %td.command
+                %code= entry.command
+              %td
+                %h3= entry.name
+                %div= entry.notes
+      - if notes
+        %h2 Notes
+        = notes
+    %footer
+      Generated with
+      %a{href: 'https://github.com/Nix-wie-weg/dasheets'} Dasheets

data/lib/dasheets/version.rb

@@ -1,3 +1,3 @@
 module Dasheets
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/dasheets.rb

@@ -1,4 +1,5 @@
 require 'dasheets/version'
+require 'minidown'
 
 module Dasheets
   module DSL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dasheets
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Florian Dütsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,28 +28,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -94,6 +94,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: minidown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Generate cheatsheets for Dash
 email:
 - florian.duetsch@nix-wie-weg.de
@@ -131,17 +145,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Generate cheatsheets for Dash