volt 0.9.1 → 0.9.2

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

@@ -30,14 +30,14 @@ module Volt
         parts << `encodeURIComponent(value)`
         parts << '; '
 
-        parts << 'path='    << options[:path] << '; '           if options[:path]
+        parts << 'path=' << options[:path] << '; '           if options[:path]
         parts << 'max-age=' << options[:max_age] << '; '        if options[:max_age]
 
         if (expires = options[:expires])
           parts << 'expires=' << `expires.toGMTString()` << '; '
         end
 
-        parts << 'domain='  << options[:domain] << '; '         if options[:domain]
+        parts << 'domain=' << options[:domain] << '; '         if options[:domain]
         parts << 'secure'                                       if options[:secure]
 
         cookie_val = parts.join

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

@@ -23,9 +23,7 @@ module Volt
       end
 
       def loaded(initial_state = nil)
-        if model.path == []
-          initial_state = :loaded
-        end
+        initial_state = :loaded if model.path == []
 
         model.change_state_to(:loaded_state, initial_state)
       end
@@ -143,9 +141,7 @@ module Volt
       end
 
       def event_added(event, first, first_for_event)
-        if first_for_event && event == :changed
-          ensure_setup
-        end
+        ensure_setup if first_for_event && event == :changed
       end
 
       # Update the models based on the id/identity map.  Usually these requests
@@ -156,9 +152,7 @@ module Volt
 
           if model
             data.each_pair do |key, value|
-              if key != :_id
-                model.send(:"_#{key}=", value)
-              end
+              model.send(:"_#{key}=", value) if key != :_id
             end
           end
         end

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

@@ -21,9 +21,7 @@ module Volt
       end
 
       def run_update
-        if Volt.client?
-          $page.url.update!
-        end
+        $page.url.update! if Volt.client?
       end
     end
   end

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

@@ -12,8 +12,8 @@ module Volt
 
       def self.merge_finds_and_move_to_front(query)
         # Map first parts to string
-        query = query.map {|v| v[0] = v[0].to_s ; v }
-        has_find = query.find {|v| v[0] == 'find' }
+        query = query.map { |v| v[0] = v[0].to_s; v }
+        has_find = query.find { |v| v[0] == 'find' }
 
         if has_find
           # merge any finds
@@ -48,4 +48,4 @@ module Volt
       end
     end
   end
-end
+end

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

@@ -49,7 +49,7 @@ module Volt
           $page.cookies.delete(:user_id)
         end
 
-        raise err
+        fail err
       end
     end
 

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

@@ -29,7 +29,7 @@ module Volt
           model                          = @model.new_model(nil, options)
 
           # TODO: Might not need to assign this
-          @model.attributes              ||= {}
+          @model.attributes ||= {}
           @model.attributes[method_name] = model
         end
         model
@@ -40,7 +40,7 @@ module Volt
       end
 
       def inspect
-        "<#{self.class.to_s}:#{object_id}>"
+        "<#{self.class}:#{object_id}>"
       end
     end
   end

data/lib/volt/models/state_helpers.rb

@@ -8,4 +8,4 @@ module Volt
       loaded_state == :loaded
     end
   end
-end
+end

data/lib/volt/models/state_manager.rb

@@ -10,7 +10,7 @@ module Volt
     end
 
     # Called from the QueryListener when the data is loaded
-    def change_state_to(state_name, new_state, trigger=true)
+    def change_state_to(state_name, new_state, trigger = true)
       # use an instance variable for the state storage
       ivar_name = :"@#{state_name}"
 
@@ -25,10 +25,11 @@ module Volt
     end
 
     private
+
     # Get a state ivar for state_name
     # @params [String] the name of the state variable
     # @params [Boolean] if true, one will be created if it does not exist
-    def state_dep_for(state_name, create=true)
+    def state_dep_for(state_name, create = true)
       dep_ivar_name = :"@#{state_name}_dep"
       dep = instance_variable_get(dep_ivar_name)
       if !dep && create
@@ -38,6 +39,5 @@ module Volt
 
       dep
     end
-
   end
-end
+end

data/lib/volt/models/url.rb

@@ -153,9 +153,7 @@ module Volt
       # Get the params that are in the route
       new_params = @router.url_to_params(path)
 
-      if new_params == false
-        fail "no routes match path: #{path}"
-      end
+      fail "no routes match path: #{path}" if new_params == false
 
       query_hash.merge!(new_params)
 
@@ -181,9 +179,7 @@ module Volt
           assign_from_old(old_val, new_val)
         else
           # assign value
-          if old_val != new_val
-            params.set(name, new_val)
-          end
+          params.set(name, new_val) if old_val != new_val
           new_params.delete(name)
         end
       end

data/lib/volt/models/validations.rb

@@ -19,8 +19,8 @@ module Volt
           self.custom_validations ||= []
           custom_validations << block
         else
-          self.validations             ||= {}
-          validations[field_name]      ||= {}
+          self.validations ||= {}
+          validations[field_name] ||= {}
           validations[field_name].merge!(options)
         end
       end
@@ -67,12 +67,12 @@ module Volt
       @server_errors.delete(key)
     end
 
-    def errors(marked_only=false)
+    def errors(marked_only = false)
       @errors ||= Errors.new
 
       if marked_only
         # Only return the fields that have been marked
-        @errors.to_h.select {|key,_| marked_fields[key] }
+        @errors.to_h.select { |key, _| marked_fields[key] }
       else
         @errors
       end
@@ -84,11 +84,8 @@ module Volt
       errors.clear
 
       run_validations.then do
-
         # See if any server errors are in place and merge them in if they are
-        if Volt.client?
-          errors.merge!(server_errors.to_h)
-        end
+        errors.merge!(server_errors.to_h) if Volt.client?
       end.then do
         run_custom_validations
       end.then do
@@ -107,10 +104,9 @@ module Volt
         return true if errs[key]
       end
 
-      return false
+      false
     end
 
-
     private
 
     # Runs through each of the normal validations.
@@ -142,7 +138,7 @@ module Volt
         end
       end
 
-      return promise
+      promise
     end
 
     def run_custom_validations
@@ -161,7 +157,7 @@ module Volt
         end
       end
 
-      return promise
+      promise
     end
 
     def validation_class(validation, args)
@@ -169,6 +165,5 @@ module Volt
     rescue NameError => e
       puts "Unable to find #{validation} validator"
     end
-
   end
 end

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

@@ -37,13 +37,9 @@ module Volt
           @args.each do |arg, val|
             case arg
             when :min
-              if @value < val
-                add_error("number must be greater than #{val}")
-              end
+              add_error("number must be greater than #{val}") if @value < val
             when :max
-              if @value > val
-                add_error("number must be less than #{val}")
-              end
+              add_error("number must be less than #{val}") if @value > val
             end
           end
 

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

@@ -17,7 +17,7 @@ module Volt
               message = (args.is_a?(Hash) && args[:message]) || 'is already taken'
 
               # return the error
-              next {field_name => [message]}
+              next { field_name => [message] }
             end
           end
         end

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

@@ -1,6 +1,5 @@
 module Volt
   # Provide methods on the model class to more easily setup user validations
   module UserValidatorHelpers
-
   end
 end

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

@@ -15,7 +15,7 @@ module Volt
 
     def setup
       # Listen for changes
-      @computation = -> do
+      @computation = lambda do
         begin
           @context.instance_eval(&@getter)
         rescue => e
@@ -27,17 +27,15 @@ module Volt
       end
 
       @is_radio = `#{element}.is('[type=radio]')`
-      if @is_radio
-        @selected_value = `#{element}.attr('value') || ''`
-      end
+      @selected_value = `#{element}.attr('value') || ''` if @is_radio
 
       # Bind so when this value updates, we update
       case @attribute_name
         when 'value'
-          changed_event = Proc.new { changed }
+          changed_event = proc { changed }
           `#{element}.on('input.attrbind', #{changed_event})`
         when 'checked'
-          changed_event = Proc.new { |event| changed(event) }
+          changed_event = proc { |event| changed(event) }
           `#{element}.on('change.attrbind', #{changed_event})`
       end
     end
@@ -79,13 +77,11 @@ module Volt
         # update, we can just depend on it and update directly.
         @string_template_renderer = new_value
 
-        @string_template_renderer_computation = -> do
+        @string_template_renderer_computation = lambda do
           self.value = @string_template_renderer.html
         end.watch!
       else
-        if new_value.is_a?(NilMethodCall) || new_value.nil?
-          new_value = ''
-        end
+        new_value = '' if new_value.is_a?(NilMethodCall) || new_value.nil?
 
         self.value = new_value
       end
@@ -96,9 +92,7 @@ module Volt
         when 'value'
           # TODO: only update if its not the same, this keeps it from moving the
           # cursor in text fields.
-          if val != `(#{element}.val() || '')`
-            `#{element}.val(#{val})`
-          end
+          `#{element}.val(#{val})` if val != `(#{element}.val() || '')`
         when 'disabled'
           # Disabled is handled specially, you can either return a boolean:
           # (true being disabled, false not disabled), or you can optionally
@@ -114,13 +108,9 @@ module Volt
     end
 
     def update_checked(value)
-      if value.is_a?(NilMethodCall) || value.nil?
-        value = false
-      end
+      value = false if value.is_a?(NilMethodCall) || value.nil?
 
