volt 0.4.18 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd56992ff8ae73d3af5d43f4d4a73d528c4a249
-  data.tar.gz: eb337a2886b9625c09c90e9f5634bbf975f91768
+  metadata.gz: 92e92321c95b13a37fe37cbb8f7a639a338a264c
+  data.tar.gz: af72a815e19b40a9d6fb57977afea8f8186ec7e4
 SHA512:
-  metadata.gz: 07dc0de1053f83ca3325566dbe61b96f51ac2e14280dd6ef9a336de6afcff122c2544667c83ea31a3e24e10b4c8bb6936ba525f8d6cec990a274f0d44650c699
-  data.tar.gz: eff6fe08d0f836de3ebb822795a4704a88852c0eedcd2b42a21a96162e9adf3aa18eb1711124a800406e0bf20c2498accf72320c520920c66e2e0936c003424f
+  metadata.gz: 0ae673bd0e6340fa5eed1529c18c45839b1f22008c31ad039ecf0aa38768495ee7e19888509207c94ab3b70494b0b5b03abaaae6a03c20ed2d9aa9fe42146604
+  data.tar.gz: d2529b34a6540cdeeffc846ea757ac8e77b6a0d90c52523cc0d4fe662f8c264ead47db1abefe130148d22f0b01ae0718b664a602e1f7d5dfcadd100b7a417f32

data/Readme.md

@@ -605,17 +605,15 @@ Routes take two arguments, a path, and a params hash.  When a new url is loaded
 
 When the params are changed, the url will be set to the path for the route that's params hash matches.
 
-**Note: at the moment nested params do not work, but they are a planned feature**
-
 Route path's can also contain variables similar to bindings.
 
 ```ruby
     get "/todos/{_index}", _view: 'todos'
 ```
     
