volt 0.9.1 → 0.9.2

data/lib/volt/extra_core/logger.rb

@@ -21,7 +21,7 @@ else
 
   module Volt
     class VoltLogger < Logger
-      def initialize(current={})
+      def initialize(current = {})
         super(STDOUT)
         @current = current
         @formatter = Volt::VoltLoggerFormatter.new
@@ -38,7 +38,6 @@ else
         level = error ? Logger::ERROR : Logger::INFO
         text = TaskLogger.task_dispatch_message(self, args)
 
-
         if error
           text += "\n" + colorize(error.to_s, :red)
           if error.is_a?(Exception) && !error.is_a?(VoltUserError)
@@ -47,7 +46,6 @@ else
         end
 
         log(level, text)
-
       end
 
       def args
@@ -70,7 +68,6 @@ else
         Volt.logger.info(colorize(msg, color))
       end
 
-
       private
 
       def colorize(string, color)

data/lib/volt/extra_core/object.rb

@@ -13,7 +13,7 @@ class Object
   # TODO: Need a real implementation of this
   def deep_clone
     if RUBY_PLATFORM == 'opal'
-      JSON.parse(self.to_json)
+      JSON.parse(to_json)
     else
       Marshal.load(Marshal.dump(self))
     end

data/lib/volt/models.rb

@@ -5,9 +5,7 @@ require 'volt/models/persistors/store_factory'
 require 'volt/models/persistors/array_store'
 require 'volt/models/persistors/model_store'
 require 'volt/models/persistors/params'
-if RUBY_PLATFORM == 'opal'
-  require 'volt/models/persistors/cookies'
-end
+require 'volt/models/persistors/cookies' if RUBY_PLATFORM == 'opal'
 require 'volt/models/persistors/flash'
 require 'volt/models/persistors/local_store'
 if RUBY_PLATFORM == 'opal'
@@ -20,4 +18,4 @@ else
   require(gem_dir + '/stdlib/promise')
 end
 # TODO: remove once https://github.com/opal/opal/pull/725 is released.
-require 'volt/utils/promise_patch'
+require 'volt/utils/promise_patch'

data/lib/volt/models/array_model.rb

@@ -11,7 +11,6 @@ module Volt
     include StateManager
     include StateHelpers
 
-
     attr_reader :parent, :path, :persistor, :options, :array
 
     # For many methods, we want to call load data as soon as the model is interacted
@@ -74,7 +73,7 @@ module Volt
       end
 
       if model.is_a?(Model) && !model.can_create?
-        raise "permissions did not allow create for #{model.inspect}"
+        fail "permissions did not allow create for #{model.inspect}"
       end
 
       super(model)
@@ -135,7 +134,6 @@ module Volt
       self[0]
     end
 
-
     # returns a promise to fetch the first instance
     def fetch_first(&block)
       persistor = self.persistor
@@ -201,7 +199,7 @@ module Volt
       end
     end
 
-    def buffer(attrs={})
+    def buffer(attrs = {})
       model_path  = options[:path] + [:[]]
       model_klass = Volt::Model.class_at_path(model_path)
 
@@ -215,9 +213,7 @@ module Volt
 
     # Takes the persistor if there is one and
     def setup_persistor(persistor)
-      if persistor
-        @persistor = persistor.new(self)
-      end
+      @persistor = persistor.new(self) if persistor
     end
   end
 end

data/lib/volt/models/associations.rb

@@ -1,7 +1,7 @@
 module Volt
   module Associations
     module ClassMethods
-      def belongs_to(method_name, key_name=nil)
+      def belongs_to(method_name, key_name = nil)
         # getter
         define_method(method_name) do
           association_with_root_model('belongs_to') do |root|
@@ -9,15 +9,15 @@ module Volt
             lookup_key = send(:"_#{key_name || method_name}_id")
 
             # Return a promise for the belongs_to
-            root.send(:"_#{method_name.pluralize}").where(:_id => lookup_key).fetch_first
+            root.send(:"_#{method_name.pluralize}").where(_id: lookup_key).fetch_first
           end
         end
       end
 
-      def has_many(method_name, remote_key_name=nil)
+      def has_many(method_name, remote_key_name = nil)
         define_method(method_name) do
           association_with_root_model('has_many') do |root|
-            id = self._id
+            id = _id
 
             # The key will be "{this class name}_id"
             remote_key_name ||= :"#{path[-2].singularize}_id"
@@ -33,6 +33,7 @@ module Volt
     end
 
     private
+
     # Currently the has_many and belongs_to associations only work on the store collection,
     # this method checks to make sure we are on store and returns the root reference to it.
     def association_with_root_model(method_name)

data/lib/volt/models/buffer.rb

@@ -7,8 +7,7 @@ module Volt
     def save!(&block)
       # TODO: this shouldn't need to be run, but if no attributes are assigned, then
       # if needs to be run.  Maybe there's a better way to handle it.
