dominate 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 221114d9a95c40764d02f786475739c0d97d5c79
-  data.tar.gz: a69c298b432e604e46fa502fadffb16ae2097eb9
+  metadata.gz: 0d3b1aa6fbb858cc24a4ec18c547d42e546b6b3f
+  data.tar.gz: 3bc383c404685b5d9ee40256fb7f48173955b1d1
 SHA512:
-  metadata.gz: 086713340ee8435820e4ca1c1fae36ad9002cca30f7f7cf27967c37657c3c56003cba63cbbe71fef185bb62ec6ab9ecb0114ba794505ca235e9b1ece485bc51f
-  data.tar.gz: d7b1be90668b397a9f98f7208607f70be651bc1aacc4962fad690939d6d1abf79a6bf3215eb0e7ac5b50c787028d08c65985457cb49d97263ab58ca1baf3d0f2
+  metadata.gz: c1b9bc7d8bfea1378e6fa9d7c1d45fa4018c84ba4127ea3d297df2293579154cf09700784d6a33dd5349a009b2195309996ea81f8a6578214207f389f32d6307
+  data.tar.gz: 68d92c99a94802ceb21ee260be6e0ed1d77c6d9bbc801e88db3dcc82b6d55fd74b13a9bc80c3022bb22d0fea8d7c8ecb26be85081dd8ab5d502c02c0a7d81b4e

data/Makefile

@@ -14,10 +14,10 @@ define install_bs
 		echo 'RACK_ENV=development' >> .env; \
 	fi;
 
-	bs gem install dep
-	bs gem install cutest-cj
-	bs gem install pry
-	bs gem install awesome_print
+	bs gem list dep-cj -i || gem install dep-cj
+	bs gem list cutest -i || gem install cutest-cj
+	bs gem list pry -i || gem install pry
+	bs gem list awesome_print -i || bs gem install awesome_print
 endef
 
 install:
@@ -26,3 +26,6 @@ install:
 
 test:
 	bs env $$(cat .env.test) cutest test/**/*_test.rb
+
+compile:
+	bs env $$(cat .env.test) ruby -e "require './app'"

data/lib/dominate/assets/middleware.rb

@@ -1,4 +1,5 @@
 require 'rack/mime'
+require 'open-uri'
 
 module Dominate
   module Assets
@@ -87,7 +88,8 @@ module Dominate
           "Cache-Control"             => 'public, max-age=2592000, no-transform',
           'Connection'                => 'keep-alive',
           'Age'                       => '25637',
-          'Strict-Transport-Security' => 'max-age=31536000'
+          'Strict-Transport-Security' => 'max-age=31536000',
+          'Content-Disposition'       => 'inline'
         })
 
         if name == "all-#{sha}"
@@ -108,7 +110,11 @@ module Dominate
         path    = "#{Dominate.config.asset_path}/#{type}"
 
         files.each do |file|
-          content += Dominate::HTML.load_file "#{path}/#{file}"
+          if file[/^http/]
+            content += open(file).string
+          else
+            content += Dominate::HTML.load_file("#{path}/#{file}")
+          end
         end
 
         content

data/lib/dominate/dom.rb

@@ -18,7 +18,7 @@ module Dominate
     def load_html
       load_layout if config.layout
 
-      inner_html = doc.inner_html
+      inner_html = doc.to_s
 
       updated_html = inner_html.gsub(PARTIAL_REGEX_WITHIN) do |m|
         match   = m.strip.match(PARTIAL_REGEX)

data/lib/dominate/html.rb

@@ -4,7 +4,9 @@ module Dominate
   module HTML
     extend self
 
-    STATIC_TYPES = %w(html js css eot woff ttf svg)
+    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)
 
 
@@ -31,8 +33,7 @@ module Dominate
     end
 
     def load_file path, c = {}, instance = self
-      c[:moo] = 'cow'
-      html = _cache.fetch(path) {
+      cache = _cache.fetch(path) {
         template = false
 
         ext = path[/\.[^.]*$/][1..-1]
@@ -42,6 +43,8 @@ module Dominate
             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
@@ -62,9 +65,13 @@ module Dominate
         end
 
         template
-      }.render instance, c.to_h
+      }
 
-      html
+      if defined? cache.render
+        cache.render instance, c.to_h
+      else
+        cache.to_s
+      end
     end
 
     private

data/lib/dominate/version.rb

@@ -1,3 +1,3 @@
 module Dominate
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dominate
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri