volt 0.9.0.pre7 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b1a1de6a4ca5bb3040697994dc02235caef5df1
-  data.tar.gz: 560933928252e51c201ffc9f0167d7a81255c415
+  metadata.gz: 1a09dcf76510b9f9be2a538e6dfc437cf74ccd1b
+  data.tar.gz: c6982a5ceaf9fd3a4ae463f185141e789bd93fb9
 SHA512:
-  metadata.gz: 55024841e17f8e8f267f5728f5ed46ac81254c29c4fb3f494a840b2c337d5cbe901204bdac3396380465460b03cc2ebcaabc886d6a77b234ec50ce96d1b4a6be
-  data.tar.gz: 72dccab3dfa677e6b444e152ca9b3654cf48317de5a65a2ac2494b6084bc862301dbedce6d8663a803c0e46b0bb0167a5549f042724c768975877f6fc89d7c94
+  metadata.gz: ba21338f15fece2dbfa90951956f9a73e93ead112259ffc87e7944a9f43368412f66f319fe265117b67d43bf783813058c3e1ea9b1b11403a666353718d4ee38
+  data.tar.gz: 2eb8459d1199bf301536c79335d1554ca7f84211251b5c772bef6637ee4440107bd1260880593537c656179d11c2580618b1d1c2495bad9ef9e43a2c4d95e369

data/CHANGELOG.md

@@ -4,7 +4,7 @@
 ### Added
 - the permissions api has been added!
 - added has_many and belongs_to on models.  See docs.
-- you can now serve http/rest from Volt.  Thanks to @jfahrer for his great work.  Docs coming soon.
+- you can now serve http/rest from Volt.  Thanks to @jfahrer for his great work.  More docs coming soon.
 - there is now a generator for controllers and HttpControllers.
 - fixed generated component code
 - added .order for sorting on the data store (since .sort is a ruby Enum method)

data/README.md

@@ -1,3 +1,4 @@
+[![Gratipay](http://img.shields.io/gratipay/voltframework.svg)](https://www.gratipay.com/voltframework/)
 [![Gem Version](https://badge.fury.io/rb/volt.svg)](http://badge.fury.io/rb/volt)
 [![Code Climate](https://codeclimate.com/github/voltrb/volt/badges/gpa.svg)](https://codeclimate.com/github/voltrb/volt)
 [![Build Status](http://img.shields.io/travis/voltrb/volt/master.svg?style=flat)](https://travis-ci.org/voltrb/volt)
@@ -12,7 +13,8 @@ Instead of syncing data between the client and server via HTTP, Volt uses a pers
 Pages HTML is written in a template language where you can put Ruby between `{{` and `}}`. Volt uses data flow/reactive programming to automatically and intelligently propagate changes to the DOM (or any other code wanting to know when a value updates). When something in the DOM changes, Volt intelligently updates only the nodes that need to be changed.
 
 See some demo videos here:
-- [Volt Todos Example](https://www.youtube.com/watch?v=Tg-EtRnMz7o)
+- [Volt Todos Example](https://www.youtube.com/watch?v=KbFtIt7-ge8)
+- [What Is Volt in 6 Minutes](https://www.youtube.com/watch?v=P27EPQ4ne7o)
 - [Pagination Example](https://www.youtube.com/watch?v=1uanfzMLP9g)
 - [Routes and Templates](https://www.youtube.com/watch?v=1yNMP3XR6jU)
 - [Isomorphic App Development - RubyConf 2014](https://www.youtube.com/watch?v=7i6AL7Walc4)
@@ -20,8 +22,8 @@ See some demo videos here:
 **Note:** The blog video is outdated, expect an updated version soon.
 
 Check out demo apps:
- - https://github.com/voltrb/todos3
- - https://github.com/voltrb/contactsdemo
+ - https://github.com/voltrb/todomvc
+ - https://github.com/voltrb/blog5
 
 # Docs
 
@@ -33,4 +35,5 @@ There is also a [work in progress tutorial](https://github.com/rhgraysonii/volt_
 
 You want to contribute? Great! Thanks for being awesome! At the moment, we have a big internal todo list, hop on https://gitter.im/voltrb/volt so we don't duplicate work. Pull requests are always welcome, but asking about helping on Gitter should save some duplication.
 
-[![Pledgie](https://pledgie.com/campaigns/26731.png?skin_name=chrome)](https://pledgie.com/campaigns/26731)
+
+[![Gratipay](//img.shields.io/gratipay/voltframework.svg)](https://www.gratipay.com/voltframework/)

data/VERSION

@@ -1 +1 @@
-0.9.0.pre7
+0.9.0

data/lib/volt/models/buffer.rb

@@ -7,57 +7,58 @@ 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.
-      validate!
-
-      # Get errors from validate
-      errors = self.errors.to_h
-
-      result = nil
+      return validate!.then do
+
+        # Get errors from validate
+        errors = self.errors.to_h
+
+        result = nil
+
+        if errors.size == 0
+          save_to = options[:save_to]
+          if save_to
+            if save_to.is_a?(ArrayModel)
+              # Add to the collection
+              promise = save_to.append(attributes)
+            else
+              # We have a saved model
+              promise = save_to.assign_attributes(attributes)
+            end
 
-      if errors.size == 0
-        save_to = options[:save_to]
-        if save_to
-          if save_to.is_a?(ArrayModel)
-            # Add to the collection
-            promise = save_to.append(attributes)
-          else
-            # We have a saved model
-            promise = save_to.assign_attributes(attributes)
-          end
+            result = promise.then do |new_model|
+              # The main model saved, so mark the buffer as not new
+              @new = false
 
-          result = promise.then do |new_model|
-            # The main model saved, so mark the buffer as not new
-            @new = false
+              if new_model
+                # Mark the model as loaded
+                new_model.change_state_to(:loaded_state, :loaded)
 
-            if new_model
-              # Mark the model as loaded
-              new_model.change_state_to(:loaded_state, :loaded)
+                # Set the buffer's id to track the main model's id
+                attributes[:_id] = new_model._id
+                options[:save_to]     = new_model
+              end
 
-              # Set the buffer's id to track the main model's id
-              attributes[:_id] = new_model._id
-              options[:save_to]     = new_model
-            end
+              nil
+            end.fail do |errors|
+              if errors.is_a?(Hash)
+                server_errors.replace(errors)
+              end
 
-            nil
-          end.fail do |errors|
-            if errors.is_a?(Hash)
-              server_errors.replace(errors)
+              promise_for_errors(errors)
             end
-
-            promise_for_errors(errors)
+          else
+            fail 'Model is not a buffer, can not be saved, modifications should be persisted as they are made.'
           end
         else
-          fail 'Model is not a buffer, can not be saved, modifications should be persisted as they are made.'
+          # Some errors, mark all fields
+          result = promise_for_errors(errors)
         end
-      else
-        # Some errors, mark all fields
-        result = promise_for_errors(errors)
-      end
 
-      # If passed a block, call then on it with the block.
-      result = result.then(&block) if block
+        # If passed a block, call then on it with the block.
+        result = result.then(&block) if block
 
-      return result
+        result
+      end
     end
 
     # When errors come in, we mark all fields and return a rejected promise.

data/lib/volt/models/model.rb

@@ -152,12 +152,17 @@ module Volt
       # Save the changes
       if initial_setup
         # Run initial validation
-        errs = Volt.in_mode?(:no_validate) ? nil : validate!
-
-        if errs && errs.size > 0
-          return Promise.new.reject(errs)
+        if Volt.in_mode?(:no_validate)
+          # No validate, resolve nil
+          Promise.new.resolve(nil)
         else
-          return Promise.new.resolve(nil)
+          return validate!.then do |errs|
+            if errs && errs.size > 0
+              Promise.new.reject(errs)
+            else
+              Promise.new.resolve(nil)
+            end
+          end
         end
       else
         return run_changed
@@ -404,51 +409,56 @@ module Volt
     # @return [Promise|nil] a promise for when the save is
     #         complete
     def run_changed(attribute_name=nil)
-      result = 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.
       unless Volt.in_mode?(:no_validate)
         # Run the validations for all fields
-        validate!
-
-        # Buffers are allowed to be in an invalid state
-        unless buffer?
-          # First check that all local validations pass
-          if error_in_changed_attributes?
-            # Some errors are present, revert changes
-            revert_changes!
-
-            # After we revert, we need to validate again to get the error messages back
-            # TODO: Could probably cache the previous errors.
-            errs = validate!
-
-            result = Promise.new.reject(errs)
-          else
-            # No errors, tell the persistor to handle the change (usually save)
-
-            # Don't save right now if we're in a nosave block
-            unless Volt.in_mode?(:no_save)
-              # the changed method on a persistor should return a promise that will
-              # be resolved when the save is complete, or fail with a hash of errors.
-              if @persistor
-                result = @persistor.changed(attribute_name)
-              else
-                result = Promise.new.resolve(nil)
+        result = nil
+        return validate!.then do
+
+          # Buffers are allowed to be in an invalid state
+          unless buffer?
+            # First check that all local validations pass
+            if error_in_changed_attributes?
+              # Some errors are present, revert changes
+              revert_changes!
+
+              # After we revert, we need to validate again to get the error messages back
+              # TODO: Could probably cache the previous errors.
+              result = validate!.then do
+                # Reject the promise with the errors
+                Promise.new.reject(errs)
+              end
+            else
+              # No errors, tell the persistor to handle the change (usually save)
+
+              # Don't save right now if we're in a nosave block
+              unless Volt.in_mode?(:no_save)
+                # the changed method on a persistor should return a promise that will
+                # be resolved when the save is complete, or fail with a hash of errors.
+                if @persistor
+                  result = @persistor.changed(attribute_name)
+                else
+                  result = Promise.new.resolve(nil)
+                end
+
+                # Saved, no longer new
+                @new = false
+
+                # Clear the change tracking
+                clear_tracked_changes!
               end
-
-              # Saved, no longer new
-              @new = false
-
-              # Clear the change tracking
-              clear_tracked_changes!
             end
           end
+
+          # Return result inside of the validate! promise
+          result
         end
       end
 
-      return result
+      # Didn't run validations
+      return nil
     end
   end
 end

data/lib/volt/models/validations.rb

@@ -82,16 +82,18 @@ module Volt
     def validate!
       errors.clear
 
-      run_validations
+      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)
+        # 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
+      end.then do
+        run_custom_validations
+      end.then do
+        # Return the errors object
+        errors
       end
-
-      run_custom_validations
-
-      errors
     end
 
     # Returns true if any of the changed fields now has an error
@@ -111,7 +113,10 @@ module Volt
     private
 
     # Runs through each of the normal validations.
+    # @return [Promise] a promsie to run all validations
     def run_validations
+      promise = Promise.new.resolve(nil)
+
       validations = self.class.validations
       if validations
 
@@ -123,8 +128,12 @@ module Volt
             klass = validation_class(validation, args)
 
             if klass
-              result = klass.validate(self, field_name, args)
-              errors.merge!(result)
+              # Chain on the promises
+              promise = promise.then do
+                klass.validate(self, field_name, args)
+              end.then do |errs|
+                errors.merge!(errs)
+              end
             else
               fail "validation type #{validation} is not specified."
             end
@@ -132,19 +141,26 @@ module Volt
         end
       end
 
-      errors
+      return promise
     end
 
     def run_custom_validations
+      promise = Promise.new.resolve(nil)
       # 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_exec(&custom_validation)
-          errors.merge!(result)
+          # Add to the promise chain
+          promise = promise.then do
+            # Run the validator in the context of the model
+            instance_exec(&custom_validation)
+          end.then do |errs|
+            errors.merge!(errs)
+          end
         end
       end
+
+      return promise
     end
 
     def validation_class(validation, args)

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

@@ -68,7 +68,7 @@ module Volt
           current_value = value
         end
 
-        if current_value && !current_value.nil? && !current_value.is_a?(Exception)
+        if current_value && !current_value.is_a?(Exception)
           # This branch is currently true
           true_template = template_name
           break

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

@@ -85,7 +85,6 @@ module Volt
           remove_starting_controller
         else
           # None of the actions stopped the chain
-
           # Wait until the controller is loaded before we actually render.
           @waiting_for_load = -> { @starting_controller_handler.controller.loaded? }.watch_until!(true) do
             render_next_template(full_path, path)

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

@@ -4,7 +4,7 @@ module Volt
 
     def initialize(controller, action)
       @controller = controller
-      @action = action.to_sym
+      @action = action.to_sym if action
     end
 
     def call_action(stage_prefix=nil, stage_suffix=nil)

data/lib/volt/reactive/computation.rb

@@ -57,9 +57,7 @@ module Volt
       unless @invalidated
         @invalidated = true
 
-        unless @stopped || @computing
-          queue_flush!
-        end
+        queue_flush! unless @stopped
 
         invalidations  = @invalidations
         @invalidations = []

data/spec/models/validations_spec.rb

@@ -15,6 +15,19 @@ describe Volt::Model do
     end
   end
 
+  let(:test_model_with_promises) do
+    Class.new(Volt::Model) do
+      attr_accessor :ran_promise
+      validate do
+
+        Promise.new.then do
+          self.ran_promise = true
+          {name: 'Invalid'}
+        end
+      end
+    end
+  end
+
   it 'should return errors for all failed validations' do
     model.validate!
     expect(model.errors).to eq(
@@ -37,6 +50,15 @@ describe Volt::Model do
     )
   end
 
+  it 'should resolve promises returned from inside of validations' do
+    model = test_model_with_promises.new
+
+    model.validate!.then do |errs|
+      expect(errs).to eq({name: 'Invalid'})
+      expect(model.ran_promise).to eq(true)
+    end
+  end
+
   describe 'builtin validations' do
     shared_examples_for 'a built in validation' do |field, message|
       specify do

data/spec/reactive/computation_spec.rb

@@ -150,10 +150,10 @@ describe Volt::Computation do
     describe 'when computing' do
       before(:each) { computation.instance_variable_set :@computing, true }
 
-      it "doesn't add self to flush queue" do
+      it "should still add itself to flush queue" do
         computation.invalidate!
 
-        expect(Volt::Computation.class_variable_get :@@flush_queue).to be_empty
+        expect(Volt::Computation.class_variable_get :@@flush_queue).not_to be_empty
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre7
+  version: 0.9.0
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -827,9 +827,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5