volt 0.9.3.pre3 → 0.9.3.pre4

data/lib/volt/server/socket_connection_handler.rb

@@ -38,7 +38,16 @@ module Volt
       # Messages are json and wrapped in an array
       message = JSON.parse(message).first
 
-      @@dispatcher.dispatch(self, message)
+      begin
+        @@dispatcher.dispatch(self, message)
+      rescue => e
+        if defined?(DRb::DRbConnError) && e.is_a?(DRb::DRbConnError)
+          # The child process was restarting, so drb failed to send
+        else
+          # re-raise the issue
+          raise
+        end
+      end
     end
 
     def send_message(*args)

data/lib/volt/server.rb

@@ -7,43 +7,17 @@ require 'sass'
 require 'volt/utils/tilt_patch'
 require 'sprockets-sass'
 
-
 require 'volt'
 require 'volt/tasks/dispatcher'
 require 'volt/tasks/task'
 require 'volt/server/component_handler'
 require 'volt/server/rack/component_paths'
-require 'volt/server/rack/index_files'
-require 'volt/server/rack/http_resource'
-require 'volt/server/rack/opal_files'
-require 'volt/server/rack/quiet_common_logger'
 require 'volt/page/page'
 
-require 'volt/volt/core'
 require 'volt/server/websocket/websocket_handler'
 require 'volt/utils/read_write_lock'
 require 'volt/server/forking_server'
 
-module Rack
-  # TODO: For some reason in Rack (or maybe thin), 304 headers close
-  # the http connection.  We might need to make this check if keep
-  # alive was in the request.
-  class KeepAlive
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      status, headers, body = @app.call(env)
-
-      if status == 304 && env['HTTP_CONNECTION'] && env['HTTP_CONNECTION'].downcase == 'keep-alive'
-        headers['Connection'] = 'keep-alive'
-      end
-
-      [status, headers, body]
-    end
-  end
-end
 
 module Volt
   class Server
@@ -54,7 +28,7 @@ module Volt
       @root_path = root_path || Dir.pwd
       @volt_app = app
 
-      @app_path        = File.expand_path(File.join(@root_path, 'app'))
+      @app_path = File.expand_path(File.join(@root_path, 'app'))
 
       display_welcome
     end
@@ -70,7 +44,10 @@ module Volt
       @volt_app ||= Volt.boot(@root_path)
     end
 
-    # App returns the main rack app.  In development it will fork a
+    # App returns the main rack app.  In development it will use ForkingServer,
+    # which forks the app and processes responses in a child process, that is
+    # killed when code changes and reforked.  (This provides simple fast code
+    # reloading)
     def app
       app = Rack::Builder.new
 
@@ -94,7 +71,7 @@ module Volt
 
         # Setup the dispatcher (it stays this class during its run)
         SocketConnectionHandler.dispatcher = Dispatcher.new(@volt_app)
-        app.run(new_server)
+        app.run(@volt_app.middleware)
       else
         # In developer
         app.run ForkingServer.new(self)
@@ -102,52 +79,5 @@ module Volt
 
       app
     end
-
-    # new_server returns the core of the Rack app.
-    # Volt.boot should be called before generating the new server
-    def new_server
-      @rack_app = Rack::Builder.new
-
-      # Should only be used in production
-      if Volt.config.deflate
-        @rack_app.use Rack::Deflater
-        @rack_app.use Rack::Chunked
-      end
-
-      @rack_app.use Rack::ContentLength
-
-      @rack_app.use Rack::KeepAlive
-      @rack_app.use Rack::ConditionalGet
-      @rack_app.use Rack::ETag
-
-      @rack_app.use QuietCommonLogger
-      @rack_app.use Rack::ShowExceptions
-
-      component_paths = @volt_app.component_paths
-      @rack_app.map '/components' do
-        run ComponentHandler.new(component_paths)
-      end
-
-      # Serve the opal files
-      opal_files = OpalFiles.new(@rack_app, @app_path, @volt_app.component_paths)
-
-      # Serve the main html files from public, also figure out
-      # which JS/CSS files to serve.
-      @rack_app.use IndexFiles, @volt_app, @volt_app.component_paths, opal_files
-
-      @rack_app.use HttpResource, @volt_app, @volt_app.router
-
-      @rack_app.use Rack::Static,
-                    urls: ['/'],
-                    root: 'config/base',
-                    index: '',
-                    header_rules: [
-                      [:all, { 'Cache-Control' => 'public, max-age=86400' }]
-                    ]
-
-      @rack_app.run lambda { |env| [404, { 'Content-Type' => 'text/html; charset=utf-8' }, ['404 - page not found']] }
-
-      @rack_app
-    end
   end
 end

data/lib/volt/utils/promise_extensions.rb

@@ -12,6 +12,10 @@ class Promise
     promise
   end
 
+  def respond_to_missing(method_name, include_private = false)
+    true
+  end
+
   # Allow .each to be called directly on promises
   def each(&block)
     raise ArgumentError, 'no block given' unless block
@@ -69,7 +73,7 @@ class Promise
 
     if error
       err_str = "Exception in Promise at .sync: #{error.inspect}"
-      err_str += error.backtrace.join("\n")
+      err_str += error.backtrace.join("\n") if error.respond_to?(:backtrace)
       Volt.logger.error(err_str)
       fail error
     else

data/lib/volt/utils/set_patch.rb

@@ -0,0 +1,25 @@
+# Temp until https://github.com/opal/opal/pull/596
+require 'set'
+
+class Set
+  def delete(o)
+    if include?(o)
+      @hash.delete(o)
+      true
+    else
+      nil
+    end
+  end
+
+  def delete_if
+    block_given? or return enum_for(__method__)
+    # @hash.delete_if should be faster, but using it breaks the order
+    # of enumeration in subclasses.
+    select { |o| yield o }.each { |o| @hash.delete(o) }
+    self
+  end
+
+  def to_a
+    @hash.keys
+  end
+end

data/lib/volt/utils/timers.rb

@@ -14,6 +14,18 @@ module Volt
       end
     end
 
+    # yields the passed in block after interval ms, or immediately if on the
+    # server.
+    def self.client_set_timeout(interval)
+      if Volt.in_browser?
+        `setTimeout(function() {`
+          yield
+        `}, interval)`
+      else
+        yield
+      end
+    end
+
     # On the server, we need to manually flush next tick timers.
     # This is done automatically in the console after each enter.
     def self.flush_next_tick_timers!

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.3.pre3'
+    STRING = '0.9.3.pre4'
   end
 end

data/lib/volt/volt/app.rb

@@ -37,7 +37,8 @@ module Volt
     end
 
     attr_reader :component_paths, :router, :page, :live_query_pool,
-                :channel_live_queries, :app_path, :database, :message_bus
+                :channel_live_queries, :app_path, :database, :message_bus,
+                :middleware
 
     def initialize(app_path=nil)
       if Volt.server? && !app_path
@@ -53,6 +54,14 @@ module Volt
       setup_page
 
       if RUBY_PLATFORM != 'opal'
+        # We need to run the root config first so we can setup the Rack::Session
+        # middleware.
+        run_config
+
+        # Setup all of the middleware we can before we load the users components
+        # since the users components might want to add middleware during boot.
+        setup_preboot_middleware
+
         # Setup all app paths
         setup_paths
 
@@ -69,6 +78,9 @@ module Volt
 
         reset_query_pool!
 
+        # Setup the middleware that we can only setup after all components boot.
+        setup_postboot_middleware
+
         start_message_bus
       end
     end

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

@@ -1,6 +1,10 @@
 # The following setup handles setting up the app on the server.
 unless RUBY_PLATFORM == 'opal'
   require 'volt/server/message_bus/peer_to_peer'
+  require 'volt/server/middleware/middleware_stack'
+  require 'volt/server/middleware/default_middleware_stack'
+  require 'volt/volt/core'
+
 end
 
 module Volt
@@ -21,6 +25,16 @@ module Volt
         @router = Routes.new
       end
 
+
+      def setup_preboot_middleware
+        @middleware = MiddlewareStack.new
+        DefaultMiddlewareStack.preboot_setup(self, @middleware)
+      end
+
+      def setup_postboot_middleware
+        DefaultMiddlewareStack.postboot_setup(self, @middleware)
+      end
+
       def require_http_controllers
         @component_paths.app_folders do |app_folder|
           # Sort so we get consistent load order across platforms
@@ -32,11 +46,15 @@ module Volt
         end
       end
 
+      # This config needs to run earlier than others
+      def run_config
+        require("#{Volt.root}/config/app.rb")
+      end
 
       # Load in all .rb files in the initializers folders and the config/app.rb
       # file.
       def run_app_and_initializers
-        files = ["#{Volt.root}/config/app.rb"]
+        files = []
 
         # Include the root initializers
         files += Dir[Volt.root + '/config/initializers/*.rb']

data/lib/volt/volt/users.rb

@@ -53,13 +53,19 @@ module Volt
 
     # True if the user is logged in and the user is loaded
     def current_user?
-      !!current_user
+      current_user.then do |user|
+        !!user
+      end
     end
 
     # Return the current user.
     def current_user
-      # Run first on the query, or return nil
-      user_query.try(:first)
+      user_id = current_user_id
+      if user_id
+        $page.store._users.where(id: user_id).first
+      else
+        Promise.new.resolve(nil)
+      end
     end
 
     # Put in a deprecation placeholder
@@ -69,13 +75,8 @@ module Volt
     end
 
     def fetch_current_user
-      u_query = user_query
-      if u_query
-        u_query.fetch_first
-      else
-        # No user, resolve nil
-        Promise.new.resolve(nil)
-      end
+      Volt.logger.warn("Deprication Warning: fetch current user have been depricated, Volt.current_user returns a promise now.")
+      current_user
     end
 
     # Login the user, return a promise for success
@@ -110,17 +111,5 @@ module Volt
 
       user_id_signature
     end
-
-    private
-
-    # Returns a query for the current user_id or nil if there is no user_id
-    def user_query
-      user_id = current_user_id
-      if user_id
-        $page.store._users.where(_id: user_id)
-      else
-        nil
-      end
-    end
   end
 end

data/lib/volt.rb

@@ -5,6 +5,7 @@ require 'volt/reactive/dependency'
 require 'volt/utils/modes'
 require 'volt/utils/volt_user_error'
 require 'volt/utils/boolean_patch'
+require 'volt/utils/set_patch'
 
 require 'volt/config'
 require 'volt/data_stores/data_store' unless RUBY_PLATFORM == 'opal'

data/spec/apps/kitchen_sink/Gemfile

@@ -14,7 +14,7 @@ gem 'volt-fields'
 gem 'volt-user_templates'
 
 # use mongo for data store while testing
-gem 'volt-mongo', path: '/Users/ryanstout/Sites/volt/apps/volt-mongo'
+gem 'volt-mongo'
 
 gem 'opal'
 

data/spec/apps/kitchen_sink/app/main/config/routes.rb

@@ -3,7 +3,7 @@
 client '/bindings/{{ route_test }}', action: 'bindings'
 client '/bindings', action: 'bindings'
 client '/form', action: 'form'
-client '/store', action: 'store'
+client '/store', action: 'store_demo'
 client '/cookie_test', action: 'cookie_test'
 client '/flash', action: 'flash'
 client '/yield', action: 'yield'

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

@@ -10,6 +10,10 @@ module Main
       a[{}] = 5
     end
 
+    def store_demo
+      puts "STORE DEMO"
+    end
+
     def form_ready
       `$('#title').html('form_ready')`
       `$('select#location').val('AL').change()` # have to trigger manually as this is not user initiaized action
@@ -54,6 +58,24 @@ module Main
       page._show = value
     end
 
+    def show_with_delay
+      changes = Promise.new
+      page._items = changes
+      `
+      setTimeout(function () {
+        #{changes.resolve(0.upto(100).to_a)}
+      }, 50);
+      `
+      page._items = 901.upto(1000).to_a
+    end
+
+    def show_without_delay
+      changes = Promise.new
+      changes.resolve(1.upto(200).to_a)
+      page._items = 901.upto(1000).to_a
+      page._items = changes
+    end
+
     private
 
     # the main template contains a #template binding that shows another

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

@@ -134,6 +134,16 @@
   <a id='showtrue' e-click='set_show(true)'>set _show true</a>
   <a id='showfalse' e-click='set_show(false)'>set _show false</a>
 
+  <h2>Each Bindings</h2>
+  <ul id='eachbinding'>
+    {{ _items.each do |item| }}
+    <li>{{ item }}</li>
+    {{ end }}
+  </ul>
+
+  <a id='each-show-with-delay' e-click='show_with_delay'>Show with Delay</a>
+  <a id='each-show-without-delay' e-click='show_without_delay'>Show without Delay</a>
+
   <h2>Content</h2>
 
   <p id="escapeContent">{{{this is {{escaped}}}}}</p>

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

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

data/spec/controllers/http_controller_spec.rb

@@ -7,7 +7,12 @@ if RUBY_PLATFORM != 'opal'
 
   describe Volt::HttpController do
     class TestHttpController < Volt::HttpController
+      attr_reader :ran_action1
       attr_reader :action_called
+      attr_reader :stoped_action_called
+
+      before_action :run_action1
+      before_action :run_action2, only: [:stoped_action]
 
       def just_call_an_action
         @action_called = true
@@ -45,6 +50,18 @@ if RUBY_PLATFORM != 'opal'
       def access_body
         render json: JSON.parse(request.body.read)
       end
+
+      def stoped_action
+        @stoped_action_called = true
+      end
+
+      def run_action1
+        @ran_action1 = true
+      end
+
+      def run_action2
+        stop_chain
+      end
     end
 
     let(:app) { ->(env) { [404, env, 'app'] } }
@@ -128,5 +145,15 @@ if RUBY_PLATFORM != 'opal'
         { test: 'params' }.to_json)
       expect(response.body).to eq({ test: 'params' }.to_json)
     end
+
+    it 'should run the before action' do
+      controller.perform(:render_plain_text)
+      expect(controller.ran_action1).to be(true)
+    end
+
+    it 'should not call the stoped_action' do
+      controller.perform(:stoped_action)
+      expect(controller.stoped_action_called).to be_nil
+    end
   end
 end

data/spec/integration/bindings_spec.rb

@@ -186,6 +186,35 @@ describe 'bindings test', type: :feature, sauce: true do
     end
   end
 
+  describe 'each binding' do
+    it 'should display the last assignment even if the previous assignment resolved afterwards' do
+      visit '/'
+
+      click_link 'Bindings'
+
+      click_link 'Show with Delay'
+
+      sleep 0.2
+
+      expect(find('#eachbinding li:first-child')).to have_content('901')
+      expect(page).to have_selector('#eachbinding li', count: 100)
+    end
+
+    it 'should display the last assignment regardless whether the previous promise has already been resolved' do
+      visit '/'
+
+      click_link 'Bindings'
+
+      click_link 'Show without Delay'
+
+      sleep 0.2
+
+      expect(find('#eachbinding li:first-child')).to have_content('1')
+      expect(page).to have_selector('#eachbinding li', count: 200)
+    end
+  end
+
+
   describe 'if/unless binding' do
     it 'should show corret text' do
       visit '/'

data/spec/integration/store_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe 'store', type: :feature, sauce: true do
-  it 'should sync between nested root properties on store' do
-    visit '/store'
+# describe 'store', type: :feature, sauce: true do
+#   it 'should sync between nested root properties on store' do
+#     visit '/store'
 
-    fill_in('field1', with: 'should sync')
-    expect(find('#field2').value).to eq('should sync')
-  end
-end
+#     fill_in('field1', with: 'should sync')
+#     expect(find('#field2').value).to eq('should sync')
+#   end
+# end

data/spec/models/associations_spec.rb

@@ -24,7 +24,7 @@ describe Volt::Associations do
       end
 
       it 'should associate via belongs_to' do
-        address = store._addresses!.fetch_first.sync
+        address = store._addresses!.first.sync
 
         expect(address.person.sync.id).to eq(@person.id)
       end

data/spec/models/model_spec.rb

@@ -591,4 +591,14 @@ describe Volt::Model do
         'Model does not have a parent and cannot be deleted.')
     end
   end
+
+  describe 'serialization' do
+    it 'supports JSON via to_json' do
+      model = Volt::Model.new({})
+      expect(model.to_json).to eq(model.to_h.to_json)
+      expect(model.to_json).to eq(model.to_h.to_json)
+      array_model = Volt::ArrayModel.new([model])
+      expect(array_model.to_json).to eq(array_model.to_a.to_json)
+    end
+  end
 end

data/spec/models/permissions_spec.rb

@@ -92,7 +92,7 @@ describe 'model permissions' do
         # Clear the identity map, so we can load up a fresh copy
         model.save_to.persistor.clear_identity_map
 
-        reloaded = store._test_deny_read_names.fetch_first.sync
+        reloaded = store._test_deny_read_names.first.sync
 
         expect(reloaded._name).to eq(nil)
         expect(reloaded._other).to eq('should be visible')
@@ -106,13 +106,16 @@ describe 'model permissions' do
         # Saved
         count = 0
 
-        store._test_deny_deletes.delete(model).then do
+        store._test_deny_deletes.delete(model).fail do |err|
           # deleted
           count += 1
-        end
+
+          match = !!(err =~ /permissions did not allow delete for /)
+          expect(match).to eq(true)
+        end.sync
 
         expect(count).to eq(1)
-      end
+      end.sync
     end
 
     it 'should not check the read permissions when updating (so that all fields are present for the permissions check)' do