volt 0.9.5.pre9 → 0.9.5.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd442a1d9cbb5e408187f2d1f5c880ac29019f4b
-  data.tar.gz: 94af6240b96dfb2f1521d86552772a2fd46a303b
+  metadata.gz: 2c855e92da3bc6bcee176d539ae365747bfe848e
+  data.tar.gz: ca339e18a47c685787f2e55eed17bd49f2c5de13
 SHA512:
-  metadata.gz: f2711239ae33a5b2e46c6edff9cfa3ab5eb4265614480d95a971a60025588776186d10f4e7555bea679847673e8d42abd260fba50d67a557185281b2b8f1cf25
-  data.tar.gz: c302d959c1e5492777213245304ba0a0d469aa73d252cc87db81f4271de689324af571879fa5603596638c8a73c219c74cd58a271254638ce258fb25c928f859
+  metadata.gz: 7ec01b186962830327f074a0c061ed6a41c4735ac12516175a666d1175a016da1a649b0dbf3be8275de78f8467df593d3d7d35dcfdf3453e5ebfa16dabf59257
+  data.tar.gz: ae01a3abe872c61cadd82426be2e940242d533bbd66a7cc342187a8a3b24ad139af02b3e5bcc036183af9c785234f62b6757cbca3fa82e68a2b017089938b210

data/CHANGELOG.md

@@ -8,7 +8,7 @@
 - You can now disable auto-import of JS/CSS with ```disable_auto_import``` in a dependencies.rb file
 - Opal was upgraded to 0.8, which brings sourcemaps back (yah!)
 - Page load performance was improved, and more of sprockets was used for component loading.
-- You can now return promises in permissions blocks.  Also, can_read?, can_create?, and .can_delete?
+- You can now return promises in permissions blocks.  Also, can_read?, can_create?, and .can_delete? now return promises.
 - Anything in /public is now served via Rack::Static in the default middleware stack.  (So you can put user uploaded images in there)
 - You can now use _ or - in volt tag names and attributes.  (We're moving to using dash ( - ) as the standard in html)
 - You can now trigger events on controllers rendered as tags.  The events will bubble up through the DOM and can be caught by any e- bindings.  See the docs for more information.
@@ -21,6 +21,10 @@
 ### Changed
 - fix issue with ```raw``` and promises (#275)
 - fix issue with .length on store (#269)
+- The {root}/config/initializers directory is now only for server side code.
+- Redid the initializer load order so all initializers run before any controllers/models/views are loaded.
+- Added error message for when an unserializable object is returned from a Task
+- Fixed issue with disable_encryption option
 
 ## 0.9.4
 ### Lingo Change

data/docs/UPGRADE_GUIDE.md

@@ -1,3 +1,11 @@
+# 0.9.4 to 0.9.5
+
+CSS url's now should be referenced either 1) as relative paths from the css file, or 2) using the full path from inside of app (eg: main/assets/images/background.jpg)
+
+On models, .can_delete?, .can_read?, and .can_create? now return promises.
+
+Check the CHANGELOG for more info.
+
 # 0.9.3 to 0.9.4
 
 We moved logic out of Volt::User and into the generated user file, so it is easier to customize.  Add the following to your app/main/models/user.rb:

data/lib/volt/cli.rb

@@ -120,11 +120,17 @@ module Volt
     no_tasks do
       # The logic for creating a new project.  We want to be able to invoke this
       # inside of a method so we can run it with Dir.chdir
-      def new_project(name, skip_gemfile = false)
+      def new_project(name, skip_gemfile = false, disable_encryption = false)
         require 'securerandom'
 
         # Grab the current volt version
-        directory('project', name, version: Volt::Version::STRING, name: name, domain: name.dasherize.downcase, app_name: name.capitalize)
+        directory('project', name, {
+          version: Volt::Version::STRING,
+          name: name,
+          domain: name.dasherize.downcase,
+          app_name: name.capitalize,
+          disable_encryption: disable_encryption
+        })
 
         unless skip_gemfile
           # Move into the directory

data/lib/volt/cli/new_gem.rb

@@ -31,7 +31,7 @@ class NewGem
       @thor.say 'Generating dummy project for integration specs', :green
       cli = Volt::CLI.new
       cli.shell.mute do
-        cli.new_project('dummy', true)
+        cli.new_project('dummy', true, true)
       end
 
       # Remove gemfile

data/lib/volt/controllers/http_controller.rb

@@ -1,12 +1,15 @@
 require 'volt/server/rack/http_response_header'
 require 'volt/server/rack/http_response_renderer'
 require 'volt/controllers/http_controller/http_cookie_persistor'
+require 'volt/controllers/login_as_helper'
 require 'volt/utils/lifecycle_callbacks'
 
 module Volt
   # Allow you to create controllers that act as http endpoints
   class HttpController
     include LifecycleCallbacks
+    include LoginAsHelper
+
     # Setup before_action and after_action
     setup_action_helpers_in_class(:before_action, :after_action)
 

data/lib/volt/controllers/login_as_helper.rb

@@ -0,0 +1,12 @@
+module Volt
+  module LoginAsHelper
+    def login_as(user)
+      unless user.is_a?(Volt::User)
+        raise "login_as must be passed a user instance, you passed a #{user.class.to_s}"
+      end
+
+      # Assign the user_id cookie to the signature for the user id
+      cookies._user_id = Volt.user_login_signature(user)
+    end
+  end
+end

data/lib/volt/models.rb

@@ -16,9 +16,8 @@ require 'volt/models/root_models/root_models'
 if RUBY_PLATFORM == 'opal'
   require 'promise'
 else
-  # Opal doesn't expose its promise library directly
   require 'opal'
-
+  # Opal doesn't expose its promise library directly
   gem_dir = File.join(Opal.gem_dir, '..')
   require(gem_dir + '/stdlib/promise')
 end

data/lib/volt/models/persistors/query/query_listener.rb

@@ -47,7 +47,7 @@ module Volt
         Volt.logger.error(msg)
 
         # If we get back that the user signature is wrong, log the user out.
-        if err.to_s.start_with?('user id or hash is incorrectly signed')
+        if err.starts_with?('VoltUserError:')
           # Delete the invalid cookie
           Volt.current_app.cookies.delete(:user_id)
         end

data/lib/volt/models/url.rb

@@ -72,6 +72,10 @@ module Volt
 
       path, params = @router.params_to_url(params)
 
+      if path == nil
+        raise "No route matched, make sure you have the base route defined last: `client '/', {}`"
+      end
+
       new_url    = "#{scheme}://#{host_with_port}#{path.chomp('/')}"
 
       # Add query params

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

@@ -14,6 +14,39 @@ module Volt
     end
 
     def setup
+      if `#{element}.is('select')`
+        @is_select = true
+      elsif `#{element}.is('[type=hidden]')`
+        @is_hidden = true
+      elsif `#{element}.is('[type=radio]')`
+        @is_radio = true
+        @selected_value = `#{element}.attr('value') || ''`
+      elsif `#{element}.is('option')`
+        @is_option = true
+      end
+
+      if @is_option
+      else
+        # Bind so when this value updates, we update
+        case @attribute_name
+          when 'value'
+            changed_event = Proc.new { changed }
+            if @is_select
+              `#{element}.on('change.attrbind', #{changed_event})`
+
+              invalidate_proc = Proc.new { invalidate }
+              `#{element}.on('invalidate', #{invalidate_proc})`
+            elsif @is_hidden
+              `#{element}.watch('value', #{changed_event})`
+            else
+              `#{element}.on('input.attrbind', #{changed_event})`
+            end
+          when 'checked'
+            changed_event = proc { |event| changed(event) }
+            `#{element}.on('change.attrbind', #{changed_event})`
+        end
+      end
+
       # Listen for changes
       @computation = lambda do
         begin
@@ -27,26 +60,6 @@ module Volt
         method(:getter_fail)
       )
 
-      @is_select = `#{element}.is('select')`
-      @is_hidden = `#{element}.is('[type=hidden]')`
-      @is_radio = `#{element}.is('[type=radio]')`
-      @selected_value = `#{element}.attr('value') || ''` if @is_radio
-
-      # Bind so when this value updates, we update
-      case @attribute_name
-        when 'value'
-          changed_event = Proc.new { changed }
-          if @is_select
-            `#{element}.on('change.attrbind', #{changed_event})`
-          elsif @is_hidden
-            `#{element}.watch('value', #{changed_event})`
-          else
-            `#{element}.on('input.attrbind', #{changed_event})`
-          end
-        when 'checked'
-          changed_event = proc { |event| changed(event) }
-          `#{element}.on('change.attrbind', #{changed_event})`
-      end
     end
 
     def changed(event = nil)
@@ -99,6 +112,12 @@ module Volt
     def value=(val)
       case @attribute_name
         when 'value'
+          if @is_option
+            # When a new option is added, we trigger the invalidate event on the
+            # parent select so it will re-run update on the next tick and set
+            # the correct option.
+            `#{element}.parent('select').trigger('invalidate');`
+          end
           # TODO: only update if its not the same, this keeps it from moving the
           # cursor in text fields.
           `#{element}.val(#{val})` if val != `(#{element}.val() || '')`
@@ -116,6 +135,12 @@ module Volt
       end
     end
 
+    # On select boxes, when an option is added/changed, we want to run update
+    # again.  By calling invalidate, it will run at most once on the next tick.
+    def invalidate
+      @computation.invalidate!
+    end
+
     def update_checked(value)
       value = false if value.is_a?(NilMethodCall) || value.nil?
 
@@ -131,6 +156,7 @@ module Volt
         when 'value'
           if @is_select
             `#{element}.off('change.attrbind')`
+            `#{element}.off('invalidate')`
           elsif @is_hidden
             `#{element}.unwatch('value')`
           else

data/lib/volt/page/tasks.rb

@@ -41,14 +41,22 @@ module Volt
 
     # When a request is sent to the backend, it can attach a callback,
     # this is called from the backend to pass to the callback.
-    def response(promise_id, result, error)
+    def response(promise_id, result, error, cookies)
+      # Set the cookies
+      if cookies
+        cookies.each do |key, value|
+          @volt_app.cookies.set(key, value)
+        end
+      end
+
       promise = @promises.delete(promise_id)
 
       if promise
         if error
           # TODO: full error handling
           Volt.logger.error('Task Response:')
-          Volt.logger.error(error.inspect)
+          Volt.logger.error(error)
+
           promise.reject(error)
         else
           promise.resolve(result)

data/lib/volt/server/component_templates.rb

@@ -22,12 +22,22 @@ module Volt
       @client         = client
     end
 
-    def code
-      code = generate_routes_code + generate_view_code
+    def initializer_code
+      if @client
+        generate_initializers_code
+      else
+        ''
+      end
+    end
+
+    def component_code
+      code = ''
+
+      code << generate_routes_code + generate_view_code
       if @client
         # On the backend, we just need the views
         code << generate_controller_code + generate_model_code +
-                generate_tasks_code + generate_initializers_code
+                generate_tasks_code
       end
 
       code
@@ -161,16 +171,12 @@ module Volt
     end
 
     def generate_initializers_code
-      # Include the root initializers
-      paths = Dir["#{Volt.root}/config/initializers/*.rb"]
-      paths += Dir["#{Volt.root}/config/initializers/client/*.rb"]
-
       paths = Dir["#{@component_path}/config/initializers/*.rb"]
       paths += Dir["#{@component_path}/config/initializers/client/*.rb"]
 
       code = "\n" + paths.map { |path| "require '#{localize_path(path)}'" }.join("\n")
 
-      code
+      code + "\n\n"
     end
 
     private

data/lib/volt/server/message_bus/message_encoder.rb

@@ -13,7 +13,7 @@ module Volt
         end
 
         # Message bus is encrypted by default
-        disable = Volt.config.message_bus.try(:disable_encryption)
+        disable = (msg_bus = Volt.config.message_bus) && msg_bus.disable_encryption
         @encrypted = !windows && (disable != true)
 
         if @encrypted

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

@@ -130,9 +130,11 @@ module Volt
         case type
           when :folder
             # for a folder, we search for all .js files and return a tag for them
+            base_path = base(path)
             javascript_files += Dir["#{path}/**/*.js"].sort.map do |folder|
               # Grab the component folder/assets/js/file.js
-              @app_url + '/' + folder.split('/')[-4..-1].join('/')
+              local_path = folder[path.size..-1]
+              @app_url + '/' + base_path + local_path
             end
           when :javascript_file
             # javascript_file is a cdn path to a JS file
@@ -175,9 +177,10 @@ module Volt
             # Don't import any css/scss files that start with an underscore, so scss partials
             # aren't imported by default:
             #  http://sass-lang.com/guide
-            css_files += Dir["#{path}/**/[^_]*.{css,scss}"].sort.map do |folder|
-              last4 = folder.split('/')[-4..-1].join('/').gsub(/[.]scss$/, '')
-              css_path = @app_url + '/' + last4
+            base_path = base(path)
+            css_files += Dir["#{path}/**/[^_]*.{css,scss,sass}"].sort.map do |folder|
+              local_path = folder[path.size..-1].gsub(/[.](scss|sass)$/, '')
+              css_path = @app_url + '/' + base_path + local_path
               css_path += '.css' unless css_path =~ /[.]css$/
               css_path
             end
@@ -207,5 +210,12 @@ module Volt
         end
       end
     end
+
+    private
+    def base(path)
+      path.split('/')[-2..-1].join('/')
+    end
+
+
   end
 end

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

@@ -2,8 +2,8 @@ require 'volt/server/html_parser/view_parser'
 require 'volt/server/component_templates'
 require 'volt/server/rack/asset_files'
 
-# Takes in the name and all component paths and has a .code
-# method that returns all of the ruby setup code for the component.
+# Takes in the name and all component paths returns all of the ruby code for the
+# component and its dependencies.
 module Volt
   class ComponentCode
     def initialize(volt_app, component_name, component_paths, client = true)
@@ -16,15 +16,17 @@ module Volt
     # The client argument is for if this code is being generated for the client
     def code
       # Start with config code
-      code = @client ? generate_config_code : ''
+      initializer_code = @client ? generate_config_code : ''
+      component_code = ''
 
       asset_files = AssetFiles.from_cache(@volt_app.app_url, @component_name, @component_paths)
       asset_files.component_paths.each do |component_path, component_name|
-        code << ComponentTemplates.new(component_path, component_name, @client).code
-        code << "\n\n"
+        comp_template = ComponentTemplates.new(component_path, component_name, @client)
+        initializer_code << comp_template.initializer_code + "\n\n"
+        component_code << comp_template.component_code + "\n\n"
       end
 
-      code
+      initializer_code + component_code
     end
 
     def generate_config_code

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

@@ -54,13 +54,20 @@ module Volt
       @components
     end
 
+    # Setup load path for components
+    def setup_load_paths
+      unless RUBY_PLATFORM == 'opal'
+        app_folders do |app_folder|
+          $LOAD_PATH.unshift(app_folder)
+        end
+      end
+    end
+
     # Makes each components classes available on the load path, require classes.
     def require_in_components(volt_app)
       if RUBY_PLATFORM == 'opal'
       else
         app_folders do |app_folder|
-          $LOAD_PATH.unshift(app_folder)
-
           # Sort so we get consistent load order across platforms
           Dir["#{app_folder}/*/{controllers,models,tasks}/*.rb"].each do |ruby_file|
             path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]

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

@@ -33,10 +33,11 @@ module Volt
     end
 
     def add_linking_in_asset_path
+      app_path = @volt_app.app_path
       @env.context_class.class_eval do
         # We "freedom-patch" sprockets-helpers asset_path method to
         # automatically link assets.
-        def asset_path(source, options = {})
+        define_method(:asset_path) do |source, options = {}|
           relative_path = source =~ /^[.][.]\//
           if relative_path
             component_root = logical_path.gsub(/\/[^\/]+$/, '')
@@ -47,7 +48,7 @@ module Volt
           if relative_path
             link_path = source
           else
-            link_path = source.gsub(/^#{@volt_app.app_path}\//, '')
+            link_path = source.gsub(/^#{app_path}\//, '')
           end
 
           # Return for absolute urls (one's off site)

data/lib/volt/server/socket_connection_handler.rb

@@ -54,9 +54,19 @@ module Volt
       end
     end
 
+    # Used when the message is already encoded
+    def send_string_message(str)
+      send_raw_message(str)
+    end
+
     def send_message(*args)
+      # Encode as EJSON
       str = EJSON.stringify([*args])
 
+      send_raw_message(str)
+    end
+
+    def send_raw_message(str)
       @session.send(str)
 
       if RUNNING_SERVER == 'thin'
@@ -65,7 +75,6 @@ module Volt
         # TODO: Figure out the cause of the issue and submit a fix upstream.
         EM.next_tick {}
       end
-
     end
 
     def closed

data/lib/volt/server/template_handlers/view_processor.rb

@@ -33,19 +33,23 @@ module Volt
     # end
 
     def call(input)
+      context = input[:environment].context_class.new(input)
+      # context.link_asset('main/assets/images/lombard.jpg')
       # pp input
       data = input[:data]
 
       # input[:accept] = 'application/javascript'
       # input[:content_type] = 'application/javascript'
       # input[:environment].content_type = 'application/javascript'
-      input[:cache].fetch([self.cache_key, data]) do
+      data = input[:cache].fetch([self.cache_key, data]) do
         filename = input[:filename]
         # puts input[:data].inspect
         # Remove all semicolons from source
         # input[:content_type] = 'application/javascript'
         compile(filename, input[:data])
       end
+
+      context.metadata.merge(data: data.to_str)
     end
 
     def compile(view_path, html)

data/lib/volt/tasks/dispatcher.rb

@@ -22,9 +22,9 @@ module Volt
         @worker_pool = Concurrent::ImmediateExecutor.new
       else
         @worker_pool = Concurrent::ThreadPoolExecutor.new(
-        min_threads: Volt.config.min_worker_threads,
-        max_threads: Volt.config.max_worker_threads
-      )
+          min_threads: Volt.config.min_worker_threads,
+          max_threads: Volt.config.max_worker_threads
+        )
       end
 
       @worker_timeout = Volt.config.worker_timeout || 60
@@ -102,6 +102,7 @@ module Volt
       klass = Object.send(:const_get, class_name)
 
       promise = Promise.new
+      cookies = nil
 
       start_time = Time.now.to_f
 
@@ -116,7 +117,9 @@ module Volt
           Timeout.timeout(klass.__timeout || @worker_timeout) do
             Thread.current['meta'] = meta_data
             begin
-              result = klass.new(@volt_app, channel, self).send(method_name, *args)
+              klass_inst = klass.new(@volt_app, channel, self)
+              result = klass_inst.send(method_name, *args)
+              cookies = klass_inst.fetch_cookies
             ensure
               Thread.current['meta'] = nil
             end
@@ -143,12 +146,16 @@ module Volt
 
       # Run the promise and pass the return value/error back to the client
       promise.then do |result|
-        channel.send_message('response', callback_id, result, nil)
+        reply = EJSON.stringify(['response', callback_id, result, nil, cookies])
+        channel.send_string_message(reply)
 
         finish.call
       end.fail do |error|
         finish.call(error)
-        channel.send_message('response', callback_id, nil, error)
+        # Convert the error into a string so it can be serialized.
+        error_str = "#{error.class.to_s}: #{error.to_s}"
+
+        channel.send_message('response', callback_id, nil, error_str, cookies)
       end
 
     end

data/lib/volt/tasks/task.rb

@@ -1,4 +1,5 @@
 require 'volt/controllers/collection_helpers'
+require 'volt/controllers/login_as_helper'
 
 module Volt
   class Task
@@ -17,6 +18,7 @@ module Volt
       end
     else
       include CollectionHelpers
+      include LoginAsHelper
 
       class_attribute :__timeout
 
@@ -41,6 +43,17 @@ module Volt
         self.__timeout = value
       end
 
+      def cookies
+        @cookies ||= Model.new
+      end
+
+      # Get the cookies that got set
+      def fetch_cookies
+        if @cookies
+          @cookies.to_h.reject {|k,v| k == :id }
+        end
+      end
+
       # On the backend, we proxy all class methods like we would
       # on the front-end.  This returns a promise, even if the
       # original code did not.

data/lib/volt/utils/ejson.rb

@@ -2,6 +2,10 @@ require 'json'
 
 module Volt
   class EJSON
+    class NonEjsonType < Exception ; end
+
+    OTHER_VALID_CLASSES = [String, Symbol, TrueClass, FalseClass, Numeric, NilClass]
+
     def self.stringify(obj)
       encode(obj).to_json
     end
@@ -48,12 +52,13 @@ module Volt
 
           [key, value]
         end.to_h
+      elsif Time === obj
+        {'$date' => obj.to_i * 1_000}
+      elsif OTHER_VALID_CLASSES.any? {|klass| obj.is_a?(klass) }
+        obj
       else
-        if obj.is_a?(Time)
-          {'$date' => obj.to_i * 1_000}
-        else
-          obj
-        end
+        # Not a valid class for serializing, raise an exception
+        raise NonEjsonType, "Unable to serialize #{obj.inspect} to EJSON"
       end
     end
   end

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.5.pre9'
+    STRING = '0.9.5.pre11'
   end
 end

data/lib/volt/volt/app.rb

@@ -80,6 +80,8 @@ module Volt
         # Require in app and initializers
         run_app_and_initializers unless RUBY_PLATFORM == 'opal'
 
+        require_components
+
         # abort_on_exception is a useful debugging tool, and in my opinion something
         # you probbaly want on.  That said you can disable it if you need.
         unless RUBY_PLATFORM == 'opal'

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

@@ -18,6 +18,10 @@ module Volt
       def setup_paths
         # Load component paths
         @component_paths = ComponentPaths.new(@app_path)
+        @component_paths.setup_load_paths
+      end
+
+      def require_components
         @component_paths.require_in_components(self)
       end
 

data/spec/apps/kitchen_sink/app/main/assets/css/app.scss

@@ -0,0 +1,11 @@
+.logo1 {
+  width: 129px;
+  height: 50px;
+  background: asset-url('../images/volt-logo.jpg') no-repeat center center;
+}
+
+.logo2 {
+  width: 129px;
+  height: 50px;
+  background: asset-url('main/assets/images/volt-logo.jpg') no-repeat center center;
+}

data/spec/apps/kitchen_sink/app/main/config/initializers/sample_model_extend.rb

@@ -0,0 +1,7 @@
+module Volt
+  class Model
+    def self.acts_awesome
+      true
+    end
+  end
+end

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

@@ -12,6 +12,8 @@ client '/todos', controller: 'todos'
 client '/html_safe', action: 'html_safe'
 client '/missing', action: 'missing'
 client '/require_test', action: 'require_test'
+client '/images', action: 'images'
+client '/login_from_task', action: 'login_from_task'
 
 # Events
 client '/events', component: 'main', controller: 'events', action: 'index'

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

@@ -5,7 +5,7 @@ module Main
   class MainController < Volt::ModelController
     model :page
 
-    reactive_accessor :blur_count, :focus_count
+    reactive_accessor :blur_count, :focus_count, :image_loaded
 
     def index
       a = {}
@@ -88,6 +88,10 @@ module Main
       self.focus_count += 1
     end
 
+    def do_login_from_task
+      LoginTasks.login_first_user
+    end
+
     private
 
     # the main template contains a #template binding that shows another

data/spec/apps/kitchen_sink/app/main/tasks/login_tasks.rb

@@ -0,0 +1,7 @@
+class LoginTasks < Volt::Task
+  def login_first_user
+    store.users.first.then do |first_user|
+      login_as(first_user)
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+<:Title>
+  Images
+
+<:Body>
+  <h1>Images</h1>
+
+  <div class="logo1"></div>
+  <div class="logo2"></div>
+
+  <img src="/app/main/assets/images/volt-logo.jpg" />

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

@@ -0,0 +1,7 @@
+<:Title>
+  Login From Task
+
+<:Body>
+  <h1>Login From Task</h1>
+
+  <button e-click="do_login_from_task">Login First User</button>

data/spec/integration/images_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe 'image loading', type: :feature, sauce: true do
+  it 'should load images in assets' do
+    visit '/images'
+
+    loaded = page.evaluate_script("$('img').get(0).complete")
+    expect(loaded).to eq(true)
+  end
+end

data/spec/integration/user_spec.rb

@@ -88,6 +88,14 @@ describe 'user accounts', type: :feature, sauce: true do
 
       expect(page).to have_content('Password did not match')
     end
+
+    it 'should let you login from a task' do
+      visit '/login_from_task'
+
+      click_button 'Login First User'
+
+      expect(page).to have_content('Test Account 9550')
+    end
   end
 
 end

data/spec/tasks/dispatcher_spec.rb

@@ -5,6 +5,10 @@ if RUBY_PLATFORM != 'opal'
     def allowed_method(arg1, arg2)
       'yes' + arg1 + arg2
     end
+
+    def set_cookie
+      cookies._something = 'awesome'
+    end
   end
 
   class WorkerPoolStub
@@ -29,7 +33,9 @@ if RUBY_PLATFORM != 'opal'
     it 'should only allow method calls on Task or above in the inheritance chain' do
       channel = double('channel')
 
-      expect(channel).to receive(:send_message).with('response', 0, 'yes it works', nil)
+      # Tasks handle their own conversion to EJSON
+      msg = Volt::EJSON.stringify(['response', 0, 'yes it works', nil, nil])
+      expect(channel).to receive(:send_string_message).with(msg)
 
       dispatcher.dispatch(channel, [0, 'TestTask', :allowed_method, {}, ' it', ' works'])
     end
@@ -37,7 +43,7 @@ if RUBY_PLATFORM != 'opal'
     it 'should not allow eval' do
       channel = double('channel')
 
-      expect(channel).to receive(:send_message).with('response', 0, nil, RuntimeError.new('unsafe method: eval'))
+      expect(channel).to receive(:send_message).with('response', 0, nil, "RuntimeError: unsafe method: eval", nil)
 
       dispatcher.dispatch(channel, [0, 'TestTask', :eval, '5 + 10'])
     end
@@ -45,7 +51,7 @@ if RUBY_PLATFORM != 'opal'
     it 'should not allow instance_eval' do
       channel = double('channel')
 
-      expect(channel).to receive(:send_message).with('response', 0, nil, RuntimeError.new('unsafe method: instance_eval'))
+      expect(channel).to receive(:send_message).with('response', 0, nil, 'RuntimeError: unsafe method: instance_eval', nil)
 
       dispatcher.dispatch(channel, [0, 'TestTask', :instance_eval, '5 + 10'])
     end
@@ -53,7 +59,7 @@ if RUBY_PLATFORM != 'opal'
     it 'should not allow #methods' do
       channel = double('channel')
 
-      expect(channel).to receive(:send_message).with('response', 0, nil, RuntimeError.new('unsafe method: methods'))
+      expect(channel).to receive(:send_message).with('response', 0, nil, 'RuntimeError: unsafe method: methods', nil)
 
       dispatcher.dispatch(channel, [0, 'TestTask', :methods])
     end
@@ -67,6 +73,15 @@ if RUBY_PLATFORM != 'opal'
       dispatcher.dispatch(channel, [0, 'TestTask', :allowed_method, {}, ' it', ' works'])
     end
 
+    it 'should let you set a cookie' do
+      channel = double('channel')
+
+      allow(channel).to receive(:send_message).with('response', 0, 'yes it works', {:something=>"awesome"})
+      expect(Volt.logger).to receive(:log_dispatch)
+
+      dispatcher.dispatch(channel, [0, 'TestTask', :set_cookie, {}])
+    end
+
     it 'closes the channel' do
       disp = dispatcher
       channel    = Volt::ChannelStub.new

data/spec/utils/ejson_spec.rb

@@ -92,6 +92,12 @@ describe Volt::EJSON, '.stringify' do
       )
     end
 
+    it 'should convert symbols to strings' do
+      stringified = subject.stringify({something: :awesome})
+
+      expect(stringified).to eq('{"something":"awesome"}')
+    end
+
     it 'escapes reserved key when type is incorrect' do
       stringified = subject.stringify '$date' => 'something'
 

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

@@ -102,7 +102,13 @@ Volt.configure do |config|
   #
   # Encrypt message bus - messages on the message bus are encrypted by default
   # using rbnacl.
+  <% if config[:disable_encryption] %>
+  #
+  # For dummy apps, we disable_encryption, to simplify the gem requirements.
+  config.message_bus.disable_encryption = true
+  <% else %>
   # config.message_bus.disable_encryption = true
+  <% end %>
   #
   # ## MessageBus Server -- the message bus binds to a port and ip which the
   # other volt instances need to be able to connect to.  You can customize

data/templates/project/config/initializers/boot.rb

@@ -0,0 +1,4 @@
+# Any ./config/initializers/*.rb files will when the app starts up on the server.
+# To load code on the client (or client and server), you can use the
+# config/initializers folder in a component in the app directory.  This folder
+# is only for things that are server only.  (Usually for things like config)

data/volt.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sass', '~> 3.4.15'
   spec.add_dependency 'listen', '~> 3.0.1'
   spec.add_dependency 'configurations', '~> 2.0.0.pre'
-  spec.add_dependency 'opal', '~> 0.8.0'
+  spec.add_dependency 'opal', ['>= 0.8.0', '< 0.9']
   spec.add_dependency 'bundler', '>= 1.5'
   spec.add_dependency 'faye-websocket', '~> 0.10.0'
   spec.add_dependency 'sprockets-helpers', '~> 1.2.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.5.pre9
+  version: 0.9.5.pre11
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -98,16 +98,22 @@ dependencies:
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -416,6 +422,7 @@ files:
 - lib/volt/controllers/collection_helpers.rb
 - lib/volt/controllers/http_controller.rb
 - lib/volt/controllers/http_controller/http_cookie_persistor.rb
+- lib/volt/controllers/login_as_helper.rb
 - lib/volt/controllers/model_controller.rb
 - lib/volt/controllers/template_helpers.rb
 - lib/volt/data_stores/base_adaptor_client.rb
@@ -621,8 +628,11 @@ files:
 - spec/apps/file_loading/app/slideshow/assets/js/test3.js
 - spec/apps/kitchen_sink/.gitignore
 - spec/apps/kitchen_sink/Gemfile
+- spec/apps/kitchen_sink/app/main/assets/css/app.scss
 - spec/apps/kitchen_sink/app/main/assets/css/todos.css
+- spec/apps/kitchen_sink/app/main/assets/images/volt-logo.jpg
 - spec/apps/kitchen_sink/app/main/config/dependencies.rb
+- spec/apps/kitchen_sink/app/main/config/initializers/sample_model_extend.rb
 - spec/apps/kitchen_sink/app/main/config/routes.rb
 - spec/apps/kitchen_sink/app/main/controllers/events_controller.rb
 - spec/apps/kitchen_sink/app/main/controllers/main_controller.rb
@@ -631,6 +641,7 @@ files:
 - spec/apps/kitchen_sink/app/main/controllers/upload_controller.rb
 - spec/apps/kitchen_sink/app/main/controllers/yield_component_controller.rb
 - spec/apps/kitchen_sink/app/main/models/user.rb
+- spec/apps/kitchen_sink/app/main/tasks/login_tasks.rb
 - spec/apps/kitchen_sink/app/main/views/events/index.html
 - spec/apps/kitchen_sink/app/main/views/mailers/welcome.email
 - spec/apps/kitchen_sink/app/main/views/main/bindings.html
@@ -639,7 +650,9 @@ files:
 - spec/apps/kitchen_sink/app/main/views/main/flash.html
 - spec/apps/kitchen_sink/app/main/views/main/form.html
 - spec/apps/kitchen_sink/app/main/views/main/html_safe.html
+- spec/apps/kitchen_sink/app/main/views/main/images.html
 - spec/apps/kitchen_sink/app/main/views/main/index.html
+- spec/apps/kitchen_sink/app/main/views/main/login_from_task.html
 - 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
@@ -671,6 +684,7 @@ files:
 - spec/integration/first_last_spec.rb
 - spec/integration/flash_spec.rb
 - spec/integration/http_endpoints_spec.rb
+- spec/integration/images_spec.rb
 - spec/integration/list_spec.rb
 - spec/integration/missing_spec.rb
 - spec/integration/raw_html_binding.rb
@@ -834,9 +848,7 @@ files:
 - templates/project/config.ru
 - templates/project/config/app.rb.tt
 - templates/project/config/base/index.html
-- templates/project/config/initializers/.empty_directory
-- templates/project/config/initializers/client/.empty_directory
-- templates/project/config/initializers/server/.empty_directory
+- templates/project/config/initializers/boot.rb
 - templates/project/spec/app/main/controllers/server/sample_http_controller_spec.rb
 - templates/project/spec/app/main/integration/sample_integration_spec.rb
 - templates/project/spec/app/main/models/sample_model_spec.rb
@@ -886,8 +898,11 @@ test_files:
 - spec/apps/file_loading/app/slideshow/assets/js/test3.js
 - spec/apps/kitchen_sink/.gitignore
 - spec/apps/kitchen_sink/Gemfile
+- spec/apps/kitchen_sink/app/main/assets/css/app.scss
 - spec/apps/kitchen_sink/app/main/assets/css/todos.css
+- spec/apps/kitchen_sink/app/main/assets/images/volt-logo.jpg
 - spec/apps/kitchen_sink/app/main/config/dependencies.rb
+- spec/apps/kitchen_sink/app/main/config/initializers/sample_model_extend.rb
 - spec/apps/kitchen_sink/app/main/config/routes.rb
 - spec/apps/kitchen_sink/app/main/controllers/events_controller.rb
 - spec/apps/kitchen_sink/app/main/controllers/main_controller.rb
@@ -896,6 +911,7 @@ test_files:
 - spec/apps/kitchen_sink/app/main/controllers/upload_controller.rb
 - spec/apps/kitchen_sink/app/main/controllers/yield_component_controller.rb
 - spec/apps/kitchen_sink/app/main/models/user.rb
+- spec/apps/kitchen_sink/app/main/tasks/login_tasks.rb
 - spec/apps/kitchen_sink/app/main/views/events/index.html
 - spec/apps/kitchen_sink/app/main/views/mailers/welcome.email
 - spec/apps/kitchen_sink/app/main/views/main/bindings.html
@@ -904,7 +920,9 @@ test_files:
 - spec/apps/kitchen_sink/app/main/views/main/flash.html
 - spec/apps/kitchen_sink/app/main/views/main/form.html
 - spec/apps/kitchen_sink/app/main/views/main/html_safe.html
+- spec/apps/kitchen_sink/app/main/views/main/images.html
 - spec/apps/kitchen_sink/app/main/views/main/index.html
+- spec/apps/kitchen_sink/app/main/views/main/login_from_task.html
 - 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
@@ -936,6 +954,7 @@ test_files:
 - spec/integration/first_last_spec.rb
 - spec/integration/flash_spec.rb
 - spec/integration/http_endpoints_spec.rb
+- spec/integration/images_spec.rb
 - spec/integration/list_spec.rb
 - spec/integration/missing_spec.rb
 - spec/integration/raw_html_binding.rb