vivus 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13980c33f9caddae4de3d035348884f27c3f23c2
-  data.tar.gz: cc900d231364964155a39df81819c8a83e0aa17c
+  metadata.gz: e91f68c5d5976fc293b0ddc92a60dee74a50ed96
+  data.tar.gz: abdb3ddeea7a3354350d403d518be53d1fb9f336
 SHA512:
-  metadata.gz: 418bc84b3972d05a4ac4ad1775986898ccd4d90eda741a6402ef4a26d077f98335251330079d66414afa0421a4661cea7335fd29a63083c0463d5a10e404d567
-  data.tar.gz: 4a782a7a5e5cdfb12d27dd70b2cdbc6e17295a944bdb94e5f181660e590315f05b5f2214f051912fb116a4f74190a419bdac6497cd2aa914363402b4a65f86a8
+  metadata.gz: dfad9b9bf091e40c0bb2650ec29d5d87d140a0cf06a3def21013a4c08ba7d2350ce2ac8bab6841088884a3d06698e06876af9faf5165dd4c0119611d90b25ba4
+  data.tar.gz: 5a6ae28163548adf7022ad5053bdf54c01c589b449ef58b51bd07cb3a9ed8ee2cc65469a378b74fe2daed42e3fa6e436babf5c96be84404d815d6e217ec6d72d

data/app/assets/javascripts/vivus/application.js

@@ -8,24 +8,8 @@ $(document).ready(function() {
       hljs.highlightBlock(el);
     });
 
-    $('h1.vivus-section-title').each(function(i, el) {
-      var text = $(el).text().toLowerCase();
-      var link = text.replace(/ /g, '-');
-      var anchor = "<a href='#" + link + "'>" + $(el).text() + "</a>";
-      $('#vivus-navigation > ul').append("<li class=" + $(el).prop("tagName").toLowerCase() + ">" + anchor + "<ul></ul></li>");
-      $(el).prepend("<a name='" + link + "'></a>");
-    })
-
     $('h2.vivus-name').each(function(i, el) {
-      var section = $(el).parents(".vivus-section");
-      var section_title = section.children("h1.vivus-section-title").text().toLowerCase().replace(/ /g, '-');
-
-      var anchor = "<a href='#" + section_title + "|" + $(el).text().toLowerCase().replace(/ /g, '-') + "'>" + $(el).text() + "</a>"
-
-      var navParent =  $('#vivus-navigation ul').find("a[href='#" + section_title + "']").parent();
-
-      $(navParent).find("ul").append("<li class=" + $(el).prop("tagName").toLowerCase() + ">" + anchor + "</li>");
-      $(el).prepend("<a name='" + section_title + "|" + $(el).text().toLowerCase().replace(/ /g, '-') +"'></a>");
+      $(el).before("<a name='" + $(el).text().toLowerCase().replace(/ /g, '-') +"'></a>");
     })
 
     $('.vivus-documentation *:contains("TODO:")').html(function(_, html) {

data/app/assets/stylesheets/vivus/module/component.scss

@@ -13,7 +13,7 @@ li.vivus-component {
     }
 
     > h2 {
-      margin-top: 50px;
+      padding-top: 50px;
     }
 
     > ul, ol {

data/app/assets/stylesheets/vivus/module/nav.scss

@@ -39,6 +39,12 @@
 
         margin: 20px 0 10px 20px;
 
+        &.active {
+          margin-left: 0;
+          padding-left: 15px;
+          border-left: 5px solid #F3DF6C;
+        }
+
         a {
           color: #F3DF6C;
         }

data/app/controllers/vivus/styles_controller.rb

@@ -1,6 +1,16 @@
 # Controller for dsiplaying the documentation for the styles
 class Vivus::StylesController < Vivus::ApplicationController
   def index
+    gather_stylesheets
+  end
+
+  def show
+    gather_stylesheets
+  end
+
+  private
+
+  def gather_stylesheets
     sprockets = Rails.application.assets
 
     @css_paths = %w{application.css}
@@ -12,10 +22,15 @@ class Vivus::StylesController < Vivus::ApplicationController
       .map{|file_path| Stylesheet.new(css: sprockets[file_path].body)}
       .map{|stylesheet| stylesheet.parse}
       .reject{|stylesheet| stylesheet.empty?}
-      .inject({}){ |a,b| a.merge(b) }
-  end
+      .inject({}){ | accum, data |
+        data.each do |section, components|
+          accum[section] ||= []
+          accum[section] += components
+        end
 
-  private
+        accum
+      }
+    end
 
   def is_a_file? file
     File.file?(file)

data/app/models/component.rb

@@ -10,4 +10,8 @@ class Component
   def display_example
     ERB.new(example).result if self.example
   end
+
+  def slug
+    self.name.downcase.gsub(/[^a-z1-9]+/, '-').chomp('-')
+  end
 end

data/app/views/vivus/styles/_nav.html.erb

@@ -1,7 +1,23 @@
 <nav id="vivus-navigation">
   <ul>
-    <% @stylesheets.each do |stylesheet| %>
-      <li><%= link_to stylesheet.display_path, "/vivus/#{stylesheet.path}" %></li>
+    <% @stylesheets.each do |group| %>
+      <% section = group[0] %>
+      <% section_slug = section.downcase.gsub(/[^a-z1-9]+/, '-').chomp('-') %>
+      <% chunks = group[1] %>
+
+      <li class="h1 <%= "active" if section.downcase.gsub(/[^a-z1-9]+/, '-').chomp('-') == params[:section] %>">
+        <%= link_to section, vivus_section_path(section_slug) %>
+
+        <% if chunks.present? %>
+          <ul>
+            <% chunks.each do |chunk| %>
+              <li class="h2">
+                <%= link_to chunk.name, vivus_section_path(section_slug, anchor: chunk.slug) %>
+              </li>
+            <% end %>
+          </ul>
+        <% end %>
+      </li>
     <% end %>
   </ul>
 </nav>

data/app/views/vivus/styles/index.html.erb

@@ -1,25 +1,11 @@
-<%#= render partial: "nav" %>
-<div id="vivus-navigation">
-  <ul>
-
-  </ul>
-</div>
+<%= render partial: "nav" %>
 <div id="vivus-body">
   <ul class="vivus-sections">
-    <% @stylesheets.each do |title, components| %>
-      <li class="vivus-section">
-        <h1 class="vivus-section-title"><%= title %></h1>
-        <ul class="vivus-components">
-          <%= render partial: "component", collection: components %>
-        </ul>
-      </li>
-    <% end %>
-
-    <% if @stylesheets.flatten.blank? %>
       <li class="vivus-section">
         <h2></h2>
         <h1 class="vivus-section-title">Let's begin!</h1>
-        <p>Above each block of code in your CSS, start documenting your styleguide by writing comments.
+
+        <p>Above each block of code in your CSS, start documenting your styleguide by writing comments.</p>
         <p>Use the below example as a starting point.</p>
         <pre>
 /*
@@ -49,7 +35,6 @@ need be.
 */
         </pre>
       </li>
-    <% end %>
   </ul>
 </div>
 

data/app/views/vivus/styles/show.html.erb

@@ -1,8 +1,13 @@
 <%= render partial: "nav" %>
-
-
-<% @stylesheet.parse.each do |block| %>
-  <%= block.comments.html_safe %>
-
-  <pre><%= block.html.html_safe %></pre>
-<% end %>
+<div id="vivus-body">
+  <ul class="vivus-sections">
+    <% @stylesheets.select{ |section| section.downcase.gsub(/[^a-z1-9]+/, '-').chomp('-') == params[:section]}.each do |title, components| %>
+      <li class="vivus-section">
+        <h1 class="vivus-section-title"><%= title %></h1>
+        <ul class="vivus-components">
+          <%= render partial: "component", collection: components %>
+        </ul>
+      </li>
+    <% end %>
+  </ul>
+</div>

data/config/routes.rb

@@ -1,3 +1,4 @@
 Vivus::Engine.routes.draw do
+  get '/:section', to: 'styles#show', as: "vivus_section"
   root to: "styles#index"
 end

data/lib/vivus/version.rb

@@ -1,3 +1,3 @@
 module Vivus
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: vivus
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Mark Cipolla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.7.1
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.7.1
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3'
 description: Styleguides can be a pain to keep as a living documentation for your
   CSS. By analysing the comments in your SASS files, and by adding markdown to your
   stylesheets, you can generate a living, breathing documentation styleguide that