staticpress 0.5.2 → 0.6.0

data/features/support/env.rb

@@ -1,3 +1,27 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib'))
-
 require 'aruba/cucumber'
+
+require 'compass'
+require 'debugger'
+require 'haml'
+require 'redcarpet'
+require 'sass'
+
+require_relative '../../lib/staticpress'
+
+module IntegrationHelpers
+  def create_sample_blog(title = 'Transient Thoughts')
+    blog_title = title ? "'#{title}'" : nil
+    run_simple "staticpress new temporary_blog #{blog_title}"
+    cd('temporary_blog')
+  end
+
+  def run_one_of(*commands)
+    run_simple commands.shuffle.first
+  end
+
+  def verify_directory_contains_file(directory, file)
+    check_directory_presence [directory], true
+    check_file_presence ["#{directory}/#{file}"], true
+  end
+end
+World IntegrationHelpers

data/lib/skeleton/config.ru

@@ -1,5 +1,4 @@
-require 'staticpress/booter'
-require 'staticpress/server'
+require 'staticpress'
 
 use Rack::ShowStatus
 use Rack::ShowExceptions

data/lib/staticpress.rb

@@ -1,3 +1,11 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('./Gemfile')
+
+if File.exists?(ENV['BUNDLE_GEMFILE'])
+  require 'bundler'
+
+  Bundler.require
+end
+
 require 'pathname'
 
 module Staticpress
@@ -13,3 +21,34 @@ module Staticpress
     Pathname File.expand_path('..', __FILE__)
   end
 end
+
+require 'staticpress/js_object'
+require 'staticpress/error'
+require 'staticpress/helpers'
+require 'staticpress/configuration'
+
+require 'staticpress/content/resource_content'
+require 'staticpress/content/collection_content'
+require 'staticpress/content/static_content'
+
+require 'staticpress/content/base'
+require 'staticpress/content/category'
+require 'staticpress/content/index'
+require 'staticpress/content/page'
+require 'staticpress/content/post'
+require 'staticpress/content/tag'
+require 'staticpress/content/theme'
+
+require 'staticpress/cli'
+require 'staticpress/integrations'
+require 'staticpress/metadata'
+require 'staticpress/plugin'
+require 'staticpress/plugins'
+require 'staticpress/pusher'
+require 'staticpress/route'
+require 'staticpress/server'
+require 'staticpress/settings'
+require 'staticpress/site'
+require 'staticpress/theme'
+require 'staticpress/version'
+require 'staticpress/view_helpers'

data/lib/staticpress/cli.rb

@@ -4,15 +4,6 @@ require 'fileutils'
 require 'rack'
 require 'thor'
 
-require 'staticpress'
-require 'staticpress/error'
-require 'staticpress/helpers'
-require 'staticpress/plugin'
-require 'staticpress/pusher'
-require 'staticpress/settings'
-require 'staticpress/site'
-require 'staticpress/version'
-
 module Staticpress
   class CLI < Thor
     include Thor::Actions

data/lib/staticpress/configuration.rb

@@ -1,8 +1,5 @@
 require 'yaml'
 
-require 'staticpress'
-require 'staticpress/js_object'
-
 module Staticpress
   # IDEA look into configatron https://github.com/markbates/configatron
   # FIXME this class is hard to test
@@ -15,25 +12,13 @@ module Staticpress
     end
 
     def self.default
-      @default ||= lambda do
-        reply = YAML.load_file(Staticpress.root + 'skeleton' + 'config.yml')
-
-        reply[:template_engine_options] ||= {}
-
-        if defined? Compass
-          [ :sass, :scss ].each do |template_engine|
-            (reply[:template_engine_options][template_engine] ||= {}).merge!(Compass.sass_engine_options) do |key, first_choice, second_choice|
-              reply[:template_engine_options][template_engine].key?(key) ? first_choice : second_choice
-            end
-          end
-        end
-
-        new reply
-      end.call
+      @default ||= new(YAML.load_file(Staticpress.root + 'skeleton' + 'config.yml'))
     end
 
     def self.instance
-      new(default.to_hash.merge(YAML.load_file(Staticpress.blog_path + 'config.yml')))
+      custom_file = Staticpress.blog_path + 'config.yml'
+      custom = custom_file.file? ? YAML.load_file(custom_file) : {}
+      new(default.to_hash.merge(custom))
     end
   end
 end

