middleman-kss 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2c752e9099cb3519f05631eef81ad64823f38ae
-  data.tar.gz: 812c479ddc11f50ffaddeab0386d6bfe0d7a8936
+  metadata.gz: 2b7bce4a832b29d26b1ad37f71974534425c2d54
+  data.tar.gz: 2faeb01d47817a1ae87cbd73a5e960c808a79425
 SHA512:
-  metadata.gz: 73c70d442d5dbb23c148735c2e7d3c658e84e1dafed906cb2b66f1799849ca5ae17868c63bcd8d5aafcac10c98f981da67405bf0e1b79e5b5e6b537b90ee1763
-  data.tar.gz: 32d8a79973b9f6e4ea025de449981d9e71b626c9d3cfee92aa227f943cf5a0c69316854ac35d3f7acd362525c292f51765c12a2723dfcc0731e372815de1dfc6
+  metadata.gz: a61853655503fba484196d966c36dc084ba809d800db1e6193f5379b89358f2d528a5ec2968bc6fc57fa673037f2320b904ad01084cf9abc59099030dde37a81
+  data.tar.gz: 88a88f44e572fe62732bdb03923ca61dc8d5a0011021bdf25a7f00e5f5342b14735ffff5a1934e5786b2871eead2f9cf30862186fa0dc5f95cf64b3a62477377

data/Rakefile

@@ -1 +1,13 @@
 require "bundler/gem_tasks"
+
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
+  exempt_tags = ""
+  exempt_tags << "--tags ~@nojava " if RUBY_PLATFORM == "java"
+  t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+end
+
+require 'rake/clean'
+
+task :test => ["cucumber"]

data/features/helper.feature

@@ -0,0 +1,16 @@
+Feature: Syntax highlighting with the "code" helper method
+
+  Scenario: Renders the styleguide
+    Given the Server is running at "test-app"
+    When I go to "/styleguide.html"
+    Then I should see '<h1>Styleguide</h1>'
+
+  Scenario: Renders plain styleblock
+    Given the Server is running at "test-app"
+    When I go to "/styleguide.html"
+    Then I should see '<button class="btn">Button</button>'
+
+  Scenario: Renders pseudo classes when section is found
+    Given the Server is running at "test-app"
+    When I go to "/styleguide.html"
+    Then I should see '<button class="btn pseudo-class-hover">Button</button>'

data/features/support/env.rb

@@ -0,0 +1,5 @@
+PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
+ENV['TEST'] = 'true'
+require "middleman-core"
+require "middleman-core/step_definitions"
+require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-kss')

data/fixtures/test-app/config.rb

@@ -0,0 +1 @@
+activate :kss, :kss_dir => 'css'

data/fixtures/test-app/source/css/test.css

@@ -0,0 +1,15 @@
+/*
+Just some simple buttons for testing.
+
+:hover - Subtle hover hilight
+
+Styleguide 1.1.
+*/
+.btn {
+  background: red;
+  border: 0;
+}
+
+.btn:hover {
+  background: teal;
+}

data/fixtures/test-app/source/styleblocks/_buttons.html.erb

@@ -0,0 +1,3 @@
+<button class="btn$modifier_class">Button</button>
+<a class="btn$modifier_class">Link button</a>
+<input type="submit" class="btn$modifier_class" value="Submit button" />

data/fixtures/test-app/source/styleguide.html.md.erb

@@ -0,0 +1,13 @@
+---
+title: Styleguide
+---
+
+# Styleguide
+
+## Plain styleblock
+
+<%= styleblock 'buttons' %>
+
+## Pretty styleblock
+
+<%= styleblock 'buttons', section: '1.1' %>

data/lib/middleman-kss/extension.rb

@@ -28,6 +28,8 @@ module Middleman
     end
 
     module Helpers
+      DEFAULT_STYLEGUIDE_BLOCK_FILE = '_styleguide_block.html.erb'
+
       # Renders a styleblock with or without styleguide information.
       #
       # @param [String] tile
