dominate 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c095094c79fc311758877e11f42dfb49841e822
-  data.tar.gz: 49235cf08d8ce3dd86aa3f421147efc4ce07ccfb
+  metadata.gz: 864743b37dfcebd9f526d7bacbf8b343d9ccafef
+  data.tar.gz: cad1bd5848f42ff269c02cd0f340a82775f9367d
 SHA512:
-  metadata.gz: 1b149de53b4a44ba8c2b3c15394a3ea889a7711d46a23ed80a621c1612987bf5e2ca10a936a771b9f5603bb72dc7d0593188ccfd2f783ab22097fab5aaee2f64
-  data.tar.gz: 10cd56e3438dafd5e9cb6806480302bdd53dcb555baa7696e13d1917ffc7db4adcf648588c9bfeee3233c2c4b5fceea4969d4055a32a0c70a9990bdb49a4a75b
+  metadata.gz: 4b96cb07e58de04d6ea195c0cbff175cee36ffcac3291ada395784014c50c3ea3a1a5d60f2ef2fdd9ca912b0c843f9ccae0bbb7d350cbd9a5b34e1cc87cf5bd0
+  data.tar.gz: 15a5ffa800ad2d0599fcd5ddd9074eb03204ae84d582242ee53061f662349137faf1a3e6e933d8435e7eadf9e89b57022c85935679b1709d8a207c227a9575b1

data/dominate.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "tilt"
   spec.add_dependency "nokogiri-styles"
   spec.add_dependency "eventable"
+  spec.add_dependency "mab", "~> 0.0.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/dominate/assets/middleware.rb

@@ -3,8 +3,6 @@ require 'rack/mime'
 module Dominate
   module Assets
     class Middleware
-      STATIC_TYPES = %w(html js css eot woff ttf svg)
-
       attr_reader :app, :env, :res
 
       def initialize(app)
@@ -58,10 +56,12 @@ module Dominate
       end
 
       def name
