volt 0.8.15 → 0.8.16

data/lib/volt/server/html_parser/view_handler.rb

@@ -10,7 +10,7 @@ module Volt
       @scope.last
     end
 
-    def initialize(initial_path, allow_sections=true)
+    def initialize(initial_path, allow_sections = true)
       @original_path = initial_path
 
       # Default to the body section

data/lib/volt/server/html_parser/view_parser.rb

@@ -35,7 +35,7 @@ module Volt
         end
       end
 
-      return templates
+      templates
     end
   end
 end

data/lib/volt/server/html_parser/view_scope.rb

@@ -36,7 +36,7 @@ module Volt
             if args.blank?
               add_else(nil)
             else
-              raise "else does not take a conditional, #{content} was provided."
+              fail "else does not take a conditional, #{content} was provided."
             end
           when 'template'
             add_template(args)
@@ -73,7 +73,7 @@ module Volt
     end
 
     def add_else(content)
-      raise "#else can only be added inside of an if block"
+      fail '#else can only be added inside of an if block'
     end
 
     def add_each(content)
@@ -99,11 +99,11 @@ module Volt
         parent = 'self'
       end
 
-      return parent
+      parent
     end
 
     def last_method_name(getter)
-      return getter.strip[/[^.]+$/]
+      getter.strip[/[^.]+$/]
     end
 
     def add_component(tag_name, attributes, unary)
@@ -125,17 +125,17 @@ module Volt
             data_hash << "#{name.inspect} => Proc.new { #{getter} }"
 
             setter = getter_to_setter(getter)
-            data_hash << "#{(name + "=").inspect} => Proc.new { |val| #{setter} }"
+            data_hash << "#{(name + '=').inspect} => Proc.new { |val| #{setter} }"
 
             # Add an _parent fetcher.  Useful for things like volt-fields to get the parent model.
             parent = parent_fetcher(getter)
 
             # TODO: This adds some overhead, perhaps there is a way to compute this dynamically on the
             # front-end.
-            data_hash << "#{(name + "_parent").inspect} => Proc.new { #{parent} }"
+            data_hash << "#{(name + '_parent').inspect} => Proc.new { #{parent} }"
 
             # Add a _last_method property.  This is useful
-            data_hash << "#{(name + "_last_method").inspect} => #{last_method_name(getter).inspect}"
+            data_hash << "#{(name + '_last_method').inspect} => #{last_method_name(getter).inspect}"
           end
         else
           # String
@@ -159,17 +159,17 @@ module Volt
     end
 
     # Called when this scope should be closed out
-    def close_scope(pop=true)
+    def close_scope(pop = true)
       if pop
         scope = @handler.scope.pop
       else
         scope = @handler.last
       end
 
-      raise "template path already exists: #{scope.path}" if @handler.templates[scope.path]
+      fail "template path already exists: #{scope.path}" if @handler.templates[scope.path]
 
       template = {
-          'html' => scope.html
+        'html' => scope.html
       }
 
       if scope.bindings.size > 0

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

@@ -14,12 +14,12 @@ module Volt
 
     def load_dependencies(path)
       if path
-        dependencies_file = File.join(path, "config/dependencies.rb")
+        dependencies_file = File.join(path, 'config/dependencies.rb')
       else
-        raise "Unable to find component #{component_name.inspect}"
+        fail "Unable to find component #{component_name.inspect}"
       end
 
-      if File.exists?(dependencies_file)
+      if File.exist?(dependencies_file)
         # Run the dependencies file in this asset files context
         code = File.read(dependencies_file)
         instance_eval(code)
@@ -28,18 +28,19 @@ module Volt
 
     def component(name)
       unless @included_components[name]
-        # Get the path to the component
-        path                       = @component_paths.component_path(name)
-
         # Track that we added
         @included_components[name] = true
 
-        # Load the dependencies
-        load_dependencies(path)
+        # Get the path to the component
+        @component_paths.component_paths(name).each do |path|
+
+          # Load the dependencies
+          load_dependencies(path)
 
-        # Add any assets
-        add_assets(path)
-        @components << [path, name]
+          # Add any assets
+          add_assets(path)
+          @components << [path, name]
+        end
       end
     end
 
@@ -56,7 +57,7 @@ module Volt
     end
 
     def component_paths
-      return @components
+      @components
     end
 
     def add_assets(path)
@@ -66,7 +67,6 @@ module Volt
       end
     end
 
-
     def javascript_files(opal_files)
       javascript_files = []
       @assets.each do |type, path|
@@ -88,7 +88,7 @@ module Volt
 
       javascript_files += opal_js_files
 
-      return javascript_files
+      javascript_files.uniq
     end
 
     def css_files
@@ -102,8 +102,7 @@ module Volt
         end
       end
 
-      return css_files
+      css_files.uniq
     end
-
   end
 end

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

@@ -6,7 +6,7 @@ require 'volt/server/rack/asset_files'
 # method that returns all of the ruby setup code for the component.
 module Volt
   class ComponentCode
-    def initialize(component_name, component_paths, client=true)
+    def initialize(component_name, component_paths, client = true)
       @component_name  = component_name
       @component_paths = component_paths
       @client          = client
@@ -21,7 +21,7 @@ module Volt
         code << "\n\n"
       end
 
-      return code
+      code
     end
   end
 end

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

@@ -4,7 +4,6 @@ require 'volt/page/page'
 module Volt
   class ComponentHtmlRenderer
     def initialize
-
     end
 
     def call(env)

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

@@ -1,7 +1,7 @@
 # ComponentPaths gives an array of every folder where you find a component.
 module Volt
   class ComponentPaths
-    def initialize(root=nil)
+    def initialize(root = nil)
       @root = root || Dir.pwd
     end
 
@@ -9,12 +9,12 @@ module Volt
     def app_folders
       # Find all app folders
       @app_folders ||= begin
-        volt_app    = File.expand_path(File.join(File.dirname(__FILE__), "../../../../app"))
+        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 += Gem.loaded_specs.values.map(&:full_gem_path).reject { |g| g !~ /volt/ }.map { |f| f + '/app' }
 
         app_folders
       end
@@ -27,7 +27,7 @@ module Volt
         files << yield(app_folder)
       end
 
-      return files.flatten
+      files.flatten
     end
 
     # returns an array of every folder that is a component
@@ -40,13 +40,16 @@ module Volt
           if File.directory?(folder)
             folder_name = folder[/[^\/]+$/]
 
-            @components[folder_name] ||= []
-            @components[folder_name] << folder
+            # Add in the folder if it's not alreay in there
+            folders = (@components[folder_name] ||= [])
+            unless folders.include?(folder)
+              folders << folder
+            end
           end
         end
       end
 
-      return @components
+      @components
     end
 
     # Makes each components classes available on the load path, require classes.
@@ -73,12 +76,12 @@ module Volt
       end
     end
 
-    # Returns the path for a specific component
-    def component_path(name)
+    # Returns all paths for a specific component
+    def component_paths(name)
       folders = components[name]
 
       if folders
-        return folders.first
+        return folders
       else
         return nil
       end

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

@@ -11,7 +11,7 @@ module Volt
 
       @@router ||= Routes.new.define do
         # Find the route file
-        home_path  = component_paths.component_path('main')
+        home_path  = component_paths.component_paths('main').first
         route_file = File.read("#{home_path}/config/routes.rb")
         eval(route_file)
       end
@@ -22,19 +22,19 @@ module Volt
 
       return params if params
 
-      return false
+      false
     end
 
     def call(env)
       if route_match?(env['PATH_INFO'])
-        [200, {'Content-Type' => 'text/html; charset=utf-8'}, [html]]
+        [200, { 'Content-Type' => 'text/html; charset=utf-8' }, [html]]
       else
         @app.call env
       end
     end
 
     def html
-      index_path = File.expand_path(File.join(Volt.root, "public/index.html"))
+      index_path = File.expand_path(File.join(Volt.root, 'public/index.html'))
       html       = File.read(index_path)
 
       ERB.new(html).result(binding)

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

@@ -23,7 +23,7 @@ module Volt
       # 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
@@ -33,7 +33,7 @@ module Volt
 
       environment.append_path(app_path)
 
-      volt_gem_lib_path = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
+      volt_gem_lib_path = File.expand_path(File.join(File.dirname(__FILE__), '../../..'))
       environment.append_path(volt_gem_lib_path)
 
       add_asset_folders(environment)
