diff --git a/Rules b/Rules index d28e143..13c479e 100644 --- a/Rules +++ b/Rules @@ -13,40 +13,59 @@ # item, use the pattern “/about/*/”; “/about/*” will also select the parent, # because “*” matches zero or more characters. -compile '*' do - if item.identifier == '/toc/' +compile '/assets/css/*' do + filter :erb + filter :rainpress if File.basename(item[:content_filename], ".*") == 'all' +end + +compile '/assets/js/*' do + filter :erb + filter :uglify_js if File.basename(item[:content_filename], ".*") == 'all' +end + +compile '/content/*' do + if item.identifier == '/content/toc/' filter :kramdown layout 'blank' - elsif item.identifier == '/footer/' + elsif item.identifier == '/content/footer/' layout 'blank' elsif item[:extension] == 'md' filter :kramdown, {:input => 'GFM'} filter :colorize_syntax, :default_colorizer => :pygmentize filter :relativize_paths, :type => :html layout 'default' - elsif item[:extension] == 'css' - elsif item[:extension] == 'js' - # don’t filter stylesheets, js - elsif item.binary? - # don’t filter binary items else filter :erb layout 'default' end end -route '*' do - if item[:extension] == 'css' - # Write item with identifier /foo/ to /foo.css +route '/assets/css/*' do + # if not debug mode, only let all.css through + unless @config[:debug] + item.identifier.chop + '.css' if File.basename(item[:content_filename], ".*") == 'all' + else item.identifier.chop + '.css' - elsif item[:extension] == 'js' + end +end + +route '/assets/js/*' do + # if not debug mode, only let all.js through + unless @config[:debug] + item.identifier.chop + '.js' if File.basename(item[:content_filename], ".*") == 'all' + else item.identifier.chop + '.js' - elsif item.binary? + end +end + + +route '/content/*' do + if item.binary? # Write item with identifier /foo/ to /foo.ext - item.identifier.chop + '.' + item[:extension] + item.identifier.sub("/content", "").chop + '.' + item[:extension] else # Write item with identifier /foo/ to /foo/index.html - item.identifier + 'index.html' + item.identifier.sub("/content", "") + 'index.html' end end diff --git a/content/assets/css/all.css b/content/assets/css/all.css new file mode 100644 index 0000000..f385aa0 --- /dev/null +++ b/content/assets/css/all.css @@ -0,0 +1 @@ +<%= all_css @config[:stylesheets] %> diff --git a/content/stylesheets/colorful.css b/content/assets/css/colorful.css similarity index 100% rename from content/stylesheets/colorful.css rename to content/assets/css/colorful.css diff --git a/content/stylesheets/cotton_candy.css b/content/assets/css/cotton_candy.css similarity index 100% rename from content/stylesheets/cotton_candy.css rename to content/assets/css/cotton_candy.css diff --git a/content/stylesheets/main.css b/content/assets/css/main.css similarity index 100% rename from content/stylesheets/main.css rename to content/assets/css/main.css diff --git a/content/assets/css/normalize.css b/content/assets/css/normalize.css new file mode 100644 index 0000000..b6a2510 --- /dev/null +++ b/content/assets/css/normalize.css @@ -0,0 +1 @@ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0} diff --git a/content/assets/js/all.js b/content/assets/js/all.js new file mode 100644 index 0000000..30b2c4c --- /dev/null +++ b/content/assets/js/all.js @@ -0,0 +1 @@ +<%= all_js @config[:scripts] %> diff --git a/content/js/main.js b/content/assets/js/main.js similarity index 100% rename from content/js/main.js rename to content/assets/js/main.js diff --git a/content/arrays.md b/content/content/arrays.md similarity index 100% rename from content/arrays.md rename to content/content/arrays.md diff --git a/content/bitsets.md b/content/content/bitsets.md similarity index 100% rename from content/bitsets.md rename to content/content/bitsets.md diff --git a/content/block.md b/content/content/block.md similarity index 100% rename from content/block.md rename to content/content/block.md diff --git a/content/case.md b/content/content/case.md similarity index 100% rename from content/case.md rename to content/content/case.md diff --git a/content/exceptions.md b/content/content/exceptions.md similarity index 100% rename from content/exceptions.md rename to content/content/exceptions.md diff --git a/content/footer.md b/content/content/footer.md similarity index 100% rename from content/footer.md rename to content/content/footer.md diff --git a/content/for_iterators.md b/content/content/for_iterators.md similarity index 100% rename from content/for_iterators.md rename to content/content/for_iterators.md diff --git a/content/getting_started.md b/content/content/getting_started.md similarity index 100% rename from content/getting_started.md rename to content/content/getting_started.md diff --git a/content/hello_world.md b/content/content/hello_world.md similarity index 100% rename from content/hello_world.md rename to content/content/hello_world.md diff --git a/content/if_else_while.md b/content/content/if_else_while.md similarity index 100% rename from content/if_else_while.md rename to content/content/if_else_while.md diff --git a/content/index.md b/content/content/index.md similarity index 100% rename from content/index.md rename to content/content/index.md diff --git a/content/oop.md b/content/content/oop.md similarity index 100% rename from content/oop.md rename to content/content/oop.md diff --git a/content/oop_macro.md b/content/content/oop_macro.md similarity index 100% rename from content/oop_macro.md rename to content/content/oop_macro.md diff --git a/content/primitives.md b/content/content/primitives.md similarity index 100% rename from content/primitives.md rename to content/content/primitives.md diff --git a/content/procs.md b/content/content/procs.md similarity index 100% rename from content/procs.md rename to content/content/procs.md diff --git a/content/procvars.md b/content/content/procvars.md similarity index 100% rename from content/procvars.md rename to content/content/procvars.md diff --git a/content/seqs.md b/content/content/seqs.md similarity index 97% rename from content/seqs.md rename to content/content/seqs.md index e6b43ab..5cf84d7 100644 --- a/content/seqs.md +++ b/content/content/seqs.md @@ -19,7 +19,7 @@ for i, v in a: for i in 4..100: b.add(i * i) -b.delete(0) # takes «O(n)» time +b.delete(0) # takes O(n) time b = a[0] & b # Same as original b ``` diff --git a/content/strings.md b/content/content/strings.md similarity index 100% rename from content/strings.md rename to content/content/strings.md diff --git a/content/toc.md b/content/content/toc.md similarity index 100% rename from content/toc.md rename to content/content/toc.md diff --git a/content/types.md b/content/content/types.md similarity index 100% rename from content/types.md rename to content/content/types.md diff --git a/content/types/distinct.md b/content/content/types/distinct.md similarity index 100% rename from content/types/distinct.md rename to content/content/types/distinct.md diff --git a/content/types/enums.md b/content/content/types/enums.md similarity index 100% rename from content/types/enums.md rename to content/content/types/enums.md diff --git a/content/types/objects.md b/content/content/types/objects.md similarity index 100% rename from content/types/objects.md rename to content/content/types/objects.md diff --git a/content/types/range.md b/content/content/types/range.md similarity index 100% rename from content/types/range.md rename to content/content/types/range.md diff --git a/content/varargs.md b/content/content/varargs.md similarity index 100% rename from content/varargs.md rename to content/content/varargs.md diff --git a/content/variables.md b/content/content/variables.md similarity index 100% rename from content/variables.md rename to content/content/variables.md diff --git a/content/variables/result.md b/content/content/variables/result.md similarity index 100% rename from content/variables/result.md rename to content/content/variables/result.md diff --git a/content/variables/type_casting_inference.md b/content/content/variables/type_casting_inference.md similarity index 100% rename from content/variables/type_casting_inference.md rename to content/content/variables/type_casting_inference.md diff --git a/content/fonts/fontelloe.eot b/content/fonts/fontelloe.eot deleted file mode 100644 index cffe901..0000000 Binary files a/content/fonts/fontelloe.eot and /dev/null differ diff --git a/content/fonts/fontellos.svg b/content/fonts/fontellos.svg deleted file mode 100644 index 5a187a3..0000000 --- a/content/fonts/fontellos.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - -Copyright (C) 2014 by original authors @ fontello.com - - - - - - - - - - \ No newline at end of file diff --git a/content/fonts/fontellot.ttf b/content/fonts/fontellot.ttf deleted file mode 100644 index 6f31fe8..0000000 Binary files a/content/fonts/fontellot.ttf and /dev/null differ diff --git a/content/fonts/fontellow.woff b/content/fonts/fontellow.woff deleted file mode 100644 index 5be5972..0000000 Binary files a/content/fonts/fontellow.woff and /dev/null differ diff --git a/content/stylesheets/fontello.css b/content/stylesheets/fontello.css deleted file mode 100644 index 082daba..0000000 --- a/content/stylesheets/fontello.css +++ /dev/null @@ -1,30 +0,0 @@ -@font-face { - font-family: 'fontello'; - src: url('/fonts/fontelloe.eot?23005170'); - src: url('/fonts/fontelloe.eot?23005170#iefix') format('embedded-opentype'), - url('/fonts/fontellow.woff?23005170') format('woff'), - url('/fonts/fontellot.ttf?23005170') format('truetype'), - url('/fonts/fontellos.svg?23005170#fontello') format('svg'); - font-weight: normal; - font-style: normal; -} - -[class^="icon-"]:before, [class*=" icon-"]:before { - font-family: "fontello"; - font-style: normal; - font-weight: normal; - speak: none; - - display: inline-block; - text-decoration: inherit; - width: 1em; - margin-right: .2em; - text-align: center; - - font-variant: normal; - text-transform: none; -} - -.icon-check:before { content: '\e800'; } /* '' */ -.icon-star:before { content: '\e801'; } /* '' */ -.icon-fork:before { content: '\e802'; } /* '' */ \ No newline at end of file diff --git a/layouts/default.html b/layouts/default.html index 41b10d5..0c71eee 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -2,28 +2,28 @@ - Nim by Example - <%= @item[:title] %> - - - - - - - + <% if @config[:debug] %> + <% for file in @config[:stylesheets] %> + .css"> + <% end %> + <% for file in @config[:scripts] %> + + <% end %> + <% else %> + + + <% end %> + Nim by Example - <%= @item[:title] %> + @@ -33,7 +33,7 @@ @@ -47,7 +47,7 @@ diff --git a/lib/helpers.rb b/lib/helpers.rb new file mode 100644 index 0000000..28bda4a --- /dev/null +++ b/lib/helpers.rb @@ -0,0 +1,19 @@ +def all_js(files) + js_arr = [] + for file in files + item = @items.find{|i| i.identifier == "/assets/js/#{file}/"} + puts "File #{file} doesn't exist!" unless item + js_arr << item.compiled_content + end + js_arr.join("\n") +end + +def all_css(files) + css_arr = [] + for file in files + item = @items.find{|i| i.identifier == "/assets/css/#{file}/"} + puts "File #{file} doesn't exist!" unless item + css_arr << item.compiled_content + end + css_arr.join("\n") +end diff --git a/nanoc.yaml b/nanoc.yaml index bf8c595..349101f 100644 --- a/nanoc.yaml +++ b/nanoc.yaml @@ -60,3 +60,14 @@ data_sources: # The default encoding for all files in `content/` and `layouts/`. encoding: utf-8 + + +debug: false + +scripts: + - main + +stylesheets: + - normalize + - colorful + - main diff --git a/wercker.yml b/wercker.yml index f780e54..bad2a2f 100644 --- a/wercker.yml +++ b/wercker.yml @@ -1,4 +1,4 @@ -box: flaviut/nim-by-example-build-vm@0.0.6 +box: flaviut/nim-by-example-build-vm@0.0.7 build: steps: - script: