volt 0.9.4.pre3 → 0.9.4.pre5

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

@@ -65,12 +65,12 @@ module Volt
         # end
 
       end
-      @listener = page.events.add(@event_name, self, handler)
+      @listener = browser.events.add(@event_name, self, handler)
     end
 
     # Remove the event binding
     def remove
-      page.events.remove(@event_name, self)
+      browser.events.remove(@event_name, self)
     end
   end
 end

data/lib/volt/page/bindings/view_binding/controller_handler.rb

@@ -2,9 +2,23 @@ module Volt
   class ControllerHandler
     attr_reader :controller, :action
 
+    # Checks to see if a controller has a handler, and if not creates one.
+    def self.fetch(controller, action)
+      inst = controller.instance_variable_get('@__handler')
+
+      unless inst
+        inst = new(controller, action)
+        controller.instance_variable_set('@__handler', inst)
+      end
+
+      inst
+    end
+
     def initialize(controller, action)
       @controller = controller
       @action = action.to_sym if action
+
+      @called_methods = {}
     end
 
     def call_action(stage_prefix = nil, stage_suffix = nil)
@@ -22,6 +36,12 @@ module Volt
         method_name = @action
       end
 
+      # Don't call if its already been called
+      return if @called_methods[method_name]
+
+      # Track that this method got called
+      @called_methods[method_name] = true
+
       # If no stage, then we are calling the main action method,
       # so we should call the before/after actions
       unless has_stage

data/lib/volt/page/bindings/view_binding/view_lookup_for_path.rb

@@ -5,10 +5,10 @@ module Volt
     # Takes in the path of the current view file.  This allows for relative paths
     # to be run.
     #
-    # @param [Page] the page object
+    # @param [Hash] the templates object from a Volt::App
     # @param [String] the path of the current view
-    def initialize(page, binding_in_path)
-      @page = page
+    def initialize(templates, binding_in_path)
+      @templates = templates
       path_parts       = binding_in_path.split('/')
       @collection_name = path_parts[0]
       @controller_name = path_parts[1]
@@ -17,7 +17,7 @@ module Volt
 
     # Returns true if there is a template at the path
     def check_for_template?(path)
-      @page.templates[path]
+      @templates[path]
     end
 
     # Takes in a lookup path and returns the full path for the matching
@@ -45,6 +45,8 @@ module Volt
       parts      = lookup_path.split('/')
       parts_size = parts.size
 
+      return nil, nil if parts_size == 0
+
       default_parts     = %w(main main index body)
 
       # When forcing a sub template, we can default the sub template section

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

@@ -16,7 +16,7 @@ module Volt
       @content_template_path = content_template_path
 
       # Setup the view lookup helper
-      @view_lookup = Volt::ViewLookupForPath.new(page, binding_in_path)
+      @view_lookup = Volt::ViewLookupForPath.new(volt_app.templates, binding_in_path)
 
       @current_template = nil
 
@@ -105,9 +105,9 @@ module Volt
       @controller = @current_controller_handler.controller if full_path
 
       render_template(full_path || path)
-    rescue => e
-      Volt.logger.error("Error during render of template at #{path}: #{e.inspect}")
-      Volt.logger.error(e.backtrace)
+    # rescue => e
+    #   Volt.logger.error("Error during render of template at #{path}: #{e.inspect}")
+    #   Volt.logger.error(e.backtrace)
     end
 
     def stop_waiting_for_load
@@ -201,7 +201,7 @@ module Volt
         controller = new_controller.call
       end
 
-      handler = ControllerHandler.new(controller, action)
+      handler = ControllerHandler.fetch(controller, action)
 
       if generated_new
         # Call the action
@@ -216,8 +216,8 @@ module Volt
     end
 
     # The context for templates can be either a controller, or the original context.
-    def render_template(full_path, path)
-      @current_template = TemplateRenderer.new(@volt_app, @target, @controller, @binding_name, full_path, path)
+    def render_template(full_path)
+      @current_template = TemplateRenderer.new(@volt_app, @target, @controller, @binding_name, full_path)
 
       call_ready
     end

data/lib/volt/page/path_string_renderer.rb

@@ -9,14 +9,12 @@ module Volt
   class ViewLookupException < Exception; end
   class PathStringRenderer
     attr_reader :html
-    def initialize(volt_app, path, attrs = nil, page = nil, render_from_path = nil)
+    def initialize(volt_app, path, attrs = nil, render_from_path = nil)
       # where to do the path lookup from
       render_from_path ||= 'main/main/main/body'
 
-      page ||= volt_app.page
-
       # Make path into a full path
-      @view_lookup = Volt::ViewLookupForPath.new(page, render_from_path)
+      @view_lookup = Volt::ViewLookupForPath.new(volt_app.templates, render_from_path)
       full_path, controller_path = @view_lookup.path_for_template(path, nil)
 
       if full_path.nil?

data/lib/volt/page/targets/base_section.rb

@@ -21,14 +21,14 @@ module Volt
       fail 'set_template is not implemented'
     end
 
-    def set_content_to_template(page, template_name)
+    def set_content_to_template(volt_app, template_name)
       if self.is_a?(DomSection)
         # DomTemplates are an optimization when working with the DOM (as opposed to other targets)
-        dom_template = (@@template_cache[template_name] ||= DomTemplate.new(page, template_name))
+        dom_template = (@@template_cache[template_name] ||= DomTemplate.new(volt_app, template_name))
 
         set_template(dom_template)
       else
-        template = page.templates[template_name]
+        template = volt_app.templates[template_name]
 
         if template
           html     = template['html']

data/lib/volt/page/targets/dom_template.rb

@@ -9,8 +9,8 @@ module Volt
   class DomTemplate
     include CommentSearchers
 
-    def initialize(page, template_name)
-      template = page.templates[template_name]
+    def initialize(volt_app, template_name)
+      template = volt_app.templates[template_name]
 
       if template
         html      = template['html']

data/lib/volt/page/tasks.rb

@@ -4,12 +4,12 @@ module Volt
   # The tasks class provides an interface to call tasks on
   # the backend server.  This class is setup as page.task (as a singleton)
   class Tasks
-    def initialize(page)
-      @page       = page
+    def initialize(volt_app)
+      @volt_app       = volt_app
       @promise_id = 0
       @promises   = {}
 
-      page.channel.on('message') do |*args|
+      volt_app.channel.on('message') do |*args|
         received_message(*args)
       end
     end
@@ -23,7 +23,7 @@ module Volt
       @promises[promise_id] = promise
 
       # TODO: Timeout on these callbacks
-      @page.channel.send_message([promise_id, class_name, method_name, meta_data, *args])
+      @volt_app.channel.send_message([promise_id, class_name, method_name, meta_data, *args])
 
       promise
     end
@@ -65,13 +65,13 @@ module Volt
 
     def reload
       # Stash the current page value
-      value = EJSON.stringify($page.page.to_h)
+      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`
 
-      $page.page._reloading = true
+      Volt.current_app.page._reloading = true
       `window.location.reload(false);`
     end
   end

data/lib/volt/page/template_renderer.rb

@@ -9,7 +9,7 @@ module Volt
 
       @sub_bindings = []
 
-      bindings = dom_section.set_content_to_template(volt_app.page, template_name)
+      bindings = dom_section.set_content_to_template(volt_app, template_name)
 
       bindings.each_pair do |id, bindings_for_id|
         bindings_for_id.each do |binding|

data/lib/volt/page/url_tracker.rb

@@ -3,8 +3,8 @@ module Volt
   # a param changes, or updating the url model/params when
   # the browser url changes.
   class UrlTracker
-    def initialize(page)
-      @page = page
+    def initialize(volt_app)
+      @volt_app = volt_app
 
       if Volt.client?
         that = self
@@ -21,8 +21,8 @@ module Volt
     end
 
     def url_updated(first_call = false)
-      @page.url.parse(`document.location.href`)
-      @page.url.update! unless first_call
+      @volt_app.url.parse(`document.location.href`)
+      @volt_app.url.update! unless first_call
     end
   end
 end

data/lib/volt/reactive/reactive_array.rb

@@ -160,31 +160,17 @@ module Volt
     end
 
     def clear
-      old_size = @array.size
-
-      deps        = @array_deps
-      @array_deps = []
-
-      # Trigger remove for each cell
-      old_size.times do |index|
-        trigger_removed!(old_size - index - 1)
-      end
-
-      # Trigger on each cell since we are clearing out the array
-      if deps
-        deps.each do |dep|
-          dep.changed! if dep
-        end
-      end
+      __clear
 
       @persistor.clear if @persistor
-
-      # clear the array
-      @array = []
     end
 
     # alias :__old_append :<<
-    def <<(value)
+    def <<(*args)
+      append(*args)
+    end
+
+    def append(value)
       result = (@array << value)
 
       trigger_for_index!(@array.size - 1)
@@ -236,6 +222,31 @@ module Volt
 
     private
 
+    # used internally, clears out the array, triggers the change events, but
+    # does not call clear on the persistors.  Used when models are updated
+    # externally.
+    def __clear
+      old_size = @array.size
+
+      deps        = @array_deps
+      @array_deps = []
+
+      # Trigger remove for each cell
+      old_size.times do |index|
+        trigger_removed!(old_size - index - 1)
+      end
+
+      # Trigger on each cell since we are clearing out the array
+      if deps
+        deps.each do |dep|
+          dep.changed! if dep
+        end
+      end
+
+      # clear the array
+      @array = []
+    end
+
     # Check to see if the size has changed, trigger a change on size if it has
     def trigger_size_change!
       new_size = @array.size

data/lib/volt/server/component_templates.rb

@@ -63,11 +63,11 @@ module Volt
       code
     end
 
-    def page_reference
+    def app_reference
       if @client
-        '$page'
+        'Volt.current_app'
       else
-        'page'
+        'volt_app'
       end
     end
 
@@ -111,7 +111,7 @@ module Volt
 
             binding_code = "{#{binding_code.join(', ')}}"
 
-            code << "#{page_reference}.add_template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})\n"
+            code << "#{app_reference}.add_template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})\n"
             # template_calls << "template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})"
           end
         end
@@ -172,7 +172,7 @@ module Volt
       routes_path = "#{@component_path}/config/routes.rb"
 
       if File.exist?(routes_path)
-        code << "#{page_reference}.add_routes do\n"
+        code << "#{app_reference}.add_routes do\n"
         code << "\n" + File.read(routes_path) + "\n"
         code << "end\n\n"
       end

data/lib/volt/server/forking_server.rb

@@ -67,6 +67,8 @@ module Volt
           # Running as child
           @reader.close
 
+          watch_for_parent_exit
+
           begin
             volt_app = @server.boot_volt
             @rack_app = volt_app.middleware
@@ -82,8 +84,6 @@ module Volt
 
           @writer.puts(drb_object.uri)
 
-          watch_for_parent_exit
-
           begin
             DRb.thread.join
           rescue Interrupt => e

data/lib/volt/server/message_bus/peer_to_peer/server_tracker.rb

@@ -8,8 +8,8 @@ module Volt
   module MessageBus
     class ServerTracker
       UPDATE_INTERVAL = 10
-      def initialize(page, server_id, port)
-        @page = page
+      def initialize(volt_app, server_id, port)
+        @volt_app = volt_app
         @server_id = server_id
         @port = port
 
@@ -33,7 +33,7 @@ module Volt
 
       # Register this server as active with the database
       def register
-        instances = @page.store._active_volt_instances
+        instances = @volt_app.store._active_volt_instances
         instances.where(server_id: @server_id).first.then do |item|
           ips = local_ips.join(',')
           time = Time.now.to_i

data/lib/volt/server/message_bus/peer_to_peer.rb

@@ -55,9 +55,11 @@ module Volt
       # Use subscribe instead of on provided in Eventable
       alias_method :subscribe, :on
 
-      attr_reader :server_id, :page
+      attr_reader :server_id
 
       def initialize(volt_app)
+        @volt_app = volt_app
+
         if Volt::DataStore.fetch.connected?
           # Generate a guid
           @server_id = SecureRandom.uuid
@@ -66,8 +68,6 @@ module Volt
           # The server id's for each peer we're connected to
           @peer_server_ids = {}
 
-          @page = volt_app.page
-
           setup_peer_server
           start_tracker
 
@@ -77,7 +77,7 @@ module Volt
             connect_to_peers
           end
         else
-          Volt.logger.error('Unable to connect to the database.  Volt will still run, but the message bus requires a database connection to setup connections between nodes, so the message bus has been disabled.  This means updates will not be propigated between instances (server, console, runners, etc...)')
+          Volt.logger.error('Unable to connect to the database.  Volt will still run, but the message bus requires a database connection to setup connections between nodes, so the message bus has been disabled.  This means updates will not be propagated between instances (server, console, runners, etc...)')
         end
       end
 
@@ -90,7 +90,7 @@ module Volt
       # database every minute.  If the timestamp is more than 2 minutes old,
       # an instance is marked as "dead" and removed.
       def start_tracker
-        @server_tracker = ServerTracker.new(page, @server_id, @peer_server.port)
+        @server_tracker = ServerTracker.new(@volt_app, @server_id, @peer_server.port)
 
         # Do the initial registration, and wait until its done before connecting
         # to peers.
@@ -112,7 +112,7 @@ module Volt
 
       # Return an array of peer records.
       def peers
-        instances = @page.store._active_volt_instances
+        instances = @volt_app.store._active_volt_instances
 
         instances.where(server_id: {'$ne' => @server_id}).all.sync
       end
@@ -183,7 +183,7 @@ module Volt
       def still_alive?(peer_server_id)
         # Unable to write to the socket, retry until the instance is no
         # longer marking its self as active in the database
-        peer_table = @page.store._active_volt_instances
+        peer_table = @volt_app.store._active_volt_instances
         peer = peer_table.where(server_id: peer_server_id).first.sync
         if peer
           # Found the peer, retry if it has reported in in the last 2

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

@@ -1,3 +1,5 @@
+require 'uri'
+
 # Used to get a list of the assets and other included components
 # from the dependencies.rb files.
 module Volt
@@ -7,7 +9,8 @@ module Volt
       @assets              = []
       @included_components = {}
       @components          = []
-
+      @disable_auto_import = []
+      
       # Include each of the default included components
       Volt.config.default_components.each do |def_comp_name|
         component(def_comp_name)
@@ -16,7 +19,11 @@ module Volt
       component(component_name)
     end
 
-    def load_dependencies(path)
+    def disable_auto_import
+      @disable_auto_import.push(*@current_component).uniq
+    end
+    
+    def load_dependencies(path, component_name)
       if path
         dependencies_file = File.join(path, 'config/dependencies.rb')
       else
@@ -26,6 +33,7 @@ module Volt
       if File.exist?(dependencies_file)
         # Run the dependencies file in this asset files context
         code = File.read(dependencies_file)
+        @current_component = component_name
         instance_eval(code, dependencies_file, 0)
       end
     end
@@ -44,10 +52,10 @@ module Volt
 
         component_path.each do |path|
           # Load the dependencies
-          load_dependencies(path)
+          load_dependencies(path, name)
 
           # Add any assets
-          add_assets(path)
+          add_assets(path) unless @disable_auto_import.include?(name)
           @components << [path, name]
         end
       end
@@ -57,14 +65,26 @@ module Volt
       @included_components.keys
     end
 
-    def javascript_file(url)
-      @assets << [:javascript_file, url]
+    def javascript_file(locator)
+      @assets << [:javascript_file, prepare_locator(locator, ['js'])]
     end
 
-    def css_file(url)
-      @assets << [:css_file, url]
+    def css_file(locator)
+      @assets << [:css_file, prepare_locator(locator, ['css','scss'])]
     end
 
+    def prepare_locator(locator, valid_extensions)
+      unless url_or_path?(locator)
+        locator = File.join('/assets', @current_component, '/assets', valid_extensions.first, "#{locator}")
+        locator += '.css' unless locator =~ /^.*\.(#{valid_extensions.join('|')})$/
+      end
+      locator
+    end
+    
+    def url_or_path?(url)
+      (url =~ URI::regexp || url =~ /^\/(\/)?.*/) ? true : false
+    end
+    
     def component_paths
       @components
     end

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

@@ -55,7 +55,7 @@ module Volt
     end
 
     # Makes each components classes available on the load path, require classes.
-    def require_in_components(page)
+    def require_in_components(volt_app)
       if RUBY_PLATFORM == 'opal'
       else
         app_folders do |app_folder|
@@ -69,11 +69,11 @@ module Volt
         end
 
         # Delay the loading of views
-        page.template_loader = -> { load_views_and_routes(page) }
+        volt_app.templates.template_loader = -> { load_views_and_routes(volt_app) }
       end
     end
 
-    def load_views_and_routes(page)
+    def load_views_and_routes(volt_app)
       component_names = []
       app_folders do |app_folder|
         Dir["#{app_folder}/*"].map { |cp| cp[/[^\/]+$/] }.each do |component_name|
@@ -85,7 +85,7 @@ module Volt
       # TODO: Nested components listed twice are are loaded multiple times
       component_names.uniq.each do |component_name|
         code = Volt::ComponentCode.new(component_name, self, false).code
-        # Evaluate returned code, the ```page``` variable is set for access.
+        # Evaluate returned code, the ```volt_app``` variable is set for access.
         eval(code)
       end
     end

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

@@ -20,7 +20,6 @@ module Volt
 
       # Add the lib directory to the load path
       Opal.append_path(Volt.root + '/app')
-      Opal.append_path(Volt.root + '/lib')
 
       Gem.loaded_specs.values.select {|gem| gem.name =~ /^(volt|ejson_ext)/ }
       .each do |gem|

data/lib/volt/server/socket_connection_handler.rb

@@ -35,9 +35,12 @@ module Volt
     end
 
     def process_message(message)
-      # self.class.message_all(message)
       # Messages are json and wrapped in an array
-      message = EJSON.parse(message).first
+      begin
+        message = EJSON.parse(message).first
+      rescue JSON::ParserError => e
+        Volt.logger.error("Unable to process task request message: #{message.inspect}")
+      end
 
       begin
         @@dispatcher.dispatch(self, message)

data/lib/volt/server.rb

@@ -12,7 +12,6 @@ require 'volt/tasks/dispatcher'
 require 'volt/tasks/task'
 require 'volt/server/component_handler'
 require 'volt/server/rack/component_paths'
-require 'volt/page/page'
 
 require 'volt/server/websocket/websocket_handler'
 require 'volt/utils/read_write_lock'

data/lib/volt/spec/setup.rb

@@ -35,7 +35,7 @@ module Volt
         volt_app.database.drop_database
 
         # Clear cached for a reset
-        volt_app.page.instance_variable_set('@store', nil)
+        volt_app.instance_variable_set('@store', nil)
         volt_app.reset_query_pool!
       end
 
@@ -56,15 +56,14 @@ module Volt
         let(:the_page) { Model.new }
         let(:store) do
           @__store_accessed = true
-          $page ||= volt_app.page
-          $page.store
+          volt_app.store
         end
         let(:volt_app) { volt_app }
-        let(:params) { volt_app.page.params }
+        let(:params) { volt_app.params }
 
         after do
           # Clear params if used
-          url = volt_app.page.url
+          url = volt_app.url
           if url.instance_variable_get('@params')
             url.instance_variable_set('@params', nil)
           end

data/lib/volt/tasks/task.rb

@@ -10,10 +10,10 @@ module Volt
         # things like who's logged in.
         meta_data = {}
 
-        user_id = $page.cookies._user_id
+        user_id = Volt.current_app.cookies._user_id
         meta_data['user_id'] = user_id unless user_id.nil?
 
-        $page.tasks.call(self.name, name, meta_data, *args, &block)
+        Volt.current_app.tasks.call(self.name, name, meta_data, *args, &block)
       end
     else
       include CollectionHelpers
@@ -22,7 +22,6 @@ module Volt
 
       def initialize(volt_app, channel = nil, dispatcher = nil)
         @volt_app   = volt_app
-        @page       = volt_app.page
         @channel    = channel
         @dispatcher = dispatcher
       end