@@ -44,8 +44,8 @@ module Volt
       end
 
       # opal-jquery gem
-      spec = Gem::Specification.find_by_name("opal-jquery")
-      environment.append_path(spec.gem_dir + "/opal")
+      spec = Gem::Specification.find_by_name('opal-jquery')
+      environment.append_path(spec.gem_dir + '/opal')
 
       builder.map '/assets' do
         run environment
@@ -65,6 +65,5 @@ module Volt
         environment.append_path(asset_folder)
       end
     end
-
   end
 end

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

@@ -1,6 +1,6 @@
 module Volt
   class SourceMapServer
-    def initialize sprockets
+    def initialize(sprockets)
       @sprockets = sprockets
     end
 
@@ -24,9 +24,9 @@ module Volt
         asset = sprockets[path]
         return [404, {}, []] if asset.nil?
 
-        return [200, {"Content-Type" => "text/json"}, [$OPAL_SOURCE_MAPS[asset.pathname].to_s]]
+        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/text' }, [File.read(sprockets.resolve(path_info))]]
       end
     end
   end

data/lib/volt/server/socket_connection_handler.rb

@@ -1,6 +1,6 @@
 require 'json'
 require 'sockjs/session'
-require File.join(File.dirname(__FILE__), "../../../app/volt/tasks/query_tasks")
+require File.join(File.dirname(__FILE__), '../../../app/volt/tasks/query_tasks')
 
 module Volt
   class SocketConnectionHandler < SockJS::Session
@@ -15,14 +15,13 @@ module Volt
     end
 
     # Sends a message to all, optionally skipping a users channel
-    def self.send_message_all(skip_channel=nil, *args)
+    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
-
     end
 
     def initialize(session, *args)
@@ -63,7 +62,7 @@ module Volt
     end
 
     def inspect
-      "<#{self.class.to_s}:#{object_id}>"
+      "<#{self.class}:#{object_id}>"
     end
   end
 end

data/lib/volt/server/socket_connection_handler_stub.rb

@@ -13,7 +13,7 @@ module Volt
     end
 
     # Sends a message to all, optionally skipping a users channel
-    def self.send_message_all(skip_channel=nil, *args)
+    def self.send_message_all(skip_channel = nil, *args)
       # Stub
     end
 

data/lib/volt/spec/setup.rb

@@ -1,5 +1,5 @@
 module Volt
-  def self.spec_setup(app_path='.')
+  def self.spec_setup(app_path = '.')
     if RUBY_PLATFORM == 'opal'
       require 'volt'
     else
@@ -23,7 +23,7 @@ module Volt
 
         Capybara.server do |app, port|
           require 'rack/handler/thin'
-          Rack::Handler::Thin.run(app, :Port => port)
+          Rack::Handler::Thin.run(app, Port: port)
         end
 
         Capybara.app = Server.new(app_path).app
@@ -50,7 +50,7 @@ module Volt
         elsif ENV['BROWSER'] == 'safari'
           # Needs extension
           Capybara.register_driver :safari do |app|
-            Capybara::Selenium::Driver.new(app, :browser => :safari)
+            Capybara::Selenium::Driver.new(app, browser: :safari)
           end
           Capybara.default_driver = :safari
         end

data/lib/volt/store/mongo.rb

@@ -1,5 +1,5 @@
 require 'mongo'
 
-mongo_client = Mongo::MongoClient.new("localhost", 27017)
+mongo_client = Mongo::MongoClient.new('localhost', 27_017)
 
-db = mongo_client.db("test1")
+db = mongo_client.db('test1')

data/lib/volt/tasks/task_handler.rb

@@ -7,7 +7,7 @@ module Volt
         $page.tasks.call(self.name, name, *args, &block)
       end
     else
-      def initialize(channel=nil, dispatcher=nil)
+      def initialize(channel = nil, dispatcher = nil)
         @channel    = channel
         @dispatcher = dispatcher
       end
@@ -27,7 +27,7 @@ module Volt
         promise = Promise.new
 
         begin
-          result = self.new(nil, nil).send(name, *args, &block)
+          result = new(nil, nil).send(name, *args, &block)
 
           promise.resolve(result)
         rescue => e
@@ -36,7 +36,7 @@ module Volt
           promise.reject(e)
         end
 
-        return promise
+        promise
       end
     end
   end