-In the case above, if any url matches /todos/*, (where * is anything but a slash), it will be the active route. params._view would be set to 'todos', and params._index would be set to the value in the path.
+In the case above, if any url matches /todos/*, (where * is anything but a slash), it will be the active route. ```params._view``` would be set to 'todos', and ```params._index``` would be set to the value in the path.
 
-If params._view is 'todos' and params._index is not nil, the route would be matched.
+If ```params._view``` is 'todos' and ```params._index``` is not nil, the route would be matched.
 
 Routes are matched top to bottom in a routes file.
 
@@ -627,3 +625,20 @@ An in browser irb is in the works.  We also have source maps support, but they a
     
 They are disabled by default because they slow down page rendering because so many files are rendered.  We're working with the opal and sprockets teams to make it so everything is still served in one big source maps file (which would show the files as they originated on disk)
 
+
+## Channel
+
+Controllers provide a .channel method, that you can use to get the status of the connection to the backend.  Channel is provided in a ReactiveValue, and when the status changes, the changed events are triggered.  It provides the following:
+
+| method      | description                                               |
+|-------------|-----------------------------------------------------------|
+| connected?  | true if it is connected to the backend                    |
+| status      | possible values: :opening, :open, :closed, :reconnecting  |
+| error       | the error message for the last failed connection          |
+| retry_count | the number of reconnection attempts that have been made without a successful connection |
+| reconnect_interval | the time until the next reconnection attempt (in seconds) |
+
+
+## Notices
+
+Volt ships with a component that provies notices for things like dropped backend connections, flash messages, etc...  

data/VERSION

@@ -1 +1 @@
-0.4.18
+0.5.0

data/app/volt/views/notices/index.html

@@ -2,7 +2,7 @@
 {#if page._reloading}
   <div class="notices alert alert-info">Reloading...</div>
 {/}
-{#if channel.state == :closed}
+{#if channel.status == :closed}
   <div class="notices alert alert-info">
     Connection Lost... {channel.error}...
     {#if channel.reconnect_interval}  Reconnecting in {(channel.reconnect_interval / 1000.0).round} sec{/}

data/lib/volt/models/model.rb

@@ -80,6 +80,8 @@ class Model
     __clear_element(args[0])
     attributes.delete(*args)
     trigger_by_attribute!('changed', args[0])
+    
+    @persistor.removed(args[0]) if @persistor
   end
   
   tag_all_methods do

data/lib/volt/models/url.rb

@@ -9,7 +9,6 @@ class URL
   def initialize(router=nil)
     @router = router
     @params = Model.new({}, persistor: Persistors::Params)
-    #Params.new({}, 'params')
   end
   
   # Parse takes in a url and extracts each sections.
@@ -85,8 +84,13 @@ class URL
       # Loop through the .params we already have assigned.
       assign_from_old(@params, query_hash)
       assign_new(@params, query_hash)
+      
+      puts @params.inspect + '---'
     end
     
+    # Loop through the old params, and overwrite any existing values,
+    # and delete the values that don't exist in the new params.  Also
+    # remove any assigned to the new params (query_hash)
     def assign_from_old(params, new_params)
       queued_deletes = []
       
@@ -111,6 +115,7 @@ class URL
       queued_deletes.each {|name| params.delete(name) }
     end
     
+    # Assign any new params, which weren't in the old params.
     def assign_new(params, new_params)
       new_params.each_pair do |name, value|
         if value.is_a?(Hash)
@@ -175,8 +180,8 @@ class URL
       results = {}
     
       params.each_pair do |key,value|
-        if value.cur.is_a?(Params) # TODO: Should be a param
-          # TODO: Broke here somehow for nested
+        if value.respond_to?(:persistor) && value.persistor && value.persistor.is_a?(Persistors::Params)
+          # TODO: Should be a param
           results.merge!(nested_params_hash(value, path + [key]))
         else
           results[query_key(path + [key])] = value

data/lib/volt/page/channel.rb

@@ -6,17 +6,27 @@ require 'json'
 class Channel
   include ReactiveTags
   
-  attr_reader :state, :error, :reconnect_interval
+  attr_reader :status, :error, :reconnect_interval
   
   def initialize
     @socket = nil
-    @state = :opening
+    @status = :opening
+    @connected = false
     @error = nil
+    @retry_count = 0
     @queue = []
     
     connect!
   end
   
+  def connected?
+    @connected
+  end
+  
+  def retry_count
+    @retry_count
+  end
+  
   def connect!
     %x{
       this.socket = new SockJS('/channel');
@@ -36,8 +46,10 @@ class Channel
   end
   
   def opened
-    @state = :open
+    @status = :open
+    @connected = true
     @reconnect_interval = nil
+    @retry_count = 0
     @queue.each do |message|
       send_message(message)
     end
@@ -47,7 +59,8 @@ class Channel
   end
 
   def closed(error)
-    @state = :closed
+    @status = :closed
+    @connected = false
     @error = `error.reason`
     
     trigger!('closed')
@@ -57,8 +70,10 @@ class Channel
   end
   
   def reconnect!
+    @status = :reconnecting
     @reconnect_interval ||= 0
     @reconnect_interval += (2000 + rand(5000))
+    @retry_count += 1
     
     # Trigger changed for reconnect interval
     trigger!('changed')
@@ -82,7 +97,7 @@ class Channel
     destructive!
   end
   def send_message(message)
-    if @state != :open
+    if @status != :open
       @queue << message
     else
       # TODO: Temp: wrap message in an array, so we're sure its valid JSON
@@ -94,7 +109,7 @@ class Channel
   end
   
   def close!
-    @state = :closed
+    @status = :closed
     %x{
       this.socket.close();
     }

data/lib/volt/page/page.rb

@@ -130,6 +130,9 @@ class Page
     # Setup to render template
     Element.find('body').html = "<!-- $CONTENT --><!-- $/CONTENT -->"
 
+    # Do the initial url params parse
+    @url_tracker.url_updated(true)
+
     main_controller = IndexController.new
 
     # Setup main page template
@@ -142,8 +145,6 @@ class Page
       `document.title = title;`
     end
     TemplateRenderer.new(title_target, main_controller, "main", "home/index/index/title")
-    
-    @url_tracker.url_updated(true)
   end
 end
 

data/lib/volt/router/routes.rb

@@ -44,8 +44,9 @@ class Routes
     
     add_path_matcher(sections) if Volt.server?
     
+    # Create a path that takes in the params and returns the main
+    # part of the url with the params filled in.
     path = Proc.new do |params|
-      # Create a path using the params in the path
       sections.map do |section|
         if section[0] == '{' && section[-1] == '}'
           params[section[1..-2]]
@@ -63,7 +64,7 @@ class Routes
     match_path = ''
     sections.each do |section|
       if section[0] == '{' && section[-1] == '}'
-        match_path = match_path + "[^\/]+"
+        match_path = match_path + "[^\\/]+"
       else
         match_path = match_path + section
       end
@@ -85,9 +86,15 @@ class Routes
   end
 
   # Takes in a path and returns the matching params.
+  # TODO: Slow, need dfa
   def params_for_path(path)
     routes.each do |route|
-      if route[0] == path
+      puts "ROUTE: #{route.inspect} -- #{path.inspect}"
+      if false && route[0].class == Proc
+        # puts route[0].call(params).inspect
+        
+        return false
+      elsif route[0] == path
         # Found the matching route
         return route[1]
       end
@@ -99,6 +106,7 @@ class Routes
   private
     def path_and_params(params, path, options)
       params = params.attributes.dup
+      puts params.inspect if path.class == Proc
       path = path.call(params) if path.class == Proc
     
       options.keys.each do |key|
@@ -108,11 +116,23 @@ class Routes
       return path, params
     end
   
+    # Match one route against the current params.
     def params_match_options?(params, options)
       options.each_pair do |key, value|
-        # A nil value means it can match anything, so we don't want to
-        # fail on nil.        
-        if value != nil && value != params.send(key)
+        # If the value is a hash, we have a nested route.  Get the
+        # matching section in the parameter and loop down to check
+        # the values down.
+        if value.is_a?(Hash)
+          sub_params = params.send(key)
+
+          if sub_params
+            return params_match_options?(sub_params, value)
+          else
+            return false
+          end
+        elsif value != nil && value != params.send(key)
+          # A nil value means it can match anything, so we don't want to
+          # fail on nil.
           return false
         end
       end

data/spec/models/model_spec.rb

@@ -449,10 +449,11 @@ describe Model do
     
     all_items = a._items.to_a.cur
     
-    expect(all_items).to eq([
+    a = [
       {:_name=>"Test1", :_other=>{:_time=>"Now"}},
       {:_name=>"Test2", :_other=>{:_time=>"Later"}}
-    ])
+    ]
+    expect(all_items).to eq(a)
   end
   
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryan Stout