cuba-tools 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bdced9844636ce9756c972e1f896b803385065d
-  data.tar.gz: f05797ab1125e08880e094778755aba92adcba0c
+  metadata.gz: dddb504be2eddc1fcc13ab3fd58eb0a713ea24ce
+  data.tar.gz: 90fb4df33375f75721c0a077b833849ab11ac743
 SHA512:
-  metadata.gz: 61784850e3b6ae80d5f523a168845266f3c9d4d7c84a637a8d2a819303f3931e6e74c6f8df7243be20a4408f8a5a088a4c7f6a68975f744fb3ab89f3e037320c
-  data.tar.gz: 4920a0e969a0a36e689ca97a6007c70d31865f66ed5e940a8b04c7e51db36ea76cea3aaa996adf328c7c31f7e0847eb7220d7a86cf167dc3e8d7fd788a2f11f8
+  metadata.gz: 16701025a97e9dcbeaf51d4918eeca22658314dd462cb1bbef2b5ba2ea50742df7607e7846d2964b399ea70fcce9d79451b7cad1cb78a7f9d749fcb5003316c6
+  data.tar.gz: 618fdb605de746a6c1db196218493424c4863e11aa2ae7c2cc8ceb7448d1e766a2bd4625ab410116296329c6bb35ba5dd017d9bbbc1122b6e3dafbc66998105c

data/cuba-tools.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "cuba-tools"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["cj"]
   spec.email         = ["cjlazell@gmail.com"]
   spec.description   = %q{Contains a group of tools to extend cuba}

data/lib/cuba/tools/widget/base.rb

@@ -15,7 +15,7 @@ module Cuba::Tools
         @events       = events
         @widget_state = false
 
-        events.add_observer self, :trigger
+        events.add_observer self, :trigger_event
       end
 
       def set_state state
@@ -34,12 +34,21 @@ module Cuba::Tools
         end
       end
 
-      def trigger widget_name, widget_event, data = {}
+      def trigger widget_event, data = {}
+        widget_name = data.delete(:for)
+
+        req.env[:loaded_widgets].each do |n, w|
+          w.trigger_event (widget_name || req.params['widget_name']), widget_event,
+            data.to_deep_ostruct
+        end
+      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 == name or
-                opts[:for].to_s == widget_name
+              widget_name.to_s == name or
+              opts[:for].to_s == widget_name.to_s
             )
               if not opts[:with]
                 e = widget_event
@@ -111,23 +120,19 @@ module Cuba::Tools
       end
 
       def replace state, opts = {}
-        set_state state
-
         if !state.is_a? String
           opts[:state] = state
-          content = render_state, opts
+          content = render state, opts
           selector = '#' + id_for(state)
         else
           if !opts.key?(:content) and !opts.key?(:with)
-            content = render_state opts
+            content = render opts
           else
             content = opts[:content] || opts[:with]
           end
           selector = state
         end
 
-        reset_state
-
         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]

data/lib/cuba/tools/widget/helpers.rb

@@ -7,6 +7,14 @@ module Cuba::Tools
         if path = Widget.config.view_path
           Dir["#{path}/**/*.rb"].each  { |rb| require rb  }
         end
+
+        if defined?(Slim) && defined?(Slim::Engine)
+          Slim::Engine.set_default_options \
+            disable_escape: true,
+            use_html_safe: false,
+            disable_capture: false,
+            pretty: false
+        end
       end
 
       def method_missing(meth, *args, &block)
@@ -30,9 +38,7 @@ module Cuba::Tools
         html = block.call widget
 
         mab do
-          div(defaults) do
-            text! html
-          end
+          div(defaults) { html }
         end
       end
 

data/lib/cuba/tools.rb

@@ -1,3 +1,4 @@
+require 'cuba'
 require 'cuba/tools/inflectors'
 
 module Cuba::Tools

data/test/tools/widget_test.rb

@@ -1,7 +1,6 @@
 require_relative '../cutest_helper'
 require "slim"
 require "cuba/render"
-require 'cgi'
 
 setup do
   Cuba.reset!
@@ -16,6 +15,9 @@ setup do
   Cuba.use Cuba::Tools::Widget::Middleware
   Cuba.plugin Cuba::Tools::Widget::Helpers
   Cuba.plugin Cuba::Render
+  Cuba.settings[:render][:options] ||= {
+    default_encoding: Encoding.default_external
+  }
   Cuba.define do
     def test_helper
       'test_helper'
@@ -71,7 +73,7 @@ scope "cuba/tools/widget/middleware" do
       'rack.input'     => {},
       'QUERY_STRING'   => 'widget_name=some_widget&widget_event=test'
     })
-    body = CGI.unescapeHTML resp.send('body').join
+    body = resp.send('body').join
 
     assert body[/moo/] != nil
     assert body[/cow/] != nil
@@ -84,19 +86,14 @@ scope "cuba/tools/widget/middleware" do
       'REQUEST_METHOD' => 'GET',
       'rack.input'     => {}
     })
-    # TODO: figure out why the html isn't decoded properly
-    # body = CGI.unescapeHTML resp.send('body').join
     body = resp.send('body').join
 
     assert body['test_helper'] != nil
     assert body['display'] != nil
-    assert body['some_widget_display'] != nil
+    assert body['id="some_widget_display"'] != nil
     assert body['some partial'] != nil
     assert body['some state'] != nil
     assert body['user_widget_method'] != nil
-    # TODO: figure out why the html isn't decoded properly
-    # and this is failing
-    # assert body['id="some_widget_some_state"'] != nil
-    assert body['some_widget_some_state'] != nil
+    assert body['id="some_widget_some_state"'] != nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - cj