wedge 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d62dd5b3067bf262e99e9b85580f10c6f69053a0
-  data.tar.gz: 39b1045a8fd84f04692be637f9ad8316596fdb3b
+  metadata.gz: b2dbd8ba00a1f62c5d52845b31d490a2556c87ed
+  data.tar.gz: ee88de101b63dd804501fc94c69aec3301d3b29b
 SHA512:
-  metadata.gz: 74e631d8f30318eba1c883e2f3419c00e3a94d75ad9fff551abd1186e039d8671efe6c098ff915a67ebb0443cab72e622333e5c0137fa5973c14c099ee3b6b75
-  data.tar.gz: 14311787e2080870c0b1a5281d4d18a52ddba761a688d94a2261ae5188e13e9172cb02aa3edfe6daeb7449d0820bf5873653dba971d09ec062cba0f710fbfd4d
+  metadata.gz: bab16e31b80b81dd7d394f183c3d7e5f4eb4f96e4274acc9c3df9035d978ac89cc831dc71d79d86c3bee22b0b42994b119287d8a74897457c792ed5987564202
+  data.tar.gz: d5920870feab5097fcbf6a57483da43fd2408836b5ea77cf95605c40bc9322ba922645f183f09ceed26b8d6ac2d19159cf7c9478542b8b996c76b17fdb57668f

data/lib/wedge.rb

@@ -22,7 +22,7 @@ module Wedge
 
   class << self
     attr_accessor :requires, :loaded_requires, :loaded_requires_events, :javascript_cache,
-      :wedge_javascript_loaded
+      :wedge_javascript_loaded, :object_events, :browser_events
 
     def compile_opal
       javascript
@@ -86,16 +86,22 @@ module Wedge
         if path_name == 'wedge'
           @wedge_javascript ||= begin
             @wedge_javascript_loaded = true
-            requires = {}
+            requires      = {}
+            @object_events = {}
+            @browser_events = {}
 
             @javascript_cache ||= {}
 
             components.to_h.each do |k, v|
-              requires[k] = v.klass.wedge_config.get_requires
+              requires[k]      = v.klass.wedge_config.get_requires
+              # events = Wedge[v.name].wedge_opts.events
+              # @object_events[v.name]  = events.object_events
+              # @browser_events[v.name] = events.browser_events
               javascript(v.klass.wedge_opts[:path_name])
             end
 
             compiled_requires = Base64.encode64 requires.to_json
+            # compiled_object_events = Base64.encode64 object_events.to_json
             assets_key        = opts.assets_key
             cache_assets      = opts.cache_assets
 

data/lib/wedge/events.rb

@@ -55,7 +55,10 @@ module Wedge
           trigger_browser_event event
         end
       else
-        events = object_events[name] || []
+        # fix: we need to change the way events are stored
+        wedge_events = (Wedge.components[scope.wedge_opts.name].klass.wedge_opts.object_events[name] || [])
+        events = wedge_events.concat(object_events[name] || [])
+        ##################################################
         events.each do |event|
           Wedge[event[:component]].instance_exec options, &event[:block]
         end

data/lib/wedge/plugins/form.rb

@@ -102,9 +102,11 @@ module Wedge
           send("#{key}=", val)
         end
 
-        _form.each do |key, klass|
+        _form.each do |key, form_name|
           opts = {}
-          opts[key] = klass.new(_data.send(key)) if _data.respond_to?(key)
+          if _data.respond_to?(key)
+            opts[key] = wedge(form_name, init: _data.send(key))
+          end
           @_attributes.set_values opts
 
           send("#{key}=", opts[key])
@@ -152,8 +154,8 @@ module Wedge
             att = ivar[1..-1].to_sym
             atts[att] = _attributes.send(att)
 
-            if klass = _form[att.to_s.to_sym]
-              atts[att] = klass.new(atts[att]).attributes
+            if form_name = _form[att.to_s.to_sym]
+              atts[att] = wedge(form_name, init: atts[att]).attributes
             end
           end
         end
@@ -163,11 +165,11 @@ module Wedge
         hash = {}
 
         data.each do |k, v|
-          if klass = _form[k.to_s.to_sym]
+          if form_name = _form[k.to_s.to_sym]
             d = data[k]
             d = d.attributes if d.is_a?(Form)
 
-            f  = klass.new d
+            f  = wedge(form_name, init: d)
             k  = "#{k}_attributes"
             dt = f.model_attributes
 

data/lib/wedge/plugins/validations.rb

@@ -134,7 +134,7 @@ module Wedge
               options = {}
               options[:key] = _options[:key] if _options.key? :key
 
-              f = wedge(form_name, _attributes.send(att).attributes, init: options)
+              f = wedge(form_name, init: [_attributes.send(att).attributes, options])
               assert(f.valid?, [att, f.errors])
             else
               assert(!_attributes.send(att).to_s.empty?, error)

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 module Wedge
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal