volt 0.9.4.pre1 → 0.9.4.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390291d6628b74ad144ac393109c5beab7ed1184
-  data.tar.gz: c4cf1d8701aeddbcda38c2e87f03db1b3a4c9db9
+  metadata.gz: acec655ed08b959c64ad4fa1a1d70a8c202d6061
+  data.tar.gz: 16d6eba62257243a2ea66bacfafb64ebd4ece87a
 SHA512:
-  metadata.gz: d31cb4efd187cb590793c53fb23bae2a9a3f53d4ab86090b22c4c611a97bdfb06444b43c630c19ecb266cd59e41a0e8655542de52f5377ea7b981412b914235a
-  data.tar.gz: 8b5eca835a00949d4107b6257e8d18ffd34cf41514e94087e0a3e6aa2a0c04533861b318d2fed09ce7b20b2fe7930a8d5037bc59ad5da124c9ed16a6a885a02c
+  metadata.gz: 86d429de470cc56e6434e9fe0f0822d840bc4a9c8d9d2e1f686d18c01ba4bb7e709c4de84b4e474d2b9dd00c78968e5b69bb98fc804b038535892557e6b66212
+  data.tar.gz: f5cb8e59e91b908203d7bede6ae2fcaae6e84f091d65e5a61ca6b890a721b2e79edef6bc6bc31a887ac307c1c6b0d59596e4b7b4d1d8dc3c6d40a18b5d2d1984

data/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## 0.9.4.pre1
 ### Added
+- ```root``` can now be called from a model to get the root model on the collection.  (So if the model is on store, it will return ```store```)
+- ```store``` can now be called from inside of a model
 
 ### Changed
 - fixed bug with ReactiveHash#to_json

data/README.md

@@ -7,11 +7,11 @@
 
 For the current status of Volt, read: http://voltframework.com/blog
 
-Volt is a Ruby web framework where your Ruby code runs on both the server and the client (via [Opal](https://github.com/opal/opal)). The DOM automatically updates as the user interacts with the page. Page state can be stored in the URL. If the user hits a URL directly, the HTML will first be rendered on the server for faster load times and easier indexing by search engines.
+Volt is a Ruby web framework where your Ruby code runs on both the server and the client (via [Opal](https://github.com/opal/opal)). The DOM automatically updates as the user interacts with the page. Page state can be stored in the URL. If the user hits a URL directly, the HTML will first be rendered on the server for faster load times and easier indexing by search engines.  Subsequent local page interactions will be rendered on the client.
 
 Instead of syncing data between the client and server via HTTP, Volt uses a persistent connection between the client and server. When data is updated on one client, it is updated in the database and any other listening clients (with almost no setup code needed).
 
-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.
+Page HTML is written in a templating language where you can put Ruby between `{{` and `}}`. Volt uses data flow/reactive programming to automatically and intelligently propagate changes to the DOM (or to any other code that wants to know when a value has changed). When something in the DOM changes, Volt intelligently updates only the DOM nodes that need to be changed.
 
 See some demo videos here:
 - [Volt Todos Example](https://www.youtube.com/watch?v=KbFtIt7-ge8)
@@ -43,15 +43,15 @@ Rick Carlino has been putting together some great volt tutorial videos also.
 
 # Getting Help
 
-Have a question and need help?  The volt team watches [stackoverflow](http://stackoverflow.com/search?q=voltrb) for questions and will get back to you quickly.  Be sure to post the question with the #voltrb tag.  If you have something you need to discuss, drop into our [gitter room](gitter.im/voltrb/volt).
+Have a question and need help?  The volt team watches [stackoverflow](http://stackoverflow.com/search?q=voltrb) for questions and will get back to you quickly.  Be sure to post the question with the #voltrb tag.  If you have something you'd like to discuss, drop into our [gitter room](https://gitter.im/voltrb/volt).
 
 # Contributing
 
-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.
+You want to contribute? Great! Thanks for being awesome! At the moment, we have a big internal todo list.  Please hop on https://gitter.im/voltrb/volt so that we don't duplicate work. Pull requests are always welcome, but asking about helping on Gitter should save some duplication.
 
 # Support
 
-VoltFramework is currently a labor of love mainly built by a small group of core developers.  Donations are always welcome and will help Volt get to production faster :-)  Also, if you or your company is interested in sponsoring Volt, please talk to @ryanstout in the [gitter](https://gitter.im/voltrb/volt)
+VoltFramework is currently a labor of love mainly built by a small group of core developers.  Donations are always welcome and will help Volt get to production faster :-)  Also, if you or your company is interested in sponsoring Volt, please talk to @ryanstout in [gitter](https://gitter.im/voltrb/volt).
 
 [![Pledgie](https://pledgie.com/campaigns/26731.png?skin_name=chrome)](https://pledgie.com/campaigns/26731)
 

data/app/volt/models/user.rb

@@ -2,9 +2,6 @@ require 'bcrypt' unless RUBY_PLATFORM == 'opal'
 
 module Volt
   class User < Model
-    field :username
-    field :email
-    field :name
     field :password
 
     # returns login field name depending on config settings
@@ -16,9 +13,6 @@ module Volt
       end
     end
 
-    validate login_field, unique: true, length: 8
-    validate :email, email: true
-
     permissions(:read) do
       # Never pass the hashed_password to the client
       deny :hashed_password
@@ -27,23 +21,32 @@ module Volt
       deny if !id == Volt.current_user_id && !new?
     end
 
-    if RUBY_PLATFORM == 'opal'
-      validations do
-        # Only validate password when it has changed
-        if changed?(:password)
-          # Don't validate on the server
-          validate :password, length: 8
-        end
+    unless RUBY_PLATFORM == 'opal'
+      permissions(:update) do
+        deny unless id == Volt.current_user_id
       end
     end
 
-    def password=(val)
-      if Volt.server?
-        # on the server, we bcrypt the password and store the result
-        self._hashed_password = BCrypt::Password.create(val)
-      else
-        # Assign the attribute
-        self._password = val
+    validations do
+      # Only validate password when it has changed
+      if changed?(:password)
+        # Don't validate on the server
+        validate :password, length: 8
+      end
+    end
+
+    # On the server, we hash the password and remove it (so we just store the hash)
+    unless RUBY_PLATFORM == 'opal'
+      before_save :hash_password
+
+      def hash_password
+        password = get('password')
+
+        # Clear the password
+        set('password', nil)
+
+        # Set the hashed_password field instead
+        set('hashed_password', BCrypt::Password.create(password))
       end
     end
   end

data/app/volt/tasks/user_tasks.rb

@@ -16,22 +16,9 @@ class UserTasks < Volt::Task
 
         match_pass = BCrypt::Password.new(user._hashed_password)
         fail 'Password did not match' unless  match_pass == password
-        fail 'app_secret is not configured' unless Volt.config.app_secret
 
-        # TODO: returning here should be possible, but causes some issues
-        # Salt the user id with the app_secret so the end user can't
-        # tamper with the cookie
-        signature = Digest::SHA256.hexdigest(salty_user_id(user.id))
-
-        # Return user_id:hash on user id
-        next "#{user.id}:#{signature}"
+        next Volt.user_login_signature(user)
       end
     end
   end
-
-  private
-
-  def salty_user_id(user_id)
-    "#{Volt.config.app_secret}::#{user_id}"
-  end
 end

data/docs/UPGRADE_GUIDE.md

@@ -1,3 +1,22 @@
+# 0.9.3 to 0.9.4
+
+We moved logic out of Volt::User and into the generated user file, so it is easier to customize.  Add the following to your app/main/models/user.rb:
+
+```ruby
+# The login_field method returns the name that should be used for the field
+# where the users e-mail is stored.  (usually :username or :email)
+def self.login_field
+  :email
+end
+
+# login_field is set to :email by default and can be set to
+field login_field
+field :name
+
+validate login_field, unique: true, length: 8
+validate :email, email: true
+```
+
 # 0.9.2 to 0.9.3
 
 Upgrading from 0.9.2 should be fairly simple, just implement the following:

data/lib/volt/controllers/http_controller.rb

@@ -1,11 +1,11 @@
 require 'volt/server/rack/http_response_header'
 require 'volt/server/rack/http_response_renderer'
-require 'volt/controllers/actions'
+require 'volt/utils/lifecycle_callbacks'
 
 module Volt
   # Allow you to create controllers that act as http endpoints
   class HttpController
-    include Actions
+    include LifecycleCallbacks
 
     #TODO params is only public for testing
     attr_accessor :params
@@ -23,9 +23,9 @@ module Volt
     end
 
     def perform(action='index')
-      filtered = run_actions(:before_action, action)
+      filtered = run_callbacks(:before_action, action)
       send(action.to_sym) unless filtered
-      run_actions(:after_action, action) unless filtered
+      run_callbacks(:after_action, action) unless filtered
       respond
     end
 

data/lib/volt/controllers/model_controller.rb

@@ -1,12 +1,12 @@
 require 'volt/reactive/reactive_accessors'
-require 'volt/controllers/actions'
+require 'volt/utils/lifecycle_callbacks'
 require 'volt/controllers/template_helpers'
 require 'volt/controllers/collection_helpers'
 
 module Volt
   class ModelController
     include ReactiveAccessors
-    include Actions
+    include LifecycleCallbacks
     include CollectionHelpers
 
     # A model controller will have its

data/lib/volt/models/array_model.rb

@@ -94,40 +94,50 @@ module Volt
         model = wrap_values([model]).first
       end
 
-      if model.is_a?(Model) && !model.can_create?
-        fail "permissions did not allow create for #{model.inspect}"
-      end
 
-      # Add it to the array and trigger any watches or on events.
-      super(model)
+      if model.is_a?(Model)
+        if !model.can_create?
+          fail "permissions did not allow create for #{model.inspect}"
+        end
 
-      if @persistor
-        promise = @persistor.added(model, @array.size - 1)
-        if promise && promise.is_a?(Promise)
-          return promise.then do
-
-            # Mark the model as not new
-            model.instance_variable_set('@new', false)
-
-            # Mark the model as loaded
-            model.change_state_to(:loaded_state, :loaded)
-
-            # return the model
-            model
-          end.fail do |err|
-            # remove from the collection because it failed to save on the server
-            # we don't need to call delete on the server.
-            index = @array.index(model)
-            delete_at(index, true)
-
-            # re-raise, err might not be an Error object, so we use a rejected promise to re-raise
-            Promise.new.reject(err)
-          end
+        # Add it to the array and trigger any watches or on events.
+        super(model)
+
+        @persistor.added(model, @array.size - 1)
+
+        # Validate and save
+        promise = model.run_changed.then do
+          # Mark the model as not new
+          model.instance_variable_set('@new', false)
+
+          # Mark the model as loaded
+          model.change_state_to(:loaded_state, :loaded)
+
+       end.fail do |err|
+          # remove from the collection because it failed to save on the server
+          # we don't need to call delete on the server.
+          index = @array.index(model)
+          delete_at(index, true)
+
+          # remove from the id list
+          @persistor.try(:remove_tracking_id, model)
+
+          # re-raise, err might not be an Error object, so we use a rejected promise to re-raise
+          Promise.new.reject(err)
+        end
+      else
+        promise = nil.then do
+          # Add it to the array and trigger any watches or on events.
+          super(model)
+
+          @persistor.added(model, @array.size - 1)
         end
       end
 
-      # Return this model
-      Promise.new.resolve(model)
+      promise.then do
+        # resolve the model
+        model
+      end
     end
 
     # Works like << except it always returns a promise

data/lib/volt/models/associations.rb

@@ -16,6 +16,13 @@ module Volt
             root.get(method_name.pluralize).where(id: lookup_key).first
           end
         end
+
+        define_method(:"#{method_name}=") do |obj|
+          id = obj.is_a?(Fixnum) ? obj : obj.id
+
+          # Assign the current model's something_id to the object's id
+          set("#{method_name}_id", id)
+        end
       end
 
       def has_many(method_name, remote_key_name = nil)

data/lib/volt/models/buffer.rb

@@ -18,7 +18,7 @@ module Volt
           if save_to
             if save_to.is_a?(ArrayModel)
               # Add to the collection
-              promise = save_to.append(attributes)
+              promise = save_to.create(attributes)
             else
               # We have a saved model
               promise = save_to.assign_attributes(attributes)
@@ -33,11 +33,13 @@ module Volt
                 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
+                options[:save_to] = new_model
               end
 
-              nil
+              # Copy attributes back from save_to model
+              @attributes = new_model.attributes
+
+              new_model
             end.fail do |errors|
               if errors.is_a?(Hash)
                 server_errors.replace(errors)

data/lib/volt/models/field_helpers.rb

@@ -11,8 +11,10 @@ module FieldHelpers
       end
 
       if klass
-      # Add type validation
-        validate name, type: klass
+      # Add type validation, execpt for String, since anything can be a string.
+        unless klass == String
+          validate name, type: klass
+        end
       end
 
       define_method(name) do

data/lib/volt/models/model.rb

@@ -18,6 +18,7 @@ require 'volt/models/associations'
 require 'volt/reactive/class_eventable'
 require 'volt/utils/event_counter'
 require 'volt/reactive/reactive_accessors'
+require 'volt/utils/lifecycle_callbacks'
 require 'thread'
 
 module Volt
@@ -30,6 +31,7 @@ module Volt
   end
 
   class Model
+    include LifecycleCallbacks
     include ModelWrapper
     include ModelHelpers
     include ModelHashBehaviour
@@ -357,14 +359,14 @@ module Volt
       if initial_setup
         # Run initial validation
         if Volt.in_mode?(:no_validate)
-          # No validate, resolve nil
-          Promise.new.resolve(nil)
+          # No validate, resolve self
+          Promise.new.resolve(self)
         else
           return validate!.then do |errs|
             if errs && errs.size > 0
               Promise.new.reject(errs)
             else
-              Promise.new.resolve(nil)
+              Promise.new.resolve(self)
             end
           end
         end

data/lib/volt/models/model_helpers/model_change_helpers.rb

@@ -3,7 +3,9 @@
 
 module Volt
   module ModelChangeHelpers
-    private
+    def self.included(base)
+      base.setup_action_helpers_in_class(:before_save, :before_validate)
+    end
 
     # Called when something in the model changes.  Saves
     # the model if there is a persistor, and changes the
@@ -38,14 +40,16 @@ module Volt
           end
 
           # Return result inside of the validate! promise
-          result
+          result.then { self }
         end
       end
 
       # Didn't run validations
-      nil
+      self.then
     end
 
+
+    private
     # Should only be called from run_changed.  Saves the changes back to the persistor
     # and clears the tracked changes.
     def persist_changes(attribute_name)
@@ -53,6 +57,14 @@ module Volt
 
       # Don't save right now if we're in a nosave block
       unless Volt.in_mode?(:no_save)
+        # Call the before_save callback
+        # skip validations when running before_save, this prevents n+1, and allows
+        # the before_save to put the model into an invalid state, which you want
+        # sometimes.
+        Volt::Model.no_validate do
+          run_callbacks(:before_save)
+        end
+
         # 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

data/lib/volt/models/model_helpers/model_helpers.rb

@@ -58,6 +58,17 @@ module Volt
       end
     end
 
+    def store
+      # TODO: Move away from $page
+      $page.store
+    end
+
+    # returns the root model for the collection the model is currently on.  So
+    # if the model is persisted somewhere on store, it will return ```store```
+    def root
+      persistor.try(:root_model)
+    end
+
 
 
 

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

@@ -287,24 +287,14 @@ module Volt
       # Called when the client adds an item.
       def added(model, index)
         if model.persistor
-          # Tell the persistor it was added, return the promise
-          promise = model.persistor.add_to_collection
-
           # Track the the model got added
           @ids[model.id] = true
-
-          promise
         end
       end
 
       # Called when the client removes an item
       def removed(model)
-        if model.persistor
-          # Tell the persistor it was removed
-          model.persistor.remove_from_collection
-
-          @ids.delete(model.id)
-        end
+        remove_tracking_id(model)
 
         if defined?($loading_models) && $loading_models
           return
@@ -312,6 +302,13 @@ module Volt
           StoreTasks.delete(channel_name, model.attributes[:id])
         end
       end
+
+      def remove_tracking_id(model)
+        if model.persistor
+          # Tell the persistor it was removed
+          @ids.delete(model.id)
+        end
+      end
     end
   end
 end

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

@@ -21,18 +21,6 @@ module Volt
         model.change_state_to(:loaded_state, initial_state)
       end
 
-      def add_to_collection
-        @in_collection = true
-        ensure_setup
-
-        # Call changed, return the promise
-        changed
-      end
-
-      def remove_from_collection
-        @in_collection = false
-      end
-
       def auto_generate_id
         true
       end
@@ -68,8 +56,10 @@ module Volt
 
         path_size = path.size
         if save_changes? && path_size > 0 && !@model.nil?
-          if path_size > 3 && (parent = @model.parent) && (source = parent.parent)
-            @model.attributes[:"#{path[-4].singularize}_id"] = source.id
+          if path_size > 3 && (parent = @model.parent)
+            # If we have a collection, go up one more.
+            parent = parent.parent unless parent.is_a?(Volt::Model)
+            @model.attributes[:"#{path[-4].singularize}_id"] = parent.id
           end
 
           if !collection

data/lib/volt/models/url.rb

@@ -97,8 +97,8 @@ module Volt
       new_url
     end
 
-    def url_with(params)
-      url_for(params.to_h.merge(params))
+    def url_with(passed_params)
+      url_for(params.to_h.merge(passed_params))
     end
 
     # Called when the state has changed and the url in the

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

@@ -31,7 +31,17 @@ module Volt
 
     def initialize(volt_app, target, context, binding_name, event_name, call_proc)
       super(volt_app, target, context, binding_name)
-      @event_name = event_name
+
+      # Map blur/focus to focusout/focusin
+      @event_name = case event_name
+      when 'blur'
+        'focusout'
+      when 'focus'
+        'focusin'
+      else
+        event_name
+      end
+
 
       handler = proc do |js_event|
         event = JSEvent.new(js_event)
@@ -55,8 +65,7 @@ module Volt
         # end
 
       end
-
-      @listener = page.events.add(event_name, self, handler)
+      @listener = page.events.add(@event_name, self, handler)
     end
 
     # Remove the event binding

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

@@ -25,7 +25,7 @@ module Volt
       # If no stage, then we are calling the main action method,
       # so we should call the before/after actions
       unless has_stage
-        if @controller.run_actions(:before_action, @action)
+        if @controller.run_callbacks(:before_action, @action)
           # stop_chain was called
           return true
         end
@@ -33,7 +33,7 @@ module Volt
 
       @controller.send(method_name) if @controller.respond_to?(method_name)
 
-      @controller.run_actions(:after_action, @action) unless has_stage
+      @controller.run_callbacks(:after_action, @action) unless has_stage
 
       # before_action chain was not stopped
       false

data/lib/volt/server/component_templates.rb

@@ -200,11 +200,16 @@ module Volt
     end
 
     def generate_initializers_code
-      code = "\nrequire_tree '#{@component_path}/config/initializers/'\n"
-      code << "require_tree '#{@component_path}/config/initializers/client'\n"
+      paths = Dir["#{@component_path}/config/initializers/*.rb"]
+      paths += Dir["#{@component_path}/config/initializers/client/*.rb"]
+
+      cpath_size = @component_path.size
+      paths.map! {|path| @component_name + path[cpath_size..-1]}
+
+      code = "\n" + paths.map { |path| "require '#{path}'" }.join("\n")
 
       code
     end
 
   end
-end
+end

data/lib/volt/{controllers/actions.rb → utils/lifecycle_callbacks.rb}

@@ -9,23 +9,24 @@
 #
 #   before_action :require_login
 module Volt
-  module Actions
+  module LifecycleCallbacks
     # StopChainException inherits from Exception directly so it will not be handled by a
     # default rescue.
     class StopChainException < Exception; end
 
     module ClassMethods
-      # Takes a list of action groups (as symbols).  An action group is typically used for before/after, but
-      # can be used anytime you have multiple sets of actions.  The method will create an {x}_action method for each
-      # group passed in.
-      def setup_action_helpers_in_class(*groups)
-        groups.each do |group|
+      # Takes a list of callbacks (as symbols).  A callback is typically used
+      # for before/after actions, but can be used anytime you have callbacks
+      # that may be filtered by action.  The method will create an callback
+      # method for each callback name passed in.
+      def setup_action_helpers_in_class(*callback_names)
+        callback_names.each do |callback_name|
           # Setup a class attribute to track the
-          callbacks_var_name = :"#{group}_callbacks"
+          callbacks_var_name = :"#{callback_name}_callbacks"
           class_attribute(callbacks_var_name)
 
           # Create the method on the class
-          define_singleton_method(group) do |*args, &block|
+          define_singleton_method(callback_name) do |*args, &block|
             # Add the block in place of the symbol
             args.unshift(block) if block
 
@@ -52,16 +53,19 @@ module Volt
       end
     end
 
-    # To run the actions on a class, call #run_actions passing in the group
-    # and the action being called on.  If the callback chain was stopped with
-    # #stop_chain, it will return true, otherwise false.
-    def run_actions(group, action)
-      callbacks = self.class.send(:"#{group}_callbacks")
+    # To run the callbacks on a class, call #run_callbacks passing in the
+    # callback_name and the action it runs with.  If the callback chain was
+    # stopped with #stop_chain, it will return true, otherwise false.
+    def run_callbacks(callback_name, action=nil)
+      callbacks = self.class.send(:"#{callback_name}_callbacks")
 
-      filtered_callbacks = filter_actions_by_only_exclude(callbacks || [], action)
+      callbacks ||= []
+      if action
+        callbacks = filter_actions_by_only_exclude(callbacks || [], action)
+      end
 
       begin
-        filtered_callbacks.each do |callback|
+        callbacks.map { |v| v[0] }.each do |callback|
           case callback
           when Symbol
             send(callback)
@@ -100,7 +104,7 @@ module Volt
           # If no only, include it
           true
         end
-      end.map { |v| v[0] }
+      end
     end
   end
 end

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.4.pre1'
+    STRING = '0.9.4.pre2'
   end
 end

data/lib/volt/volt/users.rb

@@ -39,8 +39,11 @@ module Volt
 
     # as_user lets you run a block as another user
     #
-    # @param user_id [Integer]
-    def as_user(user_id)
+    # @param user_or_user_id [Integer|Volt::Model]
+    def as_user(user_or_id)
+      # if we have a user, get the id
+      user_id = user_or_id.is_a?(Volt::Model) ? user_or_id.id : user_or_id
+
       previous_id = Thread.current['with_user_id']
       Thread.current['with_user_id'] = user_id
 
@@ -49,6 +52,22 @@ module Volt
       Thread.current['with_user_id'] = previous_id
     end
 
+    unless RUBY_PLATFORM == 'opal'
+      # Takes a user and returns a signed string that can be used for the
+      # user_id cookie to login a user.
+      def user_login_signature(user)
+        fail 'app_secret is not configured' unless Volt.config.app_secret
+
+        # TODO: returning here should be possible, but causes some issues
+        # Salt the user id with the app_secret so the end user can't
+        # tamper with the cookie
+        signature = Digest::SHA256.hexdigest(salty_user_id(user.id))
+
+        # Return user_id:hash on user id
+        "#{user.id}:#{signature}"
+      end
+    end
+
     def skip_permissions
       Volt.run_in_mode(:skip_permissions) do
         yield
@@ -115,5 +134,13 @@ module Volt
 
       user_id_signature
     end
+
+
+    private
+    unless RUBY_PLATFORM == 'opal'
+      def salty_user_id(user_id)
+        "#{Volt.config.app_secret}::#{user_id}"
+      end
+    end
   end
 end

data/spec/apps/kitchen_sink/app/main/controllers/main_controller.rb

@@ -5,6 +5,8 @@ module Main
   class MainController < Volt::ModelController
     model :page
 
+    reactive_accessor :blur_count, :focus_count
+
     def index
       a = {}
       a[{}] = 5
@@ -76,6 +78,16 @@ module Main
       page._items = changes
     end
 
+    def blur
+      self.blur_count ||= 0
+      self.blur_count += 1
+    end
+
+    def focus
+      self.focus_count ||= 0
+      self.focus_count += 1
+    end
+
     private
 
     # the main template contains a #template binding that shows another

data/spec/apps/kitchen_sink/app/main/models/user.rb

@@ -1,2 +1,9 @@
 class User < Volt::User
+  # login_field is set to :email by default and can be changed to :username
+  # in config/app.rb
+  field login_field
+  field :name
+
+  validate login_field, unique: true, length: 8
+  validate :email, email: true
 end

data/spec/apps/kitchen_sink/app/main/views/main/bindings.html

@@ -148,4 +148,10 @@
 
   <p id="escapeContent">{{{this is {{escaped}}}}}</p>
 
+  <h2>Event</h2>
+
+  <input e-blur="blur" e-focus="focus" id="blurFocusField" />
+  <div id="blurCount">{{ blur_count || 0 }}</div>
+  <div id="focusCount">{{ focus_count || 0 }}</div>
+
 

data/spec/integration/bindings_spec.rb

@@ -243,6 +243,25 @@ describe 'bindings test', type: :feature, sauce: true do
     end
   end
 
+  # NOTE: For some reason this spec fails randomly (capybara issue I think)
+  # describe "events" do
+  #   it 'should handle focus and blur' do
+  #     visit '/'
+  #     click_link 'Bindings'
+
+  #     expect(find('#focusCount')).to have_content('0')
+  #     expect(find('#blurCount')).to have_content('0')
+
+  #     page.execute_script("$('#blurFocusField').focus()")
+  #     sleep 0.1
+  #     expect(find('#focusCount')).to have_content('1')
+
+  #     page.execute_script("$('#blurFocusField').blur()")
+  #     expect(find('#blurCount')).to have_content('1')
+
+  #   end
+  # end
+
   if ENV['BROWSER'] != 'phantom'
     describe 'input hidden and select' do
       it 'should display binding value' do

data/spec/models/associations_spec.rb

@@ -17,14 +17,14 @@ describe Volt::Associations do
   if RUBY_PLATFORM != 'opal'
     describe "with samples" do
       before do
-        store._people! << { name: 'Jimmy' }
-        @person = store._people[0].sync
-        @person._addresses! << { city: 'Bozeman' }
-        @person._addresses << { city: 'Portland' }
+        @person = Person.new(name: 'Jimmy')
+        store.people << @person
+        @person.addresses << Address.new(city: 'Bozeman')
+        @person.addresses << Address.new(city: 'Portland')
       end
 
       it 'should associate via belongs_to' do
-        address = store._addresses!.first.sync
+        address = store.addresses.first.sync
 
         expect(address.person.sync.id).to eq(@person.id)
       end
@@ -64,7 +64,7 @@ describe Volt::Associations do
 
     it 'should assign the reference_id for has_many' do
       bob = store.people.create.sync
-      bob.addresses.create({:street => '1234 awesome street'})
+      address = bob.addresses.create({:street => '1234 awesome street'})
       expect(bob.addresses[0].sync.person_id).to eq(bob.id)
       expect(bob.id).to_not eq(nil)
     end

data/spec/models/buffer_spec.rb

@@ -4,9 +4,18 @@ class ::TestSaveFailure < Volt::Model
   validate :name, length: 5
 end
 
+class ::TestChangedAttribute < Volt::Model
+  before_save :change_attributes
+
+  def change_attributes
+    set('one', 1)
+    set('two', 2)
+  end
+end
+
 describe Volt::Buffer do
   it 'should let you pass a block that evaluates to the then of the promise' do
-    buffer = the_page._items!.buffer
+    buffer = the_page._items.buffer
 
     count = 0
     result = buffer.save! do
@@ -18,6 +27,15 @@ describe Volt::Buffer do
   end
 
   if RUBY_PLATFORM != 'opal'
+    it 'should copy attributes back from the save_to model incase it changes them during save' do
+      buffer = the_page._test_changed_attributes.buffer
+
+      buffer.save!.sync
+      expect(buffer.save_to.attributes.without(:id)).to eq({one: 1, two: 2})
+      expect(buffer.attributes.without(:id)).to eq({one: 1, two: 2})
+      expect(buffer.id).to eq(buffer.save_to.id)
+    end
+
     it 'should reject a failed save! with the errors object' do
       buffer = the_page._test_save_failures.buffer
 

data/spec/models/model_helpers/model_helpers_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Volt::ModelHelpers do
+  # it 'should have a root method on models that returns the root collection' do
+  #   model = store._posts.create
+  #   expect(model.root).to eq(store)
+  # end
+end

data/spec/models/url_spec.rb

@@ -63,4 +63,20 @@ describe Volt::URL do
       expect(subject.url_for params).to eq uri
     end
   end
+
+  describe '#url_with' do
+    let(:uri) { 'http://voltframework.com:8888/path/1?query=val&page=1#fragment' }
+    let(:fake_router) do
+      router = Volt::Routes.new
+
+      router.define do
+        client '/path/{{ id }}', view: 'blog/show'
+      end
+    end
+
+    it 'regenerates the URL and merges the given params' do
+      params = { page: 1 }
+      expect(subject.url_with params).to eq uri
+    end
+  end
 end

data/spec/models/user_spec.rb

@@ -37,9 +37,7 @@ describe Volt::User do
   end
 
   describe '#password=' do
-    let!(:user) { Volt::User.new }
-
-    subject { user.password = 'test' }
+    subject { Volt::User.new(password: 'test') }
 
     if RUBY_PLATFORM != 'opal'
       describe 'when it is a Volt server' do
@@ -49,34 +47,37 @@ describe Volt::User do
         end
 
         it 'encrypts password' do
-          subject
+          the_page._users << subject
 
           expect(BCrypt::Password).to have_received :create
         end
 
         it 'sets _hashed_password to passed value' do
-          subject
+          the_page._users << subject
 
-          expect(user._hashed_password).to eq 'hashed-password'
+          expect(subject.get('hashed_password')).to eq 'hashed-password'
         end
       end
 
       it 'should allow updates without validating the password' do
         bob = store._users.buffer(name: 'Bob', email: 'bob@bob.com', password: '39sdjkdf932jklsd')
-        bob.save!
+        bob.save!.sync
 
-        expect(bob._password).to eq(nil)
+        Volt.as_user(bob) do
 
-        bob_buf = bob.buffer
+          expect(bob.password).to eq(nil)
 
-        bob_buf._name = 'Jimmy'
+          bob_buf = bob.buffer
 
-        saved = false
-        bob_buf.save! do
-          saved = true
-        end
+          bob_buf.name = 'Jimmy'
+
+          saved = false
+          bob_buf.save! do
+            saved = true
+          end
 
-        expect(saved).to eq(true)
+          expect(saved).to eq(true)
+        end
       end
     end
 
@@ -87,12 +88,10 @@ describe Volt::User do
         allow(Volt).to receive(:server?).and_return false
       end
 
-      subject { user.password = 'a valid test password' }
-
-      it 'sets _password to passed value' do
-        subject
+      subject { Volt::User.new(password: 'a valid test password') }
 
-        expect(user._password).to eq('a valid test password')
+      it 'sets password to passed value' do
+        expect(subject.password).to eq('a valid test password')
       end
     end
   end

data/spec/models/user_validation_spec.rb

@@ -1,5 +1,13 @@
 require 'spec_helper'
 
+class TestUserTodo < Volt::Model
+  own_by_user
+
+  permissions(:update) do
+    deny :user_id
+  end
+end
+
 describe Volt::UserValidatorHelpers do
   context 'with user' do
     before do

data/spec/{controllers/actions_spec.rb → utils/lifecycle_callbacks_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'volt/controllers/model_controller'
 
 class BaseTestActions
-  include Volt::Actions
+  include Volt::LifecycleCallbacks
 
   setup_action_helpers_in_class(:before_action, :after_action)
 end
@@ -70,14 +70,14 @@ class TestOnlyCallbacks < TestActionsSymbolsBase
   before_action :run_one, :run_two, only: [:new]
 end
 
-describe Volt::Actions do
+describe Volt::LifecycleCallbacks do
   it 'should trigger before actions via blocks' do
     test_class = TestActionsBlocks.new
 
     expect(test_class.ran_before1).to eq(nil)
     expect(test_class.ran_before2).to eq(nil)
 
-    test_class.run_actions(:before_action, :index)
+    test_class.run_callbacks(:before_action, :index)
 
     expect(test_class.ran_before1).to eq(true)
     expect(test_class.ran_before2).to eq(true)
@@ -89,7 +89,7 @@ describe Volt::Actions do
     expect(test_class.ran_one).to eq(nil)
     expect(test_class.ran_two).to eq(nil)
 
-    test_class.run_actions(:before_action, :index)
+    test_class.run_callbacks(:before_action, :index)
 
     expect(test_class.ran_one).to eq(true)
     expect(test_class.ran_two).to eq(true)
@@ -107,17 +107,17 @@ describe Volt::Actions do
     expect(test_class.ran_one).to eq(nil)
     expect(test_class.ran_two).to eq(nil)
 
-    result = test_class.run_actions(:before_action, :index)
+    result = test_class.run_callbacks(:before_action, :index)
     expect(result).to eq(false)
 
     expect(test_class.ran_one).to eq(true)
     expect(test_class.ran_two).to eq(true)
   end
 
-  it 'should stop the chain when #stop_chain is called and return false from #run_actions' do
+  it 'should stop the chain when #stop_chain is called and return false from #run_callbacks' do
     test_class = TestStopCallbacks.new
 
-    result = test_class.run_actions(:before_action, :index)
+    result = test_class.run_callbacks(:before_action, :index)
     expect(result).to eq(true)
 
     expect(test_class.ran_one).to eq(true)
@@ -129,18 +129,18 @@ describe Volt::Actions do
   it 'should call without any callbacks' do
     test_class = TestNoCallbacks.new
 
-    result = test_class.run_actions(:before_action, :index)
+    result = test_class.run_callbacks(:before_action, :index)
     expect(result).to eq(false)
   end
 
   it 'should follow only limitations' do
     test_only = TestOnlyCallbacks.new
 
-    test_only.run_actions(:before_action, :index)
+    test_only.run_callbacks(:before_action, :index)
     expect(test_only.ran_one).to eq(nil)
     expect(test_only.ran_two).to eq(nil)
 
-    test_only.run_actions(:before_action, :new)
+    test_only.run_callbacks(:before_action, :new)
     expect(test_only.ran_one).to eq(true)
     expect(test_only.ran_two).to eq(true)
   end

data/templates/project/app/main/models/user.rb

@@ -1,4 +1,12 @@
 # By default Volt generates this User model which inherits from Volt::User,
 # you can rename this if you want.
 class User < Volt::User
+  # login_field is set to :email by default and can be changed to :username
+  # in config/app.rb
+  field login_field
+  field :name
+
+  validate login_field, unique: true, length: 8
+  validate :email, email: true
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.4.pre1
+  version: 0.9.4.pre2
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -409,7 +409,6 @@ files:
 - lib/volt/cli/new_gem.rb
 - lib/volt/cli/runner.rb
 - lib/volt/config.rb
-- lib/volt/controllers/actions.rb
 - lib/volt/controllers/collection_helpers.rb
 - lib/volt/controllers/http_controller.rb
 - lib/volt/controllers/model_controller.rb
@@ -576,6 +575,7 @@ files:
 - lib/volt/utils/event_counter.rb
 - lib/volt/utils/generic_counting_pool.rb
 - lib/volt/utils/generic_pool.rb
+- lib/volt/utils/lifecycle_callbacks.rb
 - lib/volt/utils/local_storage.rb
 - lib/volt/utils/logging/task_argument_filterer.rb
 - lib/volt/utils/logging/task_logger.rb
@@ -631,7 +631,6 @@ files:
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/config/app.rb
 - spec/apps/kitchen_sink/config/base/index.html
-- spec/controllers/actions_spec.rb
 - spec/controllers/http_controller_spec.rb
 - spec/controllers/model_controller_spec.rb
 - spec/controllers/reactive_accessors_spec.rb
@@ -664,6 +663,7 @@ files:
 - spec/models/buffer_spec.rb
 - spec/models/dirty_spec.rb
 - spec/models/field_helpers_spec.rb
+- spec/models/model_helpers/model_helpers_spec.rb
 - spec/models/model_spec.rb
 - spec/models/model_state_spec.rb
 - spec/models/permissions_spec.rb
@@ -726,6 +726,7 @@ files:
 - spec/utils/ejson_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb
+- spec/utils/lifecycle_callbacks_spec.rb
 - spec/utils/parsing_spec.rb
 - spec/utils/promise_extensions_spec.rb
 - spec/utils/task_argument_filtererer_spec.rb
@@ -877,7 +878,6 @@ test_files:
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/config/app.rb
 - spec/apps/kitchen_sink/config/base/index.html
-- spec/controllers/actions_spec.rb
 - spec/controllers/http_controller_spec.rb
 - spec/controllers/model_controller_spec.rb
 - spec/controllers/reactive_accessors_spec.rb
@@ -910,6 +910,7 @@ test_files:
 - spec/models/buffer_spec.rb
 - spec/models/dirty_spec.rb
 - spec/models/field_helpers_spec.rb
+- spec/models/model_helpers/model_helpers_spec.rb
 - spec/models/model_spec.rb
 - spec/models/model_state_spec.rb
 - spec/models/permissions_spec.rb
@@ -972,6 +973,7 @@ test_files:
 - spec/utils/ejson_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb
+- spec/utils/lifecycle_callbacks_spec.rb
 - spec/utils/parsing_spec.rb
 - spec/utils/promise_extensions_spec.rb
 - spec/utils/task_argument_filtererer_spec.rb