volt 0.6.5 → 0.7.0

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

@@ -5,25 +5,25 @@ class AssetFiles
     @assets = []
     @included_components = {}
     @components = []
-    
+
     component('volt')
     component(component_name)
   end
-  
+
   def load_dependencies(path)
     if path
       dependencies_file = File.join(path, "config/dependencies.rb")
     else
       raise "Unable to find component #{component_name.inspect}"
     end
-    
+
     if File.exists?(dependencies_file)
       # Run the dependencies file in this asset files context
       code = File.read(dependencies_file)
       instance_eval(code)
     end
   end
-  
+
   def component(name)
     unless @included_components[name]
       # Get the path to the component
@@ -34,17 +34,17 @@ class AssetFiles
 
       # Load the dependencies
       load_dependencies(path)
-      
+
       # Add any assets
       add_assets(path)
       @components << [path, name]
     end
   end
-  
+
   def components
     @included_components.keys
   end
-  
+
   def javascript_file(url)
     @assets << [:javascript_file, url]
   end
@@ -52,19 +52,19 @@ class AssetFiles
   def css_file(url)
     @assets << [:css_file, url]
   end
-  
+
   def component_paths
     return @components
   end
-  
+
   def add_assets(path)
     asset_folder = File.join(path, 'assets')
     if File.directory?(asset_folder)
       @assets << [:folder, asset_folder]
     end
   end
-  
-  
+
+
   def javascript_files(opal_files)
     javascript_files = []
     @assets.each do |type, path|
@@ -75,7 +75,7 @@ class AssetFiles
         javascript_files << path
       end
     end
-    
+
     opal_js_files = []
     if Volt.source_maps?
       opal_js_files += opal_files.environment['volt/page/page'].to_a.map {|v| '/assets/' + v.logical_path + '?body=1' }
@@ -85,10 +85,10 @@ class AssetFiles
     opal_js_files << '/components/home.js'
 
     javascript_files += opal_js_files
-    
+
     return javascript_files
   end
-  
+
   def css_files
     css_files = []
     @assets.each do |type, path|
@@ -99,8 +99,8 @@ class AssetFiles
         css_files << path
       end
     end
-    
+
     return css_files
   end
-  
-end
+
+end

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

@@ -3,62 +3,62 @@ class ComponentPaths
   def initialize(root=nil)
     @root = root || Dir.pwd
   end
-  
+
   # Yield for every folder where we might find components
   def app_folders
     # Find all app folders
     @app_folders ||= begin
       app_folders = ["#{@root}/app", "#{@root}/vendor/app"].map {|f| File.expand_path(f) }
-      
+
       # Gem folders with volt in them
       # TODO: we should probably qualify this a bit more
       app_folders += Gem.loaded_specs.values.map { |g| g.full_gem_path }.reject {|g| g !~ /volt/ }.map {|f| f + '/app' }
 
       app_folders
     end
-    
+
     # Yield each app folder and return a flattened array with
     # the results
-    
+
     files = []
     @app_folders.each do |app_folder|
       files << yield(app_folder)
     end
-    
+
     return files.flatten
   end
-  
+
   # returns an array of every folder that is a component
   def components
     return @components if @components
-    
+
     @components = {}
     app_folders do |app_folder|
       Dir["#{app_folder}/*"].sort.each do |folder|
         if File.directory?(folder)
           folder_name = folder[/[^\/]+$/]
-          
+
           @components[folder_name] ||= []
-          @components[folder_name] << folder          
+          @components[folder_name] << folder
         end
       end
     end
-    
+
     return @components
   end
-  
+
   # Makes each components classes available on the load path, require classes.
   def require_in_components
     # app_folders do |app_folder|
     #   $LOAD_PATH.unshift(app_folder)
-    #   
+    #
     #   Dir["#{app_folder}/*/{controllers,model}/*.rb"].each do |ruby_file|
     #     path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]
     #     puts "Path: #{path}"
     #     # require(path)
     #   end
     # end
-    
+
     # add each tasks folder directly
     components.each do |name,component_folders|
       component_folders.each do |component_folder|
@@ -68,18 +68,18 @@ class ComponentPaths
       end
     end
   end
-  
+
   # Returns the path for a specific component
   def component_path(name)
     folders = components[name]
-    
+
     if folders
       return folders.first
     else
       return nil
     end
   end
-  
+
   # Return every asset folder we need to serve from
   def asset_folders
     folders = []
@@ -88,8 +88,8 @@ class ComponentPaths
         folders << yield(asset_folder)
       end
     end
-    
+
     folders.flatten
   end
 
-end
+end

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

@@ -7,7 +7,7 @@ class IndexFiles
     @app = app
     @component_paths = component_paths
     @opal_files = opal_files
-    
+
     @@router ||= Routes.new.define do
       # Find the route file
       home_path = component_paths.component_path('home')
@@ -15,12 +15,12 @@ class IndexFiles
       eval(route_file)
     end
   end
-  
+
   def route_match?(path)
     @@router.path_matchers.each do |path_matcher|
       return true if path =~ path_matcher
     end
-    
+
     return false
   end
 
@@ -31,24 +31,24 @@ class IndexFiles
       @app.call env
     end
   end
-  
+
   def html
     index_path = File.expand_path(File.join(Volt.root, "public/index.html"))
     html = File.read(index_path)
-    
+
     ERB.new(html).result(binding)
   end
-  
+
   def javascript_files
     # TODO: Cache somehow, this is being loaded every time
     AssetFiles.new('home', @component_paths).javascript_files(@opal_files)
   end
-  
+
   def css_files
     AssetFiles.new('home', @component_paths).css_files
   end
 
-  
+
 
 end
 

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

@@ -7,31 +7,31 @@ end
 # Sets up the maps for the opal assets, and source maps if enabled.
 class OpalFiles
   attr_reader :environment
-  
+
   def initialize(builder, app_path, component_paths)
     Opal::Processor.source_map_enabled = Volt.source_maps?
-    
+
     # Don't run arity checks in production
     # Opal::Processor.arity_check_enabled = !Volt.env.production?
     # Opal::Processor.dynamic_require_severity = :raise
 
     @component_paths = component_paths
     @environment = Opal::Environment.new
-    
-    # Since the scope changes in builder blocks, we need to capture 
+
+    # Since the scope changes in builder blocks, we need to capture
     # environment in closure
     environment = @environment
-    
+
     environment.cache = Sprockets::Cache::FileStore.new("./tmp")
-    
+
     if Volt.env.production?
       # Compress in production
       environment.js_compressor = Sprockets::UglifierCompressor
       environment.css_compressor = Sprockets::YUICompressor
     end
-  
+
     environment.append_path(app_path)
-  
+
     volt_gem_lib_path = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
     environment.append_path(volt_gem_lib_path)
 
@@ -58,11 +58,11 @@ class OpalFiles
       end
     end
   end
-  
+
   def add_asset_folders(environment)
     @component_paths.asset_folders do |asset_folder|
       environment.append_path(asset_folder)
     end
   end
-  
-end
+
+end

data/lib/volt/server/socket_connection_handler.rb

@@ -3,15 +3,15 @@ require 'sockjs/session'
 
 class SocketConnectionHandler < SockJS::Session
   # Create one instance of the dispatcher
-  
+
   def self.dispatcher=(val)
     @@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|
@@ -20,32 +20,32 @@ class SocketConnectionHandler < SockJS::Session
       end
       channel.send_message(*args)
     end
-    
+
   end
-  
+
   def initialize(session, *args)
     @session = session
 
     @@channels ||= []
     @@channels << self
-    
+
     super
   end
-  
+
   def process_message(message)
     # self.class.message_all(message)
     # Messages are json and wrapped in an array
     message = JSON.parse(message).first
-    
+
     @@dispatcher.dispatch(self, message)
   end
-  
+
   def send_message(*args)
     str = JSON.dump([*args])
-    
+
     send(str)
   end
-  
+
   def closed
     puts "CHANNEL CLOSED: #{self.inspect}"
     # Remove ourself from the available channels
@@ -53,9 +53,9 @@ class SocketConnectionHandler < SockJS::Session
 
     QueryTasks.new(self).close!
   end
-  
+
   def inspect
     "<#{self.class.to_s}:#{object_id}>"
   end
 
-end
+end

data/lib/volt/server/socket_connection_handler_stub.rb

@@ -6,7 +6,7 @@ class SocketConnectionHandlerStub
   def self.dispatcher
     @@dispatcher
   end
-  
+
   def initialize(channel_stub)
     @channel_stub = channel_stub
   end
@@ -23,4 +23,4 @@ class SocketConnectionHandlerStub
   def send_message(*args)
     @channel_stub.message_received(*args)
   end
-end
+end

data/lib/volt/server.rb

@@ -23,20 +23,20 @@ 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 
+  # 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
@@ -48,18 +48,18 @@ class Server
     Volt.root = root_path
 
     @app_path = File.expand_path(File.join(root_path, "app"))
-    
+
     @component_paths = ComponentPaths.new(root_path)
-    
+
     setup_change_listener
-    
+
     display_welcome
   end
-  
+
   def display_welcome
-    puts File.read(File.join(File.dirname(__FILE__), "server/banner.txt"))      
+    puts File.read(File.join(File.dirname(__FILE__), "server/banner.txt"))
   end
-  
+
   def setup_change_listener
     # Setup the listeners for file changes
     listener = Listen.to("#{@app_path}/") do |modified, added, removed|
@@ -67,10 +67,10 @@ class Server
     end
     listener.start
   end
-  
+
   def app
     @app = Rack::Builder.new
-    
+
     # Should only be used in production
     # @app.use Rack::Deflater
 
@@ -80,7 +80,7 @@ class Server
     @app.use Rack::KeepAlive
     @app.use Rack::ConditionalGet
     @app.use Rack::ETag
-    
+
     @app.use Rack::CommonLogger
     @app.use Rack::ShowExceptions
 
@@ -88,24 +88,24 @@ class Server
     @app.map '/components' do
       run ComponentHandler.new(component_paths)
     end
-    
+
     # Serve the opal files
     opal_files = OpalFiles.new(@app, @app_path, @component_paths)
 
     # Serve the main html files from public, also figure out
     # which JS/CSS files to serve.
     @app.use IndexFiles, @component_paths, opal_files
-    
+
     # Handle socks js connection
     if RUBY_PLATFORM != 'java'
       component_paths.require_in_components
       SocketConnectionHandler.dispatcher = Dispatcher.new
-      
+
       @app.map "/channel" do
         run Rack::SockJS.new(SocketConnectionHandler)#, :websocket => false
       end
     end
-    
+
     @app.use Rack::Static,
       :urls => ["/"],
       :root => "public",
@@ -115,7 +115,7 @@ class Server
       ]
 
     @app.run lambda{ |env| [ 404, { 'Content-Type'  => 'text/html' }, ['404 - page not found'] ] }
-    
+
     return @app
   end
-end
+end

data/lib/volt/tasks/dispatcher.rb

@@ -1,7 +1,7 @@
 # The task dispatcher is responsible for taking incoming messages
 # from the socket channel and dispatching them to the proper handler.
 class Dispatcher
-  
+
   def dispatch(channel, message)
     callback_id, class_name, method_name, *args = message
 
@@ -9,10 +9,10 @@ class Dispatcher
     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)
-      
+
       # Init and send the method
       begin
         result = klass.new(channel, self).send(method_name, *args)
@@ -24,11 +24,11 @@ class Dispatcher
         result = nil
         error = e
       end
-      
+
       if callback_id
         # Callback with result
         channel.send_message('response', callback_id, result, error)
       end
     end
   end
-end
+end

data/lib/volt/utils/ejson.rb

@@ -2,8 +2,8 @@ class EJson
   def self.dump_as(obj)
     obj
   end
-  
+
   def self.dump(obj)
     JSON.dump(dump_as(obj))
   end
-end
+end

data/lib/volt/utils/generic_counting_pool.rb

@@ -2,7 +2,7 @@ require 'volt/utils/generic_pool'
 
 # A counting pool behaves like a normal GenericPool, except for
 # each time lookup is called, remove should be called when complete.
-# The item will be completely removed from the GenericCountingPool 
+# The item will be completely removed from the GenericCountingPool
 # only when it has been removed an equal number of times it has been
 # looked up.
 class GenericCountingPool < GenericPool
@@ -10,32 +10,32 @@ class GenericCountingPool < GenericPool
   def generate_new(*args)
     [0, create(*args)]
   end
-  
+
   # Finds an item and tracks that it was checked out.  Use
   # #remove when the item is no longer needed.
   def find(*args, &block)
     item = __lookup(*args, &block)
-    
+
     item[0] += 1
-    
+
     return item[1]
   end
 
   # Lookups an item
   def lookup(*args, &block)
     item = super(*args, &block)
-    
+
     return item[1]
   end
-  
+
   def transform_item(item)
     [0, item]
   end
-  
+
   def remove(*args)
     item = __lookup(*args)
     item[0] -= 1
-    
+
     if item[0] == 0
       # Last one using this item has removed it.
       super(*args)

data/lib/volt/utils/generic_pool.rb

@@ -13,19 +13,19 @@ class GenericPool
   def initialize
     @pool = {}
   end
-  
+
   def lookup(*args, &block)
     section = @pool
-    
+
     # TODO: This is to work around opal issue #500
     if RUBY_PLATFORM == 'opal'
       args.pop if args.last == nil
     end
-    
-    
+
+
     args.each_with_index do |arg, index|
       last = (args.size-1) == index
-      
+
       if last
         # return, creating if needed
         return(section[arg] ||= create_new_item(*args, &block))
@@ -36,7 +36,7 @@ class GenericPool
       end
     end
   end
-  
+
   # Does the actual creating, if a block is not passed in, it calls
   # #create on the class.
   def create_new_item(*args)
@@ -45,28 +45,28 @@ class GenericPool
     else
       new_item = create(*args)
     end
-    
+
     return transform_item(new_item)
   end
-  
+
   # Allow other pools to override how the created item gets stored.
   def transform_item(item)
     item
   end
-  
+
   # Make sure we call the pool one from lookup_all and not
   # an overridden one.
   alias_method :__lookup, :lookup
-  
+
   def lookup_all(*args)
     __lookup(*args).values
   end
-  
+
   def remove(*args)
     stack = []
     section = @pool
-    
-    args.each_with_index do |arg, index|      
+
+    args.each_with_index do |arg, index|
       stack << section
 
       if args.size-1 == index
@@ -75,14 +75,14 @@ class GenericPool
         section = section[arg]
       end
     end
-    
+
     (stack.size-1).downto(1) do |index|
       node = stack[index]
       parent = stack[index-1]
-      
+
       if node.size == 0
         parent.delete(args[index-1])
       end
     end
   end
-end
+end