dominate 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc880a64862f4eb9bffacfb66763b25fa1ba6452
-  data.tar.gz: 675cd58433124b28376788d3ca01dc83daab1360
+  metadata.gz: bb04c61b1d509aa27a58a56ae57c0952dc272ad9
+  data.tar.gz: 9bacdf195170b8f86d27e4fb1eff7c2f28149c9e
 SHA512:
-  metadata.gz: d2bfc67b7b492515b8e3b27340d49b983bfd9861106f0d29fef1f9d6d1f36c379de8389e764ada262f0f0b73b5fc179d771fecda96a348e35598abd3af693bf3
-  data.tar.gz: 5e2cde594faf34e217dede5b13a1811392facea3ef9d063275536acd52e0d67fd464cc62b5182fe2e74f922b9f940fed9781b578847cdafc51a57e5add0ff767
+  metadata.gz: 6a9973834d2a6b1e0d3344da950e8349657000b43b1b10115fc24e8a3d425a8168ae8fcf6b2b9489720e36f8752038edaa260186d91bb83a82251d3ee6fcfa11
+  data.tar.gz: ba07354f0a6b3d38d522b3053a15706155160c31ddf71d2c2f63133ef958374677c423f65a4e381fa6554136ece59d90e605a4ef7c2562c32f94d6e1307bd6eb

data/.gems

@@ -0,0 +1,6 @@
+tilt -v 2.0.1
+eventable -v 0.1.4
+slim -v 2.0.3
+cuba -v 3.1.1
+nokogiri -v 1.6.2.1
+nokogiri-styles -v 0.1.2

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.gs
+.env

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p481

data/Makefile

@@ -0,0 +1,28 @@
+.PHONY: install test server
+
+define install_bs
+	which bs || (wget https://raw.githubusercontent.com/educabilia/bs/master/bin/bs && chmod +x bs && sudo mv bs /usr/local/bin)
+
+	@if [ -s .gs ]; then \
+		true; \
+	else \
+		mkdir .gs; \
+		touch .env; \
+		echo 'GEM_HOME=$$(pwd)/.gs' >> .env; \
+		echo 'GEM_PATH=$$(pwd)/.gs' >> .env; \
+		echo 'PATH=$$(pwd)/.gs/bin:$$PATH' >> .env; \
+		echo 'RACK_ENV=development' >> .env; \
+	fi;
+
+	bs gem install dep
+	bs gem install cutest-cj
+	bs gem install pry
+	bs gem install awesome_print
+endef
+
+install:
+	$(call install_bs)
+	bs dep install
+
+test:
+	bs env $$(cat .env.test) cutest test/**/*_test.rb

data/lib/dominate/assets/middleware.rb

@@ -0,0 +1,124 @@
+require 'rack/mime'
+
+module Dominate
+  module Assets
+    class Middleware
+      STATIC_TYPES = %w(js css)
+
+      attr_reader :app, :env, :res
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call env
+        dup.call! env
+      end
+
+      def call! env
+        @env = env
+
+        if assets_path
+          render_assets
+        else
+          res
+        end
+      end
+
+      private
+
+      def res
+        @res ||= begin
+          if not assets_path
+            app.call(req.env)
+          else
+            Cuba::Response.new
+          end
+        end
+      end
+
+      def req
+        @req ||= Rack::Request.new env
+      end
+
+      def assets_path
+        path[Regexp.new("^#{Dominate.config.asset_url}($|.*)")]
+      end
+
+      def path
+        env['PATH_INFO']
+      end
+
+      def type
+        if matched = path.match(/(?<=#{Dominate.config.asset_url}\/).*(?=\/)/)
+          matched[0]
+        else
+          ''
+        end
+      end
+
+      def name
+        cleaned = path.gsub(/\.#{ext}$/, '')
+        cleaned = cleaned.gsub(/^#{Dominate.config.asset_url}\//, '')
+        cleaned = cleaned.gsub(/^#{type}\//, '')
+        cleaned
+      end
+
+      def ext
+        if matched = path.match(/(?<=\.).*$/)
+          matched[0]
+        else
+          false
+        end
+      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'
+        when 'js', 'javascript', 'javascripts'
+          content_type = 'text/javascript'
+        else
+          content_type = Rack::Mime.mime_type ext
+        end
+
+        res.headers["Content-Type"] = content_type
+
+        res.finish
+      end
+
+      def render_all_files
+        content = ''
+        files   = Dominate.config.assets[ext]
+        path    = "#{Dominate.config.asset_path}/#{type}"
+
+        files.each do |file|
+          content += load_file "#{path}/#{file}"
+        end
+
+        content
+      end
+
+      def render_single_file
+        path  = "#{Dominate.config.asset_path}/#{type}"
+        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
+      end
+    end
+  end
+end

data/lib/dominate/assets/render.rb

@@ -0,0 +1,44 @@
+module Dominate
+  module Assets
+    module Render
+      PARTIAL_REGEX = Regexp.new '([a-zA-Z_]+)$'
+
+      def self.setup app
+        app.settings[:render] ||= {}
+        app.use Middleware
+
+        load_engines
+      end
+
+      def render file, options = {}
+        path    = "#{settings[:render][:views] || Dominate.config.view_path}"
+        layout_path  = settings[:layout_path] || Dominate.config.layout_path
+        layout  = "#{layout_path}/#{settings[:render][:layout] || Dominate.config.layout}"
+        content = Dominate::HTML.load_file "#{path}/#{file}", options, self
+        options[:content] = content
+        Dominate::HTML.load_file layout, options, self
+      end
+
+      def partial file, options = {}
+        file.gsub! PARTIAL_REGEX, '_\1'
+        path = "#{settings[:render][:views] || Dominate.config.view_path}"
+        Dominate::HTML.load_file "#{path}/#{file}", options, self
+      end
+
+      private
+
+      def self.load_engines
+        if defined? Slim
+          Slim::Engine.set_default_options \
+            disable_escape: true,
+            use_html_safe: true,
+            disable_capture: false
+
+          if RACK_ENV == 'development'
+            Slim::Engine.set_default_options pretty: true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dominate/assets.rb

@@ -0,0 +1,6 @@
+module Dominate
+  module Assets
+    autoload :Middleware, 'dominate/assets/middleware'
+    autoload :Render,     'dominate/assets/render'
+  end
+end

data/lib/dominate/dom.rb

@@ -26,23 +26,28 @@ module Dominate
         HTML.load_file "#{view_path}/#{partial}", config, instance
       end
 
-      set_doc updated_html if updated_html
-
-      doc.traverse do |e|
-        if match = e.to_html.strip.match(PARTIAL_REGEX)
-          partial = match[1]
-          e.swap Nokogiri::HTML.fragment(
-            HTML.load_file "#{view_path}/#{partial}", config, instance
-          )
-        end
+      updated_html = updated_html.gsub(PARTIAL_REGEX) do |m|
+        partial = $~.captures.first
+        HTML.load_file "#{view_path}/#{partial}", config, instance
       end
+
+      set_doc updated_html
+
+      # doc.traverse do |e|
+      #   if match = e.to_html.strip.match(PARTIAL_REGEX)
+      #     partial = match[1]
+      #     e.swap Nokogiri::HTML.fragment(
+      #       HTML.load_file "#{view_path}/#{partial}", config, instance
+      #     )
+      #   end
+      # end
     end
 
     def load_layout
       path       = "#{config.view_path}/#{config.layout}"
       html       = HTML.load_file path, config, instance
       inner_html = doc.inner_html
-      set_doc html.gsub YIELD_REGEX, inner_html
+      doc.inner_html = html.gsub YIELD_REGEX, inner_html
     end
 
     def scope name, &block

data/lib/dominate/html.rb

@@ -7,28 +7,39 @@ module Dominate
     def file file, instance = false, config = {}
       c    = (Dominate.config.to_h.merge config).to_deep_ostruct
       path = "#{c.view_path}/#{file}"
-      dom = load_file path, c, instance
-
-      # todo> try https://github.com/ohler55/ox instead 
-      # dom  = Dom.new html, instance, config
-      #
-      # if File.file? path + '.dom'
-      #   dom = Instance.new(instance, c).instance_eval File.read(path + '.dom')
-      # end
-      #
-      dom
+      html = load_file path, c, instance
+
+      if c.parse_dom
+        unless dom_cache = _dom_cache[path]
+          dom_cache = (_dom_cache[path] = Dom.new(html, instance, config))
+        end
+
+        dom = dom_cache.dup
+
+        if File.file? path + '.dom'
+          dom = Instance.new(instance, c).instance_eval File.read(path + '.dom')
+        end
+
+        dom
+      else
+        html
+      end
     end
 
-    def load_file path, c, instance
+    def load_file path, c = {}, instance = self
       html = _cache.fetch(path) {
         template = false
 
-        VIEW_TYPES.each do |type|
-          f = "#{path}.#{type}"
+        if path[/\..*$/] && File.file?(path)
+          template = Tilt.new path, 1, outvar: '@_output'
+        else
+          VIEW_TYPES.each do |type|
+            f = "#{path}.#{type}"
 
-          if File.file? f
-            template = ::Tilt.new f, 1, outvar: '@_output'
-            break
+            if File.file? f
+              template = Tilt.new f, 1, outvar: '@_output'
+              break
+            end
           end
         end
 
@@ -43,11 +54,16 @@ module Dominate
       html
     end
 
+    private
+
     # @private Used internally by #render to cache the
     #          ::Tilt templates.
     def _cache
       Thread.current[:_cache] ||= ::Tilt::Cache.new
     end
-    private :_cache
+
+    def _dom_cache
+      Thread.current[:_dom_cache] ||= {}
+    end
   end
 end

data/lib/dominate/version.rb

@@ -1,3 +1,3 @@
 module Dominate
-  VERSION = "0.7.6"
+  VERSION = "0.8.0"
 end

data/lib/dominate/widget/helper.rb

@@ -44,12 +44,13 @@ module Dominate
             resp = widget.send state
           end
 
-          # if resp.is_a? Dominate::Dom
-          #   html = "<div id='#{widget.id_for(state)}'>#{resp.html}</div>"
-          #   resp.reset_html
-          #   resp.doc.inner_html = html
-          #   resp.html
-          if resp.is_a? String
+          if resp.is_a? Dominate::Dom
+            html = "<div id='#{widget.id_for(state)}'>#{resp.html}</div>"
+            # resp.reset_html
+            # resp.doc.inner_html = html
+            # resp.html
+            html
+          elsif resp.is_a? String
             html = "<div id='#{widget.id_for(state)}'>#{resp}</div>"
             html
           else

data/lib/dominate/widget.rb

@@ -58,12 +58,13 @@ module Dominate
         resp = send(state)
       end
 
-      # if resp.is_a? Dominate::Dom
-      #   html = "<div id='#{id_for(state)}'>#{resp.html}</div>"
-      #   resp.doc.inner_html = html
-      #   resp.reset_html
-      #   resp.html
-      if resp.is_a? String
+      if resp.is_a? Dominate::Dom
+        html = "<div id='#{id_for(state)}'>#{resp.html}</div>"
+        # resp.doc.inner_html = html
+        # resp.reset_html
+        # resp.html
+        html
+      elsif resp.is_a? String
         html = "<div id='#{id_for(state)}'>#{resp}</div>"
         html
       else
@@ -143,12 +144,13 @@ module Dominate
                 resp = send(e)
               end
 
-              # if resp.is_a? Dominate::Dom
-              #   html = "<div id='#{id_for(e)}'>#{resp.html}</div>"
-              #   resp.doc.inner_html = html
-              #   resp.reset_html
-              #   res.write resp.html
-              if resp.is_a? String
+              if resp.is_a? Dominate::Dom
+                html = "<div id='#{id_for(e)}'>#{resp.html}</div>"
+                # resp.doc.inner_html = html
+                # resp.reset_html
+                # res.write resp.html
+                res.write html
+              elsif resp.is_a? String
                 html = "<div id='#{id_for(e)}'>#{resp}</div>"
                 res.write html
               else

data/lib/dominate.rb

@@ -12,6 +12,7 @@ module Dominate
   autoload :Scope,    "dominate/scope"
   autoload :Dom,      "dominate/dom"
   autoload :Widget,   "dominate/widget"
+  autoload :Assets,   "dominate/assets"
 
   class NoFileFound < StandardError; end
 
@@ -28,11 +29,19 @@ module Dominate
   # Resets the configuration to the default (empty hash)
   def reset_config!
     @config = OpenStruct.new({
-      view_path:   './views',
+      parse_dom:   false,
       layout:      'app',
+      layout_path: './views/layouts',
+      view_path:   './views',
       widget_path: './widgets',
       widget_url:  '/widgets',
-      widgets:     {}
+      widgets:     {},
+      assets: OpenStruct.new({
+        js: {},
+        css: {}
+      }),
+      asset_url:  '/assets',
+      asset_path: './assets'
     })
   end
 

data/test/helper.rb

@@ -1,2 +1,5 @@
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'dominate'
 require 'slim'

data/test/template_test.rb

@@ -5,6 +5,7 @@ setup do
   Dominate.setup do |c|
     c.view_path = './test/dummy'
     c.layout    = "app"
+    c.parse_dom = true
   end
 
   inline_html = File.read './test/dummy/index.html'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dominate
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -171,13 +171,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gems
 - .gitignore
-- Gemfile
+- .ruby-version
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - dominate.gemspec
 - lib/dominate.rb
+- lib/dominate/assets.rb
+- lib/dominate/assets/middleware.rb
+- lib/dominate/assets/render.rb
 - lib/dominate/dom.rb
 - lib/dominate/html.rb
 - lib/dominate/inflectors.rb
@@ -239,4 +244,3 @@ test_files:
 - test/helper.rb
 - test/template_test.rb
 - test/widget_test.rb
-has_rdoc: 

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in dominate.gemspec
-gemspec