volt 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dc382e28cc1e24d1fc62104d3eac49143a473f0
-  data.tar.gz: d9cfbd13dfb26f582c15f11dde6167ce107f00c3
+  metadata.gz: d5fa5dd92e489dfa4a0257eccd5509aa2324cb25
+  data.tar.gz: 21e58768017cd4b82ec09ee9b9b06a828d3289e8
 SHA512:
-  metadata.gz: c40b106ac5195a1df566437905708891744f290e8386c29897c235657d9e4c945ae87dda6582e908261b04c6510583478aabdcd994d78ba1f82468d306a62739
-  data.tar.gz: ff4b2bc4553bc7829ab50162c3f848cf98535d06eb5b03af03cc0840066135de5c8fe27568b5798fe04972c10e6a2bb4b4c1839b1efbc4890533d64595fb2937
+  metadata.gz: fd684af9e5c24c317c62e97bff34c8a7f732082074424e225db3712386fb1ded60f30b686a5046961600f0f9a48b12a14da42500434f700f50b681b57125de94
+  data.tar.gz: bc38cdd81e222e1ed407fa44819ee1b0adc6edf1796ec597b7022dfd7f7abb74583fbfcd266409d3299f02afe31cc62daea8f387211c82996e21217cbfab4d45

data/Readme.md

@@ -382,6 +382,13 @@ in the file.
 
 Dependencies act just like require in ruby, but for whole components.
 
+Sometimes you may need to include an externally hosted JS file from a component.  To do this, simply do the following in the dependencies.rb file:
+
+    javascript_file 'http://code.jquery.com/jquery-2.0.3.min.js'
+    css_file '//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css'
+    
+Note above though that jquery and bootstrap are currently included by default.  Using javascript_file and css_file will be mixed in with your component assets at the correct locations according to the order they occur in the dependencies.rb files.
+
 ## Assets
 
 **Note, asset management is still early, and likely will change quite a bit**
@@ -501,4 +508,5 @@ An in browser irb is in the works.  We also have source maps support, but they a
 
     MAPS=true volt s
     
-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)
+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)
+

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/app/volt/tasks/channel_tasks.rb

@@ -1,23 +1,45 @@
 class ChannelTasks
   @@listeners = {}
+  @@channel_listeners = {}
   
-  def initialize(channel, dispatcher)
+  # The dispatcher passes its self in
+  def initialize(channel, dispatcher=nil)
     @channel = channel
-    @dispatcher = dispatcher
   end
   
   def add_listener(channel_name)
+    # Track every channel that is listening
     @@listeners[channel_name] ||= []
     @@listeners[channel_name] << @channel
+    
+    # Also keep track of which channel names a channel is listening
+    # on so it can be removed if a channel is closed.
+    @@channel_listeners[@channel] ||= {}
+    @@channel_listeners[@channel][channel_name] = true
   end
   
   def remove_listener(channel_name)
     if @@listeners[channel_name]
       @@listeners[channel_name].delete(@channel)
+      if @@channel_listeners[@channel]
+        @@channel_listeners[@channel].delete(channel_name)
+      end
+    end
+  end
+  
+  # Called when a channel is closed, removes its listeners from
+  # all channels.
+  def close!
+    channel_names = @@channel_listeners.delete(@channel)
+    
+    if channel_names
+      channel_names.each_pair do |channel_name,val|
+        remove_listener(channel_name)
+      end
     end
   end
   
-  def self.send_message_to_channel(channel_name, message, skip_channel)
+  def self.send_message_to_channel(channel_name, message, skip_channel=nil)
     listeners = @@listeners[channel_name]
     
     if listeners

data/app/volt/tasks/store_tasks.rb

@@ -3,7 +3,6 @@ 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")
     
@@ -22,6 +21,9 @@ class StoreTasks
     begin
       @@db[collection].insert(data)
       id = {'_id' => data.delete('_id')}
+      
+      # Message that we inserted a new item
+      ChannelTasks.send_message_to_channel("#{collection}", ['added', nil, collection, data.merge('_id' => id).symbolize_keys], @channel)
     rescue Mongo::OperationFailure => error
       # Really mongo client?
       if error.message[/^11000[:]/]
@@ -35,8 +37,7 @@ class StoreTasks
     
     id = id['_id']
 
-    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)
+    ChannelTasks.send_message_to_channel("#{collection}##{id}", ['changed', nil, id, data.merge('_id' => id).symbolize_keys], @channel)
   end
   
   def find(collection, scope, query=nil)

data/lib/volt/console.rb

@@ -12,9 +12,9 @@ class Console
     require 'volt'
     require 'volt/page/page'
     require 'volt/server/rack/component_paths'
-    require 'volt/server/channel_handler_stub'
+    require 'volt/server/socket_connection_handler_stub'
     
-    ChannelHandlerStub.dispatcher = Dispatcher.new
+    SocketConnectionHandlerStub.dispatcher = Dispatcher.new
     
         
     app_path = File.expand_path(File.join(Dir.pwd, "app"))

data/lib/volt/models/store.rb

@@ -36,7 +36,7 @@ class Store < Model
   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)
+      @tasks.call('ChannelTasks', "#{add_or_remove}_listener", channel_name)
     end    
   end
   

data/lib/volt/models/store_array.rb

@@ -5,6 +5,31 @@ class StoreArray < ArrayModel
     super(array, parent, path)
   end
   
+  def event_added(event, scope_provider, first) 
+    puts "New event: #{event.inspect} - #{first}"   
+    if first && [:added, :removed].include?(event)
+      # Start listening for added items on the collection
+      
+      change_channel_connection('add')
+    end
+  end
+  
+  def event_removed(event, no_more_events)
+    if no_more_events && [:added, :removed].include?(event)
+      # Stop listening
+      change_channel_connection("remove", event)
+    end
+  end
+  
+  
+  def change_channel_connection(add_or_remove, event)
+    if parent.attributes && path.size != 0
+      channel_name = "#{path[-1]}-#{event}"
+      puts "Listen on #{channel_name}"
+      @tasks.call('ChannelTasks', "#{add_or_remove}_listener", channel_name)
+    end    
+  end
+  
   def new_model(*args)
     Store.new(@tasks, *args)
   end

data/lib/volt/page/channel_stub.rb

@@ -6,7 +6,7 @@ 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.
+# them directly to SocketConnectionHandlerStub.
 class ChannelStub
   include ReactiveTags
 

data/lib/volt/page/draw_cycle.rb

@@ -0,0 +1,9 @@
+class DrawCycle
+  def initialize
+    @queue = {}
+  end
+  
+  def queue(binding)
+    
+  end
+end

data/lib/volt/page/page.rb

@@ -29,11 +29,11 @@ require 'volt/models/url'
 require 'volt/page/url_tracker'
 require 'volt'
 require 'volt/benchmark/benchmark'
-require 'volt/page/render_queue'
+require 'volt/page/draw_cycle'
 require 'volt/page/tasks'
 
 class Page
-  attr_reader :url, :params, :page, :store, :templates, :routes, :render_queue
+  attr_reader :url, :params, :page, :store, :templates, :routes, :draw_cycle
 
   def initialize
 
@@ -50,7 +50,7 @@ class Page
     @url_tracker = UrlTracker.new(self)
 
     @events = DocumentEvents.new
-    @render_queue = RenderQueue.new
+    @draw_cycle = DrawCycle.new
     
     if RUBY_PLATFORM == 'opal'
       # Setup escape binding for console

data/lib/volt/page/tasks.rb

@@ -31,8 +31,10 @@ class Tasks
     case name
     when 'response'
       response(callback_id, *args)
-    when 'update'
-      update(*args)
+    when 'changed'
+      changed(*args)
+    when 'added'
+      added(*args)
     when 'reload'
       reload
     end
@@ -46,13 +48,20 @@ class Tasks
     end
   end
   
-  def update(model_id, data)
+  def changed(model_id, data)
     $loading_models = true
     puts "UPDATE: #{model_id} with #{data.inspect}"
     Store.update(model_id, data)
     $loading_models = false
   end
   
+  def added(path, data)
+    $loading_models = true
+    puts "Add: #{path.inspect} - #{data.inspect}"
+    $page.store.send(path) << data
+    $loading_models = false
+  end
+  
   def reload
     puts "RELOAD"
     $page.page._reloading = true

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

@@ -1,4 +1,4 @@
-# Used to get a list of the assets from the dependencies
+# Used to get a list of the assets from the dependencies files.
 class AssetFiles
   def initialize(component_name, component_paths)
     @component_paths = component_paths

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

@@ -40,11 +40,11 @@ class IndexFiles
   
   def javascript_files
     # TODO: Cache somehow, this is being loaded every time
-    ComponentFiles.new('home', @component_paths, true).javascript_files(@opal_files)
+    AssetFiles.new('home', @component_paths).javascript_files(@opal_files)
   end
   
   def css_files
-    ComponentFiles.new('home', @component_paths, true).css_files
+    AssetFiles.new('home', @component_paths).css_files
   end
 
   

data/lib/volt/server/{channel_handler.rb → socket_connection_handler.rb}

@@ -1,7 +1,7 @@
 require 'json'
 require 'sockjs/session'
 
-class ChannelHandler < SockJS::Session
+class SocketConnectionHandler < SockJS::Session
   # Create one instance of the dispatcher
   
   def self.dispatcher=(val)
@@ -47,9 +47,13 @@ class ChannelHandler < SockJS::Session
     send(str)
   end
   
-  def closed    
+  def closed
+    puts "CHANNEL CLOSED"
     # Remove ourself from the available channels
     @@channels.delete(self)
+    
+    # Remove any listening channels
+    ChannelTasks.new(self).close!
   end
 
 end

data/lib/volt/server/{channel_handler_stub.rb → socket_connection_handler_stub.rb}

@@ -1,4 +1,4 @@
-class ChannelHandlerStub
+class SocketConnectionHandlerStub
   def self.dispatcher=(val)
     @@dispatcher = val
   end
@@ -8,7 +8,6 @@ class ChannelHandlerStub
   end
   
   def initialize(channel_stub)
-    puts "INIT WITH : #{channel_stub.inspect}"
     @channel_stub = channel_stub
   end
 
@@ -18,12 +17,10 @@ class ChannelHandlerStub
   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.rb

@@ -13,7 +13,7 @@ require 'listen'
 require 'volt/extra_core/extra_core'
 require 'volt/server/component_handler'
 if RUBY_PLATFORM != 'java'
-  require 'volt/server/channel_handler'
+  require 'volt/server/socket_connection_handler'
 end
 require 'volt/server/rack/component_paths'
 require 'volt/server/rack/index_files'
@@ -58,7 +58,7 @@ class Server
   def setup_change_listener
     # Setup the listeners for file changes
     listener = Listen.to("#{@app_path}/") do |modified, added, removed|
-      ChannelHandler.send_message_all(nil, 'reload')
+      SocketConnectionHandler.send_message_all(nil, 'reload')
     end
     listener.start
   end
@@ -94,10 +94,10 @@ class Server
     # Handle socks js connection
     if RUBY_PLATFORM != 'java'
       component_paths.setup_components_load_path
-      ChannelHandler.dispatcher = Dispatcher.new
+      SocketConnectionHandler.dispatcher = Dispatcher.new
       
       @app.map "/channel" do
-        run Rack::SockJS.new(ChannelHandler)#, :websocket => false
+        run Rack::SockJS.new(SocketConnectionHandler)#, :websocket => false
       end
     end
     

data/lib/volt/tasks/dispatcher.rb

@@ -12,7 +12,6 @@ class Dispatcher
     
       # 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/spec/tasks/channel_tasks_spec.rb

@@ -0,0 +1,74 @@
+if RUBY_PLATFORM != 'opal'
+  describe "ChannelTasks" do
+    before do
+      load File.join(File.dirname(__FILE__), "../../app/volt/tasks/channel_tasks.rb")
+    end
+    
+    after do
+      Object.send(:remove_const, :ChannelTasks)
+    end
+    
+    it "should let channels be added and removed" do
+      connection = double('socket connection')
+      
+      expect(connection).to receive(:send_message).with('message')
+      
+      @channel_task = ChannelTasks.new(connection)
+      @channel_task.add_listener('channel1')
+      
+      ChannelTasks.send_message_to_channel('channel1', 'message')
+    end
+    
+    it "shouldn't send to channels that aren't listening" do
+      connection1 = double('socket connection1')
+      connection2 = double('socket connection2')
+      
+      expect(connection1).to receive(:send_message).with('message for 1')
+      expect(connection1).to_not receive(:send_message).with('message for 2')
+      
+      expect(connection2).to_not receive(:send_message).with('message for 1')
+      expect(connection2).to receive(:send_message).with('message for 2')
+      
+      @channel_task = ChannelTasks.new(connection1)
+      @channel_task.add_listener('channel1')
+
+      @channel_task = ChannelTasks.new(connection2)
+      @channel_task.add_listener('channel2')
+      
+      ChannelTasks.send_message_to_channel('channel1', 'message for 1')
+      ChannelTasks.send_message_to_channel('channel2', 'message for 2')
+    end
+    
+    it "should remove channels" do
+      connection = double('socket connection')
+      
+      expect(connection).to_not receive(:send_message).with('message for channel1')
+      expect(connection).to receive(:send_message).with('message for channel2')
+      
+      @channel_task = ChannelTasks.new(connection)
+      @channel_task.add_listener('channel1')
+      @channel_task.add_listener('channel2')
+      
+      ChannelTasks.new(connection).remove_listener('channel1')
+      
+      ChannelTasks.send_message_to_channel('channel1', 'message for channel1')
+      ChannelTasks.send_message_to_channel('channel2', 'message for channel2')
+    end
+    
+    it "should remove all when the socket is closed" do
+      connection = double('socket connection')
+      
+      expect(connection).to_not receive(:send_message).with('message for channel1')
+      expect(connection).to_not receive(:send_message).with('message for channel2')
+      
+      @channel_task = ChannelTasks.new(connection)
+      @channel_task.add_listener('channel1')
+      @channel_task.add_listener('channel2')
+      
+      ChannelTasks.new(connection).close!
+      
+      ChannelTasks.send_message_to_channel('channel1', 'message for channel1')
+      ChannelTasks.send_message_to_channel('channel2', 'message for channel2')      
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -341,10 +341,10 @@ files:
 - lib/volt/page/channel.rb
 - lib/volt/page/channel_stub.rb
 - lib/volt/page/document_events.rb
+- lib/volt/page/draw_cycle.rb
 - lib/volt/page/memory_test.rb
 - lib/volt/page/page.rb
 - lib/volt/page/reactive_template.rb
-- lib/volt/page/render_queue.rb
 - lib/volt/page/sub_context.rb
 - lib/volt/page/targets/attribute_section.rb
 - lib/volt/page/targets/attribute_target.rb
@@ -371,8 +371,6 @@ files:
 - lib/volt/server.rb
 - lib/volt/server/banner.txt
 - 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
@@ -382,6 +380,8 @@ files:
 - lib/volt/server/rack/opal_files.rb
 - lib/volt/server/rack/source_map_server.rb
 - lib/volt/server/scope.rb
+- lib/volt/server/socket_connection_handler.rb
+- lib/volt/server/socket_connection_handler_stub.rb
 - lib/volt/server/template_parser.rb
 - lib/volt/store/mongo.rb
 - lib/volt/tasks/dispatcher.rb
@@ -408,6 +408,7 @@ files:
 - spec/server/template_parser_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
+- spec/tasks/channel_tasks_spec.rb
 - spec/templates/targets/binding_document/component_node_spec.rb
 - spec/templates/template_binding_spec.rb
 - templates/.gitignore
@@ -493,6 +494,7 @@ test_files:
 - spec/server/template_parser_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
+- spec/tasks/channel_tasks_spec.rb
 - spec/templates/targets/binding_document/component_node_spec.rb
 - spec/templates/template_binding_spec.rb
 has_rdoc: 

data/lib/volt/page/render_queue.rb

@@ -1,5 +0,0 @@
-class RenderQueue
-  def initialize
-    # @queue
-  end
-end