volt 0.9.3.pre5 → 0.9.3.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81532c9c3fda9af1ddf09bf56ff2c479f507f279
-  data.tar.gz: aa68ce3727fa3dda1d21bb86771070b93ce5b595
+  metadata.gz: 6b47ed7510baf946cc2e65e7140be76022472b53
+  data.tar.gz: cf681b804b8609987671fbf2626aaf399d39bec0
 SHA512:
-  metadata.gz: 9079b50cbc1bf729c3c56a11fc30082edf7c846628fccc4cd8b468a5c7184f14c7c25dbcc16dc60ab6ad4a7c51e54ec3154a97c8a38aa8c313bffea7accc071d
-  data.tar.gz: 88abd17e264363c606421fbffa52621f01bc869147de950b0922b796ad7ff74da5a0f9b04e6a2aedb79adebf957f07da7af9807c329317c12e3f9638cadae1d8
+  metadata.gz: ffcd6ef512a9b74b519b1b2ee294b8bef5d00075b8052ab6c4cee1375fac9662d2d2991024a469ccb7b8cf3c0e1d7388999dc6e5ff908f1b48a6705e8cef12df
+  data.tar.gz: 811b21c5c24ee684593c7069aba0cd68fad6480b22486c0646f34e67f365b8ab7e0ef36857c0defba4030fc9be243745f27c9a2e8930a7ba6fe58a29afc3dad0

data/CHANGELOG.md

@@ -19,6 +19,8 @@
 - Volt.current_user now works in HttpController's
 - You can now add your own middleware to the middleware stack.  (see docs)
 - Added a threadpool for Tasks, and options to customize pool size in config/app.rb
+- Volt now handles Syntax errors much better, it will display an error message when your app does not compile, and can reload from that page when things change. (in development)
+- Time objects can now be saved in models.
 
 ### Changed
 - All methods on ArrayModel's under the store collection now return a Promise.

data/app/volt/tasks/store_tasks.rb

@@ -1,4 +1,3 @@
-require 'mongo'
 require 'volt/models'
 
 class StoreTasks < Volt::Task

data/lib/volt/cli/new_gem.rb

@@ -57,15 +57,9 @@ class NewGem
 
   def copy_options
     copy('newgem/bin/newgem.tt', "bin/#{@name}") if @options[:bin]
-    case @options[:test]
-    when 'rspec'
-      copy('newgem/rspec.tt', '.rspec')
-      copy('newgem/spec/spec_helper.rb.tt', 'spec/spec_helper.rb')
-      copy('newgem/spec/newgem_spec.rb.tt', "spec/#{@namespaced_path}_spec.rb")
-    when 'minitest'
-      copy('newgem/test/minitest_helper.rb.tt', 'test/minitest_helper.rb')
-      copy('newgem/test/test_newgem.rb.tt', "test/test_#{@namespaced_path}.rb")
-    end
+    copy('newgem/rspec.tt', '.rspec')
+    copy('newgem/spec/spec_helper.rb.tt', 'spec/spec_helper.rb')
+    copy('newgem/spec/newgem_spec.rb.tt', "spec/#{@namespaced_path}_spec.rb")
     puts "Initializing git repo in #{@target}"
     Dir.chdir(@target) { `git init`; `git add .` }
 

data/lib/volt/data_stores/data_store.rb

@@ -14,7 +14,7 @@ module Volt
         adaptor_name = root.const_get(adaptor_name)
         @adaptor = adaptor_name.new
       else
-        raise "#{database_name} is not a supported database"
+        raise "#{database_name} is not a supported database, you might be missing a volt-#{database_name} gem"
       end
 
       @adaptor

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

@@ -1,6 +1,6 @@
 require 'volt/models/persistors/base'
 require 'volt/utils/local_storage'
-require 'json'
+require 'volt/utils/ejson'
 
 module Volt
   module Persistors
@@ -17,7 +17,7 @@ module Volt
         if @model.path == []
           json_data = LocalStorage['volt-store']
           if json_data
-            root_attributes = JSON.parse(json_data)
+            root_attributes = EJSON.parse(json_data)
 
             @loading_data = true
             root_attributes.each_pair do |key, value|
@@ -37,7 +37,7 @@ module Volt
       def save_all
         return if @loading_data
 
-        json_data = JSON.dump(@model.to_h)
+        json_data = EJSON.stringify(@model.to_h)
 
         LocalStorage['volt-store'] = json_data
       end

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

@@ -1,11 +1,6 @@
 require 'volt/models/persistors/store'
 require 'volt/models/persistors/store_state'
 
-if RUBY_PLATFORM == 'opal'
-else
-  require 'mongo'
-end
-
 module Volt
   module Persistors
     class ModelStore < Store

data/lib/volt/models/url.rb

@@ -8,15 +8,18 @@ module Volt
     include ReactiveAccessors
 
     # TODO: we need to make it so change events only trigger on changes
-    reactive_accessor :scheme, :host, :port, :path, :query, :params, :fragment
+    reactive_accessor :scheme, :host, :port, :path, :query, :fragment
     attr_accessor :router
 
     def initialize(router = nil)
       @router = router
-      @params = Model.new({}, persistor: Persistors::Params)
       @location = Location.new
     end
 
+    def params
+      @params ||= Model.new({}, persistor: Persistors::Params)
+    end
+
     # Parse takes in a url and extracts each sections.
     # It also assigns and changes to the params.
     def parse(url)
@@ -95,7 +98,7 @@ module Volt
     end
 
     def url_with(params)
-      url_for(@params.to_h.merge(params))
+      url_for(params.to_h.merge(params))
     end
 
     # Called when the state has changed and the url in the
@@ -103,7 +106,7 @@ module Volt
     # Called when an attribute changes to update the url
     def update!
       if Volt.in_browser?
-        new_url = url_for(@params.to_h)
+        new_url = url_for(params.to_h)
 
         # Push the new url if pushState is supported
         # TODO: add fragment fallback
@@ -158,8 +161,9 @@ module Volt
       query_hash.merge!(new_params)
 
       # Loop through the .params we already have assigned.
-      assign_from_old(@params, query_hash)
-      assign_new(@params, query_hash)
+      lparams = params
+      assign_from_old(lparams, query_hash)
+      assign_new(lparams, query_hash)
     end
 
     # Loop through the old params, and overwrite any existing values,

data/lib/volt/page/channel.rb

@@ -1,6 +1,6 @@
 # The channel is the connection between the front end and the backend.
 
-require 'json'
+require 'volt/utils/ejson'
 require 'volt/reactive/reactive_accessors'
 require 'volt/reactive/eventable'
 
@@ -94,7 +94,7 @@ module Volt
     end
 
     def message_received(message)
-      message = JSON.parse(message)
+      message = EJSON.parse(message)
 
       trigger!('message', *message)
     end
@@ -104,7 +104,7 @@ module Volt
         @queue << message
       else
         # TODO: Temp: wrap message in an array, so we're sure its valid JSON
-        message = JSON.dump([message])
+        message = EJSON.stringify([message])
         `
           this.socket.send(message);
         `

data/lib/volt/page/page.rb

@@ -1,3 +1,4 @@
+require 'volt/utils/ejson'
 
 module Volt
   class Page
@@ -178,7 +179,7 @@ module Volt
           `if (page_obj_str) {`
           `sessionStorage.removeItem('___page');`
 
-          JSON.parse(page_obj_str).each_pair do |key, value|
+          EJSON.parse(page_obj_str).each_pair do |key, value|
             page.send(:"_#{key}=", value)
           end
           `}`

data/lib/volt/page/tasks.rb

@@ -1,3 +1,5 @@
+require 'volt/utils/ejson'
+
 module Volt
   # The tasks class provides an interface to call tasks on
   # the backend server.  This class is setup as page.task (as a singleton)
@@ -63,7 +65,7 @@ module Volt
 
     def reload
       # Stash the current page value
-      value = JSON.dump($page.page.to_h)
+      value = EJSON.stringify($page.page.to_h)
 
       # If this browser supports session storage, store the page, so it will
       # be in the same state when we reload.

data/lib/volt/reactive/reactive_array.rb

@@ -45,7 +45,8 @@ module Volt
           end
         end
 
-        count
+        # return as a promise
+        count.then
       else
         size
       end

data/lib/volt/server.rb

@@ -17,6 +17,7 @@ require 'volt/page/page'
 require 'volt/server/websocket/websocket_handler'
 require 'volt/utils/read_write_lock'
 require 'volt/server/forking_server'
+require 'volt/server/websocket/rack_server_adaptor'
 
 
 module Volt
@@ -49,6 +50,9 @@ module Volt
     # killed when code changes and reforked.  (This provides simple fast code
     # reloading)
     def app
+      # Setup the rack server and adaptor
+      RackServerAdaptor.load
+
       app = Rack::Builder.new
 
       # Handle websocket connections

data/lib/volt/server/forking_server.rb

@@ -4,6 +4,15 @@ require 'drb'
 require 'stringio'
 require 'listen'
 
+class ErrorDispatcher
+  def dispatch(channel, message)
+    Volt.logger.error("The app failed to start, so the following message can not be run: #{message}")
+  end
+
+  def close_channel(channel)
+  end
+end
+
 module Volt
   class ForkingServer
     def initialize(server)
@@ -58,11 +67,17 @@ module Volt
           # Running as child
           @reader.close
 
-          volt_app = @server.boot_volt
-          @rack_app = volt_app.middleware
+          begin
+            volt_app = @server.boot_volt
+            @rack_app = volt_app.middleware
+
+            # Set the drb object locally
+            @dispatcher = Dispatcher.new(volt_app)
+          rescue Exception => error
+            boot_error(error)
+          end
+
 
-          # Set the drb object locally
-          @dispatcher = Dispatcher.new(volt_app)
           drb_object = DRb.start_service('drbunix:', [self, @dispatcher])
 
           @writer.puts(drb_object.uri)
@@ -79,6 +94,28 @@ module Volt
       end
     end
 
+    # called from the child when the boot failes.  Sets up an error page rack
+    # app to show the user the error and handle reloading requests.
+    def boot_error(error)
+      msg = error.inspect
+      if error.respond_to?(:backtrace)
+        msg << "\n" + error.backtrace.join("\n")
+      end
+      Volt.logger.error(msg)
+
+      # Only require when needed
+      require 'cgi'
+      @rack_app = Proc.new do
+        path = File.join(File.dirname(__FILE__), "forking_server/boot_error.html.erb")
+        html = File.read(path)
+        error_page = ERB.new(html, nil, '-').result(binding)
+
+        [500, {"Content-Type" => "text/html"}, error_page]
+      end
+
+      @dispatcher = ErrorDispatcher.new
+    end
+
 
     def stop_child
       # clear the drb object and kill the child process.

data/lib/volt/server/forking_server/boot_error.html.erb

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+
+    <script>
+        // Simple code to handle reload messages
+        if (document.location.protocol == 'https:') {
+          var wsProto = 'wss';
+        } else {
+          var wsProto = 'ws';
+        }
+
+        this.socket = new WebSocket(wsProto + '://' + document.location.host + '/socket');
+
+        // Log errors
+        this.socket.onerror = function (error) {
+          document.location.reload();
+        };
+
+        // Log messages from the server
+        this.socket.onmessage = function(message) {
+          if (message.data == '["reload"]') {
+            document.location.reload();
+          }
+        };
+
+        this.socket.onclose = function(error) {
+          document.location.reload();
+        };
+    </script>
+  </head>
+  <body>
+    <h2><%= CGI::escapeHTML(error.inspect) %></h2>
+
+    <% if error.respond_to?(:backtrace) %>
+<pre>
+<%= error.backtrace.map {|l| CGI::escapeHTML(l) }.join("<br />") %>
+</pre>
+    <% end %>
+  </body>
+</html>

data/lib/volt/server/rack/opal_files.rb

@@ -22,7 +22,7 @@ module Volt
       Opal.append_path(Volt.root + '/app')
       Opal.append_path(Volt.root + '/lib')
 
-      Gem.loaded_specs.values.select {|gem| gem.name =~ /^volt/ }
+      Gem.loaded_specs.values.select {|gem| gem.name =~ /^(volt|ejson_ext)/ }
       .each do |gem|
         ['app', 'lib'].each do |folder|
           path = gem.full_gem_path + "/#{folder}"

data/lib/volt/server/socket_connection_handler.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'volt/utils/ejson'
 require File.join(File.dirname(__FILE__), '../../../app/volt/tasks/query_tasks')
 
 module Volt
@@ -9,6 +9,14 @@ module Volt
     # This may be changed as new listeners connect, which is fine.
     attr_accessor :user_id
 
+
+    def initialize(session, *args)
+      @session = session
+
+      @@channels ||= []
+      @@channels << self
+    end
+
     def self.dispatcher=(val)
       @@dispatcher = val
     end
@@ -26,17 +34,10 @@ module Volt
       end
     end
 
-    def initialize(session, *args)
-      @session = session
-
-      @@channels ||= []
-      @@channels << self
-    end
-
     def process_message(message)
       # self.class.message_all(message)
       # Messages are json and wrapped in an array
-      message = JSON.parse(message).first
+      message = EJSON.parse(message).first
 
       begin
         @@dispatcher.dispatch(self, message)
@@ -51,9 +52,17 @@ module Volt
     end
 
     def send_message(*args)
-      str = JSON.dump([*args])
+      str = EJSON.stringify([*args])
 
       @session.send(str)
+
+      if RUNNING_SERVER == 'thin'
+        # This might seem strange, but it prevents a delay with outgoing
+        # messages.
+        # TODO: Figure out the cause of the issue and submit a fix upstream.
+        EM.next_tick {}
+      end
+
     end
 
     def closed

data/lib/volt/server/websocket/websocket_handler.rb

@@ -1,13 +1,10 @@
 require 'faye/websocket'
 require 'volt/server/socket_connection_handler'
-require 'volt/server/websocket/rack_server_adaptor'
+
 
 module Volt
   class WebsocketHandler
     def initialize(app)
-      # Setup the rack server and adaptor
-      RackServerAdaptor.load
-
       @app = app
     end
 

data/lib/volt/spec/setup.rb

@@ -49,7 +49,7 @@ module Volt
 
       # Setup the spec collection accessors
       # RSpec.shared_context "volt collections", {} do
-      RSpec.shared_examples_for 'volt collections', {} do
+      RSpec.shared_context 'volt collections', {} do
         # Page conflicts with capybara's page method, so we call it the_page for now.
         # TODO: we need a better solution for page
 
@@ -60,7 +60,15 @@ module Volt
           $page.store
         end
         let(:volt_app) { volt_app }
+        let(:params) { volt_app.page.params }
 
+        after do
+          # Clear params if used
+          url = volt_app.page.url
+          if url.instance_variable_get('@params')
+            url.instance_variable_set('@params', nil)
+          end
+        end
 
         if RUBY_PLATFORM != 'opal'
           after do |example|

data/lib/volt/tasks/dispatcher.rb

@@ -2,6 +2,7 @@
 require 'volt/utils/logging/task_logger'
 require 'drb'
 require 'concurrent'
+require 'timeout'
 
 module Volt
   # The task dispatcher is responsible for taking incoming messages
@@ -95,11 +96,13 @@ module Volt
         # Init and send the method
         promise = promise.then do
           result = nil
-          Concurrent.timeout(klass.__timeout || @worker_timeout) do
+          Timeout.timeout(klass.__timeout || @worker_timeout) do
             Thread.current['meta'] = meta_data
-            result = klass.new(@volt_app, channel, self).send(method_name, *args)
-
-            Thread.current['meta'] = nil
+            begin
+              result = klass.new(@volt_app, channel, self).send(method_name, *args)
+            ensure
+              Thread.current['meta'] = nil
+            end
           end
 
           result
@@ -112,8 +115,9 @@ module Volt
 
       # Called after task runs or fails
       finish = proc do |error|
-        if error.is_a?(Concurrent::TimeoutError)
-          error = Concurrent::TimeoutError.new("Task Timed Out after #{@worker_timeout} seconds: #{message}")
+        if error.is_a?(Timeout::Error)
+          # re-raise with a message
+          error = Timeout::Error.new("Task Timed Out after #{@worker_timeout} seconds: #{message}")
         end
 
         run_time = ((Time.now.to_f - start_time) * 1000).round(3)

data/lib/volt/utils/ejson.rb

@@ -1,11 +1,60 @@
+require 'json'
+
 module Volt
-  class EJson
-    def self.dump_as(obj)
-      obj
+  class EJSON
+    def self.stringify(obj)
+      encode(obj).to_json
+    end
+
+    def self.parse(str)
+      decode(JSON.parse(str))
+    end
+
+    private
+
+    def self.decode(obj)
+      if Array === obj
+        obj.map {|v| decode(v) }
+      elsif Hash === obj
+        if obj.size == 1 && (escape = obj['$escape'])
+          return escape.map do |key, value|
+            [key, decode(value)]
+          end.to_h
+        elsif obj.size == 1 && (time = obj['$date'])
+          if time.is_a?(Fixnum)
+            return Time.at(time / 1000.0)
+          end
+        end
+
+        obj.map do |key, value|
+          [key, decode(value)]
+        end.to_h
+      else
+        obj
+      end
     end
 
-    def self.dump(obj)
-      JSON.dump(dump_as(obj))
+    def self.encode(obj)
+      if Array === obj
+        obj.map {|v| encode(v) }
+      elsif Hash === obj
+        obj.map do |key, value|
+          if key == '$date'
+            key = '$escape'
+            value = {'$date' => encode(value)}
+          else
+            value = encode(value)
+          end
+
+          [key, value]
+        end.to_h
+      else
+        if obj.is_a?(Time)
+          {'$date' => obj.to_i * 1_000}
+        else
+          obj
+        end
+      end
     end
   end
-end
+end

data/lib/volt/utils/promise_extensions.rb

@@ -4,16 +4,25 @@ require 'volt/utils/promise'
 # A temp patch for promises until https://github.com/opal/opal/pull/725 is released.
 class Promise
 
-  def method_missing(method_name, *args, &block)
-    promise = self.then do |value|
-      value.send(method_name, *args, &block)
-    end
-
-    promise
+  # We made a choice not to support comparitors and << and >> on method_missing
+  # on Promises.  This makes it easier to understand what promise proxying does
+  # and how it works.  It also prevents confusing situations where you try to
+  # == compare two Promises for example.  The cost though is more code to do
+  # comparisons, but we feel it is worth it.
+  def respond_to_missing?(method_name, include_private = false)
+    !!(method_name =~ /[a-z_]\w*[?!=]?/)
   end
 
-  def respond_to_missing(method_name, include_private = false)
-    true
+  def method_missing(method_name, *args, &block)
+    if respond_to_missing?(method_name)
+      promise = self.then do |value|
+        value.send(method_name, *args, &block)
+      end
+
+      promise
+    else
+      super
+    end
   end
 
   # Allow .each to be called directly on promises
@@ -56,6 +65,20 @@ class Promise
     @value || @error
   end
 
+  # When testing with rspec, add in a custom exception! method that doesn't
+  # swallow ExpectationNotMetError's.
+  if defined?(RSpec::Expectations::ExpectationNotMetError)
+    def exception!(error)
+      if error.is_a?(RSpec::Expectations::ExpectationNotMetError)
+        raise error
+      end
+      @exception = true
+
+      reject!(error)
+    end
+  end
+
+
 
   # Waits for the promise to resolve (assuming it is blocking on
   # the server) and returns the result.

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.3.pre5'
+    STRING = '0.9.3.pre6'
   end
 end

data/lib/volt/volt/server_setup/app.rb

@@ -48,7 +48,8 @@ module Volt
 
       # This config needs to run earlier than others
       def run_config
-        require("#{Volt.root}/config/app.rb")
+        path = "#{Volt.root}/config/app.rb"
+        require(path) if File.exists?(path)
       end
 
       # Load in all .rb files in the initializers folders and the config/app.rb

data/spec/models/model_spec.rb

@@ -232,18 +232,20 @@ describe Volt::Model do
     expect(count).to eq(1)
   end
 
-  it 'should track changes through an expansion' do
-    a = Volt::Model.new
+  unless RUBY_PLATFORM == 'opal'
+    it 'should track changes through an expansion' do
+      a = Volt::Model.new
 
-    last_count = 0
-    -> { last_count = a._todos.count(&:_checked) }.watch!
+      last_count = 0
+      -> { last_count = a._todos.count(&:_checked).sync }.watch!
 
-    expect(last_count).to eq(0)
+      expect(last_count).to eq(0)
 
-    a._todos! << { checked: true }
-    Volt::Computation.flush!
+      a._todos! << { checked: true }
+      Volt::Computation.flush!
 
-    expect(last_count).to eq(1)
+      expect(last_count).to eq(1)
+    end
   end
 
   it 'should call changed when a the reference to a submodel is assigned to another value' do

data/spec/models/validators/length_validator_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Volt::LengthValidator do
-  subject { Volt::LengthValidator.validate(*params) }
-  let(:params) { [model, field_name, options] }
+  subject { Volt::LengthValidator.validate(*use_params) }
+  let(:use_params) { [model, field_name, options] }
 
   let(:model) { Volt::Model.new name: name }
   let(:field_name) { :name }

data/spec/models/validators/phone_number_validator_spec.rb

@@ -15,8 +15,8 @@ describe Volt::PhoneNumberValidator do
   let(:valid_intl_number) { '+12 123 123 1234' }
   let(:invalid_number) { '1234-123-123456' }
 
-  let(:validate) { described_class.validate(*params) }
-  let(:params) { [model, field_name, options] }
+  let(:validate) { described_class.validate(*use_params) }
+  let(:use_params) { [model, field_name, options] }
   let(:message) { 'must be a phone number with area or country code' }
 
   it_behaves_like 'a format validator'

data/spec/utils/ejson_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+describe Volt::EJSON, '.parse' do
+  subject { Volt::EJSON }
+  let(:epoch) { 135820576553 }
+  let(:ruby_epoch) { epoch / 1000.0 }
+
+  context 'safe escaping' do
+    it 'does not parse date objects with invalid values' do
+      parsed = subject.parse '{"a" : {"$escape" : {"$date" : "something"}}}'
+
+      expect(parsed).to eq('a' => { '$date' => 'something' })
+    end
+
+    it 'only escapes one level down' do
+      parsed = subject.parse %({"$escape": {"$date": {"$date": #{epoch}}}})
+
+      expect(parsed).to eq('$date' => Time.at(ruby_epoch))
+    end
+  end
+
+  context 'parsing EJSON fields' do
+    context 'date' do
+      it 'is not parsed when given a bad value' do
+        expect(subject.parse '{"a": {"$date" : "something"}}').
+          to eq('a' => { '$date' => 'something' })
+      end
+
+      it 'parses proper $date EJSON fields' do
+        parsed = subject.parse '{"a" : {"$date": 135820576553}}'
+
+        expect(parsed['a']).to eq Time.at(ruby_epoch)
+      end
+
+      it 'parses nested EJSON date fields' do
+        parsed = subject.parse '{"a" : {"b" : {"$date": 135820576553}}}'
+
+        expect(parsed['a']['b']).to eq Time.at(ruby_epoch)
+      end
+
+      it 'parses nested $dates within $escapes' do
+        parsed = subject.parse(
+          '{"a" : {"$escape": {"$date" : {"date" : {"$date": 135820576553}}}}}'
+        )
+
+        expect(parsed['a']['$date']['date']).to eq Time.at(ruby_epoch)
+      end
+
+      it 'parses multiple EJSON date fields' do
+        ejson = begin
+          %({"when":{"$date":#{epoch}},"then":{"$date":#{epoch}}})
+        end
+
+        expect(subject.parse ejson).to eq(
+          "when" => Time.at(ruby_epoch),
+          "then" => Time.at(ruby_epoch)
+        )
+      end
+    end
+  end
+end
+
+describe Volt::EJSON, '.stringify' do
+  subject { Volt::EJSON }
+  context 'marshaling dates' do
+    let(:now) { Time.now }
+    let(:now_js_epoch) { now.to_i * 1_000 }
+
+    it 'does nothing with regular hashes' do
+      stringified = subject.stringify plain: 'jane'
+
+      expect(stringified).to eq '{"plain":"jane"}'
+    end
+
+    it 'marshals when given a date' do
+      stringified = subject.stringify when: now
+
+      expect(stringified).to eq %({"when":{"$date":#{now_js_epoch}}})
+    end
+
+    it 'marshals nested dates' do
+      stringified = subject.stringify how: { when: now }
+
+      expect(stringified).to eq %({"how":{"when":{"$date":#{now_js_epoch}}}})
+    end
+
+    it 'marshals multiple dates' do
+      stringified = subject.stringify when: now, then: now
+
+      expect(stringified.gsub(' ', '')).to eq(
+        %({"when":{"$date":#{now_js_epoch}},"then":{"$date":#{now_js_epoch}}})
+      )
+    end
+
+    it 'escapes reserved key when type is incorrect' do
+      stringified = subject.stringify '$date' => 'something'
+
+      expect(stringified).to eq '{"$escape":{"$date":"something"}}'
+    end
+  end
+end

data/spec/utils/promise_extensions_spec.rb

@@ -39,4 +39,20 @@ describe Promise do
 
     expect(count_occurences(b.inspect, 'Promise')).to eq(1)
   end
+
+  it 'should not respond to comparitors' do
+    [:>, :<].each do |comp|
+      a = Promise.new
+      expect do
+        a.send(comp, 5)
+      end.to raise_error(NoMethodError)
+    end
+  end
+
+  it 'should proxy methods on promises' do
+    a = Promise.new
+    expect do
+      a.something
+    end.not_to raise_error
+  end
 end

data/templates/newgem/newgem.gemspec.tt

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "volt", "~> <%= config[:volt_version_base] %>"
+  spec.add_development_dependency 'rspec', '~> 3.2.0'
   spec.add_development_dependency "rake"
 <% if config[:test] -%>
   spec.add_development_dependency "<%=config[:test]%>"

data/templates/newgem/spec/spec_helper.rb.tt

@@ -1,2 +1,14 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require '<%= config[:namespaced_path] %>'
+# Volt sets up rspec and capybara for testing.
+require 'volt/spec/setup'
+Volt.spec_setup
+
+RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

data/templates/project/config/base/index.html

@@ -1,10 +1,9 @@
-<%# IMPORTANT: Please read before changing!                                   %>
-<%# This file is rendered on the server using ERB, so it does NOT use Volt's  %>
-<%# normal template system. You can add to it, but keep in mind the template  %>
-<%# language difference. This file handles auto-loading all JS/Opal and CSS.  %>
-
 <!DOCTYPE html>
 <html>
+  <%# IMPORTANT: Please read before changing!                                   %>
+  <%# This file is rendered on the server using ERB, so it does NOT use Volt's  %>
+  <%# normal template system. You can add to it, but keep in mind the template  %>
+  <%# language difference. This file handles auto-loading all JS/Opal and CSS.  %>
   <head>
     <meta charset="UTF-8" />
     <% javascript_files.each do |javascript_file| %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.3.pre5
+  version: 0.9.3.pre6
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -526,6 +526,7 @@ files:
 - lib/volt/server/component_handler.rb
 - lib/volt/server/component_templates.rb
 - lib/volt/server/forking_server.rb
+- lib/volt/server/forking_server/boot_error.html.erb
 - lib/volt/server/html_parser/attribute_scope.rb
 - lib/volt/server/html_parser/component_view_scope.rb
 - lib/volt/server/html_parser/each_scope.rb
@@ -720,6 +721,7 @@ files:
 - spec/tasks/query_tracker_spec.rb
 - spec/tasks/user_tasks_spec.rb
 - spec/templates/targets/binding_document/component_node_spec.rb
+- spec/utils/ejson_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb
 - spec/utils/parsing_spec.rb
@@ -964,6 +966,7 @@ test_files:
 - spec/tasks/query_tracker_spec.rb
 - spec/tasks/user_tasks_spec.rb
 - spec/templates/targets/binding_document/component_node_spec.rb
+- spec/utils/ejson_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb
 - spec/utils/parsing_spec.rb