volt 0.8.8 → 0.8.9

data/lib/volt/models/persistors/query/query_listener.rb

@@ -15,20 +15,22 @@ class QueryListener
 
   def add_listener
     @listening = true
-    @tasks.call('QueryTasks', 'add_listener', @collection, @query) do |results, errors|
-      # puts "Query Tasks: #{results.inspect} - #{@stores.inspect} - #{self.inspect}"
+    QueryTasks.add_listener(@collection, @query).then do |ret|
+      results, errors = ret
+
       # When the initial data comes back, add it into the stores.
       @stores.dup.each do |store|
         # Clear if there are existing items
         store.model.clear if store.model.size > 0
 
         results.each do |index, data|
-          # puts "ADD: #{index} - #{data.inspect}"
           store.add(index, data)
         end
 
         store.change_state_to(:loaded)
       end
+    end.fail do |err|
+      puts "Err: #{err.inspect}"
     end
   end
 
@@ -60,7 +62,7 @@ class QueryListener
       # Stop listening
       if @listening
         @listening = false
-        @tasks.call('QueryTasks', 'remove_listener', @collection, @query)
+        QueryTasks.remove_listener(@collection, @query)
       end
     end
   end

data/lib/volt/models/persistors/query/query_listener_pool.rb

@@ -6,4 +6,13 @@ require 'volt/models/persistors/query/query_listener'
 # query in different places.  This makes it so we only need to track a
 # single query at once.  Data updates will only be sent once as well.
 class QueryListenerPool < GenericPool
+  def print
+    puts "--- Running Queries ---"
+
+    @pool.each_pair do |table,query_hash|
+      query_hash.keys.each do |query|
+        puts "#{table}: #{query.inspect}"
+      end
+    end
+  end
 end

data/lib/volt/models/persistors/store.rb

@@ -28,6 +28,7 @@ module Persistors
       else
         model = @model.new_model(nil, options)
 
+        # TODO: Might not need to assign this
         @model.attributes ||= {}
         @model.attributes[method_name] = model
       end

data/lib/volt/models/url.rb

@@ -69,22 +69,30 @@ class URL
 
     path, params = @router.params_to_url(@params.to_h)
 
+    self.path = path if path
+
     new_url = "#{scheme}://#{host_with_port}#{(path || self.path).chomp('/')}"
 
+    params_str = ''
     unless params.empty?
-      new_url += '?'
       query_parts = []
       nested_params_hash(params).each_pair do |key,value|
         # remove the _ from the front
         value = `encodeURI(value)`
-        query_parts << "#{key}=#{value}"
+        query_parts << "#{key[1..-1]}=#{value}"
       end
 
-      new_url += query_parts.join('&')
+      if query_parts.size > 0
+        self.query = query_parts.join('&')
+        new_url += '?' + self.query
+      end
     end
 
     frag = self.fragment
-    new_url += '#' + frag if frag.present?
+    if frag.present?
+      self.fragment = frag
+      new_url += '#' + frag
+    end
 
     return new_url
   end
@@ -231,7 +239,7 @@ class URL
     def query_key(path)
       i = 0
       path.map do |v|
-        v = v[1..-1]
+        # v = v[1..-1]
         i += 1
         if i != 1
           "[#{v}]"
@@ -245,11 +253,13 @@ class URL
       results = {}
 
       params.each_pair do |key,value|
-        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
+        unless value.nil?
+          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
+          end
         end
       end
 

data/lib/volt/page/bindings/template_binding.rb

@@ -14,7 +14,13 @@ class TemplateBinding < BaseBinding
     @getter = getter
 
     # Run the initial render
-    @computation = -> { update(*@context.instance_eval(&getter)) }.watch!
+    @computation = -> do
+      # Don't try to render if this has been removed
+      if @context
+        # Render
+        update(*@context.instance_eval(&getter))
+      end
+    end.watch!
   end
 
   def setup_path(binding_in_path)

data/lib/volt/page/page.rb

@@ -4,6 +4,7 @@ if RUBY_PLATFORM == 'opal'
 end
 require 'volt/models'
 require 'volt/controllers/model_controller'
+require 'volt/tasks/task_handler'
 require 'volt/page/bindings/attribute_binding'
 require 'volt/page/bindings/content_binding'
 require 'volt/page/bindings/each_binding'
@@ -29,7 +30,6 @@ require 'volt/benchmark/benchmark'
 require 'volt/page/tasks'
 
 
-
 class Page
   attr_reader :url, :params, :page, :templates, :routes, :events, :model_classes
 
@@ -138,7 +138,7 @@ class Page
   end
 
   def add_model(model_name)
-    model_name = model_name.camelize
+    model_name = model_name.camelize.to_sym
     @model_classes[model_name] = Object.const_get(model_name)
   end
 
@@ -189,7 +189,7 @@ class Page
           `sessionStorage.removeItem('___page');`
 
           JSON.parse(page_obj_str).each_pair do |key, value|
-            self.page.send(:"#{key}=", value)
+            self.page.send(:"_#{key}=", value)
           end
         `}`
       end

data/lib/volt/page/tasks.rb

@@ -3,36 +3,36 @@
 class Tasks
   def initialize(page)
     @page = page
-    @callback_id = 0
-    @callbacks = {}
+    @promise_id = 0
+    @promises = {}
 
     page.channel.on('message') do |*args|
       received_message(*args)
     end
   end
 
-  def call(class_name, method_name, *args, &callback)
-    if callback
-      callback_id = @callback_id
-      @callback_id += 1
+  def call(class_name, method_name, *args)
+    promise_id = @promise_id
+    @promise_id += 1
 
-      # Track the callback
-      # TODO: Timeout on these callbacks
-      @callbacks[callback_id] = callback
-    else
-      callback_id = nil
-    end
+    # Track the callback
+    promise = Promise.new
+    @promises[promise_id] = promise
+
+    # TODO: Timeout on these callbacks
+
+    @page.channel.send_message([promise_id, class_name, method_name, *args])
 
-    @page.channel.send_message([callback_id, class_name, method_name, *args])
+    promise
   end
 
 
-  def received_message(name, callback_id, *args)
+  def received_message(name, promise_id, *args)
     case name
     when 'added', 'removed', 'updated', 'changed'
       notify_query(name, *args)
     when 'response'
-      response(callback_id, *args)
+      response(promise_id, *args)
     when 'reload'
       reload
     end
@@ -40,15 +40,16 @@ class Tasks
 
   # When a request is sent to the backend, it can attach a callback,
   # this is called from the backend to pass to the callback.
-  def response(callback_id, result, error)
-    callback = @callbacks.delete(callback_id)
+  def response(promise_id, result, error)
+    promise = @promises.delete(promise_id)
 
-    if callback
+    if promise
       if error
         # TODO: full error handling
         puts "Task Response: #{error.inspect}"
+        promise.reject(error)
       else
-        callback.call(result)
+        promise.resolve(result)
       end
     end
   end

data/lib/volt/reactive/reactive_array.rb

@@ -39,6 +39,50 @@ class ReactiveArray# < Array
     end
   end
 
+  def select
+    result = []
+    size.times do |index|
+      val = self[index]
+      if yield(val).true?
+        result << val
+      end
+    end
+
+    return result
+  end
+
+  def any?
+    if block_given?
+      size.times do |index|
+        val = self[index]
+
+        if yield(val).true?
+          return true
+        end
+      end
+
+      return false
+    else
+      return @array.any?
+    end
+  end
+
+  def all?
+    if block_given?
+      size.times do |index|
+        val = self[index]
+
+        if !yield(val).true?
+          return false
+        end
+      end
+
+      return true
+    else
+      return @array.all?
+    end
+  end
+
   # TODO: Handle a range
   def [](index)
     # Handle a negative index

data/lib/volt/router/routes.rb

@@ -74,6 +74,11 @@ class Routes
   #
   # returns the url and new params, or nil, nil if no match is found.
   def params_to_url(test_params)
+    # Add in underscores
+    test_params = test_params.each_with_object({}) do |(k,v), obj|
+      obj[:"_#{k}"] = v
+    end
+
     @param_matches.each do |param_matcher|
       # TODO: Maybe a deep dup?
       result, new_params = check_params_match(test_params.dup, param_matcher[0])

data/lib/volt/server.rb

@@ -18,6 +18,8 @@ require 'listen'
 
 require 'volt'
 require 'volt/boot'
+require 'volt/tasks/dispatcher'
+require 'volt/tasks/task_handler'
 require 'volt/server/component_handler'
 if RUBY_PLATFORM != 'java'
   require 'volt/server/socket_connection_handler'
@@ -25,7 +27,7 @@ end
 require 'volt/server/rack/component_paths'
 require 'volt/server/rack/index_files'
 require 'volt/server/rack/opal_files'