data/lib/staticpress/content/base.rb

@@ -3,12 +3,6 @@ require 'rack/mime'
 require 'tilt'
 require 'yaml'
 
-require 'staticpress'
-require 'staticpress/metadata'
-require 'staticpress/route'
-require 'staticpress/theme'
-require 'staticpress/view_helpers'
-
 module Staticpress::Content
   class Base
     extend Staticpress::Helpers
@@ -39,8 +33,10 @@ module Staticpress::Content
     def content
       return @content if @content
 
+      # regex_frontmatter = /^\<!-{2,}${1}(?<frontmatter>.*)^-+>${1}/m
       regex_frontmatter = /^-{3}${1}(?<frontmatter>.*)^-{3}${1}/m
       regex_text = /(?<text>.*)/m
+      # regex = /(#{regex_frontmatter})?#{regex_text}/
       regex = /#{regex_frontmatter}#{regex_text}/
 
       c = template_path_content

data/lib/staticpress/content/category.rb

@@ -1,8 +1,3 @@
-require 'staticpress'
-require 'staticpress/content/base'
-require 'staticpress/content/collection_content'
-require 'staticpress/content/resource_content'
-
 module Staticpress::Content
   class Category < Base
     include CollectionContent

data/lib/staticpress/content/collection_content.rb

@@ -1,6 +1,3 @@
-require 'staticpress'
-require 'staticpress/content/resource_content'
-
 module Staticpress::Content
   module CollectionContent
     include ResourceContent

data/lib/staticpress/content/index.rb

@@ -1,8 +1,3 @@
-require 'staticpress'
-require 'staticpress/content/base'
-require 'staticpress/content/post'
-require 'staticpress/content/collection_content'
-
 module Staticpress::Content
   class Index < Base
     include CollectionContent

data/lib/staticpress/content/page.rb

@@ -1,11 +1,5 @@
 require 'pathname'
 
-require 'staticpress'
-require 'staticpress/content/base'
-require 'staticpress/content/resource_content'
-require 'staticpress/content/static_content'
-require 'staticpress/route'
-
 module Staticpress::Content
   class Page < Base
     include StaticContent

data/lib/staticpress/content/post.rb

@@ -1,8 +1,3 @@
-require 'staticpress'
-require 'staticpress/content/base'
-require 'staticpress/content/resource_content'
-require 'staticpress/route'
-
 module Staticpress::Content
   class Post < Base
     include ResourceContent

data/lib/staticpress/content/resource_content.rb

@@ -1,8 +1,5 @@
 require 'pathname'
 
-require 'staticpress'
-require 'staticpress/content/static_content'
-
 module Staticpress::Content
   module ResourceContent
     def find_supported_extensions(path)

data/lib/staticpress/content/static_content.rb

@@ -1,7 +1,5 @@
 require 'tilt'
 
-require 'staticpress'
-
 module Staticpress::Content
   module StaticContent
     # layout not needed for binary files

data/lib/staticpress/content/tag.rb

@@ -1,8 +1,3 @@
-require 'staticpress'
-require 'staticpress/content/base'
-require 'staticpress/content/collection_content'
-require 'staticpress/content/resource_content'
-
 module Staticpress::Content
   class Tag < Base
     include CollectionContent

data/lib/staticpress/content/theme.rb

@@ -1,9 +1,3 @@
-require 'staticpress'
-require 'staticpress/content/base'
-require 'staticpress/content/resource_content'
-require 'staticpress/content/static_content'
-require 'staticpress/route'
-
 module Staticpress::Content
   class Theme < Base
     include ResourceContent
@@ -20,6 +14,7 @@ module Staticpress::Content
       (Staticpress::Theme.new(params[:theme]).root + 'assets' + params[:asset_type] + params[:slug]).file?
     end
 
+    # https://github.com/sstephenson/hike
     def template_path
       Staticpress::Theme.new(params[:theme]).root + 'assets' + params[:asset_type] + "#{params[:slug]}#{template_extension}"
     end

data/lib/staticpress/helpers.rb

@@ -1,9 +1,5 @@
 require 'pathname'
 
-require 'staticpress'
-require 'staticpress/configuration'
-require 'staticpress/settings'
-
 module Staticpress
   module Helpers
     def config

data/lib/staticpress/integrations.rb

@@ -0,0 +1,14 @@
+if defined? Sass
+  theme_name = Staticpress::Configuration.instance.theme
+
+  sass_paths = [
+    (Staticpress.blog_path + 'themes' + theme_name + 'assets' + 'styles'),
+    (Staticpress.root + 'themes' + theme_name + 'assets' + 'styles')
+  ]
+
+  sass_paths << Compass.sass_engine_options[:load_paths] if defined? Compass
+
+  (sass_paths.flatten - Sass.load_paths).each do |path|
+    Sass.load_paths << path
+  end
+end

data/lib/staticpress/js_object.rb

@@ -1,7 +1,5 @@
 require 'ostruct'
 
-require 'staticpress'
-
 module Staticpress
   class JSObject < OpenStruct
     def -(other)

data/lib/staticpress/metadata.rb

@@ -1,6 +1,3 @@
-require 'staticpress'
-require 'staticpress/js_object'
-
 module Staticpress
   class Metadata < JSObject
     def <<(other)

data/lib/staticpress/plugin.rb

@@ -1,7 +1,3 @@
-require 'staticpress'
-require 'staticpress/error'
-require 'staticpress/helpers'
-
 module Staticpress
   module Plugin
     extend Staticpress::Helpers

data/lib/staticpress/plugins.rb

@@ -1,5 +1,3 @@
-require 'staticpress'
-
 module Staticpress
   module Plugins
   end

data/lib/staticpress/pusher.rb

@@ -1,7 +1,3 @@
-require 'staticpress'
-require 'staticpress/error'
-require 'staticpress/helpers'
-
 module Staticpress
   class Pusher
     extend Staticpress::Helpers

data/lib/staticpress/route.rb

@@ -1,6 +1,3 @@
-require 'staticpress'
-require 'staticpress/helpers'
-
 module Staticpress
   module Route
     extend Staticpress::Helpers

data/lib/staticpress/server.rb

@@ -1,7 +1,3 @@
-require 'staticpress'
-require 'staticpress/error'
-require 'staticpress/site'
-
 module Staticpress
   class Server
     def initialize

data/lib/staticpress/settings.rb

@@ -1,6 +1,3 @@
-require 'staticpress'
-require 'staticpress/js_object'
-
 module Staticpress
   class Settings < JSObject
     def self.default

data/lib/staticpress/site.rb

@@ -1,15 +1,5 @@
 require 'fileutils'
 
-require 'staticpress'
-require 'staticpress/content/index'
-require 'staticpress/content/category'
-require 'staticpress/content/tag'
-require 'staticpress/content/page'
-require 'staticpress/content/post'
-require 'staticpress/content/theme'
-require 'staticpress/helpers'
-require 'staticpress/metadata'
-
 module Staticpress
   class Site
     # ordered by priority

data/lib/staticpress/theme.rb

@@ -1,6 +1,3 @@
-require 'staticpress'
-require 'staticpress/helpers'
-
 module Staticpress
   class Theme
     extend Staticpress::Helpers

data/lib/staticpress/version.rb

@@ -2,7 +2,7 @@ module Staticpress
   class Version
     extend Comparable
 
-    SIGNATURE = [0, 5, 2]
+    SIGNATURE = [0, 6, 0]
 
     def self.<=>(other)
       other = other.split('.').map(&:to_i) if other.respond_to? :split

data/lib/staticpress/view_helpers.rb

@@ -1,8 +1,3 @@
-require 'staticpress'
-require 'staticpress/helpers'
-require 'staticpress/plugin'
-require 'staticpress/plugins'
-
 module Staticpress
   class ViewHelpers
     include Staticpress::Helpers

data/lib/themes/basic/assets/styles/_normalize.scss

@@ -0,0 +1,520 @@
+/*! normalize.css 2012-03-09T22:11 UTC - http://github.com/necolas/normalize.css */
+
+/* =============================================================================
+   HTML5 display definitions
+   ========================================================================== */
+
+/*
+ * Corrects block display not defined in IE6/7/8/9 & FF3
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section,
+summary {
+    display: block;
+}
+
+/*
+ * Corrects inline-block display not defined in IE6/7/8/9 & FF3
+ */
+
+audio,
+canvas,
+video {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+}
+
+/*
+ * Prevents modern browsers from displaying 'audio' without controls
+ * Remove excess height in iOS5 devices
+ */
+
+audio:not([controls]) {
+    display: none;
+    height: 0;
+}
+
+/*
+ * Addresses styling for 'hidden' attribute not present in IE7/8/9, FF3, S4
+ * Known issue: no IE6 support
+ */
+
+[hidden] {
+    display: none;
+}
+
+
+/* =============================================================================
+   Base
+   ========================================================================== */
+
+/*
+ * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
+ *    http://clagnut.com/blog/348/#c790
+ * 2. Prevents iOS text size adjust after orientation change, without disabling user zoom
+ *    www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
+ */
+
+html {
+    font-size: 100%; /* 1 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+    -ms-text-size-adjust: 100%; /* 2 */
+}
+
+/*
+ * Addresses font-family inconsistency between 'textarea' and other form elements.
+ */
+
+html,
+button,
+input,
+select,
+textarea {
+    font-family: sans-serif;
+}
+
+/*
+ * Addresses margins handled incorrectly in IE6/7
+ */
+
+body {
+    margin: 0;
+}
+
+
+/* =============================================================================
+   Links
+   ========================================================================== */
+
+/*
+ * Addresses outline displayed oddly in Chrome
+ */
+
+a:focus {
+    outline: thin dotted;
+}
+
+/*
+ * Improves readability when focused and also mouse hovered in all browsers
+ * people.opera.com/patrickl/experiments/keyboard/test
+ */
+
+a:hover,
+a:active {
+    outline: 0;
+}
+
+
+/* =============================================================================
+   Typography
+   ========================================================================== */
+
+/*
+ * Addresses font sizes and margins set differently in IE6/7
+ * Addresses font sizes within 'section' and 'article' in FF4+, Chrome, S5
+ */
+
+h1 {
+    font-size: 2em;
+    margin: 0.67em 0;
+}
+
+h2 {
+    font-size: 1.5em;
+    margin: 0.83em 0;
+}
+
+h3 {
+    font-size: 1.17em;
+    margin: 1em 0;
+}
+
+h4 {
+    font-size: 1em;
+    margin: 1.33em 0;
+}
+
+h5 {
+    font-size: 0.83em;
+    margin: 1.67em 0;
+}
+
+h6 {
+    font-size: 0.75em;
+    margin: 2.33em 0;
+}
+
+/*
+ * Addresses styling not present in IE7/8/9, S5, Chrome
+ */
+
+abbr[title] {
+    border-bottom: 1px dotted;
+}
+
+/*
+ * Addresses style set to 'bolder' in FF3+, S4/5, Chrome
+*/
+
+b,
+strong {
+    font-weight: bold;
+}
+
+blockquote {
+    margin: 1em 40px;
+}
+
+/*
+ * Addresses styling not present in S5, Chrome
+ */
+
+dfn {
+    font-style: italic;
+}
+
+/*
+ * Addresses styling not present in IE6/7/8/9
+ */
+
+mark {
+    background: #ff0;
+    color: #000;
+}
+
+/*
+ * Addresses margins set differently in IE6/7
+ */
+
+p,
+pre {
+    margin: 1em 0;
+}
+
+/*
+ * Corrects font family set oddly in IE6, S4/5, Chrome
+ * en.wikipedia.org/wiki/User:Davidgothberg/Test59
+ */
+
+pre,
+code,
+kbd,
+samp {
+    font-family: monospace, serif;
+    _font-family: 'courier new', monospace;
+    font-size: 1em;
+}
+
+/*
+ * Improves readability of pre-formatted text in all browsers
+ */
+
+pre {
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+/*
+ * 1. Addresses CSS quotes not supported in IE6/7
+ * 2. Addresses quote property not supported in S4
+ */
+
+/* 1 */
+
+q {
+    quotes: none;
+}
+
+/* 2 */
+
+q:before,
+q:after {
+    content: '';
+    content: none;
+}
+
+small {
+    font-size: 75%;
+}
+
+/*
+ * Prevents sub and sup affecting line-height in all browsers
+ * gist.github.com/413930
+ */
+
+sub,
+sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+
+sup {
+    top: -0.5em;
+}
+
+sub {
+    bottom: -0.25em;
+}
+
+
+/* =============================================================================
+   Lists
+   ========================================================================== */
+
+/*
+ * Addresses margins set differently in IE6/7
+ */
+
+dl,
+menu,
+ol,
+ul {
+    margin: 1em 0;
+}
+
+dd {
+    margin: 0 0 0 40px;
+}
+
+/*
+ * Addresses paddings set differently in IE6/7
+ */
+
+menu,
+ol,
+ul {
+    padding: 0 0 0 40px;
+}
+
+/*
+ * Corrects list images handled incorrectly in IE7
+ */
+
+nav ul,
+nav ol {
+    list-style: none;
+    list-style-image: none;
+}
+
+
+/* =============================================================================
+   Embedded content
+   ========================================================================== */
+
+/*
+ * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3
+ * 2. Improves image quality when scaled in IE7
+ *    code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/
+ */
+
+img {
+    border: 0; /* 1 */
+    -ms-interpolation-mode: bicubic; /* 2 */
+}
+
+/*
+ * Corrects overflow displayed oddly in IE9
+ */
+
+svg:not(:root) {
+    overflow: hidden;
+}
+
+
+/* =============================================================================
+   Figures
+   ========================================================================== */
+
+/*
+ * Addresses margin not present in IE6/7/8/9, S5, O11
+ */
+
+figure {
+    margin: 0;
+}
+
+
+/* =============================================================================
+   Forms
+   ========================================================================== */
+
+/*
+ * Corrects margin displayed oddly in IE6/7
+ */
+
+form {
+    margin: 0;
+}
+
+/*
+ * Define consistent border, margin, and padding
+ */
+
+fieldset {
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
+}
+
+/*
+ * 1. Corrects color not being inherited in IE6/7/8/9
+ * 2. Corrects text not wrapping in FF3
+ * 3. Corrects alignment displayed oddly in IE6/7
+ */
+
+legend {
+    border: 0; /* 1 */
+    padding: 0;
+    white-space: normal; /* 2 */
+    *margin-left: -7px; /* 3 */
+}
+
+/*
+ * 1. Corrects font size not being inherited in all browsers
+ * 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome
+ * 3. Improves appearance and consistency in all browsers
+ */
+
+button,
+input,
+select,
+textarea {
+    font-size: 100%; /* 1 */
+    margin: 0; /* 2 */
+    vertical-align: baseline; /* 3 */
+    *vertical-align: middle; /* 3 */
+}
+
+/*
+ * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
+ */
+
+button,
+input {
+    line-height: normal; /* 1 */
+}
+
+/*
+ * 1. Improves usability and consistency of cursor style between image-type 'input' and others
+ * 2. Corrects inability to style clickable 'input' types in iOS
+ * 3. Removes inner spacing in IE7 without affecting normal text inputs
+ *    Known issue: inner spacing remains in IE6
+ */
+
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+    cursor: pointer; /* 1 */
+    -webkit-appearance: button; /* 2 */
+    *overflow: visible;  /* 3 */
+}
+
+/*
+ * Re-set default cursor for disabled elements
+ */
+
+button[disabled],
+input[disabled] {
+    cursor: default;
+}
+
+/*
+ * 1. Addresses box sizing set to content-box in IE8/9
+ * 2. Removes excess padding in IE8/9
+ * 3. Removes excess padding in IE7
+      Known issue: excess padding remains in IE6
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+    box-sizing: border-box; /* 1 */
+    padding: 0; /* 2 */
+    *height: 13px; /* 3 */
+    *width: 13px; /* 3 */
+}
+
+/*
+ * 1. Addresses appearance set to searchfield in S5, Chrome
+ * 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof)
+ */
+
+input[type="search"] {
+    -webkit-appearance: textfield; /* 1 */
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box; /* 2 */
+    box-sizing: content-box;
+}
+
+/*
+ * Removes inner padding and search cancel button in S5, Chrome on OS X
+ */
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+    -webkit-appearance: none;
+}
+
+/*
+ * Removes inner padding and border in FF3+
+ * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+/*
+ * 1. Removes default vertical scrollbar in IE6/7/8/9
+ * 2. Improves readability and alignment in all browsers
+ */
+
+textarea {
+    overflow: auto; /* 1 */
+    vertical-align: top; /* 2 */
+}
+
+/*
+ * Addresses placeholder color unset in Firefox
+ */
+
+:-moz-placeholder {
+    color: #a9a9a9;
+}
+
+/*
+ * Addresses placeholder text remaining visible on focus in Chrome
+ */
+
+:focus::-webkit-input-placeholder {
+    color: transparent;
+}
+
+
+/* =============================================================================
+   Tables
+   ========================================================================== */
+
+/*
+ * Remove most spacing between table cells
+ */
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}