dominate 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e395d2086436cdb2ce8e73ff7e8b4ff3bdb33975
-  data.tar.gz: 97061dbbb9e56558721bc9cd3266aec83b15c14b
+  metadata.gz: 72d9211bc986aa60662aca31c47f9d21079012ca
+  data.tar.gz: b4134caf0f64afff8dd8586e92f8120f3748694f
 SHA512:
-  metadata.gz: 5d5f41678d8ff7d2fc9ccf22a72eb62d728696443f9d1bae8cc1c9866e2b80279e5bd757a04e410cfcf4ce78ea43fcde1c2ab2d56a1b636556649b19abe2293b
-  data.tar.gz: af47481108af632da963b17ea4fe7ba30bc62f11a9055e655e9029a5f8af6391ee43db5b80743675b18249cff7198fe8fe804d54fb4da437bc9e953639d72413
+  metadata.gz: dbd70fd7b2e6d7ef293c3c3af0563427a7a49753eccb7b25a331a69906a5ca1d49ecb41a471ac180ff1ab70469fa1b4b89641d04c0f4cd456eea1adac3e68e4b
+  data.tar.gz: bf9a7234075c749d8938b67e8eba81d39b57ca312307ee82e707547e9f5da74b48d085e8625317058a38550b08e1572cdb16d4e91b3babf81e53c08b0195ebf5

data/lib/dominate/dom.rb

@@ -18,10 +18,12 @@ module Dominate
     def load_html
       load_layout if config.layout
 
-      updated_html = doc.inner_html.gsub(PARTIAL_REGEX_WITHIN) do |m|
+      inner_html = doc.inner_html
+
+      updated_html = inner_html.gsub(PARTIAL_REGEX_WITHIN) do |m|
         match   = m.strip.match(PARTIAL_REGEX)
         partial = match[1]
-        HTML.load "#{view_path}/#{partial}", config, instance
+        HTML.load_file "#{view_path}/#{partial}", config, instance
       end
 
       set_doc updated_html if updated_html
@@ -30,7 +32,7 @@ module Dominate
         if match = e.to_html.strip.match(PARTIAL_REGEX)
           partial = match[1]
           e.swap Nokogiri::HTML.fragment(
-            HTML.load "#{view_path}/#{partial}", config, instance
+            HTML.load_file "#{view_path}/#{partial}", config, instance
           )
         end
       end
@@ -38,7 +40,7 @@ module Dominate
 
     def load_layout
       path       = "#{config.view_path}/#{config.layout}"
-      html       = HTML.load path, config, instance
+      html       = HTML.load_file path, config, instance
       inner_html = doc.inner_html
       set_doc html.gsub YIELD_REGEX, inner_html
     end
@@ -70,18 +72,14 @@ module Dominate
       Scope.new(instance, config, doc).apply_instance
     end
 
+    def reset_html
+      @html = false
+    end
+
     private
 
     def set_doc html
-      if html.match(/<html.*>/)
-        @doc = Nokogiri::HTML::Document.parse html
-      else
-        @doc = Nokogiri::HTML.fragment html
-      end
-    end
-
-    def reset_html
-      @html = false
+      @doc = Nokogiri::HTML html
     end
 
     def view_path

data/lib/dominate/html.rb

@@ -7,35 +7,47 @@ module Dominate
     def file file, instance = false, config = {}
       c    = (Dominate.config.to_h.merge config).to_deep_ostruct
       path = "#{c.view_path}/#{file}"
-      html = load path, c, instance
-      dom  = Dom.new html, instance, config
-
-      if File.file? path + '.dom'
-        dom = Instance.new(instance, c).instance_eval File.read(path + '.dom')
-      end
-
+      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
     end
 
-    def load path, config, instance
-      html = false
+    def load_file path, config, instance
+      html = _cache.fetch(path) {
+        template = false
+
+        VIEW_TYPES.each do |type|
+          f = "#{path}.#{type}"
 
-      VIEW_TYPES.each do |type|
-        f = "#{path}.#{type}"
+          if File.file? f
+            template = Tilt.new f, 1, outvar: '@_output'
+            break
+          end
+        end
 
-        if File.file? f
-          template = Tilt.new f
-          html     = template.render Instance.new(instance, config)
-          break
+        unless template
+          raise Dominate::NoFileFound,
+            "Could't find file: #{path} with any of these extensions: #{VIEW_TYPES.join(', ')}."
         end
-      end
 
-      unless html
-        raise Dominate::NoFileFound,
-          "Could't find file: #{path} with any of these extensions: #{VIEW_TYPES.join(', ')}."
-      end
+        template
+      }.render instance, config.to_h
 
       html
     end
+
+    # @private Used internally by #render to cache the
+    #          Tilt templates.
+    def _cache
+      Thread.current[:_cache] ||= Tilt::Cache.new
+    end
+    private :_cache
   end
 end

data/lib/dominate/instance.rb

@@ -1,24 +1,43 @@
-module Dominate
-  class Instance
-    def initialize instance, config
-      @__config__   = config
-      @__instance__ = instance
+# module Dominate
+#   class Instance < SimpleDelegator
+#     def initialize instance, config
+#       @__config__   = config
+#       @__instance__ = instance
+#
+#       instance.instance_variables.each do |name|
+#         instance_variable_set name, instance.instance_variable_get(name)
+#       end
+#
+#       instance
+#     end
+#
+#     def method_missing method, *args, &block
+#       if @__config__.respond_to? method
+#         @__config__.send method, *args, &block
+#       elsif @__instance__.respond_to? method
+#         @__instance__.send method, *args, &block
+#       else
+#         @__instance__.send 'method_missing', method, *args, &block
+#       end
+#     end
+#   end
+# end
+
+require 'delegate'
 
+module Dominate
+  class Instance < SimpleDelegator
+    def initialize instance, locals = {}
       instance.instance_variables.each do |name|
         instance_variable_set name, instance.instance_variable_get(name)
       end
 
-      instance
-    end
-
-    def method_missing method, *args, &block
-      if @__config__.respond_to? method
-        @__config__.send method, *args, &block
-      elsif @__instance__.respond_to? method, *args, &block
-        @__instance__.send method, *args, &block
-      else
-        @__instance__.send 'method_missing', method, *args, &block
+      locals.to_h.each do |key, value|
+        (class << self; self; end).send(:attr_accessor, key.to_sym)
+        instance_variable_set("@#{key}", value)
       end
+
+      super instance
     end
   end
 end

data/lib/dominate/version.rb

@@ -1,3 +1,3 @@
 module Dominate
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/dominate/widget.rb

@@ -32,6 +32,77 @@ module Dominate
       end
     end
 
+    def set_state state
+      @widget_state = state
+    end
+
+    def reset_state
+      @widget_state = false
+    end
+
+    def partial template, locals = {}
+      locals[:partial] = template
+      resp = render locals
+
+      if resp.is_a? Dominate::Dom
+        resp.html
+      else
+        resp
+      end
+    end
+
+    def render_state options = {}
+      state = widget_state || options.delete(:state)
+
+      if method(state).parameters.length > 0
+        resp = send(state, options.to_deep_ostruct)
+      else
+        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
+      else
+        resp
+      end
+    end
+
+    def replace state, opts = {}
+      if !state.is_a? String
+        opts[:state] = state
+        content = render_state opts
+        selector = '#' + id_for(state)
+      else
+        if !opts.key?(:content) and !opts.key?(:with)
+          opts[:state] = caller[0][/`.*'/][1..-2]
+          content = render_state opts
+        else
+          content = opts[:content] || opts[:with]
+        end
+        selector = state
+      end
+
+      res.write '$("' + selector + '").replaceWith("' + escape(content) + '");'
+      # scroll to the top of the page just as if we went to the url directly
+      # if opts[:scroll_to_top]
+      #   res.write 'window.scrollTo(0, 0);'
+      # end
+    end
+
+    def id_for state
+      w_name  = name.to_s.gsub(/_/, '-')
+      w_state = state.to_s.gsub(/_/, '-')
+
+      "#{w_name}-#{w_state}"
+    end
+
+    def escape js
+      js.to_s.gsub(/(\\|<\/|\r\n|\\3342\\2200\\2250|[\n\r"'])/) {|match| JS_ESCAPE[match] }
+    end
+
     def trigger widget_event, data = {}
       widget_name = data.delete(:for)
 
@@ -62,6 +133,9 @@ module Dominate
               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
               else
                 resp
@@ -79,7 +153,7 @@ module Dominate
         locals = args.first
         # if it's a partial we add an underscore infront of it
         state = view = locals[:state] ||
-          "#{locals[:partial]}".gsub(PARTIAL_REGEX, '_\1')
+          "#{locals.delete(:partial)}".gsub(PARTIAL_REGEX, '_\1')
       else
         state = view = args.first
         locals = args.length > 1 ? args.last : {}

data/lib/dominate/widget/helper.rb

@@ -45,6 +45,9 @@ module Dominate
           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
           else
             resp
@@ -53,6 +56,11 @@ module Dominate
         #   raise "Please add ##{state} to #{widget.class}."
         # end
       end
+
+      def url_for_event event, options = {}
+        widget_name = options.delete(:widget_name) || req.env[:widget_name]
+        "http#{req.env['SERVER_PORT'] == '443' ? 's' : ''}://#{req.env['HTTP_HOST']}#{Dominate.config.widget_url}?widget_event=#{event}&widget_name=#{widget_name}" + (options.any?? '&' + URI.encode_www_form(options) : '')
+      end
     end
   end
 end

data/lib/dominate/widget/middleware.rb

@@ -6,7 +6,11 @@ module Dominate
         @app = app
       end
 
-      def call(env)
+      def call env
+        dup.call! env
+      end
+
+      def call! env
         @env = env
 
         if widget_path

data/test/widget_test.rb

@@ -13,9 +13,18 @@ setup do
   end
 
   Cuba.reset!
-  Cuba.use Dominate::Widget::Middleware
+  # Cuba.use Dominate::Widget::Middleware
   Cuba.plugin Dominate::Widget::Helper
   Cuba.define do
+
+    on "widgets" do
+      widget_name, widget_event, event = Dominate::Widget.load_all self, req, res
+
+      event.trigger widget_name, widget_event, req.params
+      # res.write "$('head > meta[name=csrf-token]').attr('content', '#{csrf_token}');"
+      res.write '$(document).trigger("page:change");'
+    end
+
     on "test" do
       res.write render_widget :some_widget
     end
@@ -30,13 +39,16 @@ scope 'dominate widget' do
       'REQUEST_METHOD' => 'GET',
       'rack.input'     => {}
     })
+    body = resp.join
 
-    assert resp.join.scan('Hello, World!').length == 2
+    assert body.scan('Hello, World!').length == 2
+    assert body['some-widget-display']
   end
 
   test 'event' do
     _, _, resp = Cuba.call({
       'PATH_INFO'   => '/widgets',
+      'SCRIPT_NAME'   => '/widgets',
       'REQUEST_METHOD' => 'GET',
       'rack.input'     => {},
       'QUERY_STRING'   => 'widget_name=some_widget&widget_event=test'
@@ -46,5 +58,7 @@ scope 'dominate widget' do
     assert body['Hello, World!']
     assert body['moo']
     assert body['cow']
+    assert body['some-widget-display']
+    assert body['some-widget-test']
   end
 end

metadata

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