middleman-sculptor 0.16 → 0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02827e1d57fc45ca687d67099a6f7589af9e0a11
-  data.tar.gz: 732e3d365f4d9dcd5d48989dd5e9afa126d04128
+  metadata.gz: c1ce098f5a9ebe72b5c144539983712625380c5a
+  data.tar.gz: 361bdd7aee1229c517e9f8eda1838b487be61f63
 SHA512:
-  metadata.gz: 41ab5524edab1c38161144e20baf1c4881a90cbae387722badcefc1f78080888cbec172d873ea0ac2660a01606b18bf2e76258498b6a94c556bdf0f23bd53e72
-  data.tar.gz: 1ebb779121b2bacf3c27fe8ac4a1fff657504b20db9e1e99294f1b2c29b8ee4a7a0edcfe123d2bd2dd6700157ceae9e05d81e1d4992acddb1e31d20b426f62ed
+  metadata.gz: 183877d32a1dfa97e8cd168b5ab6b3d235738e950bf2ab6acb2dade16d3dadba098630be510dfb93762e0e7dd5ec87cb0d3b84ffed320ae44e1310d41bb1ec23
+  data.tar.gz: b42109276f344b3648ec4a2bc903f18921b0f4a0c50dd41b3019fdb61d6bacd7163f23cc6ba369a86463406373c9a4df3e7caf82e15f9c6a941c6a7f37fc336c

data/LICENCE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Tyom Semonov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/middleman-sculptor/helpers/resources.rb

@@ -131,12 +131,8 @@ module Middleman::Sculptor
           end
         end
 
-        dir = File.dirname(r.path)
         r.add_metadata(locals: {
-          section: {
-            title: dir.upcase,
-            slug: dir.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '-')
-          }
+          section: get_section_of_resource(r)
         })
 
         options[:data_fields].each do |field|
@@ -163,6 +159,41 @@ module Middleman::Sculptor
         relative_path = args ? args.join('/') : ''
         Pathname(path).dirname.join(relative_path)
       end
+
+      def breadcrumbs(page=current_page, separator="›", remove_current=true)
+        hierarchy = [page]
+        hierarchy.unshift hierarchy.first.parent while hierarchy.first.parent
+        hierarchy.pop if remove_current
+        hierarchy.collect {|page|
+          link_to(
+            page.data.title || get_section_of_resource(page).title,
+            "#{page.url}"
+          )
+        }.join(" <span class='sep'>#{separator}</span> ")
+      end
+
+      def page_title(page=current_page, separator='›')
+        title = strip_tags(breadcrumbs(current_page, separator, false))
+          .split(separator)
+          .reverse
+          .join(" #{separator} ")
+      end
+
+      def get_section_of_resource(resource)
+        dir = File.dirname(resource.path)
+        title = dir.upcase
+
+        if resource.url == '/'
+          title = resource.data.title || site_title
+        elsif resource.metadata.locals[:section]
+          title = resource.data.title if resource.data.title
+        end
+
+        {
+          title: title,
+          slug: dir.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '-')
+        }
+      end
     end
   end
 end

data/lib/middleman-sculptor/template/config.tt

@@ -15,12 +15,7 @@ set :site_title, 'Styleguide'
 ready do
   # Proxy default site index to Glyptotheque index template
   unless sitemap.find_resource_by_path '/index.html'
-    proxy 'index.html', 'glyptotheque/site-index.html', locals: {
-      section: {
-        title: site_title,
-        slug: 'index'
-      }
-    }
+    proxy 'index.html', 'glyptotheque/site-index.html'
   end
   proxy 'sitemap.json', 'glyptotheque/sitemap.json'
 
@@ -35,23 +30,25 @@ ready do
     # Create virtual index files
     dir = File.dirname(r.path)
     index_exists = !!sitemap.find_resource_by_path("#{dir}/index.html")
+
     if last_dir != dir && !index_exists
       proxy "#{dir}/index.html", 'glyptotheque/directory-index.html', locals: {
-        section: {
-          title: dir.upcase,
-          slug: dir.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '-')
-        }
+        section: get_section_of_resource(r)
       }
       last_dir = dir
     end
 
     if r.metadata[:models]
+      dir = File.dirname(r.path)
       r.metadata.models.each do |id, model|
         proxy "#{r.path.sub(r.ext, '')}-#{id}-isolated.html",
           r.path,
           layout: 'isolated',
           iframe: model.iframe,
-          id: id
+          id: id,
+          locals: {
+            section: get_section_of_resource(r)
+          }
       end
     end
   end

data/lib/middleman-sculptor/template/source/assets/styles/glyptotheque/_base.scss

@@ -6,6 +6,13 @@
   }
 }
 
+body {
+  padding: 0;
+  margin: 0;
+  font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
+  min-height: 100%;
+}
+
 html,
 body {
   height: 100%;
@@ -13,12 +20,6 @@ body {
   color: white;
 }
 
-body {
-  padding: 0;
-  margin: 0;
-  font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
-}
-
 button {
   cursor: pointer;
 }
@@ -30,7 +31,7 @@ button {
   overflow: hidden;
   background: white;
   color: #343434;
-  box-shadow: -1px 0 0 rgba(black, .1);
+  box-shadow: 0 0 20px black;
 }
 
 .glypto-section {
@@ -90,23 +91,24 @@ button {
 
 .glypto-header {
   margin: -40px -40px 40px;
-  padding: 40px;
-  background: #ddd;
-  background: linear-gradient(58deg, #ddd, #f6f6f6);
+  padding: 36px 40px;
+  background: lighten($dark-grey, 15);
+  color: white;
   box-shadow: inset 0 -10px 0 rgba(black, .13);
 
   .glypto-title {
     margin: 0;
+    line-height: 1;
   }
 }
 
 .glypto-breadcrumbs {
+  position: absolute;
   transition: 160ms;
-  margin-top: -30px;
+  margin-top: -26px;
   font-weight: bold;
   font-size: em(12);
   line-height: 27px;
-  color: $dark-grey;
   opacity: .7;
 
   &:hover {
@@ -129,3 +131,46 @@ button {
     margin: 0 em(4);
   }
 }
+
+
+.glypto-section-list {
+  @include clearfix;
+  background: #eee;
+  padding: 5px;
+  margin: 0;
+  list-style: none;
+}
+
+.glypto-section-list-item {
+  padding: 5px;
+
+  @include breakpoint(540px) {
+    float: left;
+    width: 50%;
+  }
+
+  a:link,
+  a:hover,
+  a:visited {
+    display: block;
+    padding: em(20);
+    background: white;
+    text-decoration: none;
+    border: 1px solid transparent;
+    color: inherit;
+    min-height: 160px;
+
+    &:hover {
+      border-color: $dark-grey;
+    }
+  }
+
+  .glypto-section-name {
+    font-size: em(30);
+    margin: 0;
+  }
+
+  .glypto-section-meta {
+    color: #aaa;
+  }
+}

data/lib/middleman-sculptor/template/source/assets/styles/glyptotheque/_nav.scss

@@ -10,6 +10,7 @@
   -webkit-font-smoothing: antialiased;
   color: #ddd;
   font-size: 14px;
+  min-height: 100%;
 
   &.s-hidden {
     transition: 120ms ease-out;
@@ -19,10 +20,6 @@
       margin-right: -35px;
       opacity: .7;
 
-      &:before {
-        box-shadow: 0 2px 0 1px black, 0 7px 0 1px black, 0 12px 0 1px black;
-      }
-
       &:active {
         background: rgba(black, .2);
       }

data/lib/middleman-sculptor/template/source/assets/styles/glyptotheque.scss

@@ -1,4 +1,5 @@
 @import 'bourbon';
+@import 'breakpoint';
 
 @import 'glyptotheque/$variables';
 @import 'glyptotheque/base';

data/lib/middleman-sculptor/template/source/glyptotheque/_model-utils.slim

@@ -1,10 +1,14 @@
 .glypto-model-utils
   menu
-    button._tab-toggle(ng-class="{'__active': show == 'outline'}" ng-click="show = show === 'outline' ? null : 'outline'") Outline
-    button._tab-toggle(ng-class="{'__active': show == 'source'}" ng-click="show = show === 'source' ? null : 'source'") HTML source
+    button._tab-toggle(ng-class="{'__active': show == 'outline'}" ng-click="show = show === 'outline' ? null : 'outline'" tabindex="-1") Outline
+    button._tab-toggle(ng-class="{'__active': show == 'source'}" ng-click="show = show === 'source' ? null : 'source'" tabindex="-1") HTML source
 
     - if id
-      = link_to isolated_url, class: '_isolated', target: '_blank', title: 'Isolated version'
+      = link_to isolated_url,
+        class: '_isolated',
+        target: '_blank',
+        title: 'Isolated version',
+        tabindex: -1
         span> Isolate
         i.fa.fa-external-link
 

data/lib/middleman-sculptor/template/source/glyptotheque/_model.slim

@@ -20,7 +20,13 @@ article.glypto-model
   - unless locals[:iframe]
     - stylesheets = current_page.metadata.page[:stylesheet] || current_page.metadata.page[:stylesheets] || current_page.data[:stylesheet] || current_page.data[:stylesheets]
     - javascripts = current_page.metadata.page[:javascript] || current_page.metadata.page[:javascripts] || current_page.data[:javascript] || current_page.data[:javascripts]
-    - if stylesheets && include_stylesheets(stylesheets) != yield_content(:stylesheets)
+
+    - current_js = include_javascripts(javascripts)
+    - included_js = yield_content(:javascripts)
+
+    - if include_stylesheets(stylesheets) != yield_content(:stylesheets)
       - content_for :stylesheets, include_stylesheets(stylesheets)
-    - if javascripts && include_stylesheets(javascripts) != yield_content(:javascripts)
-      - content_for :javascripts, include_javascripts(javascripts)
+
+    - if current_js
+      - unless (included_js && included_js.match(current_js))
+        - content_for :javascripts, current_js

data/lib/middleman-sculptor/template/source/glyptotheque/_nav.slim

@@ -13,7 +13,7 @@ glypto-menu
 script type="text/ng-template" id="glyptotheque/menu.html"
   nav.glypto-nav ng-class="{'s-hidden' : navIsHidden}"
     button.glypto-nav-toggle ng-click="toggle()" title="Toggle menu: Command + Shift + E"
-    = link_to yield_content(:page_title), url_for('/index.html'), class: '_logo'
+    = link_to site_title, url_for('/index.html'), class: '_logo'
     .search: input.mousetrap(ng-model="search" type="search" placeholder="Filter (/ to focus)" glypto-search)
 
     glypto-menu-tree items="items" filter="search"

data/lib/middleman-sculptor/template/source/glyptotheque/site-index.html.slim

@@ -1,5 +1,10 @@
 - if resources_for('/').empty?
   h1 Site is empty, create some pages
 - else
-  - main_sections.each do |section|
-    h2.glypto-title = link_to section.metadata.locals.section.title, section.path
+  - if main_sections.any?
+    ul.glypto-section-list
+      - main_sections.each do |r|
+        li.glypto-section-list-item
+          = link_to r.url
+            h2.glypto-section-name = get_section_of_resource(r).title
+            .glypto-section-meta = pluralize(resources_for(r.url).count, 'item')

data/lib/middleman-sculptor/template/source/layouts/glyptotheque.slim

@@ -1,10 +1,7 @@
-- content_for :page_title,  site_title
+- content_for :page_title,  page_title
 - content_for :ng_app,      'glyptotheque'
 - content_for :stylesheets, stylesheet_link_tag('glyptotheque')
-
-- current_section = current_page.metadata.locals[:section]
-- if current_section
-  - content_for :body_class,  "section-#{current_section[:slug]}"
+- content_for :body_class,  "section-#{get_section_of_resource(current_page).slug}"
 
 = wrap_layout :layout do
   - if resource_tree('/').any?
@@ -14,12 +11,12 @@
     header.glypto-header
       .glypto-container
         - if current_page.parent
-          = partial 'glyptotheque/breadcrumbs'
+          .glypto-breadcrumbs = breadcrumbs
 
         - if current_page.data.title
-          h1.glypto-title = current_page.data.title
-        - elsif current_page.metadata.locals[:section]
-          h1.glypto-title = current_page.metadata.locals.section.title
+          h1.glypto-title = current_page.data.title || getcurrent_page
+        - elsif get_section_of_resource(current_page)
+          h1.glypto-title = get_section_of_resource(current_page).title
     .glypto-container = yield
 
   javascript:

data/lib/middleman-sculptor/template/source/layouts/isolated.slim

@@ -2,14 +2,7 @@ doctype html
 html
   head
     meta charset='utf-8'
-    title
-      - current_section = current_page.metadata.locals[:section]
-      - if current_section
-        => current_section.title
-      - else
-        => current_page.data.title || yield_content(:page_title) || resource_file(current_page)
-      - if current_page.data.title || current_section
-        | › #{site_title}
+    title = page_title
     meta name='viewport' content='width=device-width'
     = yield_content :stylesheets
     - if current_resource.metadata.options.iframe

data/lib/middleman-sculptor/template/source/layouts/layout.slim

@@ -2,21 +2,13 @@ doctype html
 html ng-app=(yield_content(:ng_app))
   head
     meta charset='utf-8'
-    title
-      - current_section = current_page.metadata.locals[:section]
-      - if current_section
-        => current_section.title
-      - else
-        => current_page.data.title || yield_content(:page_title) || resource_file(current_page)
-      - if current_page.data.title || current_section
-        | › #{site_title}
+    title = yield_content :page_title
     meta name='viewport' content='width=device-width'
     = stylesheet_link_tag '//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css'
     = yield_content :stylesheets
     = javascript_include_tag 'head-js'
 
   body class="#{yield_content(:body_class)}"
-
     = yield
 
     = yield_content :javascripts

data/lib/middleman-sculptor/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sculptor
-    VERSION = "0.16"
+    VERSION = "0.17"
   end
 end

metadata

@@ -1,103 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sculptor
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.17'
 platform: ruby
 authors:
 - Tyom Semonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.2
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Generate style guides and static components in Middleman
@@ -109,9 +109,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
+- .editorconfig
+- .gitignore
 - Gemfile
+- LICENCE.md
 - Rakefile
 - bin/middleman-sculptor
 - bin/sculpt
@@ -154,7 +155,6 @@ files:
 - lib/middleman-sculptor/template/source/assets/styles/pygments/colorful.css
 - lib/middleman-sculptor/template/source/assets/styles/pygments/github.css
 - lib/middleman-sculptor/template/source/assets/styles/pygments/trac.css
-- lib/middleman-sculptor/template/source/glyptotheque/_breadcrumbs.html.slim
 - lib/middleman-sculptor/template/source/glyptotheque/_model-outline-element.slim
 - lib/middleman-sculptor/template/source/glyptotheque/_model-outline.slim
 - lib/middleman-sculptor/template/source/glyptotheque/_model-utils.slim
@@ -179,18 +179,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Style guide generator for Middleman
 test_files: []
+has_rdoc: 

data/lib/middleman-sculptor/template/source/glyptotheque/_breadcrumbs.html.slim

@@ -1,8 +0,0 @@
-.glypto-breadcrumbs
-  => link_to site_title, '/'
-  - if current_page.parent.url != '/'
-    span.sep ›
-    - if current_page.parent.data.title
-      =< link_to current_page.parent.data.title, current_page.parent.url
-    - else
-      =< link_to current_page.parent.metadata.locals.section.title, current_page.parent.url