-      if @is_radio
-        value = (@selected_value == value)
-      end
+      value = (@selected_value == value) if @is_radio
 
       `#{element}.prop('checked', #{value})`
     end

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

@@ -10,7 +10,7 @@ module Volt
       super(page, target, context, binding_name)
 
       # Listen for changes
-      @computation = -> do
+      @computation = lambda do
         begin
           res = @context.instance_eval(&getter)
         rescue => e

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

@@ -57,7 +57,7 @@ module Volt
     def item_removed(position)
       # Remove dependency
       @templates[position].context.locals[:_index_dependency].remove
-      @templates[position].context.locals["_#{@item_name.to_s}_dependency".to_sym].remove
+      @templates[position].context.locals["_#{@item_name}_dependency".to_sym].remove
 
       @templates[position].remove_anchors
       @templates[position].remove
@@ -92,12 +92,11 @@ module Volt
         item_context.locals[:_index_value] = val
       end
 
-
       # Get and set value
       value_dependency                    = Dependency.new
-      item_context.locals["_#{@item_name.to_s}_dependency".to_sym] = value_dependency
+      item_context.locals["_#{@item_name}_dependency".to_sym] = value_dependency
 
-      item_context.locals["#{@item_name.to_s}=".to_sym] = proc do |val|
+      item_context.locals["#{@item_name}=".to_sym] = proc do |val|
         value_dependency.changed!
         @value[item_context.locals[:_index_value]] = val
       end

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

@@ -28,7 +28,7 @@ module Volt
       # manually because a promise resolved.
       @promise_dependency = Dependency.new
 
-      @computation = -> do
+      @computation = lambda do
         @promise_dependency.depend
 
         update

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

@@ -4,15 +4,13 @@ require 'volt/page/bindings/view_binding/grouped_controllers'
 require 'volt/page/bindings/view_binding/view_lookup_for_path'
 require 'volt/page/bindings/view_binding/controller_handler'
 
-
 module Volt
   class ViewBinding < BaseBinding
-
     # @param [String]     binding_in_path is the path this binding was rendered from.  Used to
     #                     lookup paths in ViewLookupForPath
     # @param [String|nil] content_template_path is the path to the template for the content
     #                     provided in the tag.
-    def initialize(page, target, context, binding_name, binding_in_path, getter, content_template_path=nil)
+    def initialize(page, target, context, binding_name, binding_in_path, getter, content_template_path = nil)
       super(page, target, context, binding_name)
 
       @content_template_path = content_template_path
@@ -23,7 +21,7 @@ module Volt
       @current_template = nil
 
       # Run the initial render
-      @computation      = -> do
+      @computation      = lambda do
         # Don't try to render if this has been removed
         if @context
           # Render
@@ -97,22 +95,19 @@ module Volt
 
     # Called when the next template is ready to render
     def render_next_template(full_path, path)
-      begin
-        # stop_waiting_for_load
-        remove_current_controller_and_template
+      remove_current_controller_and_template
 
-        # Switch the current template
-        @current_controller_handler = @starting_controller_handler
-        @starting_controller_handler = nil
+      # Switch the current template
+      @current_controller_handler = @starting_controller_handler
+      @starting_controller_handler = nil
 
-        # Also track the current controller directly
-        @controller = @current_controller_handler.controller if full_path
+      # Also track the current controller directly
+      @controller = @current_controller_handler.controller if full_path
 
-        render_template(full_path || path)
-      rescue => e
-        Volt.logger.error("Error during render of template at #{path}: #{e.inspect}")
-        Volt.logger.error(e.backtrace)
-      end
+      render_template(full_path || path)
+    rescue => e
+      Volt.logger.error("Error during render of template at #{path}: #{e.inspect}")
+      Volt.logger.error(e.backtrace)
     end
 
     def stop_waiting_for_load
@@ -189,7 +184,7 @@ module Volt
       controller_class, action = ControllerHandler.get_controller_and_action(controller_path)
 
       generated_new = false
-      new_controller = Proc.new do
+      new_controller = proc do
         # Mark that we needed to generate a new controller instance (not reused
         # from the group)
         generated_new = true
@@ -212,14 +207,12 @@ module Volt
         # Call the action
         stopped = handler.call_action
 
-        if stopped
-          controller.instance_variable_set('@chain_stopped', true)
-        end
+        controller.instance_variable_set('@chain_stopped', true) if stopped
       else
         stopped = controller.instance_variable_get('@chain_stopped')
       end
 
-      return handler, generated_new, stopped
+      [handler, generated_new, stopped]
     end
 
     # The context for templates can be either a controller, or the original context.