volt 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e66c91c0fc530f8c0bfe7ab8f309fdf5873a3d39
-  data.tar.gz: f9ed6aecc1e258b23cbe59e9d99ab64a54da72d1
+  metadata.gz: 6cb6fdeeaa6a10b0a3d1c81805a3feda5df1f60d
+  data.tar.gz: b833be5d63e7db1d7b8f9a1af8afee11d526e8d5
 SHA512:
-  metadata.gz: 17882cc80fad10785f995d654f6f127eba2e11dffa5b19965785f50aa262cb2e3950d62fdfdcecfc86099ebc47e33a12937f3dd506845d4e60577ac1f8d3b414
-  data.tar.gz: 4821c56302f0b4e649162dba8e6f07e3a629d7b3ff43e9cc970bb3d37304460d29d846b649190a306d67b20ab282042ecb47f3334c6aff915f2dfccde95a89a7
+  metadata.gz: 29913c4b065abdc2960154fbace2edb83a8ea92e6f7955d538541b05227875770d327136d9d2e02e3d6c00642894545d0b917b63f085456dacbd5f1a37f11275
+  data.tar.gz: 1a73d3935e08f24fc64aa2f7dbca692d4cd27aeda930e9d1045c4e47938fea9ef47badd3ffeebbbea8b4fc004efd6d1a7d5e8dea69bc5a6496c06f0522df023e

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/app/volt/tasks/query_tasks.rb

@@ -22,8 +22,17 @@ class QueryTasks
     puts "Load data on #{collection.inspect} - #{query.inspect}"
     live_query.add_channel(@channel)
 
-    # Return the initial data
-    return live_query.initial_data
+    errors = {}
+
+    begin
+      # Get the initial data
+      initial_data = live_query.initial_data
+    rescue => exception
+      # Capture and pass up any exceptions
+      error = {:error => exception.message}
+    end
+
+    return initial_data, error
   end
 
   def initial_data

data/app/volt/tasks/store_tasks.rb

@@ -52,7 +52,7 @@ class StoreTasks
           update_data.delete(:_id)
           @@db[collection].update({:_id => id}, update_data)
         else
-          raise
+          return {:error => error.message}
         end
       end
 

data/lib/volt/models/array_model.rb

@@ -49,14 +49,14 @@ class ArrayModel < ReactiveArray
     end
   end
 
-  tag_method(:fetch) do
+  tag_method(:then) do
     destructive!
   end
-  def fetch(*args, &block)
+  def then(*args, &block)
     if @persistor
-      return @persistor.fetch(*args, &block)
+      return @persistor.then(*args, &block)
     else
-      raise "this model's persistance layer does not support fetch, try using store"
+      raise "this model's persistance layer does not support then, try using store"
     end
   end
 

data/lib/volt/models/model.rb

@@ -3,7 +3,7 @@ require 'volt/models/array_model'
 require 'volt/models/model_helpers'
 require 'volt/reactive/object_tracking'
 require 'volt/models/model_hash_behaviour'
-require 'volt/models/validations/validations'
+require 'volt/models/validations'
 require 'volt/models/model_state'
 
 
@@ -60,7 +60,11 @@ class Model
       trigger!('changed')
 
       # Let the persistor know something changed
-      @persistor.changed if @persistor
+      if @persistor
+        # 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.
+        return @persistor.changed
+      end
     end
   end
   alias_method :assign_attributes, :attributes=
@@ -306,7 +310,7 @@ class Model
     if state == :loaded
       setup_buffer(model)
     else
-      self.parent.fetch do
+      self.parent.then do
         setup_buffer(model)
       end
     end

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

@@ -106,18 +106,24 @@ module Persistors
       return ReactiveValue.new(model)
     end
 
-    # Fetch does a one time load of the data on an unloaded model and returns
-    # the result.
-    def fetch(&block)
+    # Returns a promise that is resolved/rejected when the query is complete.  Any
+    # passed block will be passed to the promises then.  Then will be passed the model.
+    def then(&block)
+      promise = Promise.new
+
+      promise = promise.then(&block) if block
+
       # puts "FETCH: #{@state.inspect}"
       if @state == :loaded
-        block.call(@model)
+        promise.resolve(@model)
       else
-        @fetch_callbacks ||= []
-        @fetch_callbacks << block
+        @fetch_promises ||= []
+        @fetch_promises << promise
 
         load_data
       end
+
+      return promise
     end
 
     # Called from backend

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

@@ -64,7 +64,7 @@ module Persistors
         end
 
         @tasks.call('StoreTasks', 'save', collection, self_attributes) do |errors|
-          # puts "SAVE GOT: #{errors.inspect}"
+          puts "SAVE GOT: #{errors.inspect}"
           if errors.size == 0
             promise.resolve
           else

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

@@ -15,7 +15,7 @@ class QueryListener
 
   def add_listener
     @listening = true
-    @tasks.call('QueryTasks', 'add_listener', @collection, @query) do |results|
+    @tasks.call('QueryTasks', 'add_listener', @collection, @query) do |results, errors|
       # When the initial data comes back, add it into the stores.
       @stores.each do |store|
         store.model.clear

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

@@ -17,10 +17,10 @@ module StoreState
     # Trigger changed on the 'state' method
     @model.trigger_for_methods!('changed', :state, :loaded?)
 
-    if @state == :loaded && @fetch_callbacks
+    if @state == :loaded && @fetch_promises
       # Trigger each waiting fetch
-      @fetch_callbacks.compact.each {|fc| fc.call(@model) }
-      @fetch_callbacks = nil
+      @fetch_promises.compact.each {|fp| fp.resolve(@model) }
+      @fetch_promises = nil
     end
   end
 

data/lib/volt/models/{validations/validations.rb → validations.rb}

@@ -1,5 +1,6 @@
 # require 'volt/models/validations/errors'
-require 'volt/models/validations/length'
+require 'volt/models/validators/length_validator'
+require 'volt/models/validators/presence_validator'
 
 # Include in any class to get validation logic
 module Validations
@@ -67,16 +68,31 @@ module Validations
         options.each_pair do |validation, args|
           # Call the specific validator, then merge the results back
           # into one large errors hash.
-          case validation
-          when :length
-            merge.call(Length.validate(self, field_name, args))
+          klass = validation_class(validation, args)
+
+          if klass
+            validate_with(merge, klass, field_name, args)
+          else
+            raise "validtion type #{validation} is not specified."
           end
         end
       end
     end
 
-    # puts "ERROR: #{errors.inspect}"
-
     return errors
   end
+
+  private
+    # calls the validate method on the class, passing the right arguments.
+    def validate_with(merge, klass, field_name, args)
+      return merge.call(klass.validate(self, field_name, args))
+    end
+
+    def validation_class(validation, args)
+      begin
+        Object.const_get(:"#{validation.camelize}Validator")
+      rescue NameError => e
+        puts "Unable to find #{validation} validator"
+      end
+    end
 end

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

@@ -0,0 +1,28 @@
+class LengthValidator
+  def self.validate(model, field_name, args)
+    errors = {}
+    value = model.send(field_name)
+
+    if args.is_a?(Fixnum)
+      min = args
+      max = nil
+      message = nil
+    elsif args.is_a?(Hash)
+      min = args[:length] || args[:minimum]
+      max = args[:maximum]
+      raise "length or minimum must be specified" unless min.is_a?(Fixnum)
+
+      message = args[:message]
+    else
+      raise "The arguments to length must be a number or a hash"
+    end
+
+    if !value || value.size < min
+      errors[field_name] = [message || "must be at least #{args} characters"]
+    elsif max && value.size > max
+      errors[field_name] = [message || "must be less than #{args} characters"]
+    end
+
+    return errors
+  end
+end

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

@@ -0,0 +1,17 @@
+class PresenceValidator
+  def self.validate(model, field_name, args)
+    errors = {}
+    value = model.send(field_name)
+    if !value || value.blank?
+      if args.is_a?(Hash) && args[:message]
+        message = args[:message]
+      else
+        message = "must be specified"
+      end
+
+      errors[field_name] = [message]
+    end
+
+    return errors
+  end
+end

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

@@ -1,37 +1,5 @@
 require 'volt/page/bindings/template_binding'
 
-# Component bindings are the same as template bindings, but handle components
-# and do not pass their context through
+# Component bindings are the same as template bindings, but handle components.
 class ComponentBinding < TemplateBinding
-  # The context for a component binding can be either the controller, or the
-  # component arguments (@arguments), with the $page as the context.  This gives
-  # components access to the page collections.
-  # def render_template(full_path, controller_path)
-  #   # TODO: at the moment a :body section and a :title will both initialize different
-  #   # controllers.  Maybe we should have a way to tie them together?
-  #   controller_class, action = get_controller(controller_path)
-  #
-  #   model_with_parent = {parent: @context}.merge(@arguments || {})
-  #
-  #   if controller_class
-  #     # The user provided a controller, pass in the model as an argument (in a
-  #     # sub-context)
-  #     args = []
-  #     args << SubContext.new(model_with_parent) if @arguments
-  #
-  #     current_context = controller_class.new(*args)
-  #     @controller = current_context
-  #
-  #     # Trigger the action
-  #     @controller.send(action) if @controller.respond_to?(action)
-  #   else
-  #     # There is not a controller
-  #     current_context = SubContext.new(model_with_parent, @page)
-  #     @controller = nil
-  #   end
-  #
-  #   @current_template = TemplateRenderer.new(@page, @target, current_context, @binding_name, full_path)
-  #
-  #   call_ready
-  # end
 end

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

