volt 0.9.1.pre1 → 0.9.1.pre2

data/lib/volt/spec/setup.rb

@@ -1,3 +1,7 @@
+if RUBY_PLATFORM != 'opal'
+  require 'volt/volt/core'
+end
+
 module Volt
   class << self
     def spec_setup(app_path = '.')
@@ -9,15 +13,16 @@ module Volt
       require 'volt/boot'
 
       # Require in app
-      Volt.boot(app_path)
+      volt_app = Volt.boot(app_path)
 
       unless RUBY_PLATFORM == 'opal'
         begin
           require 'volt/spec/capybara'
 
-          setup_capybara(app_path)
+          setup_capybara(app_path, volt_app)
         rescue LoadError => e
           Volt.logger.warn("unable to load capybara, if you wish to use it for tests, be sure it is in the app's Gemfile")
+          Volt.logger.error(e)
         end
       end
 

data/lib/volt/tasks/dispatcher.rb

@@ -1,10 +1,14 @@
 # require 'ruby-prof'
 require 'volt/utils/logging/task_logger'
+require 'drb'
 
 module Volt
   # The task dispatcher is responsible for taking incoming messages
   # from the socket channel and dispatching them to the proper handler.
   class Dispatcher
+    # When we pass the dispatcher over DRb, don't send a copy, just proxy.
+    include DRb::DRbUndumped
+
     # Dispatch takes an incoming Task from the client and runs it on the
     # server, returning the result to the client.
     # Tasks returning a promise will wait to return.

data/lib/volt/utils/generic_pool.rb

@@ -9,6 +9,8 @@ module Volt
   # all of the items at a sub-path with #lookup_all
   #
   # TODO: make the lookup/create threadsafe
+  class GenericPoolDeleteException < StandardError ; end
+
   class GenericPool
     attr_reader :pool
 
@@ -93,6 +95,10 @@ module Volt
         stack << section
 
         if args.size - 1 == index
+          unless section
+            raise GenericPoolDeleteException, "An attempt was made to delete at #{arg}, full path: #{args.inspect} in #{inspect}"
+          end
+
           section.delete(arg)
         else
           section = section[arg]

data/lib/volt/utils/read_write_lock.rb

