madride 1.0.7 → 1.1.0

data/example/README.md

@@ -5,4 +5,4 @@ Install dependencies and start server:
     bundle install
     bundle exec madride --with bootstrap --data data.yml -- assets pages
 
-Now you can open http://0.0.0.0:3000/index.html in your browser
+Now you can open http://0.0.0.0:3000/ in your browser

data/example/pages/_default.slim

@@ -0,0 +1,13 @@
+doctype
+html[lang="en"]
+  head
+    meta[charset="utf-8"]
+    title Madride Demo
+    meta[name="viewport" content="width=device-width, initial-scale=1.0"]
+    meta[name="description" content=""]
+    meta[name="author" content=""]
+    link[href="/app.css" rel="stylesheet"]
+    style[type="text/css"] body { margin-top: 30px; }
+
+  body
+    .container == yield

data/example/pages/index.slim

@@ -0,0 +1,45 @@
+//= layout _default
+.hero-unit
+  h1#madride Hello, world!
+  p
+    | This is a template for a simple marketing or informational website.
+    | It includes a large callout called the hero unit and three
+    | supporting pieces of content. Use it as a starting point to create
+    | something more unique.
+  p
+    a.btn.btn-primary.btn-large Learn more »
+
+.row
+  .span4
+    h2 Heading
+    p
+      | Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
+      | tellus ac cursus commodo, tortor mauris condimentum nibh, ut
+      | fermentum massa justo sit amet risus. Etiam porta sem malesuada
+      | magna mollis euismod. Donec sed odio dui.
+    p
+      a.btn[href="#"] View details »
+  .span4
+    h2 Heading
+    p
+      | Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
+      | tellus ac cursus commodo, tortor mauris condimentum nibh, ut
+      | fermentum massa justo sit amet risus. Etiam porta sem malesuada
+      | magna mollis euismod. Donec sed odio dui.
+    p
+      a.btn[href="#"] View details »
+  .span4
+    h2 Heading
+    p
+      | Donec sed odio dui. Cras justo odio, dapibus ac facilisis in,
+      | egestas eget quam. Vestibulum id ligula porta felis euismod
+      | semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris
+      | condimentum nibh, ut fermentum massa justo sit amet risus.
+    p
+      a.btn[href="#"] View details »
+hr
+footer
+  p
+    ' This is a demo of madride.
+    ' Based on a <a href="#{bootstrap_demo_url}">Basic marketing site</a>
+    ' example of Bootstrap from Twitter.

data/lib/madride/context.rb

@@ -0,0 +1,62 @@
+require 'sprockets/context'
+
+
+module Madride
+  class Context < Sprockets::Context
+    def self.locals
+      @locals ||= {}
+    end
+
+
+    def locals
+      self.class.locals
+    end
+
+
+    def layout= path
+      depend_on_asset path
+      @layout = path
+    end
+
+
+    def evaluate(path, options = {}, &block)
+      pathname   = resolve(path)
+      attributes = environment.attributes_for(pathname)
+      processors = options[:processors] || attributes.processors
+
+      if options[:data]
+        result = options[:data]
+      else
+        if environment.respond_to?(:default_external_encoding)
+          mime_type = environment.mime_types(pathname.extname)
+          encoding  = environment.encoding_for_mime_type(mime_type)
+          result    = Sprockets::Utils.read_unicode(pathname, encoding)
+        else
+          result = Sprockets::Utils.read_unicode(pathname)
+        end
+      end
+
+      processors.each do |processor|
+        begin
+          template  = processor.new(pathname.to_s) { result }
+          result    = template.render(self, locals){ options[:yield] }
+        rescue Exception => e
+          annotate_exception! e
+          raise
+        end
+      end
+
+      if @layout
+        begin
+          layout = self.class.new(environment, @layout, resolve(@layout))
+          result = layout.evaluate(@layout, :yield => result)
+        rescue Exception => e
+          annotate_exception! e
+          raise
+        end
+      end
+
+      result
+    end
+  end
+end