@@ -40,29 +42,26 @@ module Middleman
       # @return [String] Generated HTML.
       #
       def styleblock(tile, options = {})
-        extension_options = ::Middleman::KSS.options
-
-        # Parse the KSS style guide once per request (because it might change a lot, yo)
-        unless request.has_key?(:styleguide)
-          request[:styleguide] = ::Kss::Parser.new(File.join(self.source_dir, extension_options[:kss_dir]))
-        end
-
-        @styleguide = request[:styleguide]
-
         tile_file = "_#{tile}.html.erb"
-        # TODO: remove "styleblocks" magic string
         tile_path = File.join(self.source_dir, "styleblocks", tile_file)
-        @block_html = File.read(tile_path)
+        tile_template = ::Tilt.new(tile_path)
+
+        @block_html = tile_template.render
+        @styleguide = self.get_styleguide
 
         if options.has_key?(:section)
           @section = @styleguide.section(options[:section])
-          # TODO: remove magic strings: "partials" and "_styleguide_block.html.erb"
-          styleguide_block_path = File.join(File.dirname(__FILE__), '_styleguide_block.html.erb')
-          #styleguide_block_path = File.join(self.source_dir, "partials", "_styleguide_block.html.erb")
-          render_individual_file(styleguide_block_path)
+          raise "Section must have a description. Section #{options[:section]} does not have one or section does not exist." if @section.description.blank?
+        end
+
+        if @section
+          # Render the styleguide block
+          styleguide_block_path = File.join(File.dirname(__FILE__), DEFAULT_STYLEGUIDE_BLOCK_FILE)
+          template = ::Tilt.new(styleguide_block_path)
+          return template.render(self)
         else
-          return @block_html.gsub('$modifier_class', '').gsub(' class=""', '')
-          #render_individual_file(@block_html)
+          # Render just the HTML without the $modifier_class thingies
+          return @block_html.gsub('$modifier_class', '').gsub(' class=""', '').prepend('<div class="styleguide-styleblock">') << '</div>'
         end
       end
 
@@ -77,6 +76,16 @@ module Middleman
         markdown.render(input)
       end
 
+      def get_styleguide
+        # Parse the KSS style guide once per request (because it probably changes every request)
+        unless request.has_key?(:styleguide)
+          extension_options = ::Middleman::KSS.options
+          request[:styleguide] = ::Kss::Parser.new(File.join(self.source_dir, extension_options[:kss_dir]))
+        end
+
+        return request[:styleguide]
+      end
+
     end
   end
 end

data/lib/middleman-kss/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module KSS
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/middleman-kss.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 1.8.7'
+  spec.required_ruby_version = '>= 1.9.2'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 
-  spec.add_runtime_dependency('middleman-core', '<= 3.0.14')
-  spec.add_runtime_dependency('kss', '~> 0.4')
+  spec.add_runtime_dependency('middleman-core', '~> 3.0')
+  spec.add_runtime_dependency('kss', '~> 0.5.0')
   spec.add_runtime_dependency('redcarpet', '~> 2.2.2')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-kss
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Antti-Jussi Kovalainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,30 +42,30 @@ dependencies:
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.14
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.14
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: kss
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,12 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- features/helper.feature
+- features/support/env.rb
+- fixtures/test-app/config.rb
+- fixtures/test-app/source/css/test.css
+- fixtures/test-app/source/styleblocks/_buttons.html.erb
+- fixtures/test-app/source/styleguide.html.md.erb
 - lib/middleman-kss.rb
 - lib/middleman-kss/_styleguide_block.html.erb
 - lib/middleman-kss/extension.rb
@@ -112,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -124,4 +130,7 @@ rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: KSS (Knyle Style Sheets) helpers for Middleman
-test_files: []
+test_files:
+- features/helper.feature
+- features/support/env.rb
+has_rdoc: