volt 0.9.3.pre3 → 0.9.3.pre4

data/spec/reactive/computation_spec.rb

@@ -117,11 +117,17 @@ describe Volt::Computation do
       promise = Promise.new
       count = 0
 
-      -> { promise }.watch_and_resolve! do |result|
+      success = lambda do |result|
         expect(result).to eq('resolved')
         count += 1
       end
 
+      failure = lambda do |error|
+
+      end
+
+      -> { promise }.watch_and_resolve!(success, failure)
+
       expect(count).to eq(0)
 
       promise.resolve('resolved')
@@ -137,9 +143,10 @@ describe Volt::Computation do
       cur_val = promise
 
       results = []
-      -> { dep.depend ; cur_val }.watch_and_resolve! do |val|
+      success = lambda do |val|
         results << val
       end
+      -> { dep.depend ; cur_val }.watch_and_resolve!(success)
 
       expect(results).to eq([])
 
@@ -153,16 +160,18 @@ describe Volt::Computation do
       expect(results).to eq([5])
     end
 
-    it 'should yield nil for an unresolved promise when asked' do
+    it 'should call success with nil for an unresolved promise when asked' do
       dep = Volt::Dependency.new
 
       cur_val = Promise.new
 
       results = []
-      -> { dep.depend ; cur_val }.watch_and_resolve!(true) do |val|
+      success = lambda do |val|
         results << val
       end
 
+      -> { dep.depend ; cur_val }.watch_and_resolve!(success, nil, true)
+
       expect(results).to eq([nil])
 
       cur_val.resolve(5)
@@ -176,10 +185,12 @@ describe Volt::Computation do
       cur_val = Promise.new
 
       results = []
-      computation = -> { dep.depend ; cur_val }.watch_and_resolve! do |val|
+      success = lambda  do |val|
         results << val
       end
 
+      computation = -> { dep.depend ; cur_val }.watch_and_resolve!(success)
+
       expect(results).to eq([])
 
       computation.stop
@@ -188,6 +199,23 @@ describe Volt::Computation do
 
       expect(results).to eq([])
     end
+
+    it 'should call the fail on a failure' do
+      cur_val = Promise.new
+
+      results = []
+      success = lambda {}
+      failure = lambda do |error|
+        results << error
+      end
+
+      computation = -> { cur_val }.watch_and_resolve!(success, failure)
+
+      cur_val.reject('broken')
+      computation.stop
+
+      expect(results).to eq(['broken'])
+    end
   end
 
   # Currently Class#class_variable_set/get isn't in opal

data/spec/router/routes_spec.rb

@@ -246,4 +246,73 @@ describe Volt::Routes do
 
     params = @routes.url_to_params('/blog/20')
   end
+
+  it 'should setup RESTful routes' do
+    routes do
+      rest '/api/v1/articles', controller: 'articles'
+    end
+
+    params = @routes.url_to_params(:get, '/api/v1/articles')
+    expect(params).to eq(controller: 'articles', action: 'index')
+
+    params = @routes.url_to_params(:get, '/api/v1/articles/1')
+    expect(params).to eq(controller: 'articles', action: 'show', id: '1')
+
+    params = @routes.url_to_params(:post, '/api/v1/articles')
+    expect(params).to eq(controller: 'articles', action: 'create')
+
+    params = @routes.url_to_params(:put, '/api/v1/articles/1')
+    expect(params).to eq(controller: 'articles', action: 'update', id: '1')
+
+    params = @routes.url_to_params(:delete, '/api/v1/articles/1')
+    expect(params).to eq(controller: 'articles', action: 'destroy', id: '1')
+  end
+
+  it 'should only setup desired RESTful routes' do
+    routes do
+      rest '/api/v1/articles', controller: 'articles', only: [:index, :show]
+    end
+
+    params = @routes.url_to_params(:get, '/api/v1/articles')
+    expect(params).to eq(controller: 'articles', action: 'index')
+
+    params = @routes.url_to_params(:get, '/api/v1/articles/1')
+    expect(params).to eq(controller: 'articles', action: 'show', id: '1')
+
+    expect(@routes.url_to_params(:post, '/api/v1/articles')).to be_nil
+    expect(@routes.url_to_params(:put, '/api/v1/articles/1')).to be_nil
+    expect(@routes.url_to_params(:delete, '/api/v1/articles/1')).to be_nil
+
+    routes do
+      rest '/api/v1/articles', controller: 'articles', only: [:update, :destroy, :create]
+    end
+
+    expect(@routes.url_to_params(:get, '/api/v1/articles')).to be_nil
+    expect(@routes.url_to_params(:get, '/api/v1/articles/1')).to be_nil
+
+    params = @routes.url_to_params(:post, '/api/v1/articles')
+    expect(params).to eq(controller: 'articles', action: 'create')
+
+    params = @routes.url_to_params(:put, '/api/v1/articles/1')
+    expect(params).to eq(controller: 'articles', action: 'update', id: '1')
+
+    params = @routes.url_to_params(:delete, '/api/v1/articles/1')
+    expect(params).to eq(controller: 'articles', action: 'destroy', id: '1')
+  end
+
+  it 'should exclude undesired RESTful routes' do
+    routes do
+      rest '/api/v1/articles', controller: 'articles', except: [:update, :destroy, :create]
+    end
+
+    params = @routes.url_to_params(:get, '/api/v1/articles')
+    expect(params).to eq(controller: 'articles', action: 'index')
+
+    params = @routes.url_to_params(:get, '/api/v1/articles/1')
+    expect(params).to eq(controller: 'articles', action: 'show', id: '1')
+
+    expect(@routes.url_to_params(:post, '/api/v1/articles')).to be_nil
+    expect(@routes.url_to_params(:put, '/api/v1/articles/1')).to be_nil
+    expect(@routes.url_to_params(:delete, '/api/v1/articles/1')).to be_nil
+  end
 end

data/spec/server/middleware/middleware_handler.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+unless RUBY_PLATFORM == 'opal'
+  describe Volt::MiddlewareStack do
+    before do
+      @stack = Volt::MiddlewareStack.new
+    end
+
+    it 'should set_app' do
+      app = double('rack app')
+      @stack.set_app(app)
+      expect(@stack.instance_variable_get('@app')).to eq(app)
+    end
+
+    it 'should insert a middleware at the end of the stack when calling use' do
+      middleware1 = double('middleware1')
+      @stack.use(middleware1, 'arg1')
+
+      expect(@stack.middlewares).to eq([
+        [[middleware1, 'arg1'], nil]
+      ])
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -47,7 +47,7 @@ unless RUBY_PLATFORM == 'opal'
     # the seed, which is printed after each run.
     #     --seed 1234
     config.order = 'random'
-    # config.seed = '61236'
+    config.seed = '10780'
   end
 
 end

data/spec/tasks/user_tasks_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 if RUBY_PLATFORM != 'opal'
   describe UserTasks do
-    let(:fake_response) { double('FakeResponse', fetch_first: true) }
+    let(:user_promise) { double('UserPromise', then: true) }
+    let(:fake_response) { double('FakeResponse', first: user_promise) }
 
     let(:fake_users_collection) do
       double('FakeUsersCollection', where: fake_response)
@@ -15,7 +16,7 @@ if RUBY_PLATFORM != 'opal'
     before do
       allow($page).to receive(:store).and_return fake_store
       allow(User).to receive(:login_field).and_return 'user'
-      allow(fake_response).to receive(:fetch_first).and_yield(user)
+      allow(user_promise).to receive(:then).and_yield(user)
     end
 
     subject { UserTasks.new(Volt.current_app) }

data/templates/project/Gemfile.tt

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'volt', '<%= config[:version] %>'
 
 # volt uses mongo as the default data store.
-gem 'volt-mongo', '~> 0.0.2'
+gem 'volt-mongo', '~> 0.1.0'
 
 # The following gem's are optional for themeing
 # Twitter bootstrap
@@ -13,7 +13,7 @@ gem 'volt-bootstrap', '~> 0.0.10'
 gem 'volt-bootstrap_jumbotron_theme', '~> 0.1.0'
 
 # User templates for login, signup, and logout menu.
-gem 'volt-user_templates', '~> 0.3.0'
+gem 'volt-user_templates', '~> 0.4.0'
 
 # Add ability to send e-mail from apps.
 gem 'volt-mailer', '~> 0.1.0'

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

@@ -1,8 +1,12 @@
+<%# 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>
   <head>
     <meta charset="UTF-8" />
-    <%# This file is rendered on the server and does not uses erb instead of Volt's normal template system.  You can add to it, but keep in mind the template language difference. It handles auto-loading all JS/Opal and Css %>
     <% javascript_files.each do |javascript_file| %>
       <script src="<%= javascript_file %>"></script>
     <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.3.pre3
+  version: 0.9.3.pre4
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -543,6 +543,8 @@ files:
 - lib/volt/server/message_bus/peer_to_peer/server_tracker.rb
 - lib/volt/server/message_bus/peer_to_peer/socket_with_timeout.rb
 - lib/volt/server/message_bus/redis.rb
+- lib/volt/server/middleware/default_middleware_stack.rb
+- lib/volt/server/middleware/middleware_stack.rb
 - lib/volt/server/rack/asset_files.rb
 - lib/volt/server/rack/component_code.rb
 - lib/volt/server/rack/component_paths.rb
@@ -551,6 +553,7 @@ files:
 - lib/volt/server/rack/http_response_header.rb
 - lib/volt/server/rack/http_response_renderer.rb
 - lib/volt/server/rack/index_files.rb
+- lib/volt/server/rack/keep_alive.rb
 - lib/volt/server/rack/opal_files.rb
 - lib/volt/server/rack/quiet_common_logger.rb
 - lib/volt/server/rack/source_map_server.rb
@@ -579,6 +582,7 @@ files:
 - lib/volt/utils/promise.rb
 - lib/volt/utils/promise_extensions.rb
 - lib/volt/utils/read_write_lock.rb
+- lib/volt/utils/set_patch.rb
 - lib/volt/utils/tilt_patch.rb
 - lib/volt/utils/timers.rb
 - lib/volt/utils/volt_user_error.rb
@@ -617,7 +621,7 @@ files:
 - spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/app/main/views/main/missing.html
 - spec/apps/kitchen_sink/app/main/views/main/require_test.html
-- spec/apps/kitchen_sink/app/main/views/main/store.html
+- spec/apps/kitchen_sink/app/main/views/main/store_demo.html
 - spec/apps/kitchen_sink/app/main/views/main/yield.html
 - spec/apps/kitchen_sink/app/main/views/todos/index.html
 - spec/apps/kitchen_sink/app/main/views/upload/index.html
@@ -699,6 +703,7 @@ files:
 - spec/server/message_bus/peer_to_peer/peer_server_spec.rb
 - spec/server/message_bus/peer_to_peer/socket_with_timeout_spec.rb
 - spec/server/message_bus/peer_to_peer_spec.rb
+- spec/server/middleware/middleware_handler.rb
 - spec/server/rack/asset_files_spec.rb
 - spec/server/rack/component_paths_spec.rb
 - spec/server/rack/http_request_spec.rb
@@ -785,7 +790,6 @@ files:
 - templates/project/app/main/config/routes.rb
 - templates/project/app/main/controllers/main_controller.rb
 - templates/project/app/main/lib/.empty_directory
-- templates/project/app/main/models/.empty_directory
 - templates/project/app/main/models/user.rb
 - templates/project/app/main/tasks/.empty_directory
 - templates/project/app/main/views/main/about.html
@@ -860,7 +864,7 @@ test_files:
 - spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/app/main/views/main/missing.html
 - spec/apps/kitchen_sink/app/main/views/main/require_test.html
-- spec/apps/kitchen_sink/app/main/views/main/store.html
+- spec/apps/kitchen_sink/app/main/views/main/store_demo.html
 - spec/apps/kitchen_sink/app/main/views/main/yield.html
 - spec/apps/kitchen_sink/app/main/views/todos/index.html
 - spec/apps/kitchen_sink/app/main/views/upload/index.html
@@ -942,6 +946,7 @@ test_files:
 - spec/server/message_bus/peer_to_peer/peer_server_spec.rb
 - spec/server/message_bus/peer_to_peer/socket_with_timeout_spec.rb
 - spec/server/message_bus/peer_to_peer_spec.rb
+- spec/server/middleware/middleware_handler.rb
 - spec/server/rack/asset_files_spec.rb
 - spec/server/rack/component_paths_spec.rb
 - spec/server/rack/http_request_spec.rb

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

@@ -1,9 +0,0 @@
-<:Title>
-  Store
-
-<:Body>
-  <h1>Store</h1>
-
-  <p>Sync between nested root properties.</p>
-  <input id="field1" value="{{ store._root_prop!._name }}" /><br />
-  <input id="field2" value="{{ store._root_prop!._name }}" />