data/lib/madride/directive_processor.rb

@@ -0,0 +1,11 @@
+require "sprockets/directive_processor"
+
+module Madride
+  class DirectiveProcessor < Sprockets::DirectiveProcessor
+    protected
+
+    def process_layout_directive path
+      context.layout = path
+    end
+  end
+end

data/lib/madride/environment.rb

@@ -3,7 +3,8 @@ require "tilt/haml"
 
 
 require "madride/templates/slim"
-require "madride/context_patch"
+require "madride/context"
+require "madride/directive_processor"
 
 
 module Madride
@@ -11,20 +12,20 @@ module Madride
     def initialize *args
       super
 
+      @context_class = Class.new(Context)
+
+      # unregister .htm and register .html instead
+      register_mime_type nil, '.htm'
+      register_mime_type 'text/html', '.html'
+
       register_engine '.slim', SlimTemplate
       register_engine '.haml', Tilt::HamlTemplate
 
-      # text/html extension is .htm, so we need to reassign aliases map manually
-
-      @trail.alias_extension '.slim', '.html'
-      @trail.alias_extension '.haml', '.html'
-      @trail.alias_extension '.htm',  '.html'
+      register_preprocessor 'text/html', DirectiveProcessor
 
       Madride.paths.each do |path|
         append_path path
       end
-
-      @context_class.send(:include, ContextPatch)
     end
 
 

data/lib/madride/version.rb

@@ -1,3 +1,3 @@
 module Madride
-  VERSION = "1.0.7"
+  VERSION = "1.1.0"
 end

data/spec/environment_spec.rb

@@ -46,5 +46,16 @@ module Madride
       asset.should_not be_nil
       asset.to_s.should match(%r{<title>\s*Simple Page\s*</title>})
     end
+
+
+    it "should use default layout if layouts path provided" do
+      env = environment
+      env.append_path "layouts"
+      env.locals.merge! YAML.load_file fixtures_path('data.yml').to_s
+
+      asset = env["video/index.html"]
+      asset.should_not be_nil
+      asset.to_s.should match(%r{<title>\s*Default Layout\s*</title>})
+    end
   end
 end

data/spec/fixtures/data.yml

@@ -2,3 +2,8 @@ bands:
   - pennywise
   - dead kennedys
   - the sex pistols
+
+movies:
+  - el mariachi
+  - desperado
+  - once upon a time in mexico

data/spec/fixtures/layouts/_simple.slim

@@ -0,0 +1,6 @@
+html
+  head
+    title Default Layout
+
+  body
+    == yield

data/spec/fixtures/pages/video/index.html.slim

@@ -0,0 +1,4 @@
+//= layout _simple
+h1 List of Videos
+- for title in movies
+  h2 title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madride
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -159,9 +159,11 @@ files:
 - example/README.md
 - example/assets/app.css
 - example/data.yml
-- example/pages/index.html.slim
+- example/pages/_default.slim
+- example/pages/index.slim
 - lib/madride.rb
-- lib/madride/context_patch.rb
+- lib/madride/context.rb
+- lib/madride/directive_processor.rb
 - lib/madride/environment.rb
 - lib/madride/templates/slim.rb
 - lib/madride/version.rb
@@ -172,11 +174,13 @@ files:
 - spec/fixtures/assets/app.js
 - spec/fixtures/assets/madride.js
 - spec/fixtures/data.yml
+- spec/fixtures/layouts/_simple.slim
 - spec/fixtures/pages/about/index.html.slim
 - spec/fixtures/pages/index.html.slim
 - spec/fixtures/pages/music.html.slim
 - spec/fixtures/pages/music/bands.html.slim
 - spec/fixtures/pages/simple.slim
+- spec/fixtures/pages/video/index.html.slim
 - spec/server_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/madride/madride
@@ -193,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -393285937
+      hash: 316891443
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,13 +206,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -393285937
+      hash: 316891443
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: madride-1.0.7
+summary: madride-1.1.0
 test_files:
 - spec/.gitkeep
 - spec/environment_spec.rb
@@ -216,10 +220,12 @@ test_files:
 - spec/fixtures/assets/app.js
 - spec/fixtures/assets/madride.js
 - spec/fixtures/data.yml
+- spec/fixtures/layouts/_simple.slim
 - spec/fixtures/pages/about/index.html.slim
 - spec/fixtures/pages/index.html.slim
 - spec/fixtures/pages/music.html.slim
 - spec/fixtures/pages/music/bands.html.slim
 - spec/fixtures/pages/simple.slim
+- spec/fixtures/pages/video/index.html.slim
 - spec/server_spec.rb
 - spec/spec_helper.rb

data/example/pages/index.html.slim

@@ -1,57 +0,0 @@
-doctype
-html[lang="en"]
-  head
-    meta[charset="utf-8"]
-    title Madride Demo
-    meta[name="viewport" content="width=device-width, initial-scale=1.0"]
-    meta[name="description" content=""]
-    meta[name="author" content=""]
-    link[href="/app.css" rel="stylesheet"]
-    style[type="text/css"] body { margin-top: 30px; }
-
-  body
-    .container
-      .hero-unit
-        h1#madride Hello, world!
-        p
-          | This is a template for a simple marketing or informational website.
-          | It includes a large callout called the hero unit and three
-          | supporting pieces of content. Use it as a starting point to create
-          | something more unique.
-        p
-          a.btn.btn-primary.btn-large Learn more »
-
-      .row
-        .span4
-          h2 Heading
-          p
-            | Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
-            | tellus ac cursus commodo, tortor mauris condimentum nibh, ut
-            | fermentum massa justo sit amet risus. Etiam porta sem malesuada
-            | magna mollis euismod. Donec sed odio dui.
-          p
-            a.btn[href="#"] View details »
-        .span4
-          h2 Heading
-          p
-            | Donec id elit non mi porta gravida at eget metus. Fusce dapibus,
-            | tellus ac cursus commodo, tortor mauris condimentum nibh, ut
-            | fermentum massa justo sit amet risus. Etiam porta sem malesuada
-            | magna mollis euismod. Donec sed odio dui.
-          p
-            a.btn[href="#"] View details »
-        .span4
-          h2 Heading
-          p
-            | Donec sed odio dui. Cras justo odio, dapibus ac facilisis in,
-            | egestas eget quam. Vestibulum id ligula porta felis euismod
-            | semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris
-            | condimentum nibh, ut fermentum massa justo sit amet risus.
-          p
-            a.btn[href="#"] View details »
-      hr
-      footer
-        p
-          ' This is a demo of madride.
-          ' Based on a <a href="#{bootstrap_demo_url}">Basic marketing site</a>
-          ' example of Bootstrap from Twitter.

data/lib/madride/context_patch.rb

@@ -1,48 +0,0 @@
-module Madride
-  module ContextPatch
-    def self.included(base)
-      base.send(:include, InstanceMethods)
-
-      base.class_eval do
-        @locals = {}
-
-        class << self
-          attr_reader :locals
-        end
-      end
-    end
-
-
-    module InstanceMethods
-      def evaluate(path, options = {})
-        pathname   = resolve(path)
-        attributes = environment.attributes_for(pathname)
-        processors = options[:processors] || attributes.processors
-
-        if options[:data]
-          result = options[:data]
-        else
-          if environment.respond_to?(:default_external_encoding)
-            mime_type = environment.mime_types(pathname.extname)
-            encoding  = environment.encoding_for_mime_type(mime_type)
-            result    = Sprockets::Utils.read_unicode(pathname, encoding)
-          else
-            result = Sprockets::Utils.read_unicode(pathname)
-          end
-        end
-
-        processors.each do |processor|
-          begin
-            template = processor.new(pathname.to_s) { result }
-            result = template.render(self, self.class.locals)
-          rescue Exception => e
-            annotate_exception! e
-            raise
-          end
-        end
-
-        result
-      end
-    end
-  end
-end