volt 0.9.5 → 0.9.6.pre1

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

@@ -47,7 +47,7 @@ module Volt
         Volt.logger.error(msg)
 
         # If we get back that the user signature is wrong, log the user out.
-        if err.starts_with?('VoltUserError:')
+        if err.start_with?('VoltUserError:')
           # Delete the invalid cookie
           Volt.current_app.cookies.delete(:user_id)
         end

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

@@ -104,7 +104,7 @@ module Volt
         dom_section.insert_anchor_before(binding_name, @templates[position].binding_name)
       end
 
-      # TODORW: :parent => @value may change
+      # TODORW: parent: @value may change
       item_context                           = SubContext.new({ _index_value: position, parent: @value }, @context)
       item_context.locals[@item_name.to_sym] = proc do
         # Fetch only whats there currently, no promises.

data/lib/volt/page/channel.rb

@@ -27,14 +27,25 @@ module Volt
     end
 
     def connect!
-      `
-        if (document.location.protocol == 'https:') {
-          var wsProto = 'wss';
-        } else {
-          var wsProto = 'ws';
-        }
+      # The websocket url can be overridden by config.public.websocket_url
+      socket_url = Volt.config.try(:public).try(:websocket_url) || begin
+        "#{`document.location.host`}/socket"
+      end
+
+      if socket_url !~ /^wss?[:]\/\//
+        if socket_url !~ /^[:]\/\//
+          # Add :// to the front
+          socket_url = "://#{socket_url}"
+        end
+
+        ws_proto = (`document.location.protocol` == 'https://') ? 'wss' : 'ws'
 
-        this.socket = new WebSocket(wsProto + '://' + document.location.host + '/socket');
+        # Add wss? to the front
+        socket_url = "#{ws_proto}#{socket_url}"
+      end
+
+      `
+        this.socket = new WebSocket(socket_url);
 
         this.socket.onopen = function () {
           self.$opened();

data/lib/volt/page/tasks.rb

@@ -73,11 +73,17 @@ module Volt
 
     def reload
       # Stash the current page value
-      value = EJSON.stringify(Volt.current_app.page.to_h)
+      begin
+        value = EJSON.stringify(Volt.current_app.page.to_h)
 
-      # If this browser supports session storage, store the page, so it will
-      # be in the same state when we reload.
-      `sessionStorage.setItem('___page', value);` if `sessionStorage`
+        # If this browser supports session storage, store the page, so it will
+        # be in the same state when we reload.
+        `sessionStorage.setItem('___page', value);` if `sessionStorage`
+      rescue EJSON::NonEjsonType => e
+        # Unable to serailize the page, ignore stashing it
+        # clear the ___page stash
+        `sessionStorage.removeItem('___page');`
+      end
 
       Volt.current_app.page._reloading = true
       `window.location.reload(false);`

data/lib/volt/reactive/computation.rb

@@ -21,21 +21,33 @@ module Volt
 
     # Runs the computation, called on initial run and
     # when changed!
-    def compute!
+    def compute!(initial_run=false)
       @invalidated = false
 
       unless @stopped
 
         @computing = true
-        run_in do
-          if @computation.arity > 0
-            # Pass in the Computation so it can be canceled from within
-            @computation.call(self)
+        begin
+          run_in do
+            if @computation.arity > 0
+              # Pass in the Computation so it can be canceled from within
+              @computation.call(self)
+            else
+              @computation.call
+            end
+          end
+        rescue => e
+          if initial_run
+            # Re-raise if we are in the initial run
+            raise
           else
-            @computation.call
+            msg = "Exception During Compute: " + e.inspect
+            msg += "\n" + e.backtrace.join("\n") if e.respond_to?(:backtrace)
+            Volt.logger.error(msg)
           end
+        ensure
+          @computing = false
         end
-        @computing = false
       end
     end
 
@@ -140,7 +152,7 @@ class Proc
     computation = Volt::Computation.new(self)
 
     # Initial run
-    computation.compute!
+    computation.compute!(true)
 
     # return the computation
     computation

data/lib/volt/reactive/dependency.rb

@@ -34,7 +34,7 @@ module Volt
             # If @dependencies is nil, this Dependency has been removed
             if @dependencies
               # For set, .delete returns a boolean if it was deleted
-              deleted = @dependencies.delete(current)
+              deleted = @dependencies.delete?(current)
 
               # Call on stop dep if no more deps
               @on_stop_dep.call if @on_stop_dep && deleted && @dependencies.size == 0
@@ -54,6 +54,8 @@ module Volt
 
       deps.each(&:invalidate!)
 
+      # Call on stop dep here because we are clearing out the @dependencies, so
+      # it won't trigger on the invalidates
       @on_stop_dep.call if @on_stop_dep
     end
 

data/lib/volt/server/component_templates.rb

@@ -66,15 +66,16 @@ module Volt
           # handle things.
           code << "\nrequire '#{require_path}'\n"
         else
+          valid_exts_re = exts.join('|')
           # On the sever side, we eval the compiled code
-          path_parts = view_path.scan(/([^\/]+)\/([^\/]+)\/[^\/]+\/([^\/]+)[.](html|email)$/)
+          path_parts = view_path.scan(/([^\/]+)\/([^\/]+)\/[^\/]+\/([^\/]+)[.](#{valid_exts_re})$/)
           component_name, controller_name, view, _ = path_parts[0]
 
           # file extension
           format = File.extname(view_path).downcase.delete('.').to_sym
 
           # Get the path for the template, supports templates in folders
-          template_path = view_path[views_path.size..-1].gsub(/[.](#{exts.join('|')})$/, '')
+          template_path = view_path[views_path.size..-1].gsub(/[.](#{valid_exts_re})$/, '')
           template_path = "#{@component_name}/#{template_path}"
 
           html = File.read(view_path)
@@ -189,4 +190,4 @@ module Volt
 
 
   end
-end
+end

data/lib/volt/server/middleware/default_middleware_stack.rb

@@ -26,11 +26,11 @@ module Volt
       rack_app.use Rack::ETag
 
       rack_app.use Rack::Session::Cookie, {
-        :key => 'rack.session',
-        # :domain => 'localhost.com',
-        :path => '/',
-        :expire_after => 2592000,
-        :secret => Volt.config.app_secret
+        key: 'rack.session',
+        # domain: 'localhost.com',
+        path: '/',
+        expire_after: 2592000,
+        secret: Volt.config.app_secret
       }
 
       rack_app.use QuietCommonLogger
@@ -57,7 +57,7 @@ module Volt
 
       # serve assets from public
       rack_app.use Rack::Static,
-                    urls: ['/'],
+                    urls: [''],
                     root: 'public',
                     index: 'index.html',
                     header_rules: [

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

@@ -11,18 +11,6 @@ module Volt
       @opal_files      = opal_files
 
       @@router = volt_app.router
-
-      @@router.define do
-        # Load routes for each component
-        component_paths.components.values.flatten.uniq.each do |component_path|
-          routes_path = "#{component_path}/config/routes.rb"
-
-          if File.exist?(routes_path)
-            route_file = File.read(routes_path)
-            instance_eval(route_file, routes_path, 0)
-          end
-        end
-      end
     end
 
     def route_match?(path)

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

@@ -110,7 +110,7 @@ module Volt
     def add_image_compression
       if defined?(ImageOptim)
         env = @environment
-        image_optim = ImageOptim.new({:pngout => false, :svgo => false})
+        image_optim = ImageOptim.new({pngout: false, svgo: false})
 
         processor = proc do |_context, data|
           image_optim.optimize_image_data(data) || data

data/lib/volt/server/socket_connection_handler.rb

@@ -15,6 +15,29 @@ module Volt
 
       @@channels ||= []
       @@channels << self
+
+      # Trigger a client connect event
+      @@dispatcher.volt_app.trigger!("client_connect")
+
+    end
+
+    def update_user_id(user_id)
+      if !@user_id && user_id
+        # If there is currently no user id associated with this channel
+        # and we get a new valid user_id, set it then trigger a
+        # user_connect event
+        @user_id = user_id
+        @@dispatcher.volt_app.trigger!("user_connect", @user_id)
+      elsif @user_id && !user_id
+        # If there is currently a user id associated with this channel
+        # and we get a nil user id, trigger a user_disconnect event then
+        # set the id to nil
+        @@dispatcher.volt_app.trigger!("user_disconnect", @user_id)
+        @user_id = user_id
+      else
+        # Otherwise, lets just set the id (should never really run)
+        @user_id = user_id
+      end
     end
 
     def self.dispatcher=(val)
@@ -22,7 +45,11 @@ module Volt
     end
 
     def self.dispatcher
-      @@dispatcher
+      defined?(@@dispatcher) ? @@dispatcher : nil
+    end
+
+    def self.channels
+      @@channels
     end
 
     # Sends a message to all, optionally skipping a users channel
@@ -85,6 +112,18 @@ module Volt
 
         begin
           @@dispatcher.close_channel(self)
+
+          # Check for volt_app (@@dispatcher could be an ErrorDispatcher)
+          if @@dispatcher.respond_to?(:volt_app)
+            # Trigger a client disconnect event
+            @@dispatcher.volt_app.trigger!("client_disconnect")
+
+            # Trigger a user disconnect event even if the user hasn't logged out
+            if @user_id
+              @@dispatcher.volt_app.trigger!("user_disconnect", @user_id)
+            end
+          end
+
         rescue DRb::DRbConnError => e
         # ignore drb read of @@dispatcher error if child has closed
         end

data/lib/volt/server/template_handlers/sprockets_component_handler.rb

@@ -54,8 +54,11 @@ module Sprockets
         data = env.read_file(input[:filename], input[:content_type])
       end
 
-      dependencies = Set.new(input[:metadata][:dependencies])
-      dependencies += [env.build_file_digest_uri(input[:filename])]
+      # dependencies = Set.new(input[:metadata][:dependencies])
+      # dependencies += [env.build_file_digest_uri(input[:filename])]
+
+      dependencies = input[:metadata][:dependencies]
+      # dependencies.merge(env.build_file_digest_uri(input[:filename]))
 
       { data: data, dependencies: dependencies }
     end

data/lib/volt/server/template_handlers/view_processor.rb

@@ -23,7 +23,7 @@ module Volt
     end
 
     def cache_key
-      @cache_key ||= "#{self.class.name}:0.1".freeze
+      @cache_key ||= "#{self.class.name}:0.2".freeze
     end
 
     # def evaluate(context, locals, &block)
@@ -65,8 +65,6 @@ module Volt
       exts = ComponentTemplates::Preprocessors.extensions
       template_path = view_path.split('/')[-4..-1].join('/').gsub('/views/', '/').gsub(/[.](#{exts.join('|')})$/, '')
 
-      exts = ComponentTemplates::Preprocessors.extensions
-
       format = File.extname(view_path).downcase.delete('.').to_sym
       code = ''
 
@@ -82,7 +80,9 @@ module Volt
     end
 
     def self.setup(sprockets=$volt_app.sprockets)
-      sprockets.register_mime_type 'application/vtemplate', extensions: ['.html', '.email']
+      exts = ComponentTemplates::Preprocessors.extensions.map{ |ext| ".#{ext}" }
+      
+      sprockets.register_mime_type 'application/vtemplate', extensions: exts
       sprockets.register_transformer 'application/vtemplate', 'application/javascript', Volt::ViewProcessor.new(true)
     end
   end

data/lib/volt/tasks/task.rb

@@ -39,7 +39,8 @@ module Volt
 
       # Set the timeout for method calls on this task.  (The default is
       # Volt.config.worker_timeout)
-      def timeout(value)
+      # Set 0 to disable timeout
+      def self.timeout(value)
         self.__timeout = value
       end
 

data/lib/volt/utils/csso_patch.rb

@@ -31,7 +31,7 @@ module Csso
       })
       sprockets.css_compressor = :csso
     else
-      Sprockets::Compressors.register_css_compressor(:csso, 'Csso::Compressor', :default => true)
+      Sprockets::Compressors.register_css_compressor(:csso, 'Csso::Compressor', default: true)
     end
   end
 

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.5'
+    STRING = '0.9.6.pre1'
   end
 end

data/lib/volt/volt/app.rb

@@ -1,5 +1,10 @@
 require 'opal'
 
+# On the server, setup the server env by default
+unless RUBY_PLATFORM == 'opal'
+  ENV['SERVER'] ||= 'true'
+end
+
 # on the client, we want to include the main volt.rb file
 require 'volt'
 require 'volt/models'
@@ -48,6 +53,8 @@ module Volt
     attr_accessor :sprockets, :opal_files
 
     def initialize(app_path=nil)
+      app_path ||= Dir.pwd
+
       if Volt.server? && !app_path
         raise "Volt::App.new requires an app path to boot"
       end
@@ -102,6 +109,8 @@ module Volt
         # Setup the middleware that we can only setup after all components boot.
         setup_postboot_middleware
 
+        setup_routes
+
         start_message_bus
       end
     end

data/lib/volt/volt/server_setup/app.rb

@@ -10,6 +10,9 @@ end
 module Volt
   module ServerSetup
     module App
+      # Include Eventable to allow for lifecycle callbacks
+      include Eventable
+      
       # The root url is where the volt app is mounted
       attr_reader :root_url
       # The app url is where the app folder (and sprockets) is mounted
@@ -37,6 +40,22 @@ module Volt
         @router = Routes.new
       end
 
+      def setup_routes
+        component_paths = @component_paths
+        @router.define do
+          # Load routes for each component
+          component_paths.components.values.flatten.uniq.each do |component_path|
+            routes_path = "#{component_path}/config/routes.rb"
+
+            if File.exist?(routes_path)
+              route_file = File.read(routes_path)
+              instance_eval(route_file, routes_path, 0)
+            end
+          end
+        end
+
+      end
+
       def setup_preboot_middleware
         @middleware = MiddlewareStack.new
         DefaultMiddlewareStack.preboot_setup(self, @middleware)

data/lib/volt/volt/users.rb

@@ -114,6 +114,10 @@ module Volt
     end
 
     def logout
+      # Notify the backend so we can remove the user_id from the user's channel
+      UserTasks.logout
+      
+      # Remove the cookie so user is no longer logged in
       Volt.current_app.cookies.delete(:user_id)
     end
 

data/spec/apps/kitchen_sink/app/main/config/routes.rb

@@ -14,6 +14,7 @@ client '/missing', action: 'missing'
 client '/require_test', action: 'require_test'
 client '/images', action: 'images'
 client '/login_from_task', action: 'login_from_task'
+client '/callbacks', action: 'callbacks'
 
 # Events
 client '/events', component: 'main', controller: 'events', action: 'index'