-        cleaned = path.gsub(/\.#{ext}$/, '')
-        cleaned = cleaned.gsub(/^#{Dominate.config.asset_url}\//, '')
-        cleaned = cleaned.gsub(/^#{type}\//, '')
-        cleaned
+        @name ||= begin
+          cleaned = path.gsub(/\.#{ext}$/, '')
+          cleaned = cleaned.gsub(/^#{Dominate.config.asset_url}\//, '')
+          cleaned = cleaned.gsub(/^#{type}\//, '')
+          cleaned
+        end
       end
 
       def ext
@@ -73,22 +73,31 @@ module Dominate
       end
 
       def render_assets
-        if name == 'all'
-          res.write render_all_files
-        else
-          res.write render_single_file
-        end
-
         case type
         when 'css', 'stylesheet', 'stylesheets'
-          content_type = 'text/css'
+          content_type = 'text/css; charset=utf-8'
         when 'js', 'javascript', 'javascripts'
-          content_type = 'text/javascript'
+          content_type = 'text/javascript; charset=utf-8'
         else
           content_type = Rack::Mime.mime_type ext
         end
 
-        res.headers["Content-Type"] = content_type
+        res.headers.merge!({
+          "Content-Type"              => content_type,
+          "Cache-Control"             => 'public, max-age=2592000, no-transform',
+          'Connection'                => 'keep-alive',
+          'Age'                       => '25637',
+          'Strict-Transport-Security' => 'max-age=31536000'
+        })
+
+        if name == "all-#{sha}"
+          @name = 'dominate-compiled'
+          res.write render_single_file
+        elsif name == 'all'
+          res.write render_all_files
+        else
+          res.write render_single_file
+        end
 
         res.finish
       end
@@ -99,7 +108,7 @@ module Dominate
         path    = "#{Dominate.config.asset_path}/#{type}"
 
         files.each do |file|
-          content += load_file "#{path}/#{file}"
+          content += Dominate::HTML.load_file "#{path}/#{file}"
         end
 
         content
@@ -107,17 +116,11 @@ module Dominate
 
       def render_single_file
         path  = "#{Dominate.config.asset_path}/#{type}"
-        load_file "#{path}/#{name}.#{ext}"
+        Dominate::HTML.load_file "#{path}/#{name}.#{ext}"
       end
 
-      def load_file path
-        ext = path[/\.[^.]*$/][1..-1]
-
-        if STATIC_TYPES.include? ext
-          File.read path
-        else
-          Dominate::HTML.load_file path
-        end
+      def sha
+        Thread.current[:_sha] ||= `git rev-parse HEAD`.strip
       end
     end
   end

data/lib/dominate/assets.rb

@@ -1,6 +1,72 @@
+require 'dominate/mab'
+
 module Dominate
   module Assets
     autoload :Middleware, 'dominate/assets/middleware'
     autoload :Render,     'dominate/assets/render'
+
+    def self.setup app
+      app.use Middleware
+      app.plugin Render
+    end
+
+    def css_assets options = {}
+      options = {
+        'data-turbolinks-track' => 'true',
+        rel: 'stylesheet',
+        type: 'text/css',
+        media: 'all'
+      }.merge options
+
+      url = Dominate.config.asset_url
+
+      if Dominate.config.assets_compiled
+        options[:href] = "#{url}/css/all-#{sha}.css"
+      else
+        options[:href] = "#{url}/css/all.css"
+      end
+
+      mab { link options }
+    end
+
+    def js_assets options = {}
+      options = {
+        'data-turbolinks-track' => 'true',
+      }.merge options
+
+      url = Dominate.config.asset_url
+
+      if Dominate.config.assets_compiled
+        options[:src] = "#{url}/js/all-#{sha}.js"
+      else
+        options[:src] = "#{url}/js/all.js"
+      end
+
+      mab { script options }
+    end
+
+    def self.compile
+      Dominate.config.assets.to_h.each do |type, assets|
+        content = ''
+
+        if assets.length > 0
+          type_path = "#{Dominate.config.asset_path}/#{Dominate.config[:"asset_#{type}_folder"]}"
+          assets.each do |file|
+            path = "#{type_path}/#{file}"
+            content += Dominate::HTML.load_file path
+          end
+          tmp_path = "#{type_path}/tmp.dominate-compiled.#{type}"
+          File.write "#{type_path}/dominate-compiled.#{type}", content
+          # system "minify #{tmp_path} > #{type_path}/dominate-compiled.#{type}"
+          # File.delete tmp_path
+        end
+      end
+    end
+
+    private
+
+    def sha
+      Thread.current[:_sha] ||= `git rev-parse HEAD`.strip
+    end
   end
 end

data/lib/dominate/html.rb

@@ -1,8 +1,12 @@
+require 'tilt/template'
+
 module Dominate
   module HTML
     extend self
 
-    VIEW_TYPES = %w(html slim haml erb md markdown mkd mab)
+    STATIC_TYPES = %w(html js css eot woff ttf svg)
+    VIEW_TYPES   = %w(html slim haml erb md markdown mkd mab)
+
 
     def file file, instance = false, config = {}
       c    = (Dominate.config.to_h.merge config).to_deep_ostruct
@@ -27,11 +31,20 @@ module Dominate
     end
 
     def load_file path, c = {}, instance = self
+      c[:moo] = 'cow'
       html = _cache.fetch(path) {
         template = false
 
-        if path[/\..*$/] && File.file?(path)
-          template = Tilt.new path, 1, outvar: '@_output'
+        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
+          else
+            template = Tilt.new path, 1, outvar: '@_output'
+          end
         else
           VIEW_TYPES.each do |type|
             f = "#{path}.#{type}"

data/lib/dominate/mab.rb

@@ -0,0 +1,5 @@
+require 'mab'
+
+def mab(&blk)
+  Mab::Builder.new({}, self, &blk).to_s
+end

data/lib/dominate/version.rb

@@ -1,3 +1,3 @@
 module Dominate
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/lib/dominate.rb

@@ -40,8 +40,11 @@ module Dominate
         js: {},
         css: {}
       }),
-      asset_url:  '/assets',
-      asset_path: './assets'
+      asset_url:        '/assets',
+      asset_path:       './assets',
+      asset_js_folder:  'js',
+      asset_css_folder: 'css',
+      assets_compiled:  false
     })
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dominate
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +201,7 @@ files:
 - lib/dominate/html.rb
 - lib/dominate/inflectors.rb
 - lib/dominate/instance.rb
+- lib/dominate/mab.rb
 - lib/dominate/scope.rb
 - lib/dominate/version.rb
 - lib/dominate/widget.rb