@@ -0,0 +1,173 @@
+# Currently the released gem version of the concurrent-ruby gem does not have the ReadWriteLock
+# relased in it (it is on master).
+
+# Ruby read-write lock implementation
+# Allows any number of concurrent readers, but only one concurrent writer
+# (And if the "write" lock is taken, any readers who come along will have to wait)
+
+# If readers are already active when a writer comes along, the writer will wait for
+#   all the readers to finish before going ahead
+# But any additional readers who come when the writer is already waiting, will also
+#   wait (so writers are not starved)
+
+# Written by Alex Dowad
+# Bug fixes contributed by Alex Kliuchnikau
+# Suggestion on avoiding reader starvation contributed by maniek
+# Thanks to Doug Lea for java.util.concurrent.ReentrantReadWriteLock (used for inspiration)
+
+# Usage:
+# lock = ReadWriteLock.new
+# lock.with_read_lock  { data.retrieve }
+# lock.with_write_lock { data.modify! }
+
+# NOTE: DON'T try to acquire the write lock while already holding a read lock!
+# OR try to acquire the write lock while you already have it
+# It will lead to deadlock
+
+# Implementation notes:
+# A goal is to make the uncontended path for both readers/writers lock-free
+# Only if there is reader-writer or writer-writer contention, should locks be used
+# Internal state is represented by a single integer ("counter"), and updated
+#  using atomic compare-and-swap operations
+# When the counter is 0, the lock is free
+# Each reader increments the counter by 1 when acquiring a read lock
+#   (and decrements by 1 when releasing the read lock)
+# The counter is increased by (1 << 15) for each writer waiting to acquire the
+#   write lock, and by (1 << 30) if the write lock is taken
+
+require 'rubygems' # for compatibility with JRuby, MRI 1.8, etc
+require 'concurrent/atomic'
+require 'thread'
+
+class ReadWriteLock
+  def initialize
+    @counter      = Concurrent::Atomic.new(0)         # single integer which represents lock state
+    @reader_q     = ConditionVariable.new # queue for waiting readers
+    @reader_mutex = Mutex.new             # to protect reader queue
+    @writer_q     = ConditionVariable.new # queue for waiting writers
+    @writer_mutex = Mutex.new             # to protect writer queue
+  end
+
+  WAITING_WRITER  = 1 << 15
+  RUNNING_WRITER  = 1 << 30
+  MAX_READERS     = WAITING_WRITER - 1
+  MAX_WRITERS     = RUNNING_WRITER - MAX_READERS - 1
+
+  def with_read_lock
+    acquire_read_lock
+    result = yield
+    release_read_lock
+    result
+  end
+
+  def with_write_lock
+    acquire_write_lock
+    result = yield
+    release_write_lock
+    result
+  end
+
+  def acquire_read_lock
+    while(true)
+      c = @counter.value
+      raise "Too many reader threads!" if (c & MAX_READERS) == MAX_READERS
+
+      # If a writer is waiting when we first queue up, we need to wait
+      if c >= WAITING_WRITER
+        # But it is possible that the writer could finish and decrement @counter right here...
+        @reader_mutex.synchronize do
+          # So check again inside the synchronized section
+          @reader_q.wait(@reader_mutex) if @counter.value >= WAITING_WRITER
+        end
+
+        # after a reader has waited once, they are allowed to "barge" ahead of waiting writers
+        # but if a writer is *running*, the reader still needs to wait (naturally)
+        while(true)
+          c = @counter.value
+          if c >= RUNNING_WRITER
+            @reader_mutex.synchronize do
+              @reader_q.wait(@reader_mutex) if @counter.value >= RUNNING_WRITER
+            end
+          else
+            return if @counter.compare_and_swap(c,c+1)
+          end
+        end
+      else
+        break if @counter.compare_and_swap(c,c+1)
+      end
+    end
+  end
+
+  def release_read_lock
+    while(true)
+      c = @counter.value
+      if @counter.compare_and_swap(c,c-1)
+        # If one or more writers were waiting, and we were the last reader, wake a writer up
+        if c >= WAITING_WRITER && (c & MAX_READERS) == 1
+          @writer_mutex.synchronize { @writer_q.signal }
+        end
+        break
+      end
+    end
+  end
+
+  def acquire_write_lock
+    while(true)
+      c = @counter.value
+      raise "Too many writers!" if (c & MAX_WRITERS) == MAX_WRITERS
+
+      if c == 0 # no readers OR writers running
+        # if we successfully swap the RUNNING_WRITER bit on, then we can go ahead
+        break if @counter.compare_and_swap(0,RUNNING_WRITER)
+      elsif @counter.compare_and_swap(c,c+WAITING_WRITER)
+        while(true)
+          # Now we have successfully incremented, so no more readers will be able to increment
+          #   (they will wait instead)
+          # However, readers OR writers could decrement right here, OR another writer could increment
+          @writer_mutex.synchronize do
+            # So we have to do another check inside the synchronized section
+            # If a writer OR reader is running, then go to sleep
+            c = @counter.value
+            @writer_q.wait(@writer_mutex) if (c >= RUNNING_WRITER) || ((c & MAX_READERS) > 0)
+          end
+
+          # We just came out of a wait
+          # If we successfully turn the RUNNING_WRITER bit on with an atomic swap,
+          # Then we are OK to stop waiting and go ahead
+          # Otherwise go back and wait again
+          c = @counter.value
+          break if (c < RUNNING_WRITER) &&
+                   ((c & MAX_READERS) == 0) &&
+                   @counter.compare_and_swap(c,c+RUNNING_WRITER-WAITING_WRITER)
+        end
+        break
+      end
+    end
+  end
+
+  def release_write_lock
+    while(true)
+      c = @counter.value
+      if @counter.compare_and_swap(c,c-RUNNING_WRITER)
+        @reader_mutex.synchronize { @reader_q.broadcast }
+        if (c & MAX_WRITERS) > 0 # if any writers are waiting...
+          @writer_mutex.synchronize { @writer_q.signal }
+        end
+        break
+      end
+    end
+  end
+
+  def to_s
+    c = @counter.value
+    s = if c >= RUNNING_WRITER
+      "1 writer running, "
+    elsif (c & MAX_READERS) > 0
+      "#{c & MAX_READERS} readers running, "
+    else
+      ""
+    end
+
+    "#<ReadWriteLock:#{object_id.to_s(16)} #{s}#{(c & MAX_WRITERS) / WAITING_WRITER} writers waiting>"
+  end
+end

data/lib/volt/volt/app.rb

@@ -0,0 +1,46 @@
+module Volt
+  class App
+    attr_reader :component_paths, :router
+
+    def initialize(app_path)
+      # Setup root path
+      Volt.root = app_path
+
+      # Require in config files
+      unless RUBY_PLATFORM == 'opal'
+        Volt.run_files_in_config_folder
+      end
+
+      # Load component paths
+      @component_paths = ComponentPaths.new(app_path)
+      @component_paths.require_in_components
+
+      unless RUBY_PLATFORM == 'opal'
+        setup_router
+        require_http_controllers
+      end
+    end
+
+    unless RUBY_PLATFORM == 'opal'
+      def setup_router
+        # Find the route file
+        home_path  = @component_paths.component_paths('main').first
+        routes = File.read("#{home_path}/config/routes.rb")
+        @router = Routes.new.define do
+          eval(routes)
+        end
+      end
+
+      def require_http_controllers
+        @component_paths.app_folders do |app_folder|
+          # Sort so we get consistent load order across platforms
+          Dir["#{app_folder}/*/controllers/server/*.rb"].each do |ruby_file|
+            #path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]
+            #require(path)
+            load ruby_file
+          end
+        end
+      end
+    end
+  end
+end

data/lib/volt/volt/core.rb

@@ -0,0 +1,3 @@
+# Require in the core volt classes that get used on the server
+require 'volt/controllers/http_controller'
+require 'volt/server/rack/http_request'

data/spec/apps/kitchen_sink/Gemfile

@@ -25,7 +25,3 @@ end
 platform :jruby do
   gem 'jubilee'
 end
-
-#---------------------
-# Needed at the moment
-gem 'volt-sockjs', require: false, platforms: :mri

data/spec/integration/flash_spec.rb

@@ -10,6 +10,7 @@ if ENV['BROWSER'] && ENV['BROWSER'] != 'sauce'
 
       click_link 'Flash Notice'
       expect(page).to have_content('A notice message')
+      # sleep 40
       find('.alert').click
       expect(page).to_not have_content('A notice message')
 

data/spec/integration/user_spec.rb

@@ -14,8 +14,6 @@ describe 'user accounts', type: :feature, sauce: true do
   it 'should create an account' do
     visit '/'
 
-    # sleep 300
-
     click_link 'Login'
 
     click_link 'Signup here'

data/spec/server/html_parser/view_parser_spec.rb

@@ -156,7 +156,7 @@ describe Volt::ViewParser do
                                    'html' => "      <div id=\"id0\">\n      </div>\n",
                                    'bindings' => {
                                      'id0' => [
-                                       "lambda { |__p, __t, __c, __id| Volt::AttributeBinding.new(__p, __t, __c, __id, \"class\", Proc.new { Volt::StringTemplateRender.new(__p, __c, \"main/main/main/body/_rv1\") }) }"
+                                       "lambda { |__p, __t, __c, __id| Volt::AttributeBinding.new(__p, __t, __c, __id, \"class\", Proc.new { Volt::StringTemplateRenderer.new(__p, __c, \"main/main/main/body/_rv1\") }) }"
                                      ]
                                    }
                                  })

data/spec/server/rack/asset_files_spec.rb

@@ -19,7 +19,7 @@ if RUBY_PLATFORM != 'opal'
     it 'should list all JS files' do
       main = Volt::AssetFiles.new('main', @component_paths)
 
-      expect(main.javascript_files(nil)).to eq(['/assets/js/jquery-2.0.3.js', '/assets/js/sockjs-0.3.4.min.js', '/assets/js/volt_js_polyfills.js', '/assets/js/bootstrap.js', '/assets/js/test2.js', '/assets/js/test3.js', '/assets/js/test1.js', '/assets/volt/page/page.js', '/components/main.js'])
+      expect(main.javascript_files(nil)).to eq(['/assets/js/jquery-2.0.3.js', '/assets/js/volt_js_polyfills.js', '/assets/js/bootstrap.js', '/assets/js/test2.js', '/assets/js/test3.js', '/assets/js/test1.js', '/assets/volt/page/page.js', '/components/main.js'])
     end
 
     it 'should raise an exception for a missing component gem' do

data/spec/spec_helper.rb

@@ -1,7 +1,19 @@
+
 require 'volt/spec/setup'
 
 unless RUBY_PLATFORM == 'opal'
   require 'pry-byebug'
+  require 'coveralls'
+  Coveralls.wear!
+
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+
+  SimpleCov.start do
+    add_filter 'spec/'
+  end
 end
 
 # Specs are run against the kitchen sink app

data/templates/project/Gemfile.tt

@@ -24,6 +24,8 @@ end
 
 # Server for MRI
 platform :mri do
+  # The implementation of ReadWriteLock in Volt uses concurrent ruby and ext helps performance.
+  gem 'concurrent-ruby-ext', '~> 0.8.0'
   gem 'thin', '~> 1.6.0'
   gem 'bson_ext', '~> 1.9.0'
 end

data/templates/project/config/app.rb.tt

@@ -5,7 +5,7 @@ Volt.configure do |config|
   # be tampered with.  A random value is generated on new projects that will work
   # without the need to customize.  Make sure this value doesn't leave your server.
   #
-  # For added security we reccomend moving the app secret into an enviromnet.  You can
+  # For added security we recommend moving the app secret into an environment.  You can
   # setup that like so:
   #
   # config.app_secret = ENV['APP_SECRET']
@@ -38,4 +38,4 @@ Volt.configure do |config|
   # Use username instead of email as the login
   # config.public.auth.use_username = true
 
-end
+end

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

@@ -2,6 +2,7 @@
 <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 %>

data/volt.gemspec

@@ -32,7 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opal', '~> 0.7.1'
   spec.add_dependency 'opal-jquery', '~> 0.3.0'
   spec.add_dependency 'bundler', '>= 1.5'
-  spec.add_dependency 'volt-sockjs', '~> 0.3.4.4'
+  spec.add_dependency 'faye-websocket', '~> 0.9.2'
+  spec.add_dependency 'concurrent-ruby', '~> 0.8.0'
 
   # For user passwords
   spec.add_dependency 'bcrypt', '~> 3.1.9'
@@ -44,6 +45,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'selenium-webdriver', '~> 2.43.0'
   spec.add_development_dependency 'chromedriver2-helper', '~> 0.0.8'
   spec.add_development_dependency 'poltergeist', '~> 1.5.0'
+  # spec.add_development_dependency 'puma', '~> 2.11.2'
+  spec.add_development_dependency 'thin', '~> 1.6.3'
+  spec.add_development_dependency 'coveralls', '~> 0.8.1'
 
   spec.add_development_dependency 'guard', '2.6.0' # bug in current guard
   spec.add_development_dependency 'guard-rspec', '~> 4.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.1.pre1
+  version: 0.9.1.pre2
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -193,19 +193,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: volt-sockjs
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4.4
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4.4
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +318,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -453,7 +495,6 @@ files:
 - VERSION
 - app/volt/assets/css/notices.css.scss
 - app/volt/assets/js/jquery-2.0.3.js
-- app/volt/assets/js/sockjs-0.3.4.min.js
 - app/volt/assets/js/volt_js_polyfills.js
 - app/volt/config/dependencies.rb
 - app/volt/controllers/notices_controller.rb
@@ -585,6 +626,7 @@ files:
 - lib/volt/server/banner.txt
 - lib/volt/server/component_handler.rb
 - lib/volt/server/component_templates.rb
+- lib/volt/server/forking_server.rb
 - 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
@@ -596,7 +638,6 @@ files:
 - lib/volt/server/html_parser/view_scope.rb
 - lib/volt/server/rack/asset_files.rb
 - lib/volt/server/rack/component_code.rb
-- lib/volt/server/rack/component_html_renderer.rb
 - lib/volt/server/rack/component_paths.rb
 - lib/volt/server/rack/http_request.rb
 - lib/volt/server/rack/http_resource.rb
@@ -608,6 +649,8 @@ files:
 - lib/volt/server/rack/source_map_server.rb
 - lib/volt/server/socket_connection_handler.rb
 - lib/volt/server/socket_connection_handler_stub.rb
+- lib/volt/server/websocket/rack_server_adaptor.rb
+- lib/volt/server/websocket/websocket_handler.rb
 - lib/volt/spec/capybara.rb
 - lib/volt/spec/sauce_labs.rb
 - lib/volt/spec/setup.rb
@@ -624,9 +667,12 @@ files:
 - lib/volt/utils/logging/task_logger.rb
 - lib/volt/utils/modes.rb
 - lib/volt/utils/promise_patch.rb
+- lib/volt/utils/read_write_lock.rb
 - lib/volt/utils/tilt_patch.rb
 - lib/volt/utils/timers.rb
 - lib/volt/utils/volt_user_error.rb
+- lib/volt/volt/app.rb
+- lib/volt/volt/core.rb
 - lib/volt/volt/environment.rb
 - lib/volt/volt/users.rb
 - spec/apps/file_loading/app/bootstrap/assets/js/bootstrap.js