volt 0.9.1 → 0.9.2

data/lib/volt/page/bindings/view_binding/controller_handler.rb

@@ -7,7 +7,7 @@ module Volt
       @action = action.to_sym if action
     end
 
-    def call_action(stage_prefix=nil, stage_suffix=nil)
+    def call_action(stage_prefix = nil, stage_suffix = nil)
       return unless @action
 
       has_stage = stage_prefix || stage_suffix
@@ -31,19 +31,17 @@ module Volt
         end
       end
 
-      if @controller.respond_to?(method_name)
-        @controller.send(method_name)
-      end
+      @controller.send(method_name) if @controller.respond_to?(method_name)
 
       @controller.run_actions(:after, @action) unless has_stage
 
       # before_action chain was not stopped
-      return false
+      false
     end
 
     # Fetch the controller class
     def self.get_controller_and_action(controller_path)
-      raise "Invalid controller path: #{controller_path.inspect}" unless controller_path && controller_path.size > 0
+      fail "Invalid controller path: #{controller_path.inspect}" unless controller_path && controller_path.size > 0
 
       action = controller_path[-1]
 
@@ -65,4 +63,4 @@ module Volt
       [obj, action]
     end
   end
-end
+end

data/lib/volt/page/bindings/view_binding/view_lookup_for_path.rb

@@ -87,6 +87,5 @@ module Volt
 
       [nil, nil]
     end
-
   end
-end
+end

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

@@ -25,7 +25,6 @@ module Volt
       end
 
       super
-
     end
   end
-end
+end

data/lib/volt/page/channel.rb

@@ -27,7 +27,7 @@ module Volt
     end
 
     def connect!
-      %x{
+      `
         if (document.location.protocol == 'https:') {
           var wsProto = 'wss';
         } else {
@@ -53,7 +53,7 @@ module Volt
         this.socket.onclose = function(error) {
           self.$closed(error);
         };
-      }
+      `
     end
 
     def opened
@@ -78,7 +78,7 @@ module Volt
       self.status             = :reconnecting
       self.reconnect_interval ||= 0
       self.reconnect_interval += (1000 + rand(5000))
-      self.retry_count        += 1
+      self.retry_count += 1
 
       interval = self.reconnect_interval
 

data/lib/volt/page/document_events.rb

@@ -22,7 +22,7 @@ module Volt
 
       end
 
-      @events[event][binding.binding_name]                    ||= {}
+      @events[event][binding.binding_name] ||= {}
       @events[event][binding.binding_name][binding.object_id] = handler
     end
 

data/lib/volt/page/page.rb

@@ -27,7 +27,6 @@ require 'volt/page/url_tracker'
 require 'volt/benchmark/benchmark'
 require 'volt/page/tasks'
 
-
 module Volt
   class Page
     attr_reader :url, :params, :page, :routes, :events
@@ -151,9 +150,7 @@ module Volt
 
     # On the server, we can delay loading the views until they are actually requeted.  This
     # sets up an instance variable to call to load.
-    def template_loader=(callback)
-      @template_loader = callback
-    end
+    attr_writer :template_loader
 
     def templates
       if @template_loader
@@ -166,7 +163,7 @@ module Volt
     end
 
     def add_routes(&block)
-      @routes   ||= Routes.new
+      @routes ||= Routes.new
       @routes.define(&block)
       @url.router = @routes
     end
@@ -221,7 +218,7 @@ module Volt
     $page = Page.new
 
     `$(document).ready(function() {`
-      $page.start
+    $page.start
     `});`
   end
 end

data/lib/volt/page/path_string_renderer.rb

@@ -6,27 +6,27 @@ require 'volt/page/bindings/view_binding/controller_handler'
 require 'volt/page/string_template_renderer'
 
 module Volt
-  class ViewLookupException < Exception ; end
+  class ViewLookupException < Exception; end
   class PathStringRenderer
     attr_reader :html
-    def initialize(path, attrs=nil, page=nil, render_from_path=nil)
+    def initialize(path, attrs = nil, page = nil, render_from_path = nil)
       # use the global page if one is not passed in
       page ||= $page
 
       # where to do the path lookup from
-      render_from_path ||= "main/main/main/body"
+      render_from_path ||= 'main/main/main/body'
 
       # Make path into a full path
       @view_lookup = Volt::ViewLookupForPath.new(page, render_from_path)
       full_path, controller_path = @view_lookup.path_for_template(path, nil)
 
-      if full_path == nil
-        raise ViewLookupException, "Unable to find view at `#{path}`"
+      if full_path.nil?
+        fail ViewLookupException, "Unable to find view at `#{path}`"
       end
 
       controller_class, action = ControllerHandler.get_controller_and_action(controller_path)
 
-      controller = controller_class.new#(SubContext.new(attrs, nil, true))
+      controller = controller_class.new # (SubContext.new(attrs, nil, true))
       controller.model = SubContext.new(attrs, nil, true)
 
       renderer = StringTemplateRenderer.new(page, controller, full_path)
@@ -36,6 +36,5 @@ module Volt
       # remove when done
       renderer.remove
     end
-
   end
-end
+end

data/lib/volt/page/sub_context.rb

@@ -28,9 +28,7 @@ module Volt
         obj = @locals[method_name]
 
         # TODORW: Might get a normal proc, flag internal procs
-        if obj.is_a?(Proc)
-          obj = obj.call(*args)
-        end
+        obj = obj.call(*args) if obj.is_a?(Proc)
         return obj
       elsif @return_nils && method_name[-1] != '='
         return nil

data/lib/volt/page/targets/binding_document/component_node.rb

@@ -75,9 +75,7 @@ module Volt
     end
 
     def find_by_binding_id(binding_id)
-      if @binding_id == binding_id
-        return self
-      end
+      return self if @binding_id == binding_id
 
       @nodes.each do |node|
         if node.is_a?(ComponentNode)

data/lib/volt/page/tasks.rb

@@ -14,7 +14,7 @@ module Volt
 
     def call(class_name, method_name, meta_data, *args)
       promise_id            = @promise_id
-      @promise_id           += 1
+      @promise_id += 1
 
       # Track the callback
       promise               = Promise.new
@@ -45,7 +45,7 @@ module Volt
       if promise
         if error
           # TODO: full error handling
-          Volt.logger.error("Task Response:")
+          Volt.logger.error('Task Response:')
           Volt.logger.error(error.inspect)
           promise.reject(error)
         else
@@ -67,9 +67,7 @@ module Volt
 
       # If this browser supports session storage, store the page, so it will
       # be in the same state when we reload.
-      if `sessionStorage`
-        `sessionStorage.setItem('___page', value);`
-      end
+      `sessionStorage.setItem('___page', value);` if `sessionStorage`
 
       $page.page._reloading = true
       `window.location.reload(false);`

data/lib/volt/reactive/class_eventable.rb

@@ -17,7 +17,7 @@ module Volt
       # events at the class level.  When the event triggers, self will be set to the
       # instance it was triggered on.
       def on(*events, &callback)
-        raise '.on requires an event' if events.size == 0
+        fail '.on requires an event' if events.size == 0
 
         listener = Listener.new(self, events, callback)
 
@@ -68,4 +68,4 @@ module Volt
       base.send :include, InstanceMethods
     end
   end
-end
+end

data/lib/volt/reactive/computation.rb

@@ -41,8 +41,8 @@ module Volt
       if @invalidated
         # Call invalidate now, since its already invalidated
         # Computation.run_without_tracking do
-          queue_flush!
-          callback.call
+        queue_flush!
+        callback.call
         # end
       else
         # Store the invalidation
@@ -146,9 +146,9 @@ class Proc
   # @param the value to match
   # @return [Volt::Computation] the initial computation is returned.
   def watch_until!(value, &block)
-    computation = Proc.new do |comp|
+    computation = proc do |comp|
       # First fetch the value
-      result = self.call
+      result = call
 
       if result == value
         # Values match
@@ -174,11 +174,11 @@ class Proc
   #   -> { }
   def watch_and_resolve!
     unless block_given?
-      raise "watch_and_resolve! requires a block to call when the value is resolved or another value other than a promise is returned in the watch."
+      fail 'watch_and_resolve! requires a block to call when the value is resolved or another value other than a promise is returned in the watch.'
     end
 
-    computation = Proc.new do
-      result = self.call
+    computation = proc do
+      result = call
 
       if result.is_a?(Promise)
         result.then do |final|

data/lib/volt/reactive/dependency.rb

@@ -36,7 +36,7 @@ module Volt
     #   on this dependency.
     # @param on_stop_dep [Proc] a proc to be called when no computations are depending
     #   on this dependency anymore.
-    def initialize(on_dep=nil, on_stop_dep=nil)
+    def initialize(on_dep = nil, on_stop_dep = nil)
       @dependencies = Set.new
       @on_dep = on_dep
       @on_stop_dep = on_stop_dep

data/lib/volt/reactive/eventable.rb

@@ -18,7 +18,7 @@ module Volt
     end
 
     def remove
-      raise "Listener has already been removed" if @removed
+      fail 'Listener has already been removed' if @removed
       @removed = true
 
       @events.each do |event|
@@ -44,11 +44,11 @@ module Volt
     #
     # returns: a listener that has a #remove method to stop the listener.
     def on(*events, &callback)
-      raise '.on requires an event' if events.size == 0
+      fail '.on requires an event' if events.size == 0
 
       listener = Listener.new(self, events, callback)
 
-      @listeners        ||= {}
+      @listeners ||= {}
 
       events.each do |event|
         event             = event.to_sym
@@ -69,7 +69,6 @@ module Volt
       listener
     end
 
-
     # Triggers event on the class the module was includeded.  Any .on listeners
     # will have their block called passing in *args.
     def trigger!(event, *args)

data/lib/volt/reactive/reactive_accessors.rb

@@ -42,6 +42,5 @@ module Volt
       value_dep = instance_variable_get(:"@__#{var_name}_dependency")
       value_dep ||= instance_variable_set(:"@__#{var_name}_dependency", Dependency.new)
     end
-
   end
 end

data/lib/volt/reactive/reactive_array.rb

@@ -40,9 +40,7 @@ module Volt
         count = 0
 
         size.times do |index|
-          if block.call(self[index])
-            count += 1
-          end
+          count += 1 if block.call(self[index])
         end
 
         count
@@ -55,9 +53,7 @@ module Volt
       result = []
       size.times do |index|
         val = self[index]
-        if yield(val)
-          result << val
-        end
+        result << val if yield(val)
       end
 
       result
@@ -68,9 +64,7 @@ module Volt
         size.times do |index|
           val = self[index]
 
-          if yield(val)
-            return true
-          end
+          return true if yield(val)
         end
 
         false
@@ -84,9 +78,7 @@ module Volt
         size.times do |index|
           val = self[index]
 
-          unless yield(val)
-            return false
-          end
+          return false unless yield(val)
         end
 
         true

data/lib/volt/router/routes.rb

@@ -275,9 +275,7 @@ module Volt
             return false
           end
         elsif value.nil?
-          unless test_params.key?(key)
-            return false
-          end
+          return false unless test_params.key?(key)
         else
           if test_params[key] == value
             test_params.delete(key)

data/lib/volt/server.rb

@@ -135,12 +135,12 @@ module Volt
       @rack_app.use HttpResource, @volt_app.router
 
       @rack_app.use Rack::Static,
-        urls: ['/'],
-        root: 'config/base',
-        index: '',
-        header_rules: [
-          [:all, { 'Cache-Control' => 'public, max-age=86400' }]
-        ]
+                    urls: ['/'],
+                    root: 'config/base',
+                    index: '',
+                    header_rules: [
+                      [:all, { 'Cache-Control' => 'public, max-age=86400' }]
+                    ]
 
       @rack_app.run lambda { |env| [404, { 'Content-Type' => 'text/html; charset=utf-8' }, ['404 - page not found']] }
 

data/lib/volt/server/component_handler.rb

@@ -23,7 +23,7 @@ module Volt
       [200, { 'Content-Type' => 'application/javascript; charset=utf-8' }, StringIO.new(javascript_code)]
     end
 
-    def compile_for_component(component_name, for_client, map=false)
+    def compile_for_component(component_name, for_client, map = false)
       code = ComponentCode.new(component_name, @component_paths, for_client).code
 
       # Compile the code

data/lib/volt/server/component_templates.rb

@@ -112,9 +112,9 @@ module Volt
         parts = ["class #{klass_parts.pop} < Volt::Task; end"]
 
         # Work backwards on the modules
-        klass_parts.reverse.each do |kpart|
+        klass_parts.reverse_each do |kpart|
           parts.unshift("module #{kpart}")
-          parts.push("end")
+          parts.push('end')
         end
 
         # Combine the parts

data/lib/volt/server/forking_server.rb

@@ -14,7 +14,7 @@ module Volt
       at_exit do
         # Only run on parent
         if @child_id
-          puts "Exiting..."
+          puts 'Exiting...'
           @exiting = true
           stop_child
         end
@@ -85,7 +85,7 @@ module Volt
       Thread.new do
         loop do
           if @writer.closed?
-            puts "Parent process died"
+            puts 'Parent process died'
             exit
           end
 
@@ -146,12 +146,10 @@ module Volt
 
     def reload(changed_files)
       # only reload the server code if a non-view file was changed
-      server_code_changed = changed_files.any? {|path| File.extname(path) == '.rb' }
+      server_code_changed = changed_files.any? { |path| File.extname(path) == '.rb' }
 
       msg = 'file changed, reloading'
-      if server_code_changed
-        msg << ' server and'
-      end
+      msg << ' server and' if server_code_changed
       msg << ' client...'
 
       Volt.logger.log_with_color(msg, :light_blue)
@@ -159,7 +157,7 @@ module Volt
       begin
         SocketConnectionHandler.send_message_all(nil, 'reload')
       rescue => e
-        Volt.logger.error("Reload dispatch error: ")
+        Volt.logger.error('Reload dispatch error: ')
         Volt.logger.error(e)
       end
 
@@ -185,6 +183,5 @@ module Volt
     def stop_change_listener
       @listener.stop
     end
-
   end
-end
+end