volt 0.8.27.beta5 → 0.8.27.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42348e0223848e865c4d02adcc27da2db50d0551
-  data.tar.gz: bdf2f78a331fdec437d1a82571bc897ef24a865c
+  metadata.gz: 664d87e842c6c03b483345d4771a71d72ad1567e
+  data.tar.gz: 8e82d85deddbc176c6cda90317b5a005f63f918d
 SHA512:
-  metadata.gz: 7674f328725d1e5adf5e73aae1658d4793f63bfa8dd475a104e82de0ee47e7e00f672a28631aaf6266723cdf3baa22bdd30cc4e6fcf0a4a66e335606e972f355
-  data.tar.gz: edac11f20bbdca8fb750adfebdfae961870ca1b4b54e681ca76f06d59873bc4bc6dceca6310dae1322db23e082af60d80f6953e4f5cb663ac8ee682e3421ed15
+  metadata.gz: a8e1ffac496bf1ead1564de04a4dac9a48ccbc68776d5db3fa0b9bb8ed2fcb7b10a31c9e5869f1f521f6b0d0796c37937a041a4efbe398d674e0884cbf93e3c2
+  data.tar.gz: 5e54e036809c3d61f75de5a80f01658d46ef572aacc0193c45498a97b92c41dc665e2b761dcc848f7206a21240b18698557cc2df90be43cdf36b39b4594cce9c

data/VERSION

@@ -1 +1 @@
-0.8.27.beta5
+0.8.27.beta6

data/app/volt/tasks/store_tasks.rb

@@ -25,8 +25,8 @@ class StoreTasks < Volt::TaskHandler
       # Create a buffer
       buffer = model.buffer
 
-      # Assign the data
-      buffer.assign_attributes(data, true)
+      # Assign the changed data to the buffer
+      buffer.assign_attributes(data, false, true)
 
       buffer
     end

data/lib/volt/controllers/model_controller.rb

@@ -38,6 +38,23 @@ module Volt
 
     # Sets the current model on this controller
     def model=(val)
+      if val.is_a?(Promise)
+        # Resolve the promise before setting
+        @last_promise = val
+
+        val.then do |result|
+          # Only assign if nothing else has been assigned since we started the resolve
+          self.model = result if @last_promise == val
+        end.fail do |err|
+          Volt.logger.error("Unable to resolve promise assigned to model on #{inspect}")
+        end
+
+        return
+      end
+
+      # Clear
+      @last_promise = nil
+
       # Start with a nil reactive value.
       self.current_model ||= Model.new
 

data/lib/volt/models/buffer.rb

@@ -1,7 +1,11 @@
 module Volt
   module Buffer
     def save!
-      # Compute the erros once
+      # 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.
+      validate!
+
+      # Get errors from validate
       errors = self.errors.to_h
 
       if errors.size == 0
@@ -12,7 +16,7 @@ module Volt
             promise = save_to.append(attributes)
           else
             # We have a saved model
-            promise = save_to.assign_attributes(attributes, true)
+            promise = save_to.assign_attributes(attributes)
           end
 
           return promise.then do |new_model|
@@ -64,20 +68,12 @@ module Volt
       model_klass = self.class
 
       new_options = options.merge(path: model_path, save_to: self, buffer: true).reject { |k, _| k.to_sym == :persistor }
-      model       = model_klass.new({}, new_options, :loading)
 
-      if loaded?
-        setup_buffer(model)
-      else
-        parent.then do
-          setup_buffer(model)
-        end.fail do |err|
-          # TODO: right now this error gets ignored a lot, so lets log.
-          Volt.logger.error("error setting up buffer: #{err.inspect}")
-          Volt.logger.error(err.backtrace)
-
-          raise err
-        end
+      model = nil
+      Volt::Model.no_validate do
+        model = model_klass.new(attributes, new_options, :loaded)
+
+        model.instance_variable_set('@new', @new)
       end
 
       model

data/lib/volt/models/model.rb

@@ -124,16 +124,16 @@ module Volt
     end
 
     # Assign multiple attributes as a hash, directly.
-    def assign_attributes(attrs, initial_setup = false)
-      @attributes = {}
+    def assign_attributes(attrs, initial_setup=false, skip_changes=false)
+      @attributes ||= {}
 
       attrs = wrap_values(attrs)
 
       if attrs
         # When doing a mass-assign, we don't validate or save until the end.
-        if initial_setup
+        if initial_setup || skip_changes
           Model.no_change_tracking do
-            assign_all_attributes(attrs)
+            assign_all_attributes(attrs, skip_changes)
           end
         else
           assign_all_attributes(attrs)
@@ -403,13 +403,14 @@ module Volt
     end
 
     # Used internally from other methods that assign all attributes
-    def assign_all_attributes(attrs)
+    def assign_all_attributes(attrs, track_changes=false)
       # Assign each attribute using setters
       attrs.each_pair do |key, value|
         key = key.to_sym
 
         # Track the change, since assign_all_attributes runs with no_change_tracking
-        # attribute_will_change!(key, @attributes[key])
+        old_val = @attributes[key]
+        attribute_will_change!(key, old_val) if track_changes && old_val != value
 
         if self.respond_to?(:"#{key}=")
           # If a method without an underscore is defined, call that.

data/lib/volt/models/permissions.rb

@@ -12,7 +12,8 @@ module Volt
         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
-            if !(user_id = Volt.user_id).nil?
+            # Only assign the user_id if there isn't already one and the user is logged in.
+            if _user_id.nil? && !(user_id = Volt.user_id).nil?
               send(:"_#{key}=", user_id)
             end
           end

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

@@ -92,6 +92,7 @@ module Volt
 
               queue_client_save
             else
+              # puts "SAVE TO DB: #{@model.inspect} - #{self_attributes.inspect} - #{@model.changed_attributes.inspect}"
               errors = save_to_db!(self_attributes)
               if errors.size == 0
                 promise.resolve(nil)

data/lib/volt/models/validations.rb

@@ -98,6 +98,7 @@ module Volt
     # @return [Boolean] true if one of the changed fields has an error.
     def error_in_changed_attributes?
       errs = errors
+
       changed_attributes.each_pair do |key, _|
         # If any of the fields with errors are also the ones that were
         return true if errs[key]

data/spec/models/model_spec.rb

@@ -499,5 +499,9 @@ describe Volt::Model do
 
       expect(count).to eq(1)
     end
+
+    it 'should skip read permissions when checking create/update' do
+
+    end
   end
 end

data/spec/models/validations_spec.rb

@@ -29,6 +29,7 @@ describe Volt::Model do
 
   it 'should show all fields in marked errors once saved' do
     buffer = model.buffer
+
     buffer.save!
 
     expect(buffer.marked_errors.keys).to eq(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.8.27.beta5
+  version: 0.8.27.beta6
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor