livingstyleguide 0.1.0 → 0.2.0

data/lib/livingstyleguide.rb

@@ -10,5 +10,5 @@ end
 Compass.configuration.add_import_path LivingStyleGuide::VariablesImporter.new
 
 base_directory = File.join(File.dirname(__FILE__), '..')
-Compass::Frameworks.register 'livingstyleguide', path: base_directory
+Compass::Frameworks.register 'livingstyleguide', :path => base_directory
 

data/lib/livingstyleguide/markdown_extensions.rb

@@ -6,12 +6,12 @@ require "erb"
 module LivingStyleGuide
   class RedcarpetTemplate < ::Tilt::RedcarpetTemplate::Redcarpet2
     RENDER_OPTIONS = {
-      autolink: true,
-      fenced_code_blocks: true,
-      tables: true,
-      strikethrough: true,
-      space_after_headers: true,
-      superscript: true
+      :autolink => true,
+      :fenced_code_blocks => true,
+      :tables => true,
+      :strikethrough => true,
+      :space_after_headers => true,
+      :superscript => true
     }
 
     def generate_renderer
@@ -45,7 +45,7 @@ module LivingStyleGuide
     end
 
     def header(text, header_level)
-      klass = %w(page-title headline sub-headline)[header_level]
+      klass = %w(page-title headline sub-headline sub-sub-headline)[header_level]
       header_level += 1
       %Q(<h#{header_level} class="livingstyleguide--#{klass}">#{text}</h#{header_level}>\n)
     end
@@ -74,7 +74,7 @@ module LivingStyleGuide
     end
 
     def list(contents, list_type)
-      tag_name = "#{list_type[0]}l"
+      tag_name = "#{list_type.to_s[0, 1]}l"
       %Q(<#{tag_name} class="livingstyleguide--#{list_type}-list">\n#{contents}</#{tag_name}>\n)
     end
 
@@ -89,7 +89,7 @@ module LivingStyleGuide
       else
         code = ERB::Util.html_escape(code).gsub(/&quot;/, '"')
         code = ::MiniSyntax.highlight(code.strip, language.to_s.strip.to_sym)
-        code.gsub! /^\s*\*\*\*\n(.+?)\n\s*\*\*\*\n/m, %Q(<strong class="livingstyleguide--code-highlight-block">\\1</strong>)
+        code.gsub! /^\s*\*\*\*\n(.+?)\n\s*\*\*\*(\n|$)/m, %Q(<strong class="livingstyleguide--code-highlight-block">\\1</strong>)
         code.gsub! /\*\*\*(.+?)\*\*\*/, %Q(<strong class="livingstyleguide--code-highlight">\\1</strong>)
         %Q(<pre class="livingstyleguide--code-block"><code class="livingstyleguide--code">#{code}</code></pre>)
       end

data/lib/livingstyleguide/variables_importer.rb

@@ -59,7 +59,7 @@ module LivingStyleGuide
     end
 
     def self.sass_options(uri, importer, options)
-      options.merge! filename: uri.gsub(%r{\*/},"*\\/"), syntax: :scss, importer: importer
+      options.merge! :filename => uri.gsub(%r{\*/},"*\\/"), :syntax => :scss, :importer => importer
     end
 
     def self.sass_engine(uri, name, importer, options)
@@ -68,7 +68,7 @@ module LivingStyleGuide
     end
 
     def self.content_for_images(uri, variables, skip_overrides = false)
-      binder = LivingStyleGuide::Binding.new(variables: variables)
+      binder = LivingStyleGuide::Binding.new(:variables => variables)
       CONTENT_TEMPLATE.result(binder.get_binding)
     end
   end

data/lib/livingstyleguide/version.rb

@@ -1,3 +1,3 @@
 module LivingStyleGuide
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/livingstyleguide.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'compass'
   gem.add_dependency 'sass'
   gem.add_dependency 'redcarpet'
+
+  gem.add_development_dependency 'rake'
 end

data/stylesheets/_livingstyleguide.scss

@@ -12,6 +12,7 @@ $livingstyleguide--headline-font: $livingstyleguide--base-font !default;
 $livingstyleguide--page-title-font-size: 30px !default;
 $livingstyleguide--headline-font-size: 22px !default;
 $livingstyleguide--sub-headline-font-size: 16px !default;
+$livingstyleguide--sub-sub-headline-font-size: $livingstyleguide--base-font-size !default;
 $livingstyleguide--headline-font-weight: bold !default;
 $livingstyleguide--headline-line-height: 1.1 !default;
 $livingstyleguide--code-font: Courier, "Courier New", monospace !default;
@@ -28,6 +29,7 @@ $livingstyleguide--border-radius: 0 !default;
 $livingstyleguide--color: #505050 !default;
 $livingstyleguide--width: 640px !default;
 $livingstyleguide--gap-width: 10px !default;
+$livingstyleguide--layout-example-padding: $livingstyleguide--gap-width !default;
 
 $livingstyleguide--code-background-color: #505050 !default;
 $livingstyleguide--code-color: white !default;

data/stylesheets/livingstyleguide/_content.scss

@@ -19,7 +19,8 @@
 
 .livingstyleguide--page-title,
 .livingstyleguide--headline,
-.livingstyleguide--sub-headline {
+.livingstyleguide--sub-headline,
+.livingstyleguide--sub-sub-headline {
   font-family: $livingstyleguide--headline-font;
   font-size: $livingstyleguide--headline-font-size;
   font-weight: $livingstyleguide--headline-font-weight;
@@ -37,10 +38,16 @@
   font-size: $livingstyleguide--sub-headline-font-size;
 }
 
+.livingstyleguide--sub-sub-headline {
+  font-size: $livingstyleguide--sub-sub-headline-font-size;
+}
+
 .livingstyleguide--example {
   background: white;
   margin: $livingstyleguide--gap-width auto 0;
+  overflow: hidden;
   padding: $livingstyleguide--gap-width;
+  position: relative;
   width: $livingstyleguide--width;
   @include box-sizing(border-box);
   @include border-top-radius($livingstyleguide--border-radius);
@@ -54,5 +61,7 @@
 
 .livingstyleguide--layout-example {
   @extend #{$livingstyleguide--layout-selector} !optional;
-  padding: $livingstyleguide--gap-width;
+  height: auto;
+  min-height: auto;
+  padding: $livingstyleguide--layout-example-padding;
 }

data/test/fixtures/markdown/text.md

@@ -11,3 +11,5 @@ Lorem ipsum **dolor** sit amet, `<consectetur> adipiscing` elit. Sed a pulvinar
 1. Lorem
 2. Ipsum
 3. Dolor
+
+### Even More Lorem

data/test/integration/markdown_test.rb

@@ -50,6 +50,7 @@ class MarkdownTest < Test::Unit::TestCase
         <li class="livingstyleguide--ordered-list-item">Ipsum</li>
         <li class="livingstyleguide--ordered-list-item">Dolor</li>
       </ol>
+      <h4 class="livingstyleguide--sub-sub-headline">Even More Lorem</h4>
     HTML
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Living Style Guide
 email:
 - nico@hagenburger.net
@@ -144,12 +160,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2497067780070501476
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2497067780070501476
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -173,4 +195,3 @@ test_files:
 - test/integration/variables_test.rb
 - test/test_helper.rb
 - test/unit/sass_extensions_test.rb
-has_rdoc: