livingstyleguide 0.6.0.alpha.0 → 0.6.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ce8037b3c84517db3602995b10c72e30b3c3ca6
-  data.tar.gz: b7acd8ff3d54088613ed7274af01da497835256b
+  metadata.gz: 9d11d94de9e3e3effd2978cf825fa788d8b1c580
+  data.tar.gz: 1c229b285f7e026f7eec53f85c039d561740ee85
 SHA512:
-  metadata.gz: 18e3233b83e7645a1170de1bd28e824b2d96a0028b3ca2afc4fe32ead5527d8ccca0be533eafaa07e7362a174f091d0fbacecc54f11c874d2dae6ced6bf2cf07
-  data.tar.gz: 6831b4ff910cd4076116c03145fd305244aecc5375199f2b1556ebac641c3f5db95c2365762d2a6ae8816f33afbf382709c5d103a8e1b59d95dd2952cf6a257a
+  metadata.gz: 995f18281ce94a1eb31f3b711025cc104d3fa4faf8fb23e01443ca57f4069bbea6a63d755315413705e06a5d204dfcec8934791c126f3fe661db8577016fa473
+  data.tar.gz: 95cd6a320e6055b2ef931c2d56f388fbb0f173b596fc57a59df264b3c0271f28b542c4b9bddbf66a6bd8bd6b71f29792c19254cbfaf52769aa055fe20df0dfda

data/CHANGELOG.md

@@ -22,3 +22,13 @@
 
 * More stable CSS
 
+## 0.6.0.alpha.0
+
+* Implemented command line interface
+
+## 0.6.0.alpha.1
+
+* Added Rails support
+* Removed globbing
+* Set .html.lsg as default file extension
+

data/lib/livingstyleguide.rb

@@ -24,11 +24,6 @@ module LivingStyleGuide
 
 end
 
-Compass.configuration.add_import_path LivingStyleGuide::VariablesImporter.new
-
-base_directory = File.join(File.dirname(__FILE__), '..')
-Compass::Frameworks.register 'livingstyleguide', :path => base_directory
-
 class Sass::Engine
   include LivingStyleGuide::Renderer
 end
@@ -39,3 +34,5 @@ class String
   end
 end
 
+require 'livingstyleguide/integration'
+

data/lib/livingstyleguide/importer.rb

@@ -1,18 +1,27 @@
-require 'sass-globbing'
+class LivingStyleGuide::Importer < Sass::Importers::Filesystem
+
+  def initialize(root)
+    super(root)
+  end
 
-class LivingStyleGuide::Importer < Sass::Globbing::Importer
   def find_relative(name, base, options, absolute = false)
-    if name =~ /^(.+)\.s[ac]ss$|^(\*|[a-z0-9_\/-])+$/
-      path = File.expand_path(File.dirname(base))
-      file = "#{path}/#{name.sub(/\..+$/, '')}.md"
-      file.sub!(/(.*)\//, '\\1/_') unless file =~ /\/_/
+    find_markdown(File.join(File.dirname(base), name))
+    super(name, base, options)
+  end
 
-      if File.exist? file
-        LivingStyleGuide.add_markdown File.read(file)
-      end
+  def find(name, options)
+    find_markdown(name)
+    super(name, options)
+  end
 
-      super(name, base, options, absolute)
+  def find_markdown(sass_filename)
+    glob = "#{sass_filename.sub(/\.s[ac]ss$/, '')}.md"
+    glob.sub!(/(.*)\//, '\\1/{_,}') unless glob =~ /\/_/
+    glob = '{_,}' + glob unless glob =~ /\//
+    Dir.glob(glob) do |markdown_filename|
+      LivingStyleGuide.add_markdown File.read(markdown_filename)
     end
   end
+
 end
 

data/lib/livingstyleguide/integration.rb

@@ -0,0 +1,3 @@
+require 'livingstyleguide/integration/compass'
+require 'livingstyleguide/integration/rails'
+

data/lib/livingstyleguide/integration/compass.rb

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

data/lib/livingstyleguide/integration/rails.rb

@@ -0,0 +1,11 @@
+if defined?(Rails) and defined?(Rails::Railtie)
+
+  require 'rails'
+  class LivingStyleGuideRailtie < Rails::Railtie
+    initializer 'living_style_guide.assets' do
+      Rails.application.assets.register_engine('.lsg', ::Tilt::LivingStyleGuideTemplate)
+    end
+  end
+
+end
+

data/lib/livingstyleguide/renderer.rb

@@ -5,7 +5,7 @@ module LivingStyleGuide::Renderer
   def render_living_style_guide
     @css     = self.render
     template = File.read(File.join(File.dirname(__FILE__), '..', '..', 'templates', 'layouts', 'default.html.erb'))
-    markdown = LivingStyleGuide.markdown
+    markdown = LivingStyleGuide.markdown || ""
     @html    = LivingStyleGuide::RedcarpetTemplate.new{ markdown }.render
     LivingStyleGuide.reset
     ERB.new(template).result(binding)

data/lib/livingstyleguide/tilt_template.rb

@@ -11,25 +11,28 @@ module ::Tilt
 
     def evaluate(scope, locals, &block)
       engine = ::Sass::Engine.new(data, sass_options)
-      @output ||= engine.render_living_style_guide
+      engine.render_living_style_guide
     end
 
     private
     def sass_options
       options = Compass.configuration.to_sass_plugin_options
       options[:template_location].each do |path, short|
-        options[:load_paths] << path
+        options[:load_paths] << ::LivingStyleGuide::Importer.new(path)
       end
-      options[:filename]   = eval_file
-      options[:line]       = line
-      options[:syntax]     = @file =~ /\.sass/ ? :sass : :scss
-      options[:importer]   = LivingStyleGuide::Importer.instance
+      options[:filename] = eval_file
+      options[:line]     = line
+      options[:syntax]   = detect_syntax
+      options[:importer] = LivingStyleGuide::Importer.new('.')
       options
     end
-  end
 
-  %w(sass.lsg scss.lsg).each do |ext|
-    register ext, LivingStyleGuideTemplate
+    private
+    def detect_syntax
+      data =~ %r(^//\s*@syntax\s*:\s*sass\s*$) ? :sass : :scss
+    end
   end
+
+  register 'lsg', LivingStyleGuideTemplate
 end
 

data/lib/livingstyleguide/version.rb

@@ -1,3 +1,3 @@
 module LivingStyleGuide
-  VERSION = "0.6.0.alpha.0"
+  VERSION = "0.6.0.alpha.1"
 end

data/livingstyleguide.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'minisyntax'
   gem.add_dependency 'compass'
   gem.add_dependency 'sass'
-  gem.add_dependency 'sass-globbing'
   gem.add_dependency 'redcarpet'
   gem.add_dependency 'tilt'
   gem.add_dependency 'activesupport'

data/test/fixtures/standalone/style.scss

@@ -1 +1,2 @@
-@import "modules/**";
+@import "modules/buttons";
+

data/test/fixtures/standalone/styleguide.html.lsg

@@ -0,0 +1,4 @@
+@import "compass";
+@import "style";
+@import "livingstyleguide";
+

data/test/integration/standalone_test.rb

@@ -4,7 +4,7 @@ require 'tilt'
 class MarkdownTest < Test::Unit::TestCase
 
   def test_standalone_project
-    html = Tilt.new('test/fixtures/standalone/styleguide.html.scss.lsg').render
+    html = Tilt.new('test/fixtures/standalone/styleguide.html.lsg').render
     assert_match %r(background: red), html
     assert_match %r(<button class="button">), html
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 0.6.0.alpha.0
+  version: 0.6.0.alpha.1
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax
@@ -52,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass-globbing
-  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'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +156,9 @@ files:
 - lib/livingstyleguide.rb
 - lib/livingstyleguide/command_line_interface.rb
 - lib/livingstyleguide/importer.rb
+- lib/livingstyleguide/integration.rb
+- lib/livingstyleguide/integration/compass.rb
+- lib/livingstyleguide/integration/rails.rb
 - lib/livingstyleguide/markdown_extensions.rb
 - lib/livingstyleguide/renderer.rb
 - lib/livingstyleguide/sass_extensions.rb
@@ -201,7 +190,7 @@ files:
 - test/fixtures/standalone/modules/_buttons.md
 - test/fixtures/standalone/modules/_buttons.scss
 - test/fixtures/standalone/style.scss
-- test/fixtures/standalone/styleguide.html.scss.lsg
+- test/fixtures/standalone/styleguide.html.lsg
 - test/fixtures/stylesheets/variables/_more-other-colors.sass
 - test/fixtures/stylesheets/variables/colors.scss
 - test/fixtures/stylesheets/variables/other-colors.sass
@@ -229,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Living Style Guide
@@ -250,7 +239,7 @@ test_files:
 - test/fixtures/standalone/modules/_buttons.md
 - test/fixtures/standalone/modules/_buttons.scss
 - test/fixtures/standalone/style.scss
-- test/fixtures/standalone/styleguide.html.scss.lsg
+- test/fixtures/standalone/styleguide.html.lsg
 - test/fixtures/stylesheets/variables/_more-other-colors.sass
 - test/fixtures/stylesheets/variables/colors.scss
 - test/fixtures/stylesheets/variables/other-colors.sass

data/test/fixtures/standalone/styleguide.html.scss.lsg

@@ -1,2 +0,0 @@
-@import "style";
-