theme 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15fd74827a251a1f0ed5376357004da8d902b5f0
-  data.tar.gz: f07758b271eea942ee3a3d3540c7e9f48d919e6a
+  metadata.gz: ce8d31486e669021fd7b9d454d097d1f6a274051
+  data.tar.gz: 55b801c6151d73af405f94fdc3ea2a939aa29bc4
 SHA512:
-  metadata.gz: f72a3b14d27832b35d016c5b9f4d84ea66c49c849ef76f66a5fd041d5d6f3fec00a3dd072ab6209a33727eaa1f250636c36d043fc3db55bfee538d8c74c794bd
-  data.tar.gz: da3f3ef51fcf89adc52e9ffc3382d580a762ce19462c8ef7ec231845d6593033a3b6d19d15c0a523905a013ba63c4a89c85c98cdf476c6e3214ffe8d752bb755
+  metadata.gz: 0833fdd497dacd4365422097155bf43f396a90c8a5a04707dceae7a1d611d3e4ce2c32eb60bdbe3fa1bb4d8859ddadda700b3d75c2de9b16228ba59e035e92cb
+  data.tar.gz: 4787df6f8c547e6a09808e49fb2389a734466e08ff2f0099bb85a558d7f020e5780c139ad440c6a86d18282819aa57401197e9a64075f38324b1c25cb014538b

data/lib/theme/assets/middleware.rb

@@ -80,7 +80,7 @@ module Theme
         when 'js', 'javascript', 'javascripts'
           content_type = 'text/javascript; charset=utf-8'
         else
-          content_type = Rack::Mime.mime_type ext
+          content_type = Rack::Mime.mime_type ".#{ext}"
         end
 
         res.headers.merge!({

data/lib/theme/component.rb

@@ -72,12 +72,12 @@ module Theme
       @node ||= self.class.node.clone
     end
 
-    def render meth = 'display', options = {}
+    def render meth = 'display', options = {}, &block
       if method(meth).parameters.length > 0
         opts = Hashr.new(options)
-        resp = send meth, opts
+        resp = send meth, opts, &block
       else
-        resp = send meth
+        resp = send meth, &block
       end
 
       options.clear

data/lib/theme/mab.rb

@@ -3,3 +3,48 @@ require 'mab'
 def mab(&blk)
   Mab::Builder.new({}, self, &blk).to_s
 end
+
+module Theme
+  class MabTemplate < Tilt::Template
+    def self.builder_class
+      @builder_class ||= Class.new(Mab::Builder) do
+        def __capture_mab_tilt__(&block)
+          __run_mab_tilt__ do
+            text capture(&block)
+          end
+        end
+      end
+    end
+
+    def prepare
+    end
+
+    def evaluate(scope, locals, &block)
+      builder = self.class.builder_class.new({}, scope)
+
+      locals.each do |local, value|
+        (class << builder; self end).send(:define_method, local, Proc.new { value })
+      end
+
+      if data.kind_of? Proc
+        (class << builder; self end).send(:define_method, :__run_mab_tilt__, &data)
+      else
+        builder.instance_eval <<-CODE, __FILE__, __LINE__
+          def __run_mab_tilt__
+            capture(&Proc.new {#{data}})
+          end
+        CODE
+      end
+
+      if block
+        builder.__capture_mab_tilt__(&block)
+      else
+        builder.__run_mab_tilt__
+      end
+
+      builder
+    end
+  end
+end
+
+Tilt.register Theme::MabTemplate, 'mab'

data/lib/theme/version.rb

@@ -1,3 +1,3 @@
 module Theme
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -100,7 +100,6 @@ files:
 - lib/theme/assets/render.rb
 - lib/theme/component.rb
 - lib/theme/events.rb
-- lib/theme/file.rb
 - lib/theme/mab.rb
 - lib/theme/middleware.rb
 - lib/theme/version.rb

data/lib/theme/file.rb

@@ -1,52 +0,0 @@
-module Theme
-  module File
-    extend self
-
-    IMAGE_TYPES  = %w(png gif jpg jpeg)
-    FONT_TYPES   = %w(eot woff ttf svg)
-    STATIC_TYPES = %w(html js css map)
-    VIEW_TYPES   = %w(html slim haml erb md markdown mkd mab)
-
-    def load path, c = {}, instance = self
-      cache = Theme.cache.file.fetch(path) {
-        template = false
-
-        ext = path[/\.[^.]*$/][1..-1]
-
-        if ext && ::File.file?(path)
-          if STATIC_TYPES.include? ext
-            template = Tilt::PlainTemplate.new nil, 1, outvar: '@_output', default_encoding: 'UTF-8' do |t|
-              ::File.read(path)
-            end
-          elsif FONT_TYPES.include?(ext) || IMAGE_TYPES.include?(ext)
-            template = ::File.read path
-          else
-            template = Tilt.new path, 1, outvar: '@_output'
-          end
-        else
-          VIEW_TYPES.each do |type|
-            f = "#{path}.#{type}"
-
-            if ::File.file? f
-              template = Tilt.new f, 1, outvar: '@_output'
-              break
-            end
-          end
-        end
-
-        unless template
-          raise Theme::No::FileFound,
-            "Could't find file: #{path} with any of these extensions: #{VIEW_TYPES.join(', ')}."
-        end
-
-        template
-      }
-
-      if defined? cache.render
-        cache.render instance, c.to_h
-      else
-        cache.to_s
-      end
-    end
-  end
-end