styleus 0.0.5 → 0.0.6

data/app/assets/stylesheets/styleus/themes/base.css.scss

@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Oleo+Script:700);
+@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700|Oleo+Script:400,700|Source+Code+Pro:400,700);
 
 @import "compass";
 @import "compass/reset";
@@ -6,7 +6,6 @@
 @import "compass/css3/user-interface";
 
 @import "base/fonts/raphael";
-@import "base/fonts/calluna";
 
 @import 'base/settings/colors';
 

data/app/assets/stylesheets/styleus/themes/base/behaviors/_text.css.scss

@@ -1,5 +1,5 @@
 @mixin ambient-font {
-  font-family: 'Calluna-Regular';
+  font-family: 'Source Sans Pro';
   color: $soft-text;
 }
 

data/app/assets/stylesheets/styleus/themes/base/coderay.css.scss

@@ -2,7 +2,7 @@
 
 .CodeRay {
   background-color: #fff;
-  font-family: 'Monaco', 'Courier New', 'Terminal', monospace;
+  font-family: 'Source Code Pro', 'Monaco', 'Courier New', 'Terminal', sans-serif, monospace;
   color: #fff;
   overflow: auto;
   font-size: 14px;

data/app/assets/stylesheets/styleus/themes/base/components/_component_index.css.scss

@@ -12,7 +12,7 @@
 
   h3 {
     @include default-index-alignment;
-    font-family: 'Calluna-Regular';
+    font-family: 'Source Sans Pro';
     color: #bb9b1d;
     font-size: 1.2em;
     letter-spacing: 0.12em;
@@ -23,14 +23,15 @@
   }
 
   ul {
-    @include default-index-alignment;
+    @include component;
 
     li {
+      @include default-index-alignment;
       text-align: right;
       margin-bottom: 0.3em;
 
       a:link, a:visited, a:hover, a:active {
-        font-family: 'Calluna-Regular';
+        font-family: 'Source Sans Pro';
         letter-spacing: 0.12em;
         color: #ccc;
         text-decoration: none;
@@ -44,7 +45,7 @@
           height: 0.8em;
           position: absolute;
           right: -9999px - 5;
-          top: 0;
+          top: 0.15em;
           border-bottom: 1px dashed #bb9b1d;
         }
       }

data/app/assets/stylesheets/styleus/themes/base/layout/main.css.scss

@@ -31,7 +31,7 @@ body { background: $main_background asset-url('styleus/themes/base/noise.png', i
       float: right;
       text-decoration: none;
       font-size: 2em;
-      font-family: 'Calluna-Regular';
+      font-family: 'Source Sans Pro';
       text-transform: none;
       font-weight: bold;
       opacity: 0.4;

data/app/helpers/styleus_helper.rb

@@ -1,3 +1,5 @@
+require 'styleus_representer_helper'
+
 module StyleusHelper
   def styleus(comp_list = [])
     @components = Styleus::ViewComponent.from_hashes(comp_list)
@@ -17,89 +19,58 @@ module StyleusHelper
   end
 
   def styleus_partials(partial_path, options = { })
-    sample_template = _styleus_representation_wrap(class: '__boxed') { render partial: "#{partial_path}_sample" }
+    sample_template = _styleus_component_wrap(class: '__boxed') { render partial: "#{partial_path}_sample" }
 
     plain_template = _html_representation("#{partial_path}.html.erb") { render partial: "#{partial_path}" }
 
     helper_template = _helper_representation { render partial: "#{partial_path}_helper" } if options[:helper]
 
-    sample_template.concat(plain_template).concat(helper_template || safe_empty)
+    sample_template.concat(plain_template).concat(helper_template || _safe_empty)
   end
 
   def option_bar(component)
-    content_tag 'nav', class: '__option_bar' do
-      content_tag 'ul' do
-        html_area = content_tag('li') { link_to t('icons.html'), component_path(component), title: t('links.titles.html'), class: 'icon', data: { toggle: "##{component.id} [data-subject=html-representation]" } }
-        helper_area = content_tag('li') { link_to t('icons.helper'), component_path(component), title: t('links.titles.helper'), class: 'icon', data: { toggle: "##{component.id} [data-subject=ruby-representation]" } } if component.helper?
-        presentation_area = content_tag('li') { link_to t('icons.expand_all'), component_path(component), title: t('links.titles.expand_all'), class: 'icon', data: { toggle: "##{component.id} [data-subject*=representation]" } }
-
-        html_area.concat(helper_area || safe_empty).concat(presentation_area)
-      end
-    end
+    _option_bar(component)
   end
 
   def component_index(headline)
-    return if @components.empty?
-    content_tag 'nav', class: "__component_index" do
-      menu_entries = content_tag 'ul' do
-        content_tag_for(:li, @components) do |component|
-          link_to component.headline, anchor: component.id
-        end
-      end
-      content_tag('h3', headline).concat menu_entries
-    end
-
+    _component_index(headline, @components)
   end
 
   def _styleus_article_wrap(options = { }, &block)
     captured_block = capture(&block)
-
-    content_tag('article', class: '__sg_article', id: options[:id]) do
-      content  = safe_empty
-      headline = options[:headline]
-      content.concat(content_tag('h3', headline)) if headline
-      content.concat(captured_block)
-      content
-    end
+    _article(options) { captured_block }
   end
 
-  def _styleus_representation_wrap(options = { }, &block)
+  def _styleus_component_wrap(options = { }, &block)
     captured_block = capture(&block)
-
-    classes = '__sg_component'.concat(" #{options[:class].to_s}")
-    content_tag('section', class: classes) do
-      render layout: 'layouts/styleus_context' do
-        captured_block.to_s.html_safe
-      end
-    end
+    classes        = %W{__sg_component #{options[:class]}}.join(' ')
+    _component(classes) { captured_block }
   end
 
 
   def _html_representation(note = nil, &block)
-    _coderay_highlight_wrap(note, type: :html, &block)
+    _coderay_highlight_wrap(note, &block)
   end
 
   def _helper_representation(&block)
     _coderay_highlight_wrap('Rails Helper', type: :ruby, &block)
   end
 
-  def _coderay_highlight_wrap(note = nil, options = { type: :html }, &block)
+  def _coderay_highlight_wrap(note = nil, options = { }, &block)
     captured_block = capture(&block)
-    code_block     = CodeRay.scan(captured_block.to_s, options[:type])
+    type           = options[:type] || :html
 
-    note_tag = note ? content_tag('p', note, class: '__code_note') : safe_empty
+    highlighted_code = _highlight(captured_block.to_s, type)
+    code_with_note   = _code_note(note).concat highlighted_code
 
-    highlighted_code = "#{note_tag}#{code_block.div(:css => :class, line_numbers: :table)}"
-    content_tag('div', data: { subject: "#{options[:type]}-representation" }) do
-      highlighted_code.html_safe
-    end
+    _code(code_with_note, type)
   end
 
   def _joined_component_list
     @component_list.join.html_safe
   end
 
-  def safe_empty
-    ''.html_safe
+  def _highlight(code, type)
+    CodeRay.scan(code, type).div(:css => :class, line_numbers: :table).html_safe
   end
 end

data/app/helpers/styleus_representer_helper.rb

@@ -0,0 +1,37 @@
+module StyleusRepresenterHelper
+  def _option_bar(component)
+    _render_styleus('option_bar', locals: { component: component })
+  end
+
+  def _component_index(headline, components)
+    _render_styleus('component_index', locals: { headline: headline, components: components })
+  end
+
+  def _article(options, &block)
+    _render_styleus('article', locals: { headline: options[:headline], id: options[:id] }, &block)
+  end
+
+  def _component(classes, &block)
+    _render_styleus('component', locals: { classes: classes }, &block)
+  end
+
+  def _code_note(note)
+    note ? _render_styleus('code_note', object: note) : safe_empty
+  end
+
+  def _code(code, type)
+    _render_styleus 'code', object: code, locals: { type: type }
+  end
+
+
+  def _render_styleus(styleus_partial, options = { }, &block)
+    render_type    = block_given? ? 'layout' : 'partial'
+    partial_path   = "styleus/#{styleus_partial}"
+    render_options = { :"#{render_type}" => partial_path }.merge options
+    render render_options, &block
+  end
+
+  def _safe_empty
+    ''.html_safe
+  end
+end

data/app/views/styleus/_article.html.erb

@@ -0,0 +1,4 @@
+<article class="__sg_article" id="<%= id %>">
+  <%= content_tag 'h3', headline if headline %>
+  <%= yield %>
+</article>

data/app/views/styleus/_code.html.erb

@@ -0,0 +1,3 @@
+<%= content_tag('div', data: { subject: "#{type}-representation" }) do %>
+  <%= code.html_safe %>
+<% end %>

data/app/views/styleus/_code_note.html.erb

@@ -0,0 +1 @@
+<p class="__code_note"><%= code_note %></p>

data/app/views/styleus/_component.html.erb

@@ -0,0 +1,5 @@
+<section class="<%= classes %>">
+  <%= render layout: 'layouts/styleus_context' do %>
+    <%= yield %>
+  <% end %>
+</section>

data/app/views/styleus/_component_index.html.erb

@@ -0,0 +1,10 @@
+<% unless components.empty? %>
+  <nav class="__component_index">
+    <%= content_tag 'h3', headline if headline %>
+    <ul>
+      <%= content_tag_for(:li, components) do |component| %>
+        <%= link_to component.headline, anchor: component.id %>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

data/app/views/styleus/_option_bar.html.erb

@@ -0,0 +1,14 @@
+<nav class="__option_bar">
+  <ul>
+    <li><%= link_to t('icons.html'), component_path(component),
+                    title: t('links.titles.html'), class: 'icon', data: { toggle: "##{component.id} [data-subject=html-representation]" } %></li>
+
+    <% if component.helper? %>
+      <li><%= link_to t('icons.helper'), component_path(component),
+                      title: t('links.titles.helper'), class: 'icon', data: { toggle: "##{component.id} [data-subject=ruby-representation]" } %></li>
+    <% end %>
+
+    <li><%= link_to t('icons.expand_all'), component_path(component),
+                    title: t('links.titles.expand_all'), class: 'icon', data: { toggle: "##{component.id} [data-subject*=representation]" } %></li>
+  </ul>
+</nav>

data/lib/styleus/version.rb

@@ -1,3 +1,3 @@
 module Styleus
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: styleus
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,10 +67,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/fonts/calluna_license.txt
-- app/assets/fonts/calluna_regular.eot
-- app/assets/fonts/calluna_regular.ttf
-- app/assets/fonts/calluna_regular.woff
 - app/assets/fonts/raphaelicons-webfont.eot
 - app/assets/fonts/raphaelicons-webfont.svg
 - app/assets/fonts/raphaelicons-webfont.ttf
@@ -93,7 +89,6 @@ files:
 - app/assets/stylesheets/styleus/themes/base/components/_article.css.scss
 - app/assets/stylesheets/styleus/themes/base/components/_component_index.css.scss
 - app/assets/stylesheets/styleus/themes/base/components/_option_bar.css.scss
-- app/assets/stylesheets/styleus/themes/base/fonts/calluna.css.scss
 - app/assets/stylesheets/styleus/themes/base/fonts/raphael.css.scss
 - app/assets/stylesheets/styleus/themes/base/layout/main.css.scss
 - app/assets/stylesheets/styleus/themes/base/settings/_colors.css.scss
@@ -102,6 +97,7 @@ files:
 - app/controllers/components_controller.rb
 - app/helpers/path_helper.rb
 - app/helpers/styleus_helper.rb
+- app/helpers/styleus_representer_helper.rb
 - app/models/styleus/base.rb
 - app/models/styleus/component.rb
 - app/models/styleus/view_component.rb
@@ -109,6 +105,12 @@ files:
 - app/views/components/show.html.erb
 - app/views/layouts/_styleus.html.erb
 - app/views/layouts/_styleus_context.html.erb
+- app/views/styleus/_article.html.erb
+- app/views/styleus/_code.html.erb
+- app/views/styleus/_code_note.html.erb
+- app/views/styleus/_component.html.erb
+- app/views/styleus/_component_index.html.erb
+- app/views/styleus/_option_bar.html.erb
 - app/views/styleus/_screen_size_viewer.html.erb
 - config/initializers/01_styleus_config.rb
 - config/initializers/02_init_container_routes.rb

data/app/assets/fonts/calluna_license.txt

@@ -1,26 +0,0 @@
-/* @license
- * MyFonts Webfont Build ID 2427055, 2012-12-09T11:36:08-0500
- * 
- * The fonts listed in this notice are subject to the End User License
- * Agreement(s) entered into by the website owner. All other parties are 
- * explicitly restricted from using the Licensed Webfonts(s).
- * 
- * You may obtain a valid license at the URLs below.
- * 
- * Webfont: Calluna Regular by exljbris
- * URL: http://www.myfonts.com/fonts/exljbris/calluna/regular/
- * Copyright: © 2009 exljbris Font Foundry. All rights reserved.
- * Licensed pageviews: Unlimited
- * 
- * 
- * License: http://www.myfonts.com/viewlicense?type=web&buildid=2427055
- * 
- * © 2012 Bitstream Inc
-*/
-
-
-
-
-  
-
- 

data/app/assets/stylesheets/styleus/themes/base/fonts/calluna.css.scss

@@ -1,26 +0,0 @@
-/* @license
- * MyFonts Webfont Build ID 2427055, 2012-12-09T11:36:08-0500
- *
- * The fonts listed in this notice are subject to the End User License
- * Agreement(s) entered into by the website owner. All other parties are
- * explicitly restricted from using the Licensed Webfonts(s).
- *
- * You may obtain a valid license at the URLs below.
- *
- * Webfont: Calluna Regular by exljbris
- * URL: http://www.myfonts.com/fonts/exljbris/calluna/regular/
- * Copyright: © 2009 exljbris Font Foundry. All rights reserved.
- * Licensed pageviews: Unlimited
- *
- *
- * License: http://www.myfonts.com/viewlicense?type=web&buildid=2427055
- *
- * © 2012 Bitstream Inc
-*/
-
-
-@font-face {
-  font-family: 'Calluna-Regular';
-  src: asset-url('calluna_regular.eot', font);
-  src: asset-url('calluna_regular.eot#iefix', font) format('embedded-opentype'), asset-url('calluna_regular.woff', font) format('woff'), asset-url('calluna_regular.ttf', font) format('truetype');
-}