volt 0.8.15 → 0.8.16

data/lib/volt/models/persistors/params.rb

@@ -9,14 +9,14 @@ module Volt
 
       def changed(attribute_name)
         if RUBY_PLATFORM == 'opal'
-          %x{
+          `
             if (window.setTimeout && this.$run_update.bind) {
               if (window.paramsUpdateTimer) {
                 clearTimeout(window.paramsUpdateTimer);
               }
               window.paramsUpdateTimer = setTimeout(this.$run_update.bind(this), 0);
             }
-          }
+          `
         end
       end
 

data/lib/volt/models/persistors/query/query_listener.rb

@@ -16,6 +16,8 @@ module Volt
 
     def add_listener
       @listening = true
+
+      # Call the backend and add the listner
       QueryTasks.add_listener(@collection, @query).then do |ret|
         results, errors = ret
 

data/lib/volt/models/persistors/query/query_listener_pool.rb

@@ -8,7 +8,7 @@ module Volt
   # single query at once.  Data updates will only be sent once as well.
   class QueryListenerPool < GenericPool
     def print
-      puts "--- Running Queries ---"
+      puts '--- Running Queries ---'
 
       @pool.each_pair do |table, query_hash|
         query_hash.keys.each do |query|

data/lib/volt/models/persistors/store.rb

@@ -4,10 +4,9 @@ require 'volt/models/persistors/model_identity_map'
 module Volt
   module Persistors
     class Store < Base
-
       @@identity_map = ModelIdentityMap.new
 
-      def initialize(model, tasks=nil)
+      def initialize(model, tasks = nil)
         @tasks = tasks
         @model = model
 

data/lib/volt/models/persistors/store_state.rb

@@ -2,9 +2,8 @@ module Volt
   module Persistors
     # StoreState provides method for a store to track its loading state.
     module StoreState
-
       # Called when a collection loads
-      def loaded(initial_state=nil)
+      def loaded(initial_state = nil)
         change_state_to(initial_state || :not_loaded)
       end
 
@@ -15,7 +14,7 @@ module Volt
       end
 
       # Called from the QueryListener when the data is loaded
-      def change_state_to(new_state, skip_trigger=false)
+      def change_state_to(new_state, skip_trigger = false)
         old_state = @state
         @state    = new_state
 

data/lib/volt/models/url.rb

@@ -54,7 +54,7 @@ module Volt
 
       scroll
 
-      return true
+      true
     end
 
     # Full url rebuilds the url from it's constituent parts
@@ -78,15 +78,15 @@ module Volt
 
         if query_parts.size > 0
           self.query = query_parts.join('&')
-          new_url    += '?' + self.query
+          new_url    += '?' + query
         end
       end
 
       # Add fragment
-      frag    = self.fragment
+      frag    = fragment
       new_url += '#' + frag if frag.present?
 
-      return new_url
+      new_url
     end
 
     # Called when the state has changed and the url in the
@@ -94,24 +94,24 @@ module Volt
     # Called when an attribute changes to update the url
     def update!
       if Volt.client?
-        new_url = full_url()
+        new_url = full_url
 
         # Push the new url if pushState is supported
         # TODO: add fragment fallback
-        %x{
+        `
         if (document.location.href != new_url && history && history.pushState) {
           history.pushState(null, null, new_url);
         }
-      }
+      `
       end
     end
 
     def scroll
       if Volt.client?
-        frag = self.fragment
+        frag = fragment
         if frag
           # Scroll to anchor via http://www.w3.org/html/wg/drafts/html/master/browsers.html#scroll-to-fragid
-          %x{
+          `
           var anchor = $('#' + frag);
           if (anchor.length == 0) {
             anchor = $('*[name="' + frag + '"]:first');
@@ -120,7 +120,7 @@ module Volt
             console.log('scroll to: ', anchor.offset().top);
             $(document.body).scrollTop(anchor.offset().top);
           }
-        }
+        `
         else
           # Scroll to the top by default
           `$(document.body).scrollTop(0);`
@@ -129,6 +129,7 @@ module Volt
     end
 
     private
+
     # Assigning the params is tricky since we don't want to trigger changed on
     # any values that have not changed.  So we first loop through all current
     # url params, removing any not present in the params, while also removing
@@ -142,7 +143,7 @@ module Volt
       new_params = @router.url_to_params(path)
 
       if new_params == false
-        raise "no routes match path: #{path}"
+        fail "no routes match path: #{path}"
       end
 
       query_hash.merge!(new_params)
@@ -193,7 +194,7 @@ module Volt
 
     def query_hash
       query_hash = {}
-      qury       = self.query
+      qury       = query
       if qury
         qury.split('&').reject { |v| v == '' }.each do |part|
           parts    = part.split('=').reject { |v| v == '' }
@@ -206,7 +207,7 @@ module Volt
 
           hash_part = query_hash
           sections.each_with_index do |section, index|
-            if index == sections.size-1
+            if index == sections.size - 1
               # Last part, assign the value
               hash_part[section] = parts[1]
             else
@@ -216,7 +217,7 @@ module Volt
         end
       end
 
-      return query_hash
+      query_hash
     end
 
     # Splits a key from a ?key=value&... parameter into its nested
@@ -240,7 +241,7 @@ module Volt
       end.join('')
     end
 
-    def nested_params_hash(params, path=[])
+    def nested_params_hash(params, path = [])
       results = {}
 
       params.each_pair do |key, value|
@@ -254,7 +255,7 @@ module Volt
         end
       end
 
-      return results
+      results
     end
   end
 end

data/lib/volt/models/validations.rb

@@ -11,9 +11,7 @@ module Volt
         @validations[field_name] = options
       end
 
-      def validations
-        @validations
-      end
+      attr_reader :validations
     end
 
     def self.included(base)
@@ -22,7 +20,7 @@ module Volt
 
     # Once a field is ready, we can use include_in_errors! to start
     # showing its errors.
-    def mark_field!(field_name, trigger_changed=true)
+    def mark_field!(field_name, trigger_changed = true)
       marked_fields[field_name] = true
     end
 
@@ -36,14 +34,14 @@ module Volt
 
     # TODO: Errors is being called for any validation change.  We should have errors return a
     # hash like object that only calls the validation for each one.
-    def errors(marked_only=false)
+    def errors(marked_only = false)
       errors = {}
 
       validations = self.class.validations
 
       if validations
         # Merge into errors, combining any error arrays
-        merge = Proc.new do |new_errors|
+        merge = proc do |new_errors|
           errors.merge!(new_errors) do |key, new_val, old_val|
             new_val + old_val
           end
@@ -64,27 +62,26 @@ module Volt
             if klass
               validate_with(merge, klass, field_name, args)
             else
-              raise "validation type #{validation} is not specified."
+              fail "validation type #{validation} is not specified."
             end
           end
         end
       end
 
-      return errors
+      errors
     end
 
     private
+
     # calls the validate method on the class, passing the right arguments.
     def validate_with(merge, klass, field_name, args)
-      return merge.call(klass.validate(self, field_name, args))
+      merge.call(klass.validate(self, field_name, args))
     end
 
     def validation_class(validation, args)
-      begin
-        Volt.const_get(:"#{validation.camelize}Validator")
-      rescue NameError => e
-        puts "Unable to find #{validation} validator"
-      end
+      Volt.const_get(:"#{validation.camelize}Validator")
+    rescue NameError => e
+      puts "Unable to find #{validation} validator"
     end
   end
 end

data/lib/volt/models/validators/length_validator.rb

@@ -11,11 +11,11 @@ module Volt
       elsif args.is_a?(Hash)
         min = args[:length] || args[:minimum]
         max = args[:maximum]
-        raise "length or minimum must be specified" unless min.is_a?(Fixnum)
+        fail 'length or minimum must be specified' unless min.is_a?(Fixnum)
 
         message = args[:message]
       else
-        raise "The arguments to length must be a number or a hash"
+        fail 'The arguments to length must be a number or a hash'
       end
 
       if !value || value.size < min
@@ -24,7 +24,7 @@ module Volt
         errors[field_name] = [message || "must be less than #{args} characters"]
       end
 
-      return errors
+      errors
     end
   end
 end

data/lib/volt/models/validators/presence_validator.rb

@@ -7,13 +7,13 @@ module Volt
         if args.is_a?(Hash) && args[:message]
           message = args[:message]
         else
-          message = "must be specified"
+          message = 'must be specified'
         end
 
         errors[field_name] = [message]
       end
 
-      return errors
+      errors
     end
   end
 end

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

@@ -14,7 +14,6 @@ module Volt
     end
 
     def setup
-
       # Listen for changes
       @computation = -> do
         begin
@@ -39,7 +38,7 @@ module Volt
       end
     end
 
-    def changed(event=nil)
+    def changed(event = nil)
       case @attribute_name
         when 'value'
           current_value = element.value
@@ -134,7 +133,7 @@ module Volt
     end
 
     def remove_anchors
-      raise "attribute bindings do not have anchors, can not remove them"
+      fail 'attribute bindings do not have anchors, can not remove them'
     end
   end
 end

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

@@ -18,7 +18,7 @@ module Volt
       @context      = context
       @binding_name = binding_name
 
-      @@binding_number ||= 10000
+      @@binding_number ||= 10_000
     end
 
     def dom_section

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

@@ -45,10 +45,10 @@ module Volt
         values_size    = values.size
 
         # Start over, re-create all nodes
-        (templates_size-1).downto(0) do |index|
+        (templates_size - 1).downto(0) do |index|
           item_removed(index)
         end
-        0.upto(values_size-1) do |index|
+        0.upto(values_size - 1) do |index|
           item_added(index)
         end
       end
@@ -80,19 +80,19 @@ module Volt
       end
 
       # TODORW: :parent => @value may change
-      item_context                           = SubContext.new({:_index_value => position, :parent => @value}, @context)
-      item_context.locals[@item_name.to_sym] = Proc.new { @value[item_context.locals[:_index_value]] }
+      item_context                           = SubContext.new({ _index_value: position, parent: @value }, @context)
+      item_context.locals[@item_name.to_sym] = proc { @value[item_context.locals[:_index_value]] }
 
       position_dependency                    = Dependency.new
       item_context.locals[:index_dependency] = position_dependency
 
       # Get and set index
-      item_context.locals[:index=]           = Proc.new do |val|
+      item_context.locals[:index=]           = proc do |val|
         position_dependency.changed!
         item_context.locals[:_index_value] = val
       end
 
-      item_context.locals[:index] = Proc.new do
+      item_context.locals[:index] = proc do
         position_dependency.depend
         item_context.locals[:_index_value]
       end
@@ -108,7 +108,7 @@ module Volt
     def update_indexes_after(start_index)
       size = @templates.size
       if size > 0
-        start_index.upto(size-1) do |index|
+        start_index.upto(size - 1) do |index|
           @templates[index].context.locals[:index=].call(index)
         end
       end
@@ -118,10 +118,9 @@ module Volt
       return [] if values.is_a?(Model) || values.is_a?(Exception)
       values = values.attributes if values.respond_to?(:attributes)
 
-      return values
+      values
     end
 
-
     # When this each_binding is removed, cleanup.
     def remove
       @computation.stop

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

@@ -1,7 +1,7 @@
 require 'volt/page/bindings/base_binding'
 
 module Volt
-# TODO: We need to figure out how we want to wrap JS events
+  # TODO: We need to figure out how we want to wrap JS events
   class JSEvent
     attr_reader :js_event
 
@@ -26,7 +26,6 @@ module Volt
     end
   end
 
-
   class EventBinding < BaseBinding
     attr_accessor :context, :binding_name
 
@@ -34,7 +33,7 @@ module Volt
       super(page, target, context, binding_name)
       @event_name = event_name
 
-      handler = Proc.new do |js_event|
+      handler = proc do |js_event|
         event = JSEvent.new(js_event)
         event.prevent_default! if event_name == 'submit'
 

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

@@ -55,11 +55,11 @@ module Volt
     # 2. controller - main
     # 3. view - main
     # 4. section - body
-    def path_for_template(lookup_path, force_section=nil)
+    def path_for_template(lookup_path, force_section = nil)
       parts      = lookup_path.split('/')
       parts_size = parts.size
 
-      default_parts     = ['main', 'main', 'index', 'body']
+      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
@@ -96,10 +96,10 @@ module Volt
         end
       end
 
-      return nil, nil
+      [nil, nil]
     end
 
-    def update(path, section_or_arguments=nil, options={})
+    def update(path, section_or_arguments = nil, options = {})
       Computation.run_without_tracking do
         # Remove existing template and call _removed
         controller_send(:"#{@action}_removed") if @action && @controller
@@ -144,7 +144,7 @@ module Volt
         # In the browser, we want to keep a grouped controller around during a single run
         # of the event loop.  To make that happen, we clear it on the next tick.
         `setImmediate(function() {`
-          clear_grouped_controller
+        clear_grouped_controller
         `});`
       else
         # For the backend, clear it immediately
@@ -161,7 +161,7 @@ module Volt
 
     # The context for templates can be either a controller, or the original context.
     def render_template(full_path, controller_path)
-      args = @arguments ? [SubContext.new(@arguments)] : []
+      args = @arguments ? [SubContext.new(@arguments, nil, true)] : []
 
       @controller = nil
 
@@ -228,6 +228,7 @@ module Volt
     end
 
     private
+
     # Sends the action to the controller if it exists
     def controller_send(action_name)
       if @controller.respond_to?(action_name)
@@ -260,7 +261,7 @@ module Volt
         end
       end
 
-      return obj, action
+      [obj, action]
     end
   end
 end