volt 0.8.18 → 0.8.19

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

@@ -25,6 +25,8 @@ module Volt
       def add_to_collection
         @in_collection = true
         ensure_setup
+
+        # Call changed, return the promise
         changed
       end
 
@@ -84,14 +86,12 @@ module Volt
             fail 'Attempting to save model directly on store.'
           else
             if RUBY_PLATFORM == 'opal'
-              StoreTasks.save(collection, path, self_attributes).then do |errors|
-                if errors.size == 0
-                  promise.resolve(nil)
-                else
-                  promise.reject(errors)
-                end
-              end
+              @save_promises ||= []
+              @save_promises << promise
+
+              queue_client_save
             else
+              puts "Save to DB"
               errors = save_to_db!(self_attributes)
               if errors.size == 0
                 promise.resolve(nil)
@@ -101,9 +101,40 @@ module Volt
             end
           end
         end
+
         promise
       end
 
+      def queue_client_save
+        `
+        if (!self.saveTimer) {
+          self.saveTimer = setImmediate(self.$run_save.bind(self));
+        }
+        `
+      end
+
+      # Run save is called on the client side after a queued setImmediate.  It does the
+      # saving on the front-end.  Adding a setImmediate allows multiple changes to be
+      # batched together.
+      def run_save
+        # Clear the save timer
+        `
+        clearImmediate(self.saveTimer);
+        delete self.saveTimer;
+        `
+
+        StoreTasks.save(collection, @model.path, self_attributes).then do
+          save_promises = @save_promises
+          @save_promises = nil
+          save_promises.each {|promise|  promise.resolve(nil) }
+        end.fail do |errors|
+          save_promises = @save_promises
+          @save_promises = nil
+          save_promises.each {|promise|  promise.reject(errors) }
+        end
+
+      end
+
       def event_added(event, first, first_for_event)
         if first_for_event && event == :changed
           ensure_setup
@@ -113,12 +144,14 @@ module Volt
       # Update the models based on the id/identity map.  Usually these requests
       # will come from the backend.
       def self.changed(model_id, data)
-        model = @@identity_map.lookup(model_id)
+        Model.nosave do
+          model = @@identity_map.lookup(model_id)
 
-        if model
-          data.each_pair do |key, value|
-            if key != :_id
-              model.send(:"_#{key}=", value)
+          if model
+            data.each_pair do |key, value|
+              if key != :_id
+                model.send(:"_#{key}=", value)
+              end
             end
           end
         end
@@ -147,6 +180,11 @@ module Volt
 
         # Do the actual writing of data to the database, only runs on the backend.
         def save_to_db!(values)
+          # Check to make sure the model has no validation errors.
+          errors = @model.errors
+          return errors if errors.present?
+
+          # Passed, save it
           id = values[:_id]
 
           # Try to create
@@ -166,8 +204,8 @@ module Volt
             end
           end
 
-          # puts "Update Collection: #{collection.inspect} - #{values.inspect}"
-          QueryTasks.live_query_pool.updated_collection(collection.to_s, Thread.current['from_channel'])
+          puts "Update Collection: #{collection.inspect} - #{values.inspect} -- #{Thread.current['in_channel'].inspect}"
+          QueryTasks.live_query_pool.updated_collection(collection.to_s, Thread.current['in_channel'])
           return {}
         end
       end

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

@@ -33,7 +33,7 @@ module Volt
           store.change_state_to(:loaded)
         end
       end.fail do |err|
-        puts "Err: #{err.inspect}"
+        puts "Error adding listener: #{err.inspect}"
       end
     end
 
@@ -47,6 +47,8 @@ module Volt
         @stores.first.model.each_with_index do |item, index|
           store.add(index, item.to_h)
         end
+
+        store.change_state_to(:loaded)
       else
         # First time we've added a store, setup the listener and get
         # the initial data.
@@ -84,6 +86,7 @@ module Volt
 
     def changed(model_id, data)
       $loading_models = true
+      puts "new data: #{data.inspect}"
       Persistors::ModelStore.changed(model_id, data)
       $loading_models = false
     end

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

@@ -11,7 +11,7 @@ module Volt
       puts '--- Running Queries ---'
 
       @pool.each_pair do |table, query_hash|
-        query_hash.keys.each do |query|
+        query_hash.each_key do |query|
           puts "#{table}: #{query.inspect}"
         end
       end

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

@@ -10,19 +10,18 @@ module Volt
       def state
         @state_dep ||= Dependency.new
         @state_dep.depend
+
         @state
       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)
         old_state = @state
         @state    = new_state
 
         # Trigger changed on the 'state' method
-        unless skip_trigger
-          if old_state != @state
-            @state_dep.changed! if @state_dep
-          end
+        if old_state != @state
+          @state_dep.changed! if @state_dep
         end
 
         if @state == :loaded && @fetch_promises
@@ -30,6 +29,7 @@ module Volt
           @fetch_promises.compact.each { |fp| fp.resolve(@model) }
           @fetch_promises = nil
 
+          # puts "STOP LIST---------"
           stop_listening
         end
       end

data/lib/volt/models/validations.rb

@@ -1,17 +1,33 @@
 # require 'volt/models/validations/errors'
 require 'volt/models/validators/length_validator'
 require 'volt/models/validators/presence_validator'
+require 'volt/models/validators/unique_validator'
 
 module Volt
   # Include in any class to get validation logic
   module Validations
     module ClassMethods
-      def validate(field_name, options)
-        @validations             ||= {}
-        @validations[field_name] = options
+      def validate(field_name=nil, options=nil, &block)
+        if block
+          if field_name || options
+            raise "validate should be passed a field name and options or a block, not both."
+          end
+          @custom_validations ||= []
+          @custom_validations << block
+        else
+          @validations             ||= {}
+          @validations[field_name] = options
+        end
+      end
+
+      # TODO: For some reason attr_reader on a class doesn't work in Opal
+      def validations
+        @validations
       end
 
-      attr_reader :validations
+      def custom_validations
+        @custom_validations
+      end
     end
 
     def self.included(base)
@@ -20,7 +36,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)
       marked_fields[field_name] = true
     end
 
@@ -28,31 +44,69 @@ module Volt
       @marked_fields ||= ReactiveHash.new
     end
 
+
+    # Marks all fields, useful for when a model saves.
+    def mark_all_fields!
+      validations = self.class.validations
+      if validations
+        validations.each_key do |key|
+          mark_field!(key.to_sym)
+        end
+      end
+    end
+
+
     def marked_errors
       errors(true)
     end
 
+    # server errors are errors that come back from the server when we save!
+    # Any changes to the associated fields will clear the error until another
+    # save!
+    def server_errors
+      @server_errors ||= ReactiveHash.new
+    end
+
+    # When a field is changed, we want to clear any errors from the server
+    def clear_server_errors(key)
+      @server_errors.delete(key)
+    end
+
     # 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)
       errors = {}
 
-      validations = self.class.validations
+      # Merge into errors, combining any error arrays
+      merge = proc do |new_errors|
+        errors.merge!(new_errors) do |key, new_val, old_val|
+          new_val + old_val
+        end
+      end
+
+      errors = run_validations(errors, merge, marked_only)
 
+      # See if any server errors are in place and merge them in if they are
+      if Volt.client?
+        errors = merge.call(server_errors.to_h)
+      end
+
+      errors = run_custom_validations(errors, merge)
+
+      errors
+    end
+
+    private
+
+    # Runs through each of the normal validations.
+    def run_validations(errors, merge, marked_only)
+      validations = self.class.validations
       if validations
-        # Merge into errors, combining any error arrays
-        merge = proc do |new_errors|
-          errors.merge!(new_errors) do |key, new_val, old_val|
-            new_val + old_val
-          end
-        end
 
         # Run through each validation
         validations.each_pair do |field_name, options|
-          if marked_only
-            # When marked only, skip any validations on non-marked fields
-            next unless marked_fields[field_name]
-          end
+          # When marked only, skip any validations on non-marked fields
+          next if marked_only && !marked_fields[field_name]
 
           options.each_pair do |validation, args|
             # Call the specific validator, then merge the results back
@@ -68,10 +122,25 @@ module Volt
         end
       end
 
-      errors
+      return errors
+    end
+
+    def run_custom_validations(errors, merge)
+      # Call all of the custom validations
+      custom_validations = self.class.custom_validations
+      if custom_validations
+        custom_validations.each do |custom_validation|
+          # Run the validator in the context of the model
+          result = instance_eval(&custom_validation)
+          if result
+            errors = merge.call(result)
+          end
+        end
+      end
+
+      return errors
     end
 
-    private
 
     # calls the validate method on the class, passing the right arguments.
     def validate_with(merge, klass, field_name, args)

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

@@ -2,7 +2,7 @@ module Volt
   class LengthValidator
     def self.validate(model, field_name, args)
       errors = {}
-      value  = model.send(field_name)
+      value  = model.read_attribute(field_name)
 
       if args.is_a?(Fixnum)
         min     = args

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

@@ -2,7 +2,7 @@ module Volt
   class PresenceValidator
     def self.validate(model, field_name, args)
       errors = {}
-      value  = model.send(field_name)
+      value  = model.read_attribute(field_name)
       if !value || value.blank?
         if args.is_a?(Hash) && args[:message]
           message = args[:message]

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

@@ -0,0 +1,28 @@
+module Volt
+  class UniqueValidator
+    def self.validate(model, field_name, args)
+      errors = {}
+
+      if RUBY_PLATFORM != 'opal'
+        if args
+          value  = model.read_attribute(field_name)
+
+          query = {}
+          # Check to see if any other documents have this value.
+          query[field_name.to_s] = value
+          query['_id'] = {'$ne' => model._id}
+
+          # Check if the value is taken
+          # TODO: need a way to handle scope for unique
+          if $page.store.send(:"_#{model.path[-2]}").find(query).size > 0
+            message = (args.is_a?(Hash) && args[:message]) || "is already taken"
+
+            errors[field_name] = [message]
+          end
+        end
+      end
+
+      errors
+    end
+  end
+end

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

@@ -53,7 +53,7 @@ module Volt
     # The defaults are as follows:
     # 1. component - main
     # 2. controller - main
-    # 3. view - main
+    # 3. view - index
     # 4. section - body
     def path_for_template(lookup_path, force_section = nil)
       parts      = lookup_path.split('/')
@@ -243,7 +243,7 @@ module Volt
       action = controller_path[-1]
 
       # Get the constant parts
-      parts  = controller_path[0..-2].map { |v| v.gsub('-', '_').camelize }
+      parts  = controller_path[0..-2].map { |v| v.tr('-', '_').camelize }
 
       # Home doesn't get namespaced
       if parts.first == 'Main'

data/lib/volt/page/page.rb

@@ -86,6 +86,10 @@ module Volt
       @local_store ||= Model.new({}, persistor: Persistors::LocalStore)
     end
 
+    def cookies
+      @cookies ||= Model.new({}, persistor: Persistors::Cookies)
+    end
+
     def tasks
       @tasks ||= Tasks.new(self)
     end

data/lib/volt/page/tasks.rb

@@ -12,7 +12,7 @@ module Volt
       end
     end
 
-    def call(class_name, method_name, *args)
+    def call(class_name, method_name, meta_data, *args)
       promise_id            = @promise_id
       @promise_id           += 1
 
@@ -22,7 +22,7 @@ module Volt
 
       # TODO: Timeout on these callbacks
 
-      @page.channel.send_message([promise_id, class_name, method_name, *args])
+      @page.channel.send_message([promise_id, class_name, method_name, meta_data, *args])
 
       promise
     end

data/lib/volt/reactive/computation.rb

@@ -56,6 +56,8 @@ module Volt
           if Volt.in_browser?
             self.class.queue_flush!
           end
+
+          # If we are not in the browser, the user must manually flush
         end
 
         invalidations  = @invalidations

data/lib/volt/reactive/hash_dependency.rb

@@ -13,14 +13,12 @@ module Volt
     end
 
     def delete(key)
-      dep = @hash_depedencies[key]
+      dep = @hash_depedencies.delete(key)
 
       if dep
         dep.changed!
         dep.remove
       end
-
-      @hash_depedencies.delete(key)
     end
 
     def changed_all!