@@ -12,7 +12,7 @@ class TemplateBinding < BaseBinding
     @current_template = nil
 
     # Find the source for the getter binding
-    @path, section = value_from_getter(getter)
+    @path, section, @options = value_from_getter(getter)
 
     if section.is_a?(String)
       # Render this as a section

data/spec/models/validations_spec.rb

@@ -2,11 +2,20 @@ require 'volt/models'
 
 class TestModel < Model
   validate :_name, length: 4
+  validate :_description, length: {message: 'needs to be longer', length: 50}
+  validate :_username, presence: true
 end
 
+
 describe Model do
   it "should validate the name" do
-    expect(TestModel.new.errors).to eq({:_name => ["must be at least 4 chars"]})
+    expect(TestModel.new.errors).to eq(
+      {
+        :_name => ["must be at least 4 characters"],
+        :_description => ["needs to be longer"],
+        :_username => ["must be specified"]
+      }
+    )
   end
 
   it "should show marked validations once they are marked" do
@@ -18,7 +27,7 @@ describe Model do
 
     expect(model.marked_errors).to eq(
       {
-        :_name => ["must be at least 4 chars"]
+        :_name => ["must be at least 4 characters"]
       }
     )
   end
@@ -30,10 +39,38 @@ describe Model do
 
     model.save!
 
-    expect(model.marked_errors).to eq(
-      {
-        :_name => ["must be at least 4 chars"]
-      }
-    )
+    expect(model.marked_errors.keys).to eq([:_name, :_description, :_username])
+  end
+
+  describe "length" do
+    it "should allow custom errors on length" do
+      model = TestModel.new
+
+      expect(model.marked_errors).to eq({})
+
+      model.mark_field!(:_description)
+
+      expect(model.marked_errors).to eq(
+        {
+          :_description => ["needs to be longer"]
+        }
+      )
+    end
+  end
+
+  describe "presence" do
+    it "should validate presence" do
+      model = TestModel.new
+
+      expect(model.marked_errors).to eq({})
+
+      model.mark_field!(:_username)
+
+      expect(model.marked_errors).to eq(
+        {
+          :_username => ["must be specified"]
+        }
+      )
+    end
   end
 end

data/templates/project/app/home/config/routes.rb

@@ -1,4 +1,4 @@
-get "/about", _controller: 'about'
+get "/about", _action: 'about'
 
 # The main route
 get '/'

data/templates/project/app/home/views/index/index.html

@@ -1,19 +1,19 @@
 <:Title>
-  {#template params._controller.or('home') + '/' + params._action.or(''), "title"}
+  {#template params._controller.or('index') + '/' + params._action.or('home'), "title"}
 
 <:Body>
   <div class="container">
     <div class="header">
       <ul class="nav nav-pills pull-right">
-        <:nav controller="" text="Home" />
-        <:nav controller="about" text="About" />
+        <:nav action="" text="Home" />
+        <:nav action="about" text="About" />
       </ul>
       <h3 class="text-muted">Project name</h3>
     </div>
 
     <:volt:notices />
 
-    {#template params._controller.or('home') + '/' + params._action.or('')}
+    {#template params._controller.or('index') + '/' + params._action.or('home')}
 
     <div class="footer">
       <p>&copy; Company 2014</p>
@@ -23,7 +23,7 @@
 
 
 <:Nav>
-  <li class="{#if params._controller.or('') == @controller}active{/}">
-    <a href="/{@controller}">{@text}</a>
+  <li class="{#if params._action.or('') == @action}active{/}">
+    <a href="/{@action}">{@text}</a>
   </li>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -397,9 +397,9 @@ files:
 - lib/volt/models/persistors/store_factory.rb
 - lib/volt/models/persistors/store_state.rb
 - lib/volt/models/url.rb
-- lib/volt/models/validations/errors.rb
-- lib/volt/models/validations/length.rb
-- lib/volt/models/validations/validations.rb
+- lib/volt/models/validations.rb
+- lib/volt/models/validators/length_validator.rb
+- lib/volt/models/validators/presence_validator.rb
 - lib/volt/page/bindings/attribute_binding.rb
 - lib/volt/page/bindings/base_binding.rb
 - lib/volt/page/bindings/component_binding.rb

data/lib/volt/models/validations/length.rb

@@ -1,13 +0,0 @@
-module Validations
-  class Length
-    def self.validate(model, field_name, args)
-      errors = {}
-      value = model.send(field_name)
-      if !value || value.size < args
-        errors[field_name] = ["must be at least #{args} chars"]
-      end
-
-      return errors
-    end
-  end
-end