volt 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10cc84012e873b87e79b5cd770e387ab1c292b03
-  data.tar.gz: 2ba97e0d7442c60768ba4ceacf5c9ca13d96db6f
+  metadata.gz: d4e6123d91124a8535f3f22faaa795a3fd568988
+  data.tar.gz: 088c3ff7fb4ea5d2c8d847111aafe413df710764
 SHA512:
-  metadata.gz: 5cf7ccd40cea80341c5138c59a7d8057143478f8ebbf6148fd3a2f050e1088fa6a94cf8a5591f9de93f848884d9ec50ef84ebb7031936a634583b6e3b357e686
-  data.tar.gz: a28b2acab7c75e6fb85e48ee54c5c1ebc29a0851bd8d31e9badde216be6b23c820900fdca47c58a4ca9d476ed0aedc39f1ce83bfa07a984ad0b06435bad78266
+  metadata.gz: 48debc3dc906b16a0774be28c7feef8e3ba2730608dc3e901399423877105489a9b1401cb68f6028eb3f9ef05c8d21711412c88b0d1730d951403b1ba773d6b5
+  data.tar.gz: d61897a965dc4edd12737867c8fd95e96672ac300a39d82ff683f5d5d470e5ebf1c369f9635639c21fca43209c02b164769d66d4187e6eeab7df6c049ec0b71e

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/app/volt/tasks/store_tasks.rb

@@ -3,6 +3,7 @@ require_relative 'channel_tasks'
 
 class StoreTasks
   def initialize(channel=nil, dispatcher=nil)
+    puts "init store tasks"
     @@mongo_db ||= Mongo::MongoClient.new("localhost", 27017)
     @@db ||= @@mongo_db.db("development")
     
@@ -33,13 +34,15 @@ class StoreTasks
     end
     
     id = id['_id']
-    # ChannelHandler.send_message_all(@channel, 'update', nil, id, data.merge('_id' => id))
-    
-    ChannelTasks.send_message_to_channel("#{collection}##{id}", ['update', nil, id, data.merge('_id' => id)], @channel)
+
+    puts "DATA: #{data.merge('_id' => id).symbolize_keys.inspect}"
+    ChannelTasks.send_message_to_channel("#{collection}##{id}", ['update', nil, id, data.merge('_id' => id).symbolize_keys], @channel)
   end
   
   def find(collection, scope, query=nil)
-    puts "FIND: #{collection.inspect} - #{scope}"
-    return @@db[collection].find(scope).to_a
+    results = @@db[collection].find(scope).to_a.map {|item| item.symbolize_keys }
+    puts "FIND: #{collection.inspect} - #{scope} - #{results.inspect}"
+    
+    return results
   end
 end

data/lib/volt/cli.rb

@@ -31,7 +31,14 @@ class CLI < Thor
     end
 
     ENV['SERVER'] = 'true'
-    Thin::Runner.new(['start']).run!
+    Thin::Runner.new(['start', '--threaded', '--max-persistent-conns', '100', "--max-conns", "300"]).run!
+    
+    # require 'volt/server'
+    # 
+    # EM.run do
+    #   thin = Rack::Handler.get("thin")
+    #   thin.run(Server.new.app, Port: 5000)
+    # end
   end
   
   desc "gem GEM", "Creates a component gem where you can share a component"

data/lib/volt/console.rb

@@ -10,10 +10,22 @@ class Console
     require 'volt/models/params'
     require 'volt/server/template_parser'
     require 'volt'
+    require 'volt/page/page'
+    require 'volt/server/rack/component_paths'
+    require 'volt/server/channel_handler_stub'
+    
+    ChannelHandlerStub.dispatcher = Dispatcher.new
+    
+        
+    app_path = File.expand_path(File.join(Dir.pwd, "app"))
+    component_paths = ComponentPaths.new
+    component_paths.add_tasks_to_load_path
 
     Pry.config.prompt_name = 'volt'
 
     # start a REPL session
-    Pry.start
+    # Pry.start
+    
+    Page.new.pry
   end
 end

data/lib/volt/extra_core/extra_core.rb

@@ -5,3 +5,8 @@ require 'volt/extra_core/stringify_keys'
 require 'volt/extra_core/string'
 require 'volt/extra_core/numeric'
 require 'volt/extra_core/true_false'
+if RUBY_PLATFORM == 'opal'
+  # TODO: != does not work with opal for some reason
+else
+  require 'volt/extra_core/symbol'
+end

data/lib/volt/extra_core/string.rb

@@ -26,4 +26,14 @@ class String
       return self
     end
   end
+  
+  def plural?
+    # TODO: Temp implementation
+    self[-1] == 's'
+  end
+  
+  def singular?
+    # TODO: Temp implementation
+    self[-1] != 's'
+  end
 end

data/lib/volt/extra_core/stringify_keys.rb

@@ -4,4 +4,10 @@ class Object
       hash[key.to_s] = value
     }
   end
+
+  def symbolize_keys
+    self.each_with_object({}) { |(key, value), hash|
+      hash[key.to_sym] = value
+    }
+  end
 end

data/lib/volt/extra_core/symbol.rb

@@ -0,0 +1,25 @@
+class Symbol
+  def camelize
+    to_s.camelize.to_sym
+  end
+  
+  def underscore
+    to_s.underscore.to_sym
+  end
+  
+  def pluralize
+    to_s.pluralize.to_sym
+  end
+  
+  def singularize
+    to_s.singularize.to_sym
+  end
+  
+  def plural?
+    to_s.plural?
+  end
+
+  def singular?
+    to_s.singular?
+  end
+end

data/lib/volt/extra_core/time.rb

@@ -0,0 +1,16 @@
+class Temp1
+  include Events
+  
+  attr_accessor :seconds
+  def initialize
+    @seconds = ReactiveValue.new(nil)
+  end
+  
+  def seconds=(val)
+    @seconds.cur = val
+  end
+  
+  def live_seconds
+    @seconds
+  end
+end

data/lib/volt/models/model.rb

@@ -178,10 +178,10 @@ class Model
       # If this isn't a model yet, instantiate it
       @parent.send(:"#{path}=", new_array_model([], @parent, @path))
       result = @parent.send(path)
-      
-      # Add the new item
-      result << value
     end
+
+    # Add the new item
+    result << value
     
     return result
   end

data/lib/volt/models/store.rb

@@ -5,50 +5,47 @@ class Store < Model
   
   @@identity_map = {}
   
+  attr_reader :state
+  
   def initialize(tasks=nil, *args)
     @tasks = tasks
+    @state = :not_loaded
 
     super(*args)
     
-    track_in_identity_map if attributes && attributes['_id']
+    track_in_identity_map if attributes && attributes[:_id]
     
     value_updated
   end
-  
-  # def _id
-  #   return attributes && attributes['_id']
-  # end
 
   def event_added(event, scope_provider, first)
     if first && event == :changed
       # Start listening
       ensure_id
-      if self.attributes && self.path.size > 1
-        channel_name = "#{self.path[-2]}##{self.attributes['_id']}"
-        puts "LISTENER ON: #{channel_name.inspect} -- #{self.path.inspect}"
-        $page.tasks.call('ChannelTasks', 'add_listener', channel_name)
-      end
+      change_channel_connection("add")
     end
   end
   
   def event_removed(event, no_more_events)
     if no_more_events && event == :changed
       # Stop listening
-      if self.attributes && self.path.size > 1
-        channel_name = "#{self.path[-2]}##{self.attributes['_id']}"
-        puts "REMOVE LISTENER ON: #{channel_name}"
-        $page.tasks.call('ChannelTasks', 'remove_listener', channel_name)
-      end
+      change_channel_connection("remove")
     end
   end
   
+  def change_channel_connection(add_or_remove)
+    if attributes && path.size > 1
+      channel_name = "#{path[-2]}##{attributes[:_id]}"
+      $page.tasks.call('ChannelTasks', "#{add_or_remove}_listener", channel_name)
+    end    
+  end
+  
   def self.update(model_id, data)
     model = @@identity_map[model_id]
     
     if model
       data.each_pair do |key, value|
         if key != '_id'
-          puts "update #{key} with #{value.inspect}"
           model.send(:"#{key}=", value)
         end
       end
@@ -63,6 +60,11 @@ class Store < Model
   end
   
   def method_missing(method_name, *args, &block)
+    if method_name[-1] == ']'
+      # Load the model
+      self.load!
+    end
+
     result = super
     
     if method_name[0] == '_' && method_name[-1] == '='
@@ -74,36 +76,39 @@ class Store < Model
   end
   
   def track_in_identity_map
-    @@identity_map[attributes['_id']] = self
+    @@identity_map[attributes[:_id]] = self
   end
   
   # When called, will setup an id if there is not one
   def ensure_id
     # No id yet, lets create one
-    if attributes && !attributes['_id']
-      self.attributes['_id'] = generate_id
+    if attributes && !attributes[:_id]
+      self.attributes[:_id] = generate_id
       track_in_identity_map
     end
   end
   
   def value_updated
-    # puts "VU: #{@tasks.inspect} = #{path.inspect} - #{attributes.inspect}"
-    if (!defined?($loading_models) || !$loading_models) && @tasks && path.size > 0 && !self.nil?
+    path_size = path.size
+    if !(defined?($loading_models) && $loading_models) && @tasks && path_size > 0 && !nil?
       
       ensure_id
       
-      if path.size > 2 && parent && source = parent.parent
-        self.attributes[path[-2].to_s.singularize+'_id'] = source._id
+      if path_size > 3 && parent && source = parent.parent
+        self.attributes[:"#{path[-4].singularize}_id"] = source._id
       end
       
-      # Don't store any sub-stores, those will do their own saving.
-      attrs = attributes.reject {|k,v| v.is_a?(Model) || v.is_a?(ArrayModel) }
-      
-      puts "Save: #{collection} - #{attrs.inspect}"
-      @tasks.call('StoreTasks', 'save', collection, attrs)
+      # puts "Save: #{collection} - #{attrs.inspect}"
+      @tasks.call('StoreTasks', 'save', collection, self_attributes)
     end
   end
   
+  # Return the attributes that are only for this store, not any sub-associations.
+  def self_attributes
+    # Don't store any sub-stores, those will do their own saving.
+    attrs = attributes.reject {|k,v| v.is_a?(Model) || v.is_a?(ArrayModel) }    
+  end
+  
   def collection(path=nil)
     path ||= self.path
     
@@ -121,41 +126,48 @@ class Store < Model
     self.attributes ||= {}
     attributes[method_name] = model
     
+    if model.state == :not_loaded
+      model.load!
+    end
+    
     return model
   end
   
-  
-  
-  def new_model(attributes={}, parent=nil, path=nil, class_paths=nil)
-    model = Store.new(@tasks, attributes, parent, path, class_paths)
-
-    if @tasks && path.last[-1] == 's'
-      # puts "FIND NEW MODEL: #{path.inspect} - #{attributes.inspect}"
-      
-      # Check to see the parents scope so we can only lookup associated
-      # models.
-      scope = {}
-      
-      if parent.attributes && parent.attributes['_id'].true?
-        scope[path[-1].singularize + '_id'] = parent._id
-      end
+  def load!
+    if @state == :not_loaded
+      @state = :loading
+    
+      if @tasks && path.last.plural?
+        # Check to see the parents scope so we can only lookup associated
+        # models.
+        scope = {}
       
-      puts "FIND: #{collection(path).inspect} at #{scope.inspect}"
-      @tasks.call('StoreTasks', 'find', collection(path), scope) do |results|
-        # TODO: Globals evil, replace
-        $loading_models = true
-        results.each do |result|
-          # Get model again, we need to fetch it each time so it gets the
-          # updated model when it switches from nil.
-          # TODO: Strange that this is needed
-          model = self.send(path.last)
-          model << Store.new(@tasks, result, model, path + [:[]], class_paths)
+        # Scope to the parent
+        if path.size > 2 && (attrs = parent.attributes) && attrs[:_id].true?
+          scope[:"#{path[-3].singularize}_id"] = parent._id
         end
-        $loading_models = false
+        
+        load_child_models(scope)
       end
     end
     
-    return model
+    return self
+  end
+  
+  def load_child_models(scope)
+    # puts "FIND: #{collection(path).inspect} at #{scope.inspect}"
+    @tasks.call('StoreTasks', 'find', collection(path), scope) do |results|
+      # TODO: Globals evil, replace
+      $loading_models = true
+      results.each do |result|
+        self << Store.new(@tasks, result, self, path + [:[]], @class_paths)
+      end
+      $loading_models = false
+    end
+  end
+  
+  def new_model(attributes={}, parent=nil, path=nil, class_paths=nil)
+    return Store.new(@tasks, attributes, parent, path, class_paths)
   end
   
   def new_array_model(*args)

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

@@ -0,0 +1,27 @@
+require 'volt/page/bindings/template_binding'
+
+# Component bindings are the same as template bindings, but handle components
+# and do not pass their context through
+class ComponentBinding < TemplateBinding
+  # The context for a component binding can be either the controller, or the 
+  # component arguments (@model), with the $page as the context.  This gives
+  # components access to the page collections.
+  def render_template(full_path, controller_name)
+    # TODO: at the moment a :body section and a :title will both initialize different
+    # controllers.  Maybe we should have a way to tie them together?
+    controller = get_controller(controller_name)
+    if controller
+      # The user provided a controller, pass in the model as an argument (in a 
+      # sub-context)
+      args = []
+      args << SubContext.new(@model) if @model
+      
+      current_context = controller.new(*args)
+    else
+      # The user didn't specify a model, create a 
+      current_context = SubContext.new(@model || {}, $page)
+    end
+
+    @current_template = TemplateRenderer.new(@target, current_context, @binding_name, full_path)    
+  end
+end

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

@@ -97,7 +97,7 @@ class TemplateBinding < BaseBinding
         controller = nil
         if path_position > 1
           # Lookup the controller
-          controller = [full_path[0], full_path[1]]
+          controller = [full_path[0], full_path[1] + 'Controller']
         end
         return path, controller
       end
@@ -110,34 +110,37 @@ class TemplateBinding < BaseBinding
     full_path, controller_name = path_for_template(@path.cur, @section.cur)
 
     @current_template.remove if @current_template
-    
-    current_context = @context
-    
+        
     if @model
       # Load in any procs
       @model.each_pair do |key,value|
         if value.class == Proc
-          @model[key] = value.call
+          @model[key.gsub('-', '_')] = value.call
         end
       end
     end
     
+    render_template(full_path, controller_name)
+  end
+  
+  # The context for templates can be either a controller, or the original context.
+  def render_template(full_path, controller_name)    
     # TODO: at the moment a :body section and a :title will both initialize different
     # controllers.  Maybe we should have a way to tie them together?
-    if controller_name
+    
+    controller = get_controller(controller_name)
+    if controller
       args = []
       args << SubContext.new(@model) if @model
       
-      controller = get_controller(controller_name)
-      
-      # Initialize the new controller
-      current_context = (controller || ModelController).new(*args)
-    elsif @model
-      # Passed in attributes, but there is no controller
-      current_context = SubContext.new(@model, current_context)      
+      # Setup the controller
+      current_context = controller.new(*args)
+    else
+      # Pass the context directly
+      current_context = @context
     end
 
-    @current_template = TemplateRenderer.new(@target, current_context, @binding_name, full_path)
+    @current_template = TemplateRenderer.new(@target, current_context, @binding_name, full_path)    
   end
 
   def remove
@@ -164,28 +167,28 @@ class TemplateBinding < BaseBinding
   
     # Fetch the controller class
     def get_controller(controller_name)
-      name = controller_name[1].gsub('-', '_').camelize
-    
-      # For the home object, we do not need to namespace our controller
-      if controller_name[0] != 'home'
-        # Controller is namespaced, lookup outer module first
-        base_name = controller_name[0].gsub('-', '_').camelize.to_sym
-        if Object.send(:const_defined?, base_name)
-          base_object = Object.send(:const_get, base_name)
-        end
-      else
-        # Get controller directlry
-        base_object = Object
+      return nil unless controller_name && controller_name.size > 0
+      
+      # Get the constant parts
+      parts = controller_name.map {|v| v.gsub('-', '_').camelize }
+      
+      # Home doesn't get namespaced
+      if parts.first == 'Home'
+        parts.shift
       end
       
-      if base_object
-        name = (name + 'Controller').to_sym
-        if base_object.send(:const_defined?, name)
-          return base_object.send(:const_get, name)
+      # Do const lookups starting at object and working our way down.
+      # So Volt::ProgressBar would lookup Volt, then ProgressBar on Volt.
+      obj = Object
+      parts.each do |part|
+        if obj.const_defined?(part)
+          obj = obj.const_get(part)
+        else
+          return nil
         end
       end
-
-      return nil
+      
+      return obj
     end
   
 end

data/lib/volt/page/channel.rb

@@ -82,7 +82,6 @@ class Channel
     destructive!
   end
   def send_message(message)
-    `console.log('do send message');`
     puts "Send #{message.inspect}"
     if @state != :open
       @queue << message

data/lib/volt/page/channel_stub.rb

@@ -0,0 +1,38 @@
+# Acts the same as the Channel class on the front-end, but calls
+# directly instead of using sockjs.
+
+require 'volt/reactive/events'
+require 'volt/tasks/dispatcher'
+
+# Behaves the same as the Channel class, only the Channel class uses
+# sockjs to pass messages to the backend.  ChannelStub, simply passes
+# them directly to ChannelHandlerStub.
+class ChannelStub
+  include ReactiveTags
+
+  attr_reader :state, :error, :reconnect_interval
+  
+  def initiailze
+    @state = :connected
+  end
+  
+  def opened
+    trigger!('open')
+    trigger!('changed')
+  end
+  
+  def message_received(*message)
+    trigger!('message', nil, *message)
+  end
+  
+  tag_method(:send_message) do
+    destructive!
+  end
+  def send_message(message)
+    ChannelHandlerStub.new(self).process_message(message)
+  end
+  
+  def close!
+    raise "close! should not be called on the backend channel"
+  end
+end

data/lib/volt/page/page.rb

@@ -1,8 +1,8 @@
-require 'opal'
+if RUBY_PLATFORM == 'opal'
+  require 'opal'
 
-ENV['CLIENT'] = true
-
-require 'opal-jquery'
+  require 'opal-jquery'
+end
 require 'volt/models'
 require 'volt/models/params'
 require 'volt/controllers/model_controller'
@@ -11,13 +11,19 @@ require 'volt/page/bindings/content_binding'
 require 'volt/page/bindings/each_binding'
 require 'volt/page/bindings/if_binding'
 require 'volt/page/bindings/template_binding'
+require 'volt/page/bindings/component_binding'
 require 'volt/page/bindings/event_binding'
 require 'volt/page/template_renderer'
 require 'volt/page/reactive_template'
 require 'volt/page/document_events'
 require 'volt/page/sub_context'
 require 'volt/page/targets/dom_target'
-require 'volt/page/channel'
+
+if RUBY_PLATFORM == 'opal'
+  require 'volt/page/channel'
+else
+  require 'volt/page/channel_stub'
+end
 require 'volt/router/routes'
 require 'volt/models/url'
 require 'volt/page/url_tracker'
@@ -46,24 +52,23 @@ class Page
     @events = DocumentEvents.new
     @render_queue = RenderQueue.new
     
-    # Add event for link clicks to handle all a onclick
-    # EventBinding.new(self, )
-    
-    # Setup escape binding for console
-    %x{
-      $(document).keyup(function(e) {
-        if (e.keyCode == 27) {
-          Opal.gvars.page.$launch_console();
-        }
-      });
+    if RUBY_PLATFORM == 'opal'
+      # Setup escape binding for console
+      %x{
+        $(document).keyup(function(e) {
+          if (e.keyCode == 27) {
+            Opal.gvars.page.$launch_console();
+          }
+        });
       
-      $(document).on('click', 'a', function(event) {        
-        Opal.gvars.page.$link_clicked($(this).attr('href'));
-        event.stopPropagation();
+        $(document).on('click', 'a', function(event) {        
+          Opal.gvars.page.$link_clicked($(this).attr('href'));
+          event.stopPropagation();
         
-        return false;
-      });
-    }
+          return false;
+        });
+      }
+    end
   end
   
   def tasks
@@ -90,7 +95,13 @@ class Page
   end
 
   def channel
-    @channel ||= ReactiveValue.new(Channel.new)
+    @channel ||= begin
+      if Volt.client?
+        ReactiveValue.new(Channel.new)
+      else
+        ReactiveValue.new(ChannelStub.new)
+      end
+    end
   end
 
   def events
@@ -136,9 +147,11 @@ class Page
   end
 end
 
-$page = Page.new
+if Volt.client?
+  $page = Page.new
 
-# Call start once the page is loaded
-Document.ready? do
-  $page.start
-end
+  # Call start once the page is loaded
+  Document.ready? do
+    $page.start
+  end
+end

data/lib/volt/page/sub_context.rb

@@ -10,6 +10,10 @@ class SubContext
     @context = context
   end
   
+  def respond_to?(method_name)
+    !!(@locals[method_name.to_s] || (@context && @context.respond_to?(method_name)) || super)
+  end
+  
   def method_missing(method_name, *args, &block)
     method_name = method_name.to_s
     if @locals[method_name]

data/lib/volt/server/channel_handler.rb

@@ -8,6 +8,10 @@ class ChannelHandler < SockJS::Session
     @@dispatcher = val
   end
   
+  def self.dispatcher
+    @@dispatcher
+  end
+  
   # Sends a message to all, optionally skipping a users channel
   def self.send_message_all(skip_channel=nil, *args)
     @@channels.each do |channel|

data/lib/volt/server/channel_handler_stub.rb

@@ -0,0 +1,29 @@
+class ChannelHandlerStub
+  def self.dispatcher=(val)
+    @@dispatcher = val
+  end
+
+  def self.dispatcher
+    @@dispatcher
+  end
+  
+  def initialize(channel_stub)
+    puts "INIT WITH : #{channel_stub.inspect}"
+    @channel_stub = channel_stub
+  end
+
+  # Sends a message to all, optionally skipping a users channel
+  def self.send_message_all(skip_channel=nil, *args)
+    # Stub
+  end
+
+  def process_message(message)
+    puts "GOT: #{message.inspect}"
+    @@dispatcher.dispatch(self, message)
+  end
+
+  def send_message(*args)
+    puts "SEND MSG: #{args.inspect}"
+    @channel_stub.message_received(*args)
+  end
+end

data/lib/volt/server/component_handler.rb

@@ -16,14 +16,13 @@ class ComponentHandler
     component_name = req.path.strip.gsub(/^\/components\//, '').gsub(/[.]js$/, '')
 
     code = ''
-    
-
+  
     component_files = ComponentFiles.new(component_name, @component_paths, true)
     component_files.component_paths.each do |component_path, component_name|
       code << ComponentTemplates.new(component_path, component_name).code
       code << "\n\n"
     end
-    
+  
     javascript_code = Opal.compile(code)
 
     # puts "ENV: #{env.inspect}"

data/lib/volt/server/template_parser.rb

@@ -69,10 +69,10 @@ class Template
 		end
 	end
 
-	def add_template(node, content)
+	def add_template(node, content, name='Template')
 		html = "<!-- $#{@binding_number} --><!-- $/#{@binding_number} -->"
 
-		@current_scope.add_binding(@binding_number, "lambda { |target, context, id| TemplateBinding.new(target, context, id, #{@template_parser.template_path.inspect}, Proc.new { [#{content}] }) }")
+		@current_scope.add_binding(@binding_number, "lambda { |target, context, id| #{name}Binding.new(target, context, id, #{@template_parser.template_path.inspect}, Proc.new { [#{content}] }) }")
 
 		@binding_number += 1
 		return html
@@ -351,7 +351,7 @@ class Template
     args_str = "#{template_path.inspect}"
     args_str << ", {#{attributes_string}}" if attribute_hash.size > 0
 
-		new_html = add_template(node, args_str)
+		new_html = add_template(node, args_str, 'Component')
     
     node.swap(new_html)#Nokogiri::HTML::DocumentFragment.parse(new_html))
   end

data/lib/volt/server.rb

@@ -1,11 +1,13 @@
+ENV['SERVER'] = 'true'
+
 require 'opal'
 require "rack"
 if RUBY_PLATFORM != 'java'
   require "rack/sockjs"
   require "eventmachine"
 end
-require "sprockets-sass"
 require "sass"
+require "sprockets-sass"
 require 'listen'
 
 require 'volt/extra_core/extra_core'
@@ -18,6 +20,26 @@ require 'volt/server/rack/index_files'
 require 'volt/server/rack/opal_files'
 require 'volt/tasks/dispatcher'
 
+module Rack
+  # TODO: For some reason in Rack (or maybe thin), 304 headers close
+  # the http connection.  We might need to make this check if keep 
+  # alive was in the request.
+  class KeepAlive
+    def initialize(app)
+      @app = app
+    end
+ 
+    def call(env)
+      status, headers, body = @app.call(env)
+
+      if status == 304 && env['HTTP_CONNECTION'].downcase == 'keep-alive'
+        headers['Connection'] = 'keep-alive'
+      end
+      
+      [status, headers, body]
+    end
+  end
+end
 
 class Server
   def initialize
@@ -38,6 +60,13 @@ class Server
   
   def app
     @app = Rack::Builder.new
+    # @app.use Rack::Chunked
+    @app.use Rack::ContentLength
+
+    @app.use Rack::KeepAlive
+    @app.use Rack::ConditionalGet
+    @app.use Rack::ETag
+    
     @app.use Rack::CommonLogger
     @app.use Rack::ShowExceptions
 

data/lib/volt/tasks/dispatcher.rb

@@ -6,12 +6,13 @@ class Dispatcher
     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)