-      return validate!.then do
-
+      validate!.then do
         # Get errors from validate
         errors = self.errors.to_h
 

data/lib/volt/models/dirty.rb

@@ -8,7 +8,7 @@ module Volt
     end
 
     # Return true if key has changed
-    def changed?(key=nil)
+    def changed?(key = nil)
       if key
         # return the changed values for the keys
         changed_attributes.key?(key)
@@ -85,4 +85,4 @@ module Volt
       super
     end
   end
-end
+end

data/lib/volt/models/errors.rb

@@ -29,4 +29,4 @@ module Volt
       str.join
     end
   end
-end
+end

data/lib/volt/models/listener_tracker.rb

@@ -1,7 +1,6 @@
 module Volt
   # Included in model's so they can inform the ArrayModel when new listeners are added or removed.
   module ListenerTracker
-
     # Called when data from this model begins being watched
     def listener_added
       @listener_count ||= 0
@@ -12,6 +11,5 @@ module Volt
       @listener_count ||= 0
       @listener_count -= 1
     end
-
   end
-end
+end

data/lib/volt/models/model.rb

@@ -49,11 +49,11 @@ module Volt
     attr_reader :attributes, :parent, :path, :persistor, :options
 
     INVALID_FIELD_NAMES = {
-      :attributes => true,
-      :parent => true,
-      :path => true,
-      :options => true,
-      :persistor => true
+      attributes: true,
+      parent: true,
+      path: true,
+      options: true,
+      persistor: true
     }
 
     def initialize(attributes = {}, options = {}, initial_state = nil)
@@ -126,7 +126,7 @@ module Volt
     end
 
     # Assign multiple attributes as a hash, directly.
-    def assign_attributes(attrs, initial_setup=false, skip_changes=false)
+    def assign_attributes(attrs, initial_setup = false, skip_changes = false)
       @attributes ||= {}
 
       attrs = wrap_values(attrs)
@@ -227,9 +227,7 @@ module Volt
 
         @deps.changed!(attribute_name)
 
-        if old_value == nil || new_value == nil
-          @size_dep.changed!
-        end
+        @size_dep.changed! if old_value.nil? || new_value.nil?
 
         # TODO: Can we make this so it doesn't need to be handled for non store collections
         # (maybe move it to persistor, though thats weird since buffers don't have a persistor)
@@ -246,7 +244,7 @@ module Volt
     # 1) a nil model, which returns a wrapped error
     # 2) reading directly from attributes
     # 3) trying to read a key that doesn't exist.
-    def get(attr_name, expand=false)
+    def get(attr_name, expand = false)
       # Reading an attribute, we may get back a nil model.
       attr_name = attr_name.to_sym
 
@@ -286,7 +284,7 @@ module Volt
       end
     end
 
-    def respond_to_missing?(method_name, include_private=false)
+    def respond_to_missing?(method_name, include_private = false)
       method_name.to_s.start_with?('_') || super
     end
 
@@ -343,7 +341,7 @@ module Volt
         # Wrap result in a promise if it isn't one
         return Promise.new.then { result }
       else
-        fail "Model does not have a parent and cannot be deleted."
+        fail 'Model does not have a parent and cannot be deleted.'
       end
     end
 
@@ -355,12 +353,13 @@ module Volt
     end
 
     private
+
     # Volt provides a few access methods to get more data about the model,
     # we want to prevent these from being assigned or accessed through
     # underscore methods.
     def check_valid_field_name(name)
       if INVALID_FIELD_NAMES[name]
-        raise InvalidFieldName, "`#{name}` is reserved and can not be used as a field"
+        fail InvalidFieldName, "`#{name}` is reserved and can not be used as a field"
       end
     end
 
@@ -377,13 +376,11 @@ module Volt
 
     # Takes the persistor if there is one and
     def setup_persistor(persistor)
-      if persistor
-        @persistor = persistor.new(self)
-      end
+      @persistor = persistor.new(self) if persistor
     end
 
     # Used internally from other methods that assign all attributes
-    def assign_all_attributes(attrs, track_changes=false)
+    def assign_all_attributes(attrs, track_changes = false)
       # Assign each attribute using setters
       attrs.each_pair do |key, value|
         key = key.to_sym
@@ -408,7 +405,7 @@ module Volt
     #
     # @return [Promise|nil] a promise for when the save is
     #         complete
-    def run_changed(attribute_name=nil)
+    def run_changed(attribute_name = nil)
       # no_validate mode should only be used internally.  no_validate mode is a
       # performance optimization that prevents validation from running after each
       # change when assigning multile attributes.
@@ -416,7 +413,6 @@ module Volt
         # Run the validations for all fields
         result = nil
         return validate!.then do
-
           # Buffers are allowed to be in an invalid state
           unless buffer?
             # First check that all local validations pass
@@ -458,7 +454,7 @@ module Volt
       end
 
       # Didn't run validations
-      return nil
+      nil
     end
   end
 end

data/lib/volt/models/permissions.rb

@@ -1,6 +1,5 @@
 module Volt
   class Model
-
     # The permissions module provides helpers for working with Volt permissions.
     module Permissions
       module ClassMethods
@@ -9,7 +8,7 @@ module Volt
         # the user can not be changed.
         #
         # @param key [Symbol] the name of the attribute to store
-        def own_by_user(key=:user_id)
+        def own_by_user(key = :user_id)
           # When the model is created, assign it the user_id (if the user is logged in)
           on(:new) do
             # Only assign the user_id if there isn't already one and the user is logged in.
@@ -29,12 +28,11 @@ module Volt
             # for a nil model.
             unless @attributes[:user_id]
               # Show an error that the user is not logged in
-              next {key => ['requires a logged in user']}
+              next { key => ['requires a logged in user'] }
             end
           end
         end
 
-
         # TODO: Change to
         # permissions(:create, :read, :update) do |action|
         #   if owner?
@@ -81,7 +79,7 @@ module Volt
             end
           end
         else
-          raise "allow should be called inside of a permissions block"
+          fail 'allow should be called inside of a permissions block'
         end
       end
 
@@ -97,7 +95,7 @@ module Volt
             end
           end
         else
-          raise "deny should be called inside of a permissions block"
+          fail 'deny should be called inside of a permissions block'
         end
       end
 
@@ -105,10 +103,10 @@ module Volt
       # in user (```Volt.current_user```) is the owner of this instance.
       #
       # @param key [Symbol] the name of the attribute where the user_id is stored
-      def owner?(key=:user_id)
+      def owner?(key = :user_id)
         # Lookup the original user_id
         owner_id = was(key) || send(:"_#{key}")
-        owner_id != nil && owner_id == Volt.current_user_id
+        !owner_id.nil? && owner_id == Volt.current_user_id
       end
 
       # Returns boolean if the model can be deleted
@@ -134,7 +132,7 @@ module Volt
 
         clear_allow_and_deny
 
-        return !deny
+        !deny
       end
 
       # Return the list of allowed fields
@@ -145,7 +143,7 @@ module Volt
 
         clear_allow_and_deny
 
-        return result
+        result
       end
 
       # Filter fields returns the attributes with any denied or not allowed fields
@@ -161,21 +159,22 @@ module Volt
           allow << :_id
 
           # Only keep fields in the allow list
-          return @attributes.select {|key| allow.include?(key) }
+          return @attributes.select { |key| allow.include?(key) }
         elsif deny == true
           # Only keep id
           # TODO: Should this be a full reject?
-          return @attributes.reject {|key| key != :_id }
+          return @attributes.reject { |key| key != :_id }
         elsif deny && deny.size > 0
           # Reject any in the deny list
-          return @attributes.reject {|key| deny.include?(key) }
+          return @attributes.reject { |key| deny.include?(key) }
         else
           return @attributes
         end
       end
 
       private
-      def run_permissions(action_name=nil)
+
+      def run_permissions(action_name = nil)
         compute_allow_and_deny(action_name)
 
         errors = {}
@@ -199,9 +198,7 @@ module Volt
         elsif @__deny_fields
           # Allow all except the denied
           @__deny_fields.each do |field_name|
-            if changed?(field_name)
-              add_error_if_changed(errors, field_name)
-            end
+            add_error_if_changed(errors, field_name) if changed?(field_name)
           end
         end
 
@@ -244,4 +241,4 @@ module Volt
       end
     end
   end
-end
+end

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

@@ -50,23 +50,19 @@ module Volt
       end
 
       def inspect
-        "<#{self.class.to_s}:#{object_id} #{@model.path.inspect} #{@query.inspect}>"
+        "<#{self.class}:#{object_id} #{@model.path.inspect} #{@query.inspect}>"
       end
 
       # Called when an each binding is listening
       def event_added(event, first, first_for_event)
         # First event, we load the data.
-        if first
-          @listener_event_counter.add
-        end
+        @listener_event_counter.add if first
       end
 
       # Called when an each binding stops listening
       def event_removed(event, last, last_for_event)
         # Remove listener where there are no more events on this model
-        if last
-          @listener_event_counter.remove
-        end
+        @listener_event_counter.remove if last
       end
 
       # Called by child models to track their listeners
@@ -141,7 +137,7 @@ module Volt
           if parent && (attrs = parent.attributes) && attrs[:_id]
             query = query.dup
 
-            query << [:find, {:"#{@model.path[-3].singularize}_id" => attrs[:_id]}]
+            query << [:find, { :"#{@model.path[-3].singularize}_id" => attrs[:_id] }]
           end
         end
 
@@ -203,13 +199,12 @@ module Volt
         if @model.loaded_state == :loaded
           promise.resolve(@model)
         else
-          Proc.new do |comp|
+          proc do |comp|
             if @model.loaded_state == :loaded
               promise.resolve(@model)
 
               comp.stop
             end
-
           end.watch!
         end