volt 0.8.27.beta2 → 0.8.27.beta3

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

@@ -1,14 +1,15 @@
 require 'volt/page/bindings/base_binding'
 require 'volt/page/template_renderer'
 require 'volt/page/bindings/template_binding/grouped_controllers'
+require 'volt/page/bindings/template_binding/view_lookup_for_path'
 
 module Volt
   class TemplateBinding < BaseBinding
     def initialize(page, target, context, binding_name, binding_in_path, getter)
       super(page, target, context, binding_name)
 
-      # Binding in path is the path for the template this binding is in
-      setup_path(binding_in_path)
+      # Setup the view lookup helper
+      @view_lookup = Volt::ViewLookupForPath.new(page, binding_in_path)
 
       @current_template = nil
 
@@ -22,86 +23,6 @@ module Volt
       end.watch!
     end
 
-    def setup_path(binding_in_path)
-      path_parts       = binding_in_path.split('/')
-      @collection_name = path_parts[0]
-      @controller_name = path_parts[1]
-      @page_name       = path_parts[2]
-    end
-
-    # Returns true if there is a template at the path
-    def check_for_template?(path)
-      @page.templates[path]
-    end
-
-    # Takes in a lookup path and returns the full path for the matching
-    # template.  Also returns the controller and action name if applicable.
-    #
-    # Looking up a path is fairly simple.  There are 4 parts needed to find
-    # the html to be rendered.  File paths look like this:
-    # app/{component}/views/{controller_name}/{view}.html
-    # Within the html file may be one or more sections.
-    # 1. component (app/{comp})
-    # 2. controller
-    # 3. view
-    # 4. sections
-    #
-    # When searching for a file, the lookup starts at the section, and moves up.
-    # when moving up, default values are provided for the section, then view/section, etc..
-    # until a file is either found or the component level is reached.
-    #
-    # The defaults are as follows:
-    # 1. component - main
-    # 2. controller - main
-    # 3. view - index
-    # 4. section - body
-    def path_for_template(lookup_path, force_section = nil)
-      parts      = lookup_path.split('/')
-      parts_size = parts.size
-
-      default_parts     = %w(main main index body)
-
-      # When forcing a sub template, we can default the sub template section
-      default_parts[-1] = force_section if force_section
-
-      (5 - parts_size).times do |path_position|
-        # If they passed in a force_section, we can skip the first
-        next if force_section && path_position == 0
-
-        full_path = [@collection_name, @controller_name, @page_name, nil]
-
-        start_at = full_path.size - parts_size - path_position
-
-        full_path.size.times do |index|
-          if index >= start_at
-            if (part = parts[index - start_at])
-              full_path[index] = part
-            else
-              full_path[index] = default_parts[index]
-            end
-          end
-        end
-
-        path = full_path.join('/')
-        if check_for_template?(path)
-          controller = nil
-
-          if path_position >= 1
-            init_method = full_path[2]
-          else
-            init_method = full_path[3]
-          end
-
-          # Lookup the controller
-          controller = [full_path[0], full_path[1] + '_controller', init_method]
-
-          return path, controller
-        end
-      end
-
-      [nil, nil]
-    end
-
     def update(path, section_or_arguments = nil, options = {})
       Computation.run_without_tracking do
         # Remove existing template and call _removed
@@ -136,7 +57,7 @@ module Volt
           clear_grouped_controller
         end
 
-        full_path, controller_path = path_for_template(path, section)
+        full_path, controller_path = @view_lookup.path_for_template(path, section)
         render_template(full_path, controller_path)
 
         queue_clear_grouped_controller
@@ -208,7 +129,9 @@ module Volt
       if @controller
         # Set the current section on the controller if it wants so it can manipulate
         # the dom if needed
-        if @controller.respond_to?(:section=)
+        # Only assign sections for action's, so we don't get AttributeSections bound
+        # also.
+        if @action && @controller.respond_to?(:section=)
           @controller.section = @current_template.dom_section
         end
 
@@ -217,6 +140,8 @@ module Volt
     end
 
     def remove
+      controller_send(:"before_#{@action}_remove") if @controller && @action
+
       clear_grouped_controller
 
       if @current_template
@@ -228,7 +153,7 @@ module Volt
       super
 
       if @controller
-        controller_send(:"#{@action}_removed") if @action
+        controller_send(:"after_#{@action}_remove") if @action
 
         @controller = nil
       end

data/lib/volt/page/channel.rb

@@ -114,6 +114,5 @@ module Volt
         connect!
       end
     end
-
   end
 end

data/lib/volt/page/page.rb

@@ -140,13 +140,11 @@ module Volt
     attr_reader :events
 
     def add_model(model_name)
-      begin
-        model_name                 = model_name.camelize.to_sym
-        @model_classes[model_name] = Object.const_get(model_name)
-      rescue NameError => e
-        # Handle if the model is user (Volt's provided user model is scoped under Volt::)
-        raise unless model_name == :User
-      end
+      model_name                 = model_name.camelize.to_sym
+      @model_classes[model_name] = Object.const_get(model_name)
+    rescue NameError => e
+      # Handle if the model is user (Volt's provided user model is scoped under Volt::)
+      raise unless model_name == :User
     end
 
     def add_template(name, template, bindings)

data/lib/volt/page/sub_context.rb

@@ -8,7 +8,7 @@ module Volt
   class SubContext
     attr_reader :locals
 
-    def initialize(locals=nil, context = nil, return_nils = false)
+    def initialize(locals = nil, context = nil, return_nils = false)
       @locals  = locals.stringify_keys if locals
       @context = context
       @return_nils = return_nils

data/lib/volt/page/targets/base_section.rb

@@ -21,7 +21,7 @@ module Volt
       if self.is_a?(DomSection)
         dom_template = (@@template_cache[template_name] ||= DomTemplate.new(page, template_name))
 
-        return set_template(dom_template)
+        set_template(dom_template)
       else
         template = page.templates[template_name]
 
@@ -33,7 +33,7 @@ module Volt
           bindings = {}
         end
 
-        return set_content_and_rezero_bindings(html, bindings)
+        set_content_and_rezero_bindings(html, bindings)
       end
     end
   end

data/lib/volt/page/targets/helpers/comment_searchers.rb

@@ -8,14 +8,14 @@ module Volt
 
     def find_by_comment(text, in_node = `document`)
       if NO_XPATH
-        return find_by_comment_without_xml(text, in_node)
+        find_by_comment_without_xml(text, in_node)
       else
         node = nil
 
         `
           node = document.evaluate("//comment()[. = ' " + text + " ']", in_node, null, XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null).iterateNext();
         `
-        return node
+        node
       end
     end
 

data/lib/volt/reactive/reactive_accessors.rb

@@ -25,7 +25,7 @@ module Volt
       def reactive_writer(*names)
         names.each do |name|
           var_name = :"@#{name}"
-          define_method(:"#{name}=") do |new_value|
+          define_method("#{name}=") do |new_value|
             instance_variable_set(var_name, new_value)
 
             self.class.__reactive_dependency_get(name).changed!

data/lib/volt/reactive/reactive_array.rb

@@ -39,9 +39,9 @@ module Volt
           end
         end
 
-        return count
+        count
       else
-        return size
+        size
       end
     end
 
@@ -67,9 +67,9 @@ module Volt
           end
         end
 
-        return false
+        false
       else
-        return @array.any?
+        @array.any?
       end
     end
 
@@ -83,9 +83,9 @@ module Volt
           end
         end
 
-        return true
+        true
       else
-        return @array.all?
+        @array.all?
       end
     end
 

data/lib/volt/router/routes.rb

@@ -119,16 +119,16 @@ module Volt
         if node[part]
           # We found a match, replace the bindings and return
           # TODO: Handvle nested
-          return setup_bindings_in_params(original_parts, node[part])
+          setup_bindings_in_params(original_parts, node[part])
         else
-          return false
+          false
         end
       elsif (new_node = node[part])
         # Direct match for section, continue
-        return match_path(original_parts, parts, new_node)
+        match_path(original_parts, parts, new_node)
       elsif (new_node = node['*'])
         # Match on binding section
-        return match_path(original_parts, parts, new_node)
+        match_path(original_parts, parts, new_node)
       end
     end
 

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

@@ -35,11 +35,10 @@ module Volt
         component_path = @component_paths.component_paths(name)
 
         unless component_path
-          raise "Unable to find component '#{name}', make sure the gem is included in your Gemfile"
+          fail "Unable to find component '#{name}', make sure the gem is included in your Gemfile"
         end
 
         component_path.each do |path|
-
           # Load the dependencies
           load_dependencies(path)
 

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

@@ -26,10 +26,8 @@ module Volt
       code
     end
 
-
     def generate_config_code
       "\nVolt.setup_client_config(#{Volt.config.public.to_h.inspect})\n"
     end
-
   end
 end

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

@@ -84,8 +84,8 @@ module Volt
     def load_views_and_routes
       component_names = []
       app_folders do |app_folder|
-        Dir["#{app_folder}/*"].map {|cp| cp[/[^\/]+$/] }.each do |component_name|
-          component_names << component_name
+        Dir["#{app_folder}/*"].map { |cp| cp[/[^\/]+$/] }.each do |component_name|
+          component_names << component_name if File.directory?(component_name)
         end
       end
 

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

@@ -1,3 +1,4 @@
+require 'rack'
 class QuietCommonLogger < Rack::CommonLogger
   include Rack
 
@@ -16,7 +17,6 @@ class QuietCommonLogger < Rack::CommonLogger
     end
 
     body = BodyProxy.new(body) do
-
       # Don't log on ignored extensions
       unless @@ignore_extensions.include?(ext)
         log(env, status, header, began_at)
@@ -31,4 +31,4 @@ class QuietCommonLogger < Rack::CommonLogger
 
     [status, header, body]
   end
-end
+end

data/lib/volt/spec/capybara.rb

@@ -42,4 +42,4 @@ module Volt
       Capybara.app = Server.new(app_path).app
     end
   end
-end
+end

data/lib/volt/spec/sauce_labs.rb

@@ -1,8 +1,8 @@
 module Volt
   class << self
     def setup_sauce_labs
-      require "sauce"
-      require "sauce/capybara"
+      require 'sauce'
+      require 'sauce/capybara'
 
       Sauce.config do |c|
         if ENV['OS']
@@ -15,9 +15,9 @@ module Volt
           c[:browsers] = [
             # ["Windows 7", "Chrome", "30"],
             # ["Windows 8", "Firefox", "28"],
-            ["Windows 8.1", "Internet Explorer", "11"],
-            ["Windows 8.0", "Internet Explorer", "10"],
-            ["Windows 7.0", "Internet Explorer", "9"],
+            ['Windows 8.1', 'Internet Explorer', '11'],
+            ['Windows 8.0', 'Internet Explorer', '10'],
+            ['Windows 7.0', 'Internet Explorer', '9'],
             # ["OSX 10.9", "iPhone", "8.1"],
             # ["OSX 10.8", "Safari", "6"],
             # ["Linux", "Chrome", "26"]
@@ -30,4 +30,4 @@ module Volt
       Capybara.javascript_driver = :sauce
     end
   end
-end
+end

data/lib/volt/spec/setup.rb

@@ -2,16 +2,17 @@ module Volt
   class << self
     def spec_setup(app_path = '.')
       require 'volt'
-      unless RUBY_PLATFORM == 'opal'
-        require 'volt/spec/capybara'
 
-        ENV['SERVER'] = 'true'
-        ENV['VOLT_ENV'] = 'test'
+      ENV['SERVER'] = 'true'
+      ENV['VOLT_ENV'] = 'test'
+
+      require 'volt/boot'
 
-        require 'volt/boot'
+      # Require in app
+      Volt.boot(app_path)
 
-        # Require in app
-        Volt.boot(app_path)
+      unless RUBY_PLATFORM == 'opal'
+        require 'volt/spec/capybara'
 
         setup_capybara(app_path)
       end

data/lib/volt/tasks/dispatcher.rb

@@ -2,7 +2,6 @@ module Volt
   # The task dispatcher is responsible for taking incoming messages
   # from the socket channel and dispatching them to the proper handler.
   class Dispatcher
-
     # Dispatch takes an incoming Task from the client and runs it on the
     # server, returning the result to the client.
     # Tasks returning a promise will wait to return.
@@ -15,6 +14,8 @@ module Volt
 
       promise = Promise.new
 
+      start_time = Time.now.to_f
+
       # Check that we are calling on a TaskHandler class and a method provide at
       # TaskHandler or above in the ancestor chain.
       if safe_method?(klass, method_name)
@@ -35,15 +36,15 @@ module Volt
         # Unsafe method
         promise.reject(RuntimeError.new("unsafe method: #{method_name}"))
       end
-
-      if callback_id
         # Run the promise and pass the return value/error back to the client
-        promise.then do |result|
-          channel.send_message('response', callback_id, result, nil)
-        end.fail do |error|
-          channel.send_message('response', callback_id, nil, error)
-          Volt.logger.error(error)
-        end
+      promise.then do |result|
+        channel.send_message('response', callback_id, result, nil)
+
+        run_time = ((Time.now.to_f - start_time) * 1000).round(3)
+        Volt.logger.log_dispatch(class_name, method_name, run_time, args)
+      end.fail do |error|
+        Volt.logger.error(error)
+        channel.send_message('response', callback_id, nil, error)
       end
     end
 
@@ -64,7 +65,8 @@ module Volt
         end
       end
 
-      return false
+      false
     end
   end
 end
+

data/lib/volt/tasks/task_handler.rb

@@ -36,7 +36,7 @@ module Volt
       def self.method_missing(name, *args, &block)
         # TODO: optimize: this could run the inside first to see if it
         # returns a promise, so we don't have to wrap it.
-        return Promise.new.then do
+        Promise.new.then do
           new(nil, nil).send(name, *args, &block)
         end.resolve(nil)
       end

data/lib/volt/utils/generic_pool.rb

@@ -67,9 +67,9 @@ module Volt
       result = __lookup(*args) { nil }
 
       if result
-        return result.values
+        result.values
       else
-        return []
+        []
       end
     end
 

data/lib/volt/volt/users.rb

@@ -5,23 +5,23 @@ module Volt
       user_id_signature = self.user_id_signature
 
       if user_id_signature.nil?
-        return nil
+        nil
       else
         index = user_id_signature.index(':')
         user_id = user_id_signature[0...index]
 
         if RUBY_PLATFORM != 'opal'
-          hash = user_id_signature[(index+1)..-1]
+          hash = user_id_signature[(index + 1)..-1]
 
           # Make sure the user hash matches
           if BCrypt::Password.new(hash) != "#{Volt.config.app_secret}::#{user_id}"
             # user id has been tampered with, reject
-            raise "user id or hash has been tampered with"
+            fail 'user id or hash has been tampered with'
           end
 
         end
 
-        return user_id
+        user_id
       end
     end
 
@@ -34,16 +34,15 @@ module Volt
     def user
       user_id = self.user_id
       if user_id
-        return $page.store._users.find_one(_id: user_id)
+        $page.store._users.find_one(_id: user_id)
       else
-        return nil
+        nil
       end
     end
 
     # Login the user, return a promise for success
     def login(username, password)
       UserTasks.login(username, password).then do |result|
-
         # Assign the user_id cookie for the user
         $page.cookies._user_id = result
 
@@ -56,7 +55,6 @@ module Volt
       $page.cookies.delete(:user_id)
     end
 
-
     # Fetches the user_id+signature from the correct spot depending on client
     # or server, does not verify it.
     def user_id_signature
@@ -75,4 +73,4 @@ module Volt
       user_id_signature
     end
   end
-end
+end

data/lib/volt.rb

@@ -3,8 +3,7 @@ require 'volt/extra_core/extra_core'
 require 'volt/reactive/computation'
 require 'volt/reactive/dependency'
 require 'volt/config'
-if RUBY_PLATFORM == 'opal'
-else
+unless RUBY_PLATFORM == 'opal'
   require 'volt/data_stores/data_store'
 end
 require 'volt/volt/users'
@@ -40,7 +39,7 @@ module Volt
     end
 
     def logger
-      @logger ||= Logger.new(STDOUT)
+      @logger ||= Volt::VoltLogger.new
     end
 
     attr_writer :logger
@@ -50,4 +49,3 @@ module Volt
     end
   end
 end
-

data/spec/apps/file_loading/app/missing_deps/config/dependencies.rb

@@ -1 +1 @@
-component 'a-gem-that-isnt-in-the-gemfile'
+component 'a-gem-that-isnt-in-the-gemfile'

data/spec/apps/kitchen_sink/Gemfile

@@ -10,8 +10,8 @@ gem 'volt-bootstrap'
 # Simple theme for bootstrap, remove to theme yourself.
 gem 'volt-bootstrap-jumbotron-theme'
 
-gem 'volt-fields', path: '/Users/ryanstout/Sites/volt/apps/volt-fields'
-gem 'volt-user-templates', path: '/Users/ryanstout/Sites/volt/apps/volt-user-templates'
+gem 'volt-fields'
+gem 'volt-user-templates'
 
 # Server for MRI
 platform :mri do

data/spec/apps/kitchen_sink/app/main/config/dependencies.rb

@@ -11,4 +11,4 @@ component 'bootstrap-jumbotron-theme'
 component 'fields'
 
 # For testing
-component 'user-templates'
+component 'user-templates'

data/spec/apps/kitchen_sink/app/main/config/routes.rb

@@ -11,6 +11,5 @@ get '/todos', _controller: 'todos'
 get '/signup', _controller: 'user-templates', _action: 'signup'
 get '/login', _controller: 'user-templates', _action: 'login'
 
-
 # The main route, this should be last.  It will match any params not previously matched.
 get '/', {}

data/spec/apps/kitchen_sink/app/main/models/user.rb

@@ -1,2 +1,2 @@
 class User < Volt::User
-end
+end

data/spec/apps/kitchen_sink/app/main/views/main/main.html

@@ -1,5 +1,5 @@
 <:Title>
-  {{ template main_path, "title", {controller_group: 'main'} }} - KitchenSink
+  {{ template main_path, 'title', {controller_group: 'main'} }} - KitchenSink
 
 <:Body>
   <div class="container">

data/spec/apps/kitchen_sink/config/app.rb

@@ -1,3 +1,3 @@
 Volt.setup do |config|
   config.app_secret = 'vFYUzMiPIdMw1Iox0ggDpBYorLm_d55YtRPc0eGrdCpoN4h9E5FcWySIT_D8JIEOllU'
-end
+end

data/spec/extra_core/array_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 require 'volt/extra_core/array'
 
 describe Array do
-  it 'should sum an array of integers' do
-    expect([1,2,3].sum).to eq(6)
+  describe '#sum' do
+    it 'calculates sum of array of integers' do
+      expect([1, 2, 3].sum).to eq(6)
+    end
   end
 end

data/spec/extra_core/blank_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "blank" do
+  it 'should report blank when blank' do
+    expect('  '.blank?).to eq(true)
+  end
+
+  it 'should report not blank when not blank' do
+    expect('  text '.blank?).to eq(false)
+  end
+end

data/spec/extra_core/class_spec.rb

@@ -11,7 +11,7 @@ end
 class TestSubClassAttributes2 < TestClassAttributes
 end
 
-describe "extra_core class addons" do
+describe 'extra_core class addons' do
   it 'should provide class_attributes that can be inherited' do
     expect(TestClassAttributes.some_data).to eq(nil)
 
@@ -30,4 +30,4 @@ describe "extra_core class addons" do
     expect(TestSubClassAttributes.some_data).to eq(10)
     expect(TestSubClassAttributes2.some_data).to eq(15)
   end
-end
+end