+      puts "KLASS: #{klass.inspect}"
       
       # Init and send the method
       result = klass.new(channel, self).send(method_name, *args)

data/lib/volt.rb

@@ -6,11 +6,11 @@ class Volt
   end
   
   def self.server?
-    !ENV['CLIENT']
+    !!ENV['SERVER']
   end
   
   def self.client?
-    !!ENV['CLIENT']
+    !ENV['SERVER']
   end
   
   def self.source_maps?

data/spec/page/sub_context_spec.rb

@@ -0,0 +1,10 @@
+require 'volt/page/sub_context'
+
+describe SubContext do
+  it "should respond_to correctly on locals" do
+    sub_context = SubContext.new({:name => 'Name'})
+    
+    expect(sub_context.respond_to?(:name)).to eq(true)
+    expect(sub_context.respond_to?(:missing)).to eq(false)
+  end
+end

data/volt.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "oj", "~> 2.5.0"
   spec.add_dependency "rake", "~> 10.0.4"
   spec.add_dependency "listen", "~> 2.4.0"
+  # spec.add_dependency "rack-colorized_logger", "~> 1.0.4"
 
 
   spec.add_development_dependency "bundler", "~> 1.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -315,6 +315,8 @@ files:
 - lib/volt/extra_core/object.rb
 - lib/volt/extra_core/string.rb
 - lib/volt/extra_core/stringify_keys.rb
+- lib/volt/extra_core/symbol.rb
+- lib/volt/extra_core/time.rb
 - lib/volt/extra_core/true_false.rb
 - lib/volt/extra_core/try.rb
 - lib/volt/models.rb
@@ -328,12 +330,14 @@ files:
 - lib/volt/models/url.rb
 - lib/volt/page/bindings/attribute_binding.rb
 - lib/volt/page/bindings/base_binding.rb
+- lib/volt/page/bindings/component_binding.rb
 - lib/volt/page/bindings/content_binding.rb
 - lib/volt/page/bindings/each_binding.rb
 - lib/volt/page/bindings/event_binding.rb
 - lib/volt/page/bindings/if_binding.rb
 - lib/volt/page/bindings/template_binding.rb
 - lib/volt/page/channel.rb
+- lib/volt/page/channel_stub.rb
 - lib/volt/page/document_events.rb
 - lib/volt/page/memory_test.rb
 - lib/volt/page/page.rb
@@ -365,6 +369,7 @@ files:
 - lib/volt/server.rb
 - lib/volt/server/binding_setup.rb
 - lib/volt/server/channel_handler.rb
+- lib/volt/server/channel_handler_stub.rb
 - lib/volt/server/component_handler.rb
 - lib/volt/server/component_templates.rb
 - lib/volt/server/if_binding_setup.rb
@@ -393,6 +398,7 @@ files:
 - spec/models/reactive_value_spec.rb
 - spec/models/store_spec.rb
 - spec/models/string_extensions_spec.rb
+- spec/page/sub_context_spec.rb
 - spec/router/routes_spec.rb
 - spec/server/rack/component_files_spec.rb
 - spec/server/rack/component_paths_spec.rb
@@ -475,6 +481,7 @@ test_files:
 - spec/models/reactive_value_spec.rb
 - spec/models/store_spec.rb
 - spec/models/string_extensions_spec.rb
+- spec/page/sub_context_spec.rb
 - spec/router/routes_spec.rb
 - spec/server/rack/component_files_spec.rb
 - spec/server/rack/component_paths_spec.rb