volt 0.9.2 → 0.9.3.pre1

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

@@ -26,14 +26,22 @@ module Volt
         update(result)
       end
 
+      @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 { changed }
-          `#{element}.on('input.attrbind', #{changed_event})`
+          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})`
@@ -120,7 +128,13 @@ module Volt
       # aren't responsible for it being there.
       case @attribute_name
         when 'value'
-          `#{element}.off('input.attrbind', #{nil})`
+          if @is_select
+            `#{element}.off('change.attrbind')`
+          elsif @is_hidden
+            `#{element}.unwatch('value')`
+          else
+            `#{element}.off('input.attrbind', #{nil})`
+          end
         when 'checked'
           `#{element}.off('change.attrbind', #{nil})`
       end

data/lib/volt/page/page.rb

@@ -15,6 +15,7 @@ require 'volt/page/string_template_renderer'
 require 'volt/page/document_events'
 require 'volt/page/sub_context'
 require 'volt/page/targets/dom_target'
+require 'volt/data_stores/base_adaptor_client'
 
 if RUBY_PLATFORM == 'opal'
   require 'volt/page/channel'

data/lib/volt/reactive/eventable.rb

@@ -2,6 +2,7 @@ module Volt
   # Listeners are returned from #on on a class with Eventable included.
   # Listeners can be stopped by calling #remove
   class Listener
+    attr_reader :events
     def initialize(klass, events, callback)
       @klass    = klass
       @events    = events

data/lib/volt/server.rb

@@ -7,6 +7,7 @@ require 'sass'
 require 'volt/utils/tilt_patch'
 require 'sprockets-sass'
 
+
 require 'volt'
 require 'volt/tasks/dispatcher'
 require 'volt/tasks/task_handler'
@@ -49,7 +50,7 @@ module Volt
     attr_reader :listener, :app_path
 
     # You can also optionally pass in a prebooted app
-    def initialize(root_path = nil, app = false)
+    def initialize(root_path = nil, app = nil)
       @root_path = root_path || Dir.pwd
       @volt_app = app
 

data/lib/volt/server/component_templates.rb

@@ -4,7 +4,47 @@ require 'volt/tasks/task_handler'
 # Initialize with the path to a component and returns all the front-end
 # setup code (for controllers, models, views, and routes)
 module Volt
+  class BasicHandler
+    def call(file_contents)
+      file_contents
+    end
+  end
+
   class ComponentTemplates
+
+    module Handlers #:nodoc:
+      # Setup default handler on extend
+      def self.extended(base)
+        base.register_template_handler :html, BasicHandler.new
+        base.register_template_handler :email, BasicHandler.new
+      end
+
+      @@template_handlers = {}
+
+      def self.extensions
+        @@template_handlers.keys
+      end
+
+      # Register an object that knows how to handle template files with the given
+      # extensions. This can be used to implement new template types.
+      # The handler must respond to +:call+, which will be passed the template
+      # and should return the rendered template as a String.
+      def register_template_handler(extension, handler)
+        @@template_handlers[extension.to_sym] = handler
+      end
+
+      def registered_template_handler(extension)
+        extension && @@template_handlers[extension.to_sym]
+      end
+
+      def handler_for_extension(extension)
+        registered_template_handler(extension)
+      end
+    end
+
+    extend ComponentTemplates::Handlers
+
+
     # client is if we are generating for the client or backend
     def initialize(component_path, component_name, client = true)
       @component_path = component_path
@@ -16,7 +56,8 @@ module Volt
       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
+        code << generate_controller_code + generate_model_code +
+                generate_tasks_code + generate_initializers_code
       end
 
       code
@@ -31,39 +72,47 @@ module Volt
     end
 
     def generate_view_code
-      code       = ''
+      code = ''
       views_path = "#{@component_path}/views/"
 
-      exts = ['html']
-
-      # Only load email templates on the server
-      exts << 'email' unless @client
+      exts = Handlers.extensions
 
       # Load all templates in the folder
       Dir["#{views_path}*/*.{#{exts.join(',')}}"].sort.each do |view_path|
+        # file extension
+        format = File.extname(view_path).downcase.delete('.').to_sym
+
         # Get the path for the template, supports templates in folders
         template_path = view_path[views_path.size..-1].gsub(/[.](#{exts.join('|')})$/, '')
         template_path = "#{@component_name}/#{template_path}"
 
-        all_templates = ViewParser.new(File.read(view_path), template_path)
+        file_contents = File.read(view_path)
 
-        binding_initializers = []
-        all_templates.templates.each_pair do |name, template|
-          binding_code = []
+        # Process template if we have a handler for this file type
+        if handler = ComponentTemplates.handler_for_extension(format)
+          file_contents = handler.call(file_contents)
 
-          if template['bindings']
-            template['bindings'].each_pair do |key, value|
-              binding_code << "#{key.inspect} => [#{value.join(', ')}]"
+          all_templates = ViewParser.new(file_contents, template_path)
+
+          binding_initializers = []
+          all_templates.templates.each_pair do |name, template|
+            binding_code = []
+
+            if template['bindings']
+              template['bindings'].each_pair do |key, value|
+                binding_code << "#{key.inspect} => [#{value.join(', ')}]"
+              end
             end
-          end
 
-          binding_code = "{#{binding_code.join(', ')}}"
+            binding_code = "{#{binding_code.join(', ')}}"
 
-          code << "#{page_reference}.add_template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})\n"
+            code << "#{page_reference}.add_template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})\n"
+          end
         end
       end
 
       code
+
     end
 
     def generate_controller_code
@@ -125,5 +174,6 @@ module Volt
     def generate_initializers_code
       "\nrequire_tree '#{@component_path}/config/initializers/'\n"
     end
+
   end
 end

data/lib/volt/server/forking_server.rb

@@ -79,6 +79,22 @@ module Volt
       end
     end
 
+
+    def stop_child
+      # clear the drb object and kill the child process.
+      if @drb_object
+        begin
+          @drb_object = nil
+          DRb.stop_service
+          @reader.close
+          stop_change_listener
+          Process.kill(9, @child_id)
+        rescue => e
+          puts "Stop Child Error: #{e.inspect}"
+        end
+      end
+    end
+
     # In the even the parent gets killed without at_exit running,
     # we watch the pipe and close if the pipe gets closed.
     def watch_for_parent_exit
@@ -129,20 +145,6 @@ module Volt
       end
     end
 
-    def stop_child
-      # clear the drb object and kill the child process.
-      if @drb_object
-        begin
-          @drb_object = nil
-          DRb.stop_service
-          @reader.close
-          stop_change_listener
-          Process.kill(9, @child_id)
-        rescue => e
-          puts "Stop Child Error: #{e.inspect}"
-        end
-      end
-    end
 
     def reload(changed_files)
       # only reload the server code if a non-view file was changed

data/lib/volt/server/html_parser/sandlebars_parser.rb

@@ -122,7 +122,9 @@ module Volt
           # or end of doc before closed binding
           raise_parse_error("unclosed binding: {#{binding.strip}")
         else
+          #:nocov:
           fail 'should not reach here'
+          #:nocov:
         end
       end
 

data/lib/volt/server/html_parser/view_scope.rb

@@ -30,6 +30,8 @@ module Volt
         case first_symbol
           when 'if'
             add_if(args)
+          when 'unless'
+            add_if("!(#{args})")
           when 'elsif'
             add_else(args)
           when 'else'

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

@@ -16,7 +16,9 @@ module Volt
 
         # Gem folders with volt in them
         # TODO: we should probably qualify this a bit more
-        app_folders += Gem.loaded_specs.values.reduce([]) { |paths, gem| paths << "#{gem.full_gem_path}/app" if gem.name =~ /volt/; paths }
+        app_folders += Gem.loaded_specs.values
+                       .select {|gem| gem.name =~ /volt/ }
+                       .map {|gem| "#{gem.full_gem_path}/app" }
 
         app_folders.uniq
       end
@@ -60,7 +62,7 @@ module Volt
           $LOAD_PATH.unshift(app_folder)
 
           # Sort so we get consistent load order across platforms
-          Dir["#{app_folder}/*/{lib,controllers,models,tasks}/*.rb"].each do |ruby_file|
+          Dir["#{app_folder}/*/{controllers,models,tasks}/*.rb"].each do |ruby_file|
             path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]
             require(path)
           end

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

@@ -23,9 +23,11 @@ module Volt
       Opal.append_path(Volt.root + '/lib')
 
       Gem.loaded_specs.values.each do |gem|
-        path = gem.full_gem_path + '/app'
+        ['app', 'lib'].each do |folder|
+          path = gem.full_gem_path + "/#{folder}"
 
-        Opal.append_path(path) if Dir.exist?(path)
+          Opal.append_path(path) if Dir.exist?(path)
+        end
       end
 
       # Don't run arity checks in production

data/lib/volt/server/socket_connection_handler.rb

@@ -53,7 +53,11 @@ module Volt
         # Remove ourself from the available channels
         @@channels.delete(self)
 
-        QueryTasks.new(self).close!
+        begin
+          @@dispatcher.close_channel(self)
+        rescue DRb::DRbConnError => e
+        # ignore drb read of @@dispatcher error if child has closed
+        end
       else
         Volt.logger.error("Socket Error: Connection already closed\n#{inspect}")
       end

data/lib/volt/spec/setup.rb

@@ -29,6 +29,21 @@ module Volt
         RSpec.configuration.filter_run_excluding type: :feature
       end
 
+
+
+      cleanup_db = -> do
+        Volt::DataStore.fetch.drop_database
+
+        # Clear cached for a reset
+        $page.instance_variable_set('@store', nil)
+        QueryTasks.reset!
+      end
+
+      if RUBY_PLATFORM != 'opal'
+        # Call once during setup to clear if we killed the last run
+        cleanup_db.call
+      end
+
       # Setup the spec collection accessors
       # RSpec.shared_context "volt collections", {} do
       RSpec.shared_examples_for 'volt collections', {} do
@@ -42,23 +57,23 @@ module Volt
           $page.store
         end
 
-        def cleanup_after
-          Volt::DataStore.fetch.drop_database
-
-          $page.instance_variable_set('@store', nil)
-        end
 
         if RUBY_PLATFORM != 'opal'
           after do
             if @__store_accessed
               # Clear the database after each spec where we use store
-              cleanup_after
+              cleanup_db.call
             end
           end
 
+          # Assume store is accessed in capyabara specs
+          before(:context, {type: :feature}) do
+            @__store_accessed = true
+          end
+
           # Cleanup after integration tests also.
-          after(:example, {type: :feature}) do
-            cleanup_after
+          before(:example, {type: :feature}) do
+            @__store_accessed = true
           end
         end
       end

data/lib/volt/tasks/dispatcher.rb

@@ -89,5 +89,9 @@ module Volt
 
       false
     end
+
+    def close_channel(channel)
+      QueryTasks.new(channel).close!
+    end
   end
 end

data/lib/volt/utils/promise_patch.rb

@@ -57,6 +57,9 @@ class Promise
     end
 
     if error
+      err_str = "Exception in Promise at .sync: #{error.inspect}"
+      err_str += error.backtrace.join("\n")
+      Volt.logger.error(err_str)
       fail error
     else
       return result

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.2'
+    STRING = '0.9.3.pre1'
   end
 end

data/spec/apps/kitchen_sink/Gemfile

@@ -13,8 +13,13 @@ gem 'volt-bootstrap_jumbotron_theme'
 gem 'volt-fields'
 gem 'volt-user_templates'
 
+# use mongo for data store while testing
+gem 'volt-mongo'
+
 gem 'opal'
 
+gem 'concurrent-ruby-ext'
+
 # Server for MRI
 platform :mri do
   gem 'thin', '~> 1.6.0'

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

@@ -2,6 +2,7 @@
 
 client '/bindings/{{ route_test }}', action: 'bindings'
 client '/bindings', action: 'bindings'
+client '/form', action: 'form'
 client '/store', action: 'store'
 client '/cookie_test', action: 'cookie_test'
 client '/flash', action: 'flash'

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

@@ -10,6 +10,12 @@ module Main
       a[{}] = 5
     end
 
+    def form_ready
+      `$('#title').html('form_ready')`
+      `$('select#location').val('AL').change()` # have to trigger manually as this is not user initiaized action
+      `$('input#name').val('Test')`
+    end
+
     def flash_notice
       flash._notices << 'A notice message'
     end
@@ -44,6 +50,10 @@ module Main
       '<button id="examplebutton">Example Button</button>'
     end
 
+    def set_show(value)
+      page._show = value
+    end
+
     private
 
     # the main template contains a #template binding that shows another