-require 'volt/tasks/dispatcher'
+require 'volt/page/page'
 
 module Rack
   # TODO: For some reason in Rack (or maybe thin), 304 headers close

data/lib/volt/server/component_templates.rb

@@ -13,7 +13,7 @@ class ComponentTemplates
     code = generate_view_code
     if @client
       # On the backend, we just need the views
-      code << generate_controller_code + generate_model_code + generate_routes_code
+      code << generate_controller_code + generate_model_code + generate_routes_code + generate_tasks_code
     end
 
     return code
@@ -96,4 +96,10 @@ class ComponentTemplates
 
     return code
   end
+
+  def generate_tasks_code
+    return TaskHandler.known_handlers.map do |handler|
+      "class #{handler.name} < TaskHandler; end"
+    end.join "\n"
+  end
 end

data/lib/volt/server/html_parser/attribute_scope.rb

@@ -89,7 +89,7 @@ module AttributeScope
           raise "The content of text area's can not be bound to multiple bindings."
         else
           # Multiple values can not be passed to value or checked attributes.
-          raise "Multiple bindings can not be passed to a #{attribute_name} binding."
+          raise "Multiple bindings can not be passed to a #{attribute_name} binding: #{parts.inspect}"
         end
       end
     end

data/lib/volt/server/rack/component_paths.rb

@@ -56,7 +56,7 @@ class ComponentPaths
         $LOAD_PATH.unshift(app_folder)
 
         # Sort so we get consistent load order across platforms
-        Dir["#{app_folder}/*/{controllers,models}/*.rb"].sort.each do |ruby_file|
+        Dir["#{app_folder}/*/{controllers,models,tasks}/*.rb"].each do |ruby_file|
           path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]
           require(path)
         end
@@ -70,15 +70,6 @@ class ComponentPaths
         end
       end
     end
-
-    # add each tasks folder directly
-    components.sort.each do |name,component_folders|
-      component_folders.sort.each do |component_folder|
-        Dir["#{component_folder}/tasks"].sort.each do |tasks_folder|
-          $LOAD_PATH.unshift(tasks_folder)
-        end
-      end
-    end
   end
 
   # Returns the path for a specific component

data/lib/volt/server/socket_connection_handler.rb

@@ -48,6 +48,9 @@ class SocketConnectionHandler < SockJS::Session
       send(str)
     rescue MetaState::WrongStateError => e
       puts "Tried to send to closed connection: #{e.inspect}"
+
+      # Mark this channel as closed
+      closed
     end
   end
 

data/lib/volt/tasks/dispatcher.rb

@@ -5,14 +5,10 @@ class Dispatcher
   def dispatch(channel, message)
     callback_id, class_name, method_name, *args = message
 
-    # TODO: Think about security?
-    if class_name[/Tasks$/] && !class_name['::']
-      # TODO: Improve error on a class we don't have
-      require(class_name.underscore)
-
-      # Get the class
-      klass = Object.send(:const_get, class_name)
+    # Get the class
+    klass = Object.send(:const_get, class_name)
 
+    if klass.ancestors.include?(TaskHandler)
       # Init and send the method
       begin
         result = klass.new(channel, self).send(method_name, *args)

data/lib/volt/tasks/task_handler.rb

@@ -0,0 +1,41 @@
+class TaskHandler
+  if RUBY_PLATFORM == 'opal'
+    # On the front-end we setup a proxy class to the backend that returns
+    # promises for all calls.
+    def self.method_missing(name, *args, &block)
+      $page.tasks.call(self.name, name, *args, &block)
+    end
+  else
+    def initialize(channel=nil, dispatcher=nil)
+      @channel = channel
+      @dispatcher = dispatcher
+    end
+
+    def self.inherited(subclass)
+      @subclasses ||= []
+      @subclasses << subclass
+    end
+
+    def self.known_handlers
+      @subclasses ||= []
+    end
+
+    # On the backend, we proxy all class methods like we would
+    # on the front-end.  This returns promises.
+    def self.method_missing(name, *args, &block)
+      promise = Promise.new
+
+      begin
+        result = self.new(nil, nil).send(name, *args, &block)
+
+        promise.resolve(result)
+      rescue => e
+        puts "Task Error: #{e.inspect}"
+        puts e.backtrace
+        promise.reject(e)
+      end
+
+      return promise
+    end
+  end
+end