volt 0.8.15 → 0.8.16

data/lib/volt/extra_core/stringify_keys.rb

@@ -1,13 +1,13 @@
 class Object
   def stringify_keys
-    self.each_with_object({}) { |(key, value), hash|
+    each_with_object({}) do |(key, value), hash|
       hash[key.to_s] = value
-    }
+    end
   end
 
   def symbolize_keys
-    self.each_with_object({}) { |(key, value), hash|
+    each_with_object({}) do |(key, value), hash|
       hash[key.to_sym] = value
-    }
+    end
   end
-end
+end

data/lib/volt/models.rb

@@ -11,6 +11,6 @@ if RUBY_PLATFORM == 'opal'
   require 'promise.rb'
 else
   # Opal doesn't expose its promise library directly
-  spec = Gem::Specification.find_by_name("opal")
-  require(spec.gem_dir + "/stdlib/promise")
+  spec = Gem::Specification.find_by_name('opal')
+  require(spec.gem_dir + '/stdlib/promise')
 end

data/lib/volt/models/array_model.rb

@@ -22,9 +22,23 @@ module Volt
       end
     end
 
+    # Some methods get passed down to the persistor.
+    def self.proxy_to_persistor(*method_names)
+      method_names.each do |method_name|
+        define_method(method_name) do |*args, &block|
+          if @persistor.respond_to?(method_name)
+            @persistor.send(method_name, *args, &block)
+          else
+            raise "this model's persistance layer does not support #{method_name}, try using store"
+          end
+        end
+      end
+    end
+
     proxy_with_load_data :[], :size, :first, :last
+    proxy_to_persistor :find, :skip, :limit, :then
 
-    def initialize(array=[], options={})
+    def initialize(array = [], options = {})
       @options   = options
       @parent    = options[:parent]
       @path      = options[:path] || []
@@ -37,22 +51,6 @@ module Volt
       @persistor.loaded if @persistor
     end
 
-    def find(*args, &block)
-      if @persistor
-        return @persistor.find(*args, &block)
-      else
-        raise "this model's persistance layer does not support find, try using store"
-      end
-    end
-
-    def then(*args, &block)
-      if @persistor
-        @persistor.then(*args, &block)
-      else
-        raise "this model's persistance layer does not support then, try using store"
-      end
-    end
-
     def attributes
       self
     end
@@ -68,7 +66,7 @@ module Volt
 
       super(model)
 
-      @persistor.added(model, @array.size-1) if @persistor
+      @persistor.added(model, @array.size - 1) if @persistor
 
       model
     end
@@ -107,7 +105,7 @@ module Volt
     def inspect
       if @persistor && @persistor.is_a?(Persistors::ArrayStore) && state == :not_loaded
         # Show a special message letting users know it is not loaded yet.
-        "#<#{self.class.to_s}:not loaded, access with [] or size to load>"
+        "#<#{self.class}:not loaded, access with [] or size to load>"
       else
         # Otherwise inspect normally
         super
@@ -125,6 +123,7 @@ module Volt
     end
 
     private
+
     # Takes the persistor if there is one and
     def setup_persistor(persistor)
       if persistor

data/lib/volt/models/cursor.rb

@@ -2,6 +2,5 @@ require 'volt/models/array_model'
 
 module Volt
   class Cursor < ArrayModel
-
   end
 end

data/lib/volt/models/model.rb

@@ -7,7 +7,6 @@ require 'volt/models/model_state'
 require 'volt/reactive/reactive_hash'
 
 module Volt
-
   class NilMethodCall < NoMethodError
   end
 
@@ -110,7 +109,6 @@ module Volt
       !attributes
     end
 
-
     def method_missing(method_name, *args, &block)
       if method_name[0] == '_'
         if method_name[-1] == '='
@@ -149,7 +147,7 @@ module Volt
       # Reading an attribute, we may get back a nil model.
       method_name = method_name.to_sym
 
-      if method_name[0] != '_' && @attributes == nil
+      if method_name[0] != '_' && @attributes.nil?
         # The method we are calling is on a nil model, return a wrapped
         # exception.
         return_undefined_method(method_name)
@@ -190,15 +188,13 @@ module Volt
     def return_undefined_method(method_name)
       # Methods called on nil capture an error so the user can know where
       # their nil calls are.  This error can be re-raised at a later point.
-      begin
-        raise NilMethodCall.new("undefined method `#{method_name}' for #{self.to_s}")
-      rescue => e
-        result = e
-
-        # Cleanup backtrace
-        # TODO: this could be better
-        result.backtrace.reject! { |line| line['lib/models/model.rb'] || line['lib/models/live_value.rb'] }
-      end
+      fail NilMethodCall.new("undefined method `#{method_name}' for #{self}")
+    rescue => e
+      result = e
+
+      # Cleanup backtrace
+      # TODO: this could be better
+      result.backtrace.reject! { |line| line['lib/models/model.rb'] || line['lib/models/live_value.rb'] }
     end
 
     def new_model(attributes, options)
@@ -213,19 +209,6 @@ module Volt
       ArrayModel.new(attributes, options)
     end
 
-    def trigger_by_attribute!(event_name, attribute, *passed_args)
-      trigger_by_scope!(event_name, *passed_args) do |scope|
-        method_name, *args, block = scope
-
-        # TODO: Opal bug
-        args                      ||= []
-
-        # Any methods without _ are not directly related to one attribute, so
-        # they should all trigger
-        !method_name || method_name[0] != '_' || (method_name == attribute.to_sym && args.size == 0)
-      end
-    end
-
     # If this model is nil, it makes it into a hash model, then
     # sets it up to track from the parent.
     def expand!
@@ -244,7 +227,7 @@ module Volt
       if @parent
         @parent.expand!
       else
-        raise "Model data should be stored in sub collections."
+        fail 'Model data should be stored in sub collections.'
       end
 
       # Grab the last section of the path, so we can do the assign on the parent
@@ -265,7 +248,7 @@ module Volt
 
     def inspect
       Computation.run_without_tracking do
-        "<#{self.class.to_s}:#{object_id} #{attributes.inspect}>"
+        "<#{self.class}:#{object_id} #{attributes.inspect}>"
       end
     end
 
@@ -278,19 +261,19 @@ module Volt
         if save_to
           if save_to.is_a?(ArrayModel)
             # Add to the collection
-            new_model             = save_to << self.attributes
+            new_model             = save_to << attributes
 
             # Set the buffer's id to track the main model's id
-            self.attributes[:_id] = new_model._id
+            attributes[:_id] = new_model._id
             options[:save_to]     = new_model
 
             # TODO: return a promise that resolves if the append works
           else
             # We have a saved model
-            return save_to.assign_attributes(self.attributes)
+            return save_to.assign_attributes(attributes)
           end
         else
-          raise "Model is not a buffer, can not be saved, modifications should be persisted as they are made."
+          fail 'Model is not a buffer, can not be saved, modifications should be persisted as they are made.'
         end
 
         Promise.new.resolve({})
@@ -304,7 +287,6 @@ module Volt
       end
     end
 
-
     # Returns a buffered version of the model
     def buffer
       model_path = options[:path]
@@ -322,7 +304,7 @@ module Volt
       if state == :loaded
         setup_buffer(model)
       else
-        self.parent.then do
+        parent.then do
           setup_buffer(model)
         end
       end
@@ -330,10 +312,10 @@ module Volt
       model
     end
 
-
     private
+
     def setup_buffer(model)
-      model.attributes = self.attributes
+      model.attributes = attributes
       model.change_state_to(:loaded)
     end
 

data/lib/volt/models/model_hash_behaviour.rb

@@ -3,7 +3,6 @@ module Volt
   # Moving this into a module cleans up the main Model class for things that
   # make it behave like a model.
   module ModelHashBehaviour
-
     def delete(name)
       name = name.to_sym
 
@@ -45,7 +44,6 @@ module Volt
       (@attributes || {}).each_with_object(*args, &block)
     end
 
-
     # Convert the model to a hash all of the way down.
     def to_h
       if empty?

data/lib/volt/models/model_state.rb

@@ -15,7 +15,7 @@ module Volt
     end
 
     def loaded?
-      self.state == :loaded
+      state == :loaded
     end
   end
 end

data/lib/volt/models/model_wrapper.rb

@@ -12,7 +12,7 @@ module Volt
       end
     end
 
-    def wrap_values(values, lookup=[])
+    def wrap_values(values, lookup = [])
       if values.is_a?(Array)
         # Coming from an array
         values.map { |v| wrap_value(v, lookup + [:[]]) }

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

@@ -15,10 +15,14 @@ module Volt
         @@query_pool
       end
 
-      def initialize(model, tasks=nil)
+      def initialize(model, tasks = nil)
         super
 
         @query = @model.options[:query]
+        @limit = @model.options[:limit]
+        @skip = @model.options[:skip]
+
+        @skip = nil if @skip == 0
       end
 
       def event_added(event, first, first_for_event)
@@ -39,7 +43,7 @@ module Volt
 
       # Called when an event is removed and we no longer want to keep in
       # sync with the database.
-      def stop_listening(stop_watching_query=true)
+      def stop_listening(stop_watching_query = true)
         return if @has_events
         return if @fetch_promises && @fetch_promises.size > 0
 
@@ -68,10 +72,10 @@ module Volt
 
               new_query = @query.call
 
-              run_query(@model, @query.call)
+              run_query(@model, @query.call, @skip, @limit)
             end.watch!
           else
-            run_query(@model, @query)
+            run_query(@model, @query, @skip, @limit)
           end
         end
       end
@@ -82,7 +86,7 @@ module Volt
         @model.clear
       end
 
-      def run_query(model, query={})
+      def run_query(model, query={}, skip=nil, limit=nil)
         @model.clear
 
         collection = model.path.last
@@ -97,9 +101,11 @@ module Volt
           end
         end
 
-        @query_listener = @@query_pool.lookup(collection, query) do
+        # The full query contains the skip and limit
+        full_query = [query, skip, limit]
+        @query_listener = @@query_pool.lookup(collection, full_query) do
           # Create if it does not exist
-          QueryListener.new(@@query_pool, @tasks, collection, query)
+          QueryListener.new(@@query_pool, @tasks, collection, full_query)
         end
 
         @query_listener.add_store(self)
@@ -107,18 +113,26 @@ module Volt
 
       # Find can take either a query object, or a block that returns a query object.  Use
       # the block style if you need reactive updating queries
-      def find(query=nil, &block)
+      def find(query = nil, &block)
         # Set a default query if there is no block
         if block
           if query
-            raise "Query should not be passed in to a find if a block is specified"
+            fail 'Query should not be passed in to a find if a block is specified'
           end
           query = block
         else
           query ||= {}
         end
 
-        return Cursor.new([], @model.options.merge(:query => query))
+        return Cursor.new([], @model.options.merge(query: query))
+      end
+
+      def limit(limit)
+        return Cursor.new([], @model.options.merge(limit: limit))
+      end
+
+      def skip(skip)
+        return Cursor.new([], @model.options.merge(skip: skip))
       end
 
       # Returns a promise that is resolved/rejected when the query is complete.  Any
@@ -137,7 +151,7 @@ module Volt
           load_data
         end
 
-        return promise
+        promise
       end
 
       # Called from backend
@@ -147,7 +161,7 @@ module Volt
         data_id = data[:_id]
 
         # Don't add if the model is already in the ArrayModel
-        if !@model.array.find { |v| v._id == data_id }
+        unless @model.array.find { |v| v._id == data_id }
           # Find the existing model, or create one
           new_model = @@identity_map.find(data_id) do
             new_options = @model.options.merge(path: @model.path + [:[]], parent: @model)
@@ -200,7 +214,6 @@ module Volt
           StoreTasks.delete(channel_name, model.attributes[:_id])
         end
       end
-
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Volt
   module Persistors
     # Implements the base persistor functionality.
     class Base
-      def loaded(initial_state=nil)
+      def loaded(initial_state = nil)
       end
 
       def changed(attribute_name)

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

@@ -10,11 +10,11 @@ module Volt
       def added(model, index)
         if Volt.client?
           # Setup a new timer for clearing the flash.
-          %x{
+          `
             setTimeout(function() {
               self.$clear_model(model);
             }, 5000);
-          }
+          `
         end
       end
 

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

@@ -4,7 +4,6 @@ require 'json'
 
 module Volt
   module Persistors
-
     # Backs a collection in the local store
     class LocalStore < Base
       def initialize(model)
@@ -24,7 +23,7 @@ module Volt
           end
         end
 
-        return node
+        node
       end
 
       # Called when a model is added to the collection
@@ -32,7 +31,7 @@ module Volt
         root_model.persistor.save_all
       end
 
-      def loaded(initial_state=nil)
+      def loaded(initial_state = nil)
         # When the main model is first loaded, we pull in the data from the
         # store if it exists
         if @model.path == []

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

@@ -6,7 +6,7 @@ module Volt
     class ModelStore < Store
       include StoreState
 
-      ID_CHARS = [('a'..'f'), ('0'..'9')].map { |v| v.to_a }.flatten
+      ID_CHARS = [('a'..'f'), ('0'..'9')].map(&:to_a).flatten
 
       attr_reader :model
       attr_accessor :in_identity_map
@@ -49,11 +49,11 @@ module Volt
         id = []
         24.times { id << ID_CHARS.sample }
 
-        return id.join
+        id.join
       end
 
       # Called when the model changes
-      def changed(attribute_name=nil)
+      def changed(attribute_name = nil)
         path = @model.path
 
         promise = Promise.new
@@ -67,8 +67,8 @@ module Volt
           end
 
           if !collection
-            puts "Attempting to save model directly on store."
-            raise "Attempting to save model directly on store."
+            puts 'Attempting to save model directly on store.'
+            fail 'Attempting to save model directly on store.'
           else
             StoreTasks.save(collection, self_attributes).then do |errors|
               if errors.size == 0
@@ -103,10 +103,11 @@ module Volt
       end
 
       def [](val)
-        raise "Models do not support hash style lookup.  Hashes inserted into other models are converted to models, see https://github.com/voltrb/volt#automatic-model-conversion"
+        fail 'Models do not support hash style lookup.  Hashes inserted into other models are converted to models, see https://github.com/voltrb/volt#automatic-model-conversion'
       end
 
       private
+
       # Return the attributes that are only for this store, not any sub-associations.
       def self_attributes
         # Don't store any sub-stores, those will do their own saving.