volt 0.9.1.pre1 → 0.9.1.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaebdf0ceeb600875ea244b0aa8e1bf36fadc998
-  data.tar.gz: 0111f18c3191d2f2f81528d9b7ffbbe8e6187c5f
+  metadata.gz: ad2f798ba0d81a985f87b8ff96e53b84797644c8
+  data.tar.gz: 9b71d94cfc22e7ac63e51dfa0375d33759f5ecfd
 SHA512:
-  metadata.gz: f06a879922cac14ae698c20e7a6ec3966c74aeae78bc175b11c9c6588c93ed20032fd678342137b2ec3f1c8682fa36241ac21aff6df97b820fb8da2968775c2b
-  data.tar.gz: cc56f0cae364f252f7ff11ff6ce09081192c9aedd14f73a665a0ae8a366e6dac20220eaa19d8a6ac99acd340243eb1bdb7f10a2d01ab1ee78ba1e393a9d13a9a
+  metadata.gz: 0ac6eadbc636ff75bf155cb6babf498499c70c81526b758a6028d8b2d315262e190bf7ddcd27d524c5bfa2f4b0d1205d7cfb85413436fa94862f40a33c7bdc99
+  data.tar.gz: d8cebc99bc26b65ecd9df5f5826f8d2d4e696f00e859f294db53510bbc4936436866f1a0b9d12f5f62dabf6adaa8a1da43691a80f54f18b7a96bf632b678e977

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.9.1
+### Changed
+- Corrected the name of StringTemplateRender to StringTemplateRenderer
+- Volt now uses faye-websocket for socket connections.  This means we can run on any rack-hijack server supported by faye-websocket.  Currently Volt is tested with thin and puma.  (Note: Thin will probably have better performance since it is evented, which means it doesn't need a thread per connection)  More servers coming soon.
+- fixed issue with the unique validation.
+- made it so <:SectionName> can be accessed by <:section_name /> tag
+- fixed issue with if bindings not resolving some promises.
+
 ## 0.9.0
 ### Added
 - the permissions api has been added!

data/Gemfile

@@ -22,4 +22,12 @@ end
 
 group :development, :test do
   gem 'bson_ext'
+
+  # For running tests
+  gem 'thin'
+end
+
+platform :mri do
+  # The implementation of ReadWriteLock in Volt uses concurrent ruby and ext helps performance.
+  gem 'concurrent-ruby-ext'
 end

data/VERSION

@@ -1 +1 @@
-0.9.1.pre1
+0.9.1.pre2

data/app/volt/tasks/live_query/live_query.rb

@@ -85,10 +85,16 @@ class LiveQuery
   end
 
   def remove_channel(channel)
-    @channels.delete(channel)
+    deleted = @channels.delete(channel)
 
     # remove this query, no one is listening anymore
-    @pool.remove(@collection, @query) if @channels.empty?
+    if @channels.empty?
+      begin
+        @pool.remove(@collection, @query)
+      rescue Volt::GenericPoolDeleteException => e
+        # ignore
+      end
+    end
   end
 
   def notify!(skip_channel = nil, only_channel = nil)

data/app/volt/tasks/query_tasks.rb

@@ -25,8 +25,9 @@ class QueryTasks < Volt::Task
       # they simply return to :dirty once the query is issued.
       @channel.user_id = Volt.current_user_id
 
-      live_query.add_channel(@channel)
+      # live_query.add_channel(@channel)
     end
+    live_query.add_channel(@channel)
 
     errors = {}
 

data/lib/volt/boot.rb

@@ -1,25 +1,25 @@
 require 'volt/models'
 require 'volt/server/rack/component_paths'
+
 if RUBY_PLATFORM == 'opal'
   require 'volt'
 else
   require 'volt/page/page'
 end
+require 'volt/volt/app'
 
 module Volt
   def self.boot(app_path)
     # Run the app config to load all users config files
     unless RUBY_PLATFORM == 'opal'
-      Volt.run_files_in_config_folder
-
       if Volt.server?
         $page = Page.new
       end
     end
 
-    component_paths = ComponentPaths.new(app_path)
-    component_paths.require_in_components
-
-    component_paths
+    # Boot the app
+    App.new(app_path)
   end
+
+
 end

data/lib/volt/cli.rb

@@ -36,13 +36,8 @@ module Volt
     method_option :bind, type: :string, aliases: '-b', banner: 'the ip the server should bind to'
 
     def server
-      if RUBY_PLATFORM == 'java'
-        require 'volt/server'
-      else
-        require 'thin'
-      end
-
       require 'fileutils'
+      require 'volt/server'
 
       # If we're in a Volt project, clear the temp directory
       # TODO: this is a work around for a bug when switching between
@@ -55,19 +50,29 @@ module Volt
         return
       end
 
-      if RUBY_PLATFORM == 'java'
-        server = Server.new.app
-        Rack::Handler::Jubilee.run(server)
-        Thread.stop
-      else
-        ENV['SERVER'] = 'true'
-        args = ['start', '--threaded', '--max-persistent-conns', '300']
-        args += ['--max-conns', '400'] unless Gem.win_platform?
-        args += ['-p', options[:port].to_s] if options[:port]
-        args += ['-a', options[:bind]] if options[:bind]
+      ENV['SERVER'] = 'true'
 
-        Thin::Runner.new(args).run!
+      app = Volt::Server.new.app
+
+      server = Rack::Handler.get(RUNNING_SERVER)
+
+      opts = {}
+      opts[:Port] = options[:port] || 3000
+      opts[:Host] = options[:bind] if options[:bind]
+
+      server.run(app, opts) do |server|
+        case RUNNING_SERVER
+        when 'thin'
+          server.maximum_persistent_connections = 300
+          server.maximum_connections = 500 unless Gem.win_platform?
+          server.threaded = true
+
+          # We need to disable the timeout on thin, otherwise it will keep
+          # disconnecting the websockets.
+          server.timeout = 0
+        end
       end
+
     end
 
     desc 'runner FILEPATH', 'Runs a ruby file at FILEPATH in the volt app'

data/lib/volt/cli/asset_compile.rb

@@ -14,10 +14,15 @@ module Volt
       ENV['SERVER'] = 'true'
 
       require 'opal'
+      require 'rack'
       require 'volt'
       require 'volt/boot'
 
-      Volt.boot(Dir.pwd)
+
+      @root_path ||= Dir.pwd
+      Volt.root  = @root_path
+
+      Volt.boot(@root_path)
 
       require 'volt/server/rack/component_paths'
       require 'volt/server/rack/component_code'
@@ -25,8 +30,6 @@ module Volt
       require 'volt/server/rack/index_files'
       require 'volt/server/component_handler'
 
-      @root_path ||= Dir.pwd
-      Volt.root  = @root_path
 
       @app_path = File.expand_path(File.join(@root_path, 'app'))
 
@@ -49,7 +52,7 @@ module Volt
       @opal_files.environment.each_logical_path do |logical_path|
         logical_path = logical_path.to_s
         # Only include files that aren't compiled elsewhere, like fonts
-        unless logical_path[/[.](y|css|js|html|erb)$/]
+        if !logical_path[/[.](y|css|js|html|erb)$/] && File.extname(logical_path) != ''
           write_sprocket_file(logical_path)
         end
       end
@@ -68,6 +71,7 @@ module Volt
       path = "#{@root_path}/public/assets/#{logical_path}"
 
       begin
+        puts "LP: #{logical_path.inspect}"
         content = @opal_files.environment[logical_path].to_s
         write_file(path, content)
       rescue Sprockets::FileNotFound, SyntaxError => e

data/lib/volt/cli/console.rb

@@ -37,6 +37,7 @@ module Volt
 
       require 'volt'
       require 'volt/boot'
+      require 'volt/volt/core'
       require 'volt/server/socket_connection_handler_stub'
 
       SocketConnectionHandlerStub.dispatcher = Dispatcher.new

data/lib/volt/controllers/model_controller.rb

@@ -30,7 +30,7 @@ module Volt
     def yield_html
       if (template_path = attrs.content_template_path)
         # TODO: Don't use $page global
-        @yield_renderer ||= StringTemplateRender.new($page, self, template_path)
+        @yield_renderer ||= StringTemplateRenderer.new($page, self, template_path)
         @yield_renderer.html
       else
         # no template, empty string

data/lib/volt/extra_core/logger.rb

@@ -66,6 +66,10 @@ else
         colorize(@current[:run_time].to_s + 'ms', :green)
       end
 
+      def log_with_color(msg, color)
+        Volt.logger.info(colorize(msg, color))
+      end
+
 
       private
 

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

@@ -1,8 +1,6 @@
 module Volt
   class UniqueValidator
     def self.validate(model, field_name, args)
-      errors = {}
-
       if RUBY_PLATFORM != 'opal'
         if args
           value  = model.get(field_name)
@@ -14,15 +12,19 @@ module Volt
 
           # Check if the value is taken
           # TODO: need a way to handle scope for unique
-          if $page.store.send(:"_#{model.path[-2]}").find(query).size > 0
-            message = (args.is_a?(Hash) && args[:message]) || 'is already taken'
+          return $page.store.get(model.path[-2]).where(query).fetch_first do |item|
+            if item
+              message = (args.is_a?(Hash) && args[:message]) || 'is already taken'
 
-            errors[field_name] = [message]
+              # return the error
+              next {field_name: [message]}
+            end
           end
         end
       end
 
-      errors
+      # no errors
+      {}
     end
   end
 end

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

@@ -72,7 +72,7 @@ module Volt
       @string_template_renderer_computation.stop if @string_template_renderer_computation
       @string_template_renderer.remove if @string_template_renderer
 
-      if new_value.is_a?(StringTemplateRender)
+      if new_value.is_a?(StringTemplateRenderer)
         # We don't need to refetch the whole reactive template to
         # update, we can just depend on it and update directly.
         @string_template_renderer = new_value

data/lib/volt/page/channel.rb

@@ -27,13 +27,19 @@ module Volt
     end
 
     def connect!
-      `
-        this.socket = new SockJS('/channel');
+      %x{
+        this.socket = new WebSocket('ws://' + document.location.host + '/socket');
 
-        this.socket.onopen = function() {
+        this.socket.onopen = function () {
           self.$opened();
         };
 
+        // Log errors
+        this.socket.onerror = function (error) {
+          console.log('WebSocket Error ', error);
+        };
+
+        // Log messages from the server
         this.socket.onmessage = function(message) {
           self['$message_received'](message.data);
         };
@@ -41,7 +47,7 @@ module Volt
         this.socket.onclose = function(error) {
           self.$closed(error);
         };
-      `
+      }
     end
 
     def opened

data/lib/volt/page/page.rb

@@ -173,7 +173,7 @@ module Volt
       TemplateRenderer.new(self, DomTarget.new, main_controller, 'CONTENT', 'main/main/main/body')
 
       # Setup title reactive template
-      @title_template = StringTemplateRender.new(self, main_controller, 'main/main/main/title')
+      @title_template = StringTemplateRenderer.new(self, main_controller, 'main/main/main/title')
 
       # Watch for changes to the title template
       proc do

data/lib/volt/page/string_template_renderer.rb

@@ -1,10 +1,10 @@
 module Volt
-  # StringTemplateRender are used to render a template to a string.  Call .html
+  # StringTemplateRenderer are used to render a template to a string.  Call .html
   # to get the string.  Be sure to call .remove when complete.
   #
-  # StringTemplateRender will intellegently update the string in the same way
+  # StringTemplateRenderer will intellegently update the string in the same way
   # a normal bindings will update the dom.
-  class StringTemplateRender
+  class StringTemplateRenderer
     def initialize(page, context, template_path)
       @dependency = Dependency.new
 

data/lib/volt/server.rb

@@ -1,30 +1,16 @@
 ENV['SERVER'] = 'true'
 
 require 'opal'
-if RUBY_PLATFORM == 'java'
-  require 'jubilee'
-else
-  require 'thin'
-end
 
 require 'rack'
 require 'sass'
 require 'volt/utils/tilt_patch'
-if RUBY_PLATFORM != 'java'
-  require 'rack/sockjs'
-  require 'eventmachine'
-end
 require 'sprockets-sass'
-require 'listen'
 
 require 'volt'
-require 'volt/boot'
 require 'volt/tasks/dispatcher'
 require 'volt/tasks/task_handler'
 require 'volt/server/component_handler'
-if RUBY_PLATFORM != 'java'
-  require 'volt/server/socket_connection_handler'
-end
 require 'volt/server/rack/component_paths'
 require 'volt/server/rack/index_files'
 require 'volt/server/rack/http_resource'
@@ -32,8 +18,10 @@ require 'volt/server/rack/opal_files'
 require 'volt/server/rack/quiet_common_logger'
 require 'volt/page/page'
 
-require 'volt/server/rack/http_request'
-require 'volt/controllers/http_controller'
+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
@@ -58,19 +46,14 @@ end
 
 module Volt
   class Server
+    attr_reader :listener, :app_path
 
-    def initialize(root_path = nil)
-      root_path ||= Dir.pwd
-      Volt.root = root_path
-
-      @app_path        = File.expand_path(File.join(root_path, 'app'))
-
-      # Boot the volt app
-      @component_paths = Volt.boot(root_path)
+    # You can also optionally pass in a prebooted app
+    def initialize(root_path = nil, app = false)
+      @root_path = root_path || Dir.pwd
+      @volt_app = app
 
-      setup_router
-      require_http_controllers
-      setup_change_listener
+      @app_path        = File.expand_path(File.join(@root_path, 'app'))
 
       display_welcome
     end
@@ -79,81 +62,72 @@ module Volt
       puts File.read(File.join(File.dirname(__FILE__), 'server/banner.txt'))
     end
 
-    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 boot_volt
+      # Boot the volt app
+      require 'volt/boot'
 
-    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
+      @volt_app ||= Volt.boot(@root_path)
     end
 
-    def setup_change_listener
-      # Setup the listeners for file changes
-      listener = Listen.to("#{@app_path}/") do |modified, added, removed|
-        puts 'file changed, sending reload'
-        setup_router
-        require_http_controllers
-        SocketConnectionHandler.send_message_all(nil, 'reload')
+    # App returns the main rack app.  In development it will fork a
+    def app
+      app = Rack::Builder.new
+
+      # Handle websocket connections
+      app.use WebsocketHandler
+
+      if Volt.env.production? || Volt.env.test?
+        # In production/test, we boot the app and run the server
+        #
+        # Sometimes the app is already booted, so we can skip if it is
+        boot_volt unless @volt_app
+
+        # Setup the dispatcher (it stays this class during its run)
+        SocketConnectionHandler.dispatcher = Dispatcher.new
+        app.run(new_server)
+      else
+        # In developer
+        app.run ForkingServer.new(self)
       end
-      listener.start
+
+      app
     end
 
-    def app
-      @app = Rack::Builder.new
+    # 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
-        @app.use Rack::Deflater
-        @app.use Rack::Chunked
+        @rack_app.use Rack::Deflater
+        @rack_app.use Rack::Chunked
       end
 
-      @app.use Rack::ContentLength
+      @rack_app.use Rack::ContentLength
 
-      @app.use Rack::KeepAlive
-      @app.use Rack::ConditionalGet
-      @app.use Rack::ETag
+      @rack_app.use Rack::KeepAlive
+      @rack_app.use Rack::ConditionalGet
+      @rack_app.use Rack::ETag
 
-      @app.use QuietCommonLogger
-      @app.use Rack::ShowExceptions
+      @rack_app.use QuietCommonLogger
+      @rack_app.use Rack::ShowExceptions
 
-      component_paths = @component_paths
-      @app.map '/components' do
+      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(@app, @app_path, @component_paths)
+      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.
-      @app.use IndexFiles, @component_paths, opal_files
+      @rack_app.use IndexFiles, @volt_app.component_paths, opal_files
 
-      @app.use HttpResource, @router
-
-      component_paths.require_in_components
-
-      # Handle socks js connection
-      if RUBY_PLATFORM != 'java'
-        SocketConnectionHandler.dispatcher = Dispatcher.new
-
-        @app.map '/channel' do
-          run Rack::SockJS.new(SocketConnectionHandler) # , :websocket => false
-        end
-      end
+      @rack_app.use HttpResource, @volt_app.router
 
-      @app.use Rack::Static,
+      @rack_app.use Rack::Static,
         urls: ['/'],
         root: 'config/base',
         index: '',
@@ -161,9 +135,9 @@ module Volt
           [:all, { 'Cache-Control' => 'public, max-age=86400' }]
         ]
 
-      @app.run lambda { |env| [404, { 'Content-Type' => 'text/html; charset=utf-8' }, ['404 - page not found']] }
+      @rack_app.run lambda { |env| [404, { 'Content-Type' => 'text/html; charset=utf-8' }, ['404 - page not found']] }
 
-      @app
+      @rack_app
     end
   end
 end