dominate 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94bfaabd26dfb0e6fc431562da55303563361f5b
-  data.tar.gz: 75872c48e58ac4dc358db70b52a77330f2c03a71
+  metadata.gz: 6ca8662354db26898388756f0313d7c2c2966ebd
+  data.tar.gz: e5f26d9caf945d90c0e80e4e809cc4439ef3d62a
 SHA512:
-  metadata.gz: 49dca0e0ff8c89ebedbe518631e1d60e595783e5b1bcf44ac5e064c989b90ef57310ac6962d58d28c83496b55a35594eba60e281939a138a37d52a8b5a24b52b
-  data.tar.gz: 8e5f6868794dfc20474ec7544e7e327b74132ddafb04511f79398ec96a95bb3699fc479904d9aa5ddb0c99d3673f0e197579207bac1954db1f9a632a3cea4482
+  metadata.gz: 25fd968a2f8c1d1e62b50ce4af62b7c012dbdd99a75c28f78dedbed63423a0f49ec631a8ed016701400b045f3471f301ed378582d6f69018828c0bdfb2e5d6cd
+  data.tar.gz: 5c651fd9fd8f536c53bd5c1c4804a0ad8a24d9f8617b7f0a13ec0f3e4c0bdb947dfdb25e79eb22bdb9ccc9b896dbb7ae61056b2cb8d90ca02db3b30a5abdded2

data/dominate.gemspec

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

data/lib/dominate/version.rb

@@ -1,3 +1,3 @@
 module Dominate
-  VERSION = "0.6.4"
+  VERSION = "0.7.0"
 end

data/lib/dominate/widget/event.rb

@@ -1,16 +1,63 @@
-require "observer"
+require "eventable"
+
+# http://t-a-w.blogspot.com/2010/05/very-simple-parallelization-with-ruby.html
+class ThreadUtility
+  def self.with_connection(&block)
+    begin
+      yield block
+    rescue Exception => e
+      raise e
+    ensure
+      # Check the connection back in to the connection pool
+      if defined? ActiveRecord
+        ActiveRecord::Base.connection.close if ActiveRecord::Base.connection
+      end
+    end
+  end
+end
+
+module Eventable
+  # When the event happens the class where it happens runs this
+  def fire_event(event, *return_value, &block)
+    check_mutex
+    threads = []
+
+    @eventable_mutex.synchronize {
+
+      return false unless @callbacks && @callbacks[event] && !@callbacks[event].empty?
+
+      @callbacks[event].each do |listener_id, callbacks|
+        begin
+          listener = ObjectSpace._id2ref(listener_id)
+          callbacks.each do |callback|
+            threads << Thread.new do
+              ThreadUtility.with_connection do
+                listener.send callback, *return_value, &block
+              end
+            end
+          end
+        rescue RangeError => re
+          # Don't bubble up a missing recycled object, I don't care if it's not there, I just won't call it
+          raise re unless re.message.match(/is recycled object/)
+        end
+      end
+    }
+
+    threads.map(&:join)
+
+    true
+  end
+end
 
 module Dominate
   class Widget
-    class Event < Struct.new(:res, :req)
-      include Observable
+    class Event
+      include Eventable
 
-      def trigger widget_name, widget_event, data = {}
-        # THIS IS WHAT WILL MAKE SURE EVENTS ARE TRIGGERED
-        changed
-        ##################################################
+      event :trigger
 
-        notify_observers widget_name, widget_event, data.to_deep_ostruct
+      def trigger widget_name, widget_event, data = {}
+        fire_event :trigger, widget_name, widget_event, data.to_deep_ostruct
       end
     end
   end

data/lib/dominate/widget/helper.rb

@@ -22,7 +22,7 @@ module Dominate
       end
 
       def render_widget *args
-        Widget.load_all(self, req, res)
+        @dominate_widgets ||= Widget.load_all(self, Event.new, req, res)
 
         if args.first.kind_of? Hash
           opts = args.first
@@ -61,7 +61,7 @@ module Dominate
       end
 
       def url_for_event event, options = {}
-        widget_name = options.delete(:widget_name) || req.env[:widget_name]
+        widget_name = options.delete(: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

data/lib/dominate/widget.rb

@@ -20,8 +20,6 @@ module Dominate
       self.instance_variables.each do |n|
         app.instance_variable_set n, self.instance_variable_get(n)
       end
-
-      event.add_observer self, :trigger_event
     end
 
     def method_missing method, *args, &block
@@ -108,19 +106,16 @@ module Dominate
 
     def trigger widget_event, data = {}
       data        = data.to_h
-      widget_name = data.delete(:for)
+      widget_name = data.delete(:for) || req.params['widget_name']
 
-      req.env[:loaded_widgets].each do |n, w|
-        w.trigger_event (widget_name || req.params['widget_name']), widget_event,
-          data.to_deep_ostruct
-      end
+      event.trigger widget_name, widget_event, data.to_h
     end
 
     def trigger_event widget_name, widget_event, data = {}
       if class_events = self.class.events
         class_events.each do |class_event, opts|
           if class_event.to_s == widget_event.to_s && (
-            widget_name.to_s == name or
+            widget_name.to_s == name.to_s or
             opts[:for].to_s == widget_name.to_s
           )
             if not opts[:with]
@@ -142,7 +137,7 @@ module Dominate
               #   resp.reset_html
               #   res.write resp.html
               if resp.is_a? String
-                html = "<div id='#{id_for(e)}'>#{html}</div>"
+                html = "<div id='#{id_for(e)}'>#{resp}</div>"
                 res.write html
               else
                 resp
@@ -155,6 +150,11 @@ module Dominate
       end
     end
 
+    def url_for_event event, options = {}
+      widget_name = options.delete(:widget_name) || 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
+
     def render *args
       if args.first.kind_of? Hash
         locals = args.first
@@ -197,9 +197,7 @@ module Dominate
     class << self
       attr_accessor :events
 
-      def load_all app, req, res
-        event = Event.new res, req
-
+      def load_all app, event, req, res
         if widget_event = req.params["widget_event"]
           widget_name = req.params["widget_name"]
         end
@@ -207,10 +205,13 @@ module Dominate
         unless req.env[:loaded_widgets]
           req.env[:loaded_widgets] ||= {}
 
-          Dominate.config.widgets.each do |name, widget|
-            req.env[:loaded_widgets][name] = Object.const_get(widget).new(
+          Dominate.config.widgets.each do |name, widget_class_name|
+            widget = Object.const_get(widget_class_name).new(
               app, res, req, name, event
             )
+            event.register_for_event(event: :trigger, listener: widget, callback: :trigger_event)
+
+            req.env[:loaded_widgets][name] = widget
           end
         end
 

data/test/widget_test.rb

@@ -18,7 +18,9 @@ setup do
   Cuba.define do
 
     on "widgets" do
-      widget_name, widget_event, event = Dominate::Widget.load_all self, req, res
+      @dominate_event ||= Dominate::Widget::Event.new
+
+      widget_name, widget_event, event = Dominate::Widget.load_all self, @dominate_event, req, res
 
       event.trigger widget_name, widget_event, req.params
       # res.write "$('head > meta[name=csrf-token]').attr('content', '#{csrf_token}');"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dominate
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement