volt 0.8.14 → 0.8.15

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

@@ -1,98 +1,99 @@
 # ComponentPaths gives an array of every folder where you find a component.
-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
-      volt_app = File.expand_path(File.join(File.dirname(__FILE__), "../../../../app"))
-      app_folders = [volt_app, "#{@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
+module Volt
+  class ComponentPaths
+    def initialize(root=nil)
+      @root = root || Dir.pwd
     end
 
-    # Yield each app folder and return a flattened array with
-    # the results
+    # Yield for every folder where we might find components
+    def app_folders
+      # Find all app folders
+      @app_folders ||= begin
+        volt_app    = File.expand_path(File.join(File.dirname(__FILE__), "../../../../app"))
+        app_folders = [volt_app, "#{@root}/app", "#{@root}/vendor/app"].map { |f| File.expand_path(f) }
 
-    files = []
-    @app_folders.each do |app_folder|
-      files << yield(app_folder)
-    end
-
-    return files.flatten
-  end
+        # 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' }
 
-  # returns an array of every folder that is a component
-  def components
-    return @components if @components
+        app_folders
+      end
 
-    @components = {}
-    app_folders do |app_folder|
-      Dir["#{app_folder}/*"].sort.each do |folder|
-        if File.directory?(folder)
-          folder_name = folder[/[^\/]+$/]
+      # Yield each app folder and return a flattened array with
+      # the results
 
-          @components[folder_name] ||= []
-          @components[folder_name] << folder
-        end
+      files        = []
+      @app_folders.each do |app_folder|
+        files << yield(app_folder)
       end
+
+      return files.flatten
     end
 
-    return @components
-  end
+    # returns an array of every folder that is a component
+    def components
+      return @components if @components
 
-  # Makes each components classes available on the load path, require classes.
-  def require_in_components
-    if RUBY_PLATFORM == 'opal'
-    else
+      @components = {}
       app_folders do |app_folder|
-        $LOAD_PATH.unshift(app_folder)
+        Dir["#{app_folder}/*"].sort.each do |folder|
+          if File.directory?(folder)
+            folder_name = folder[/[^\/]+$/]
 
-        # Sort so we get consistent load order across platforms
-        Dir["#{app_folder}/*/{controllers,models,tasks}/*.rb"].each do |ruby_file|
-          path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]
-          require(path)
+            @components[folder_name] ||= []
+            @components[folder_name] << folder
+          end
         end
+      end
 
-        if Volt.server?
-          # Add models to page
-          Dir["#{app_folder}/*/models/*.rb"].each do |ruby_file|
-            class_name = File.basename(ruby_file).gsub(/[.]rb$/, '')
-            $page.add_model(class_name)
+      return @components
+    end
+
+    # Makes each components classes available on the load path, require classes.
+    def require_in_components
+      if RUBY_PLATFORM == 'opal'
+      else
+        app_folders do |app_folder|
+          $LOAD_PATH.unshift(app_folder)
+
+          # Sort so we get consistent load order across platforms
+          Dir["#{app_folder}/*/{controllers,models,tasks}/*.rb"].each do |ruby_file|
+            path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]
+            require(path)
+          end
+
+          if Volt.server?
+            # Add models to page
+            Dir["#{app_folder}/*/models/*.rb"].each do |ruby_file|
+              class_name = File.basename(ruby_file).gsub(/[.]rb$/, '')
+              $page.add_model(class_name)
+            end
           end
         end
       end
     end
-  end
 
-  # Returns the path for a specific component
-  def component_path(name)
-    folders = components[name]
+    # Returns the path for a specific component
+    def component_path(name)
+      folders = components[name]
 
-    if folders
-      return folders.first
-    else
-      return nil
+      if folders
+        return folders.first
+      else
+        return nil
+      end
     end
-  end
 
-  # Return every asset folder we need to serve from
-  def asset_folders
-    folders = []
-    app_folders do |app_folder|
-      Dir["#{app_folder}/*/assets"].sort.each do |asset_folder|
-        folders << yield(asset_folder)
+    # Return every asset folder we need to serve from
+    def asset_folders
+      folders = []
+      app_folders do |app_folder|
+        Dir["#{app_folder}/*/assets"].sort.each do |asset_folder|
+          folders << yield(asset_folder)
+        end
       end
-    end
 
-    folders.flatten
+      folders.flatten
+    end
   end
-
 end

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

@@ -2,54 +2,51 @@ require 'volt/server/rack/asset_files'
 require 'volt/router/routes'
 
 # Serves the main pages
-class IndexFiles
-  def initialize(app, component_paths, opal_files)
-    @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('main')
-      route_file = File.read("#{home_path}/config/routes.rb")
-      eval(route_file)
+module Volt
+  class IndexFiles
+    def initialize(app, component_paths, opal_files)
+      @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('main')
+        route_file = File.read("#{home_path}/config/routes.rb")
+        eval(route_file)
+      end
     end
-  end
 
-  def route_match?(path)
-    params = @@router.url_to_params(path)
+    def route_match?(path)
+      params = @@router.url_to_params(path)
 
-    return params if params
+      return params if params
 
-    return false
-  end
+      return false
+    end
 
-  def call(env)
-    if route_match?(env['PATH_INFO'])
-      [200, { 'Content-Type' => 'text/html; charset=utf-8' }, [html]]
-    else
-      @app.call env
+    def call(env)
+      if route_match?(env['PATH_INFO'])
+        [200, {'Content-Type' => 'text/html; charset=utf-8'}, [html]]
+      else
+        @app.call env
+      end
     end
-  end
 
-  def html
-    index_path = File.expand_path(File.join(Volt.root, "public/index.html"))
-    html = File.read(index_path)
+    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
+      ERB.new(html).result(binding)
+    end
 
-  def javascript_files
-    # TODO: Cache somehow, this is being loaded every time
-    AssetFiles.new('main', @component_paths).javascript_files(@opal_files)
-  end
+    def javascript_files
+      # TODO: Cache somehow, this is being loaded every time
+      AssetFiles.new('main', @component_paths).javascript_files(@opal_files)
+    end
 
-  def css_files
-    AssetFiles.new('main', @component_paths).css_files
+    def css_files
+      AssetFiles.new('main', @component_paths).css_files
+    end
   end
-
-
-
 end
-
-

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

@@ -5,64 +5,66 @@ if Volt.env.production?
 end
 
 # Sets up the maps for the opal assets, and source maps if enabled.
-class OpalFiles
-  attr_reader :environment
+module Volt
+  class OpalFiles
+    attr_reader :environment
 
-  def initialize(builder, app_path, component_paths)
-    Opal::Processor.source_map_enabled = Volt.source_maps?
+    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
+      # 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
+      @component_paths                   = component_paths
+      @environment                       = Opal::Environment.new
 
-    # Since the scope changes in builder blocks, we need to capture
-    # environment in closure
-    environment = @environment
+      # Since the scope changes in builder blocks, we need to capture
+      # environment in closure
+      environment                        = @environment
 
-    environment.cache = Sprockets::Cache::FileStore.new("./tmp")
+      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
+      if Volt.env.production?
+        # Compress in production
+        environment.js_compressor  = Sprockets::UglifierCompressor
+        environment.css_compressor = Sprockets::YUICompressor
+      end
 
-    environment.append_path(app_path)
+      environment.append_path(app_path)
 
-    volt_gem_lib_path = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
-    environment.append_path(volt_gem_lib_path)
+      volt_gem_lib_path = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
+      environment.append_path(volt_gem_lib_path)
 
-    add_asset_folders(environment)
+      add_asset_folders(environment)
 
-    # Add the opal load paths
-    Opal.paths.each do |path|
-      environment.append_path(path)
-    end
+      # Add the opal load paths
+      Opal.paths.each do |path|
+        environment.append_path(path)
+      end
 
-    # opal-jquery gem
-    spec = Gem::Specification.find_by_name("opal-jquery")
-    environment.append_path(spec.gem_dir + "/opal")
+      # opal-jquery gem
+      spec = Gem::Specification.find_by_name("opal-jquery")
+      environment.append_path(spec.gem_dir + "/opal")
 
-    builder.map '/assets' do
-      run environment
-    end
+      builder.map '/assets' do
+        run environment
+      end
 
-    if Volt.source_maps?
-      source_maps = SourceMapServer.new(environment)
+      if Volt.source_maps?
+        source_maps = SourceMapServer.new(environment)
 
-      builder.map(source_maps.prefix) do
-        run source_maps
+        builder.map(source_maps.prefix) do
+          run source_maps
+        end
       end
     end
-  end
 
-  def add_asset_folders(environment)
-    @component_paths.asset_folders do |asset_folder|
-      environment.append_path(asset_folder)
+    def add_asset_folders(environment)
+      @component_paths.asset_folders do |asset_folder|
+        environment.append_path(asset_folder)
+      end
     end
-  end
 
+  end
 end

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

@@ -1,31 +1,33 @@
-class SourceMapServer
-  def initialize sprockets
-    @sprockets = sprockets
-  end
+module Volt
+  class SourceMapServer
+    def initialize sprockets
+      @sprockets = sprockets
+    end
 
-  attr_reader :sprockets
+    attr_reader :sprockets
 
-  attr_writer :prefix
+    attr_writer :prefix
 
-  def prefix
-    @prefix ||= '/__opal_source_maps__'
-  end
+    def prefix
+      @prefix ||= '/__opal_source_maps__'
+    end
 
-  def inspect
-    "#<#{self.class}:#{object_id}>"
-  end
+    def inspect
+      "#<#{self.class}:#{object_id}>"
+    end
 
-  def call(env)
-    path_info = env['PATH_INFO']
+    def call(env)
+      path_info = env['PATH_INFO']
 
-    if path_info =~ /\.js\.map$/
-      path   = env['PATH_INFO'].gsub(/^\/|\.js\.map$/, '')
-      asset  = sprockets[path]
-      return [404, {}, []] if asset.nil?
+      if path_info =~ /\.js\.map$/
+        path  = env['PATH_INFO'].gsub(/^\/|\.js\.map$/, '')
+        asset = sprockets[path]
+        return [404, {}, []] if asset.nil?
 
-      return [200, {"Content-Type" => "text/json"}, [$OPAL_SOURCE_MAPS[asset.pathname].to_s]]
-    else
-      return [200, {"Content-Type" => "text/text"}, [File.read(sprockets.resolve(path_info))]]
+        return [200, {"Content-Type" => "text/json"}, [$OPAL_SOURCE_MAPS[asset.pathname].to_s]]
+      else
+        return [200, {"Content-Type" => "text/text"}, [File.read(sprockets.resolve(path_info))]]
+      end
     end
   end
 end

data/lib/volt/server/socket_connection_handler.rb

@@ -2,67 +2,68 @@ require 'json'
 require 'sockjs/session'
 require File.join(File.dirname(__FILE__), "../../../app/volt/tasks/query_tasks")
 
-class SocketConnectionHandler < SockJS::Session
-  # Create one instance of the dispatcher
+module Volt
+  class SocketConnectionHandler < SockJS::Session
+    # Create one instance of the dispatcher
 
-  def self.dispatcher=(val)
-    @@dispatcher = val
-  end
+    def self.dispatcher=(val)
+      @@dispatcher = val
+    end
 
-  def self.dispatcher
-    @@dispatcher
-  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|
-      if skip_channel && channel == skip_channel
-        next
+    # Sends a message to all, optionally skipping a users channel
+    def self.send_message_all(skip_channel=nil, *args)
+      @@channels.each do |channel|
+        if skip_channel && channel == skip_channel
+          next
+        end
+        channel.send_message(*args)
       end
-      channel.send_message(*args)
-    end
 
-  end
+    end
 
-  def initialize(session, *args)
-    @session = session
+    def initialize(session, *args)
+      @session = session
 
-    @@channels ||= []
-    @@channels << self
+      @@channels ||= []
+      @@channels << self
 
-    super
-  end
+      super
+    end
 
-  def process_message(message)
-    # self.class.message_all(message)
-    # Messages are json and wrapped in an array
-    message = JSON.parse(message).first
+    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
+      @@dispatcher.dispatch(self, message)
+    end
 
-  def send_message(*args)
-    str = JSON.dump([*args])
+    def send_message(*args)
+      str = JSON.dump([*args])
 
-    begin
-      send(str)
-    rescue MetaState::WrongStateError => e
-      puts "Tried to send to closed connection: #{e.inspect}"
+      begin
+        send(str)
+      rescue MetaState::WrongStateError => e
+        puts "Tried to send to closed connection: #{e.inspect}"
 
-      # Mark this channel as closed
-      closed
+        # Mark this channel as closed
+        closed
+      end
     end
-  end
 
-  def closed
-    # Remove ourself from the available channels
-    @@channels.delete(self)
+    def closed
+      # Remove ourself from the available channels
+      @@channels.delete(self)
 
-    QueryTasks.new(self).close!
-  end
+      QueryTasks.new(self).close!
+    end
 
-  def inspect
-    "<#{self.class.to_s}:#{object_id}>"
+    def inspect
+      "<#{self.class.to_s}:#{object_id}>"
+    end
   end
-
 end

data/lib/volt/server/socket_connection_handler_stub.rb

@@ -1,26 +1,28 @@
-class SocketConnectionHandlerStub
-  def self.dispatcher=(val)
-    @@dispatcher = val
-  end
+module Volt
+  class SocketConnectionHandlerStub
+    def self.dispatcher=(val)
+      @@dispatcher = val
+    end
 
-  def self.dispatcher
-    @@dispatcher
-  end
+    def self.dispatcher
+      @@dispatcher
+    end
 
-  def initialize(channel_stub)
-    @channel_stub = channel_stub
-  end
+    def initialize(channel_stub)
+      @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
+    # 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)
-    @@dispatcher.dispatch(self, message)
-  end
+    def process_message(message)
+      @@dispatcher.dispatch(self, message)
+    end
 
-  def send_message(*args)
-    @channel_stub.message_received(*args)
+    def send_message(*args)
+      @channel_stub.message_received(*args)
+    end
   end
 end