volt 0.9.1.pre4 → 0.9.1.pre5

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

@@ -98,6 +98,7 @@ module Volt
     # Called when the next template is ready to render
     def render_next_template(full_path, path)
       begin
+        # stop_waiting_for_load
         remove_current_controller_and_template
 
         # Switch the current template
@@ -107,7 +108,6 @@ module Volt
         # Also track the current controller directly
         @controller = @current_controller_handler.controller if full_path
 
-        @waiting_for_load = nil
         render_template(full_path || path)
       rescue => e
         Volt.logger.error("Error during render of template at #{path}: #{e.inspect}")
@@ -115,6 +115,13 @@ module Volt
       end
     end
 
+    def stop_waiting_for_load
+      if @waiting_for_load
+        @waiting_for_load.stop
+        @waiting_for_load = nil
+      end
+    end
+
     # On the next tick, we clear the grouped controller so that any changes to template paths
     # will create a new controller and trigger the action.
     def queue_clear_grouped_controller
@@ -164,9 +171,7 @@ module Volt
     def remove_starting_controller
       # Clear any previously running wait for loads.  This is for when the path changes
       # before the view actually renders.
-      if @waiting_for_load
-        @waiting_for_load.stop
-      end
+      stop_waiting_for_load
 
       if @starting_controller_handler
         # Only call the after_..._removed because the dom never loaded.
@@ -181,8 +186,7 @@ module Volt
       args = [SubContext.new(@arguments, nil, true)]
 
       # get the controller class and action
-      controller_class, action = get_controller(controller_path)
-      controller_class ||= ModelController
+      controller_class, action = ControllerHandler.get_controller_and_action(controller_path)
 
       generated_new = false
       new_controller = Proc.new do
@@ -255,29 +259,5 @@ module Volt
 
       super
     end
-
-    private
-    # Fetch the controller class
-    def get_controller(controller_path)
-      raise "Invalid controller path: #{controller_path.inspect}" unless controller_path && controller_path.size > 0
-
-      action = controller_path[-1]
-
-      # Get the constant parts
-      parts  = controller_path[0..-2].map { |v| v.tr('-', '_').camelize }
-
-      # Do const lookups starting at object and working our way down.
-      # So Volt::ProgressBar would lookup Volt, then ProgressBar on Volt.
-      obj = Object
-      parts.each do |part|
-        if obj.const_defined?(part)
-          obj = obj.const_get(part)
-        else
-          return nil
-        end
-      end
-
-      [obj, action]
-    end
   end
 end

data/lib/volt/page/document_events.rb

@@ -27,7 +27,7 @@ module Volt
     end
 
     def handle(event_name, event, target)
-      element = Element.find(target)
+      element = `$(#{target})`
 
       loop do
         # Lookup the handler, make sure to not assume the group
@@ -35,7 +35,10 @@ module Volt
         # TODO: Sometimes the event doesn't exist, but we still get
         # an event.
         handlers = @events[event_name]
-        handlers = handlers[element.id] if handlers
+
+        element_id = `(element && element[0] && element[0].id) || ''`
+
+        handlers = handlers[element_id] if handlers
 
         if handlers
           handlers.values.each do |handler|
@@ -44,10 +47,10 @@ module Volt
           end
         end
 
-        if element.size == 0
+        if `element.length` == 0
           break
         else
-          element = element.parent
+          `element = element.parent()`
         end
       end
 

data/lib/volt/page/page.rb

@@ -1,7 +1,4 @@
 require 'opal'
-if RUBY_PLATFORM == 'opal'
-  require 'opal-jquery'
-end
 require 'volt/models'
 require 'volt/controllers/model_controller'
 require 'volt/tasks/task_handler'
@@ -33,7 +30,7 @@ require 'volt/page/tasks'
 
 module Volt
   class Page
-    attr_reader :url, :params, :page, :templates, :routes, :events
+    attr_reader :url, :params, :page, :routes, :events
 
     def initialize
       # Run the code to setup the page
@@ -42,6 +39,7 @@ module Volt
       @url         = URL.new
       @params      = @url.params
       @url_tracker = UrlTracker.new(self)
+      @templates   = {}
 
       @events = DocumentEvents.new
 
@@ -140,8 +138,6 @@ module Volt
     attr_reader :events
 
     def add_template(name, template, bindings)
-      @templates ||= {}
-
       # First template gets priority.  The backend will load templates in order so
       # that local templates come in before gems (so they can be overridden).
       #
@@ -153,6 +149,22 @@ module Volt
       end
     end
 
+    # On the server, we can delay loading the views until they are actually requeted.  This
+    # sets up an instance variable to call to load.
+    def template_loader=(callback)
+      @template_loader = callback
+    end
+
+    def templates
+      if @template_loader
+        # Load the templates
+        @template_loader.call
+        @template_loader = nil
+      end
+
+      @templates
+    end
+
     def add_routes(&block)
       @routes   ||= Routes.new
       @routes.define(&block)
@@ -161,7 +173,7 @@ module Volt
 
     def start
       # Setup to render template
-      Element.find('body').html = '<!-- $CONTENT --><!-- $/CONTENT -->'
+      `$('body').html('<!-- $CONTENT --><!-- $/CONTENT -->');`
 
       load_stored_page
 
@@ -208,12 +220,6 @@ module Volt
   if Volt.client?
     $page = Page.new
 
-    # Call start once the page is loaded
-    # Document.ready? do
-    #   $page.start
-    # end
-
-    # For some reason Document.ready? (using opal-jquery) quit working.
     `$(document).ready(function() {`
       $page.start
     `});`

data/lib/volt/page/path_string_renderer.rb

@@ -0,0 +1,41 @@
+# The PathRenderer is a simple way to render a string of the contents of a view
+# at the passed in path.
+
+require 'volt/page/bindings/view_binding/view_lookup_for_path'
+require 'volt/page/bindings/view_binding/controller_handler'
+require 'volt/page/string_template_renderer'
+
+module Volt
+  class ViewLookupException < Exception ; end
+  class PathStringRenderer
+    attr_reader :html
+    def initialize(path, attrs=nil, page=nil, render_from_path=nil)
+      # use the global page if one is not passed in
+      page ||= $page
+
+      # where to do the path lookup from
+      render_from_path ||= "main/main/main/body"
+
+      # Make path into a full path
+      @view_lookup = Volt::ViewLookupForPath.new(page, render_from_path)
+      full_path, controller_path = @view_lookup.path_for_template(path, nil)
+
+      if full_path == nil
+        raise ViewLookupException, "Unable to find view at `#{path}`"
+      end
+
+      controller_class, action = ControllerHandler.get_controller_and_action(controller_path)
+
+      controller = controller_class.new#(SubContext.new(attrs, nil, true))
+      controller.model = SubContext.new(attrs, nil, true)
+
+      renderer = StringTemplateRenderer.new(page, controller, full_path)
+
+      @html = renderer.html
+
+      # remove when done
+      renderer.remove
+    end
+
+  end
+end

data/lib/volt/page/targets/dom_section.rb

@@ -41,12 +41,15 @@ module Volt
     end
 
     def insert_anchor_before_end(binding_name)
-      Element.find(@end_node).before("<!-- $#{binding_name} --><!-- $/#{binding_name} -->")
+      binding_str = "<!-- $#{binding_name} --><!-- $/#{binding_name} -->"
+      `$(#{@end_node}).before(#{binding_str})`
     end
 
     def insert_anchor_before(binding_name, insert_after_binding)
       node = find_by_comment("$#{insert_after_binding}")
-      Element.find(node).before("<!-- $#{binding_name} --><!-- $/#{binding_name} -->")
+
+      binding_str = "<!-- $#{binding_name} --><!-- $/#{binding_name} -->"
+      `$(#{node}).before(#{binding_str})`
     end
 
     # Takes in an array of dom nodes and replaces the current content

data/lib/volt/reactive/computation.rb

@@ -154,7 +154,9 @@ class Proc
         # Values match
 
         # call the block
-        block.call
+        Volt::Computation.run_without_tracking do
+          block.call
+        end
 
         # stop the computation
         comp.stop

data/lib/volt/reactive/reactive_accessors.rb

@@ -4,18 +4,13 @@ module Volt
       # Create a method to read a reactive value from an instance value.  If it
       # is not setup, create it so it can be updated through the reactive value
       # at a later point.
-      def __reactive_dependency_get(var_name)
-        value_dep = instance_variable_get(:"@__#{var_name}_dependency")
-        value_dep ||= instance_variable_set(:"@__#{var_name}_dependency", Dependency.new)
-      end
-
       def reactive_reader(*names)
         names.each do |name|
           var_name = :"@#{name}"
           define_method(name.to_sym) do
             value = instance_variable_get(var_name)
 
-            self.class.__reactive_dependency_get(name).depend
+            __reactive_dependency_get(name).depend
 
             value
           end
@@ -28,7 +23,7 @@ module Volt
           define_method("#{name}=") do |new_value|
             instance_variable_set(var_name, new_value)
 
-            self.class.__reactive_dependency_get(name).changed!
+            __reactive_dependency_get(name).changed!
           end
         end
       end
@@ -42,5 +37,11 @@ module Volt
     def self.included(base)
       base.send :extend, ClassMethods
     end
+
+    def __reactive_dependency_get(var_name)
+      value_dep = instance_variable_get(:"@__#{var_name}_dependency")
+      value_dep ||= instance_variable_set(:"@__#{var_name}_dependency", Dependency.new)
+    end
+
   end
 end

data/lib/volt/reactive/reactive_array.rb

@@ -181,6 +181,8 @@ module Volt
         end
       end
 
+      @persistor.clear if @persistor
+
       # clear the array
       @array = []
     end

data/lib/volt/server/component_handler.rb

@@ -18,13 +18,13 @@ module Volt
       # TODO: Sanatize template path
       component_name = path.gsub(/^\/components\//, '').gsub(/[.](js|map)$/, '')
 
-      javascript_code = compile_for_component(component_name, request_source_map)
+      javascript_code = compile_for_component(component_name, true, request_source_map)
 
       [200, { 'Content-Type' => 'application/javascript; charset=utf-8' }, StringIO.new(javascript_code)]
     end
 
-    def compile_for_component(component_name, map=false)
-      code = ComponentCode.new(component_name, @component_paths).code
+    def compile_for_component(component_name, for_client, map=false)
+      code = ComponentCode.new(component_name, @component_paths, for_client).code
 
       # Compile the code
       # javascript_code = Opal.compile(code)

data/lib/volt/server/component_templates.rb

@@ -16,24 +16,33 @@ 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
+        code << generate_controller_code + generate_model_code + generate_tasks_code + generate_initializers_code
       end
 
       code
     end
 
     def page_reference
-      '$page'
+      if @client
+        '$page'
+      else
+        'page'
+      end
     end
 
     def generate_view_code
       code       = ''
       views_path = "#{@component_path}/views/"
 
+      exts = ['html']
+
+      # Only load email templates on the server
+      exts << 'email' unless @client
+
       # Load all templates in the folder
-      Dir["#{views_path}*/*.html"].sort.each do |view_path|
+      Dir["#{views_path}*/*.{#{exts.join(',')}}"].sort.each do |view_path|
         # Get the path for the template, supports templates in folders
-        template_path = view_path[views_path.size..((-1 * ('.html'.size + 1)))]
+        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)
@@ -96,8 +105,25 @@ module Volt
 
     def generate_tasks_code
       Task.known_handlers.map do |handler|
-        "class #{handler.name} < Volt::Task; end"
-      end.join "\n"
+        # Split into modules and class
+        klass_parts = handler.name.split('::')
+
+        # Start with the inner class
+        parts = ["class #{klass_parts.pop} < Volt::Task; end"]
+
+        # Work backwards on the modules
+        klass_parts.reverse.each do |kpart|
+          parts.unshift("module #{kpart}")
+          parts.push("end")
+        end
+
+        # Combine the parts
+        parts.join("\n")
+      end.join "\n" # combine all into one string
+    end
+
+    def generate_initializers_code
+      "\nrequire_tree '#{@component_path}/config/initializers/'\n"
     end
   end
 end

data/lib/volt/server/forking_server.rb

@@ -63,7 +63,7 @@ module Volt
 
           # Set the drb object locally
           @dispatcher = Dispatcher.new
-          drb_object = DRb.start_service(nil, [self, @dispatcher])
+          drb_object = DRb.start_service('drbunix:', [self, @dispatcher])
 
           @writer.puts(drb_object.uri)
 
@@ -122,7 +122,9 @@ module Volt
         if @exiting
           [500, {}, 'Server Exiting']
         else
-          @server_proxy.call_on_child(env)
+          status, headers, body_str = @server_proxy.call_on_child(env)
+
+          [status, headers, StringIO.new(body_str)]
         end
       end
     end

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

@@ -8,7 +8,11 @@ module Volt
       @included_components = {}
       @components          = []
 
-      component('volt')
+      # Include each of the default included components
+      Volt.config.default_components.each do |def_comp_name|
+        component(def_comp_name)
+      end
+
       component(component_name)
     end
 

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

@@ -55,7 +55,7 @@ module Volt
     end
 
     # Makes each components classes available on the load path, require classes.
-    def require_in_components
+    def require_in_components(page)
       if RUBY_PLATFORM == 'opal'
       else
         app_folders do |app_folder|
@@ -68,15 +68,16 @@ module Volt
           end
         end
 
-        load_views_and_routes
+        # Delay the loading of views
+        page.template_loader = -> { load_views_and_routes(page) }
       end
     end
 
-    def load_views_and_routes
+    def load_views_and_routes(page)
       component_names = []
       app_folders do |app_folder|
         Dir["#{app_folder}/*"].map { |cp| cp[/[^\/]+$/] }.each do |component_name|
-          component_names << component_name if File.directory?(component_name)
+          component_names << component_name
         end
       end
 
@@ -84,6 +85,7 @@ module Volt
       # TODO: Nested components listed twice are are loaded multiple times
       component_names.uniq.each do |component_name|
         code = Volt::ComponentCode.new(component_name, self, false).code
+        # Evaluate returned code, the ```page``` variable is set for access.
         eval(code)
       end
     end

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

@@ -1,8 +1,11 @@
 require 'volt/server/rack/source_map_server'
-if Volt.env.production?
-  # Compress assets in production
-  require 'uglifier'
-end
+
+# There is currently a weird issue with therubyracer
+# https://github.com/rails/execjs/issues/15
+# https://github.com/middleman/middleman/issues/1367
+#
+# To get around this, we just force Node for the time being
+ENV['EXECJS_RUNTIME'] = 'Node'
 
 # Sets up the maps for the opal assets, and source maps if enabled.
 module Volt
@@ -43,10 +46,16 @@ module Volt
 
       environment.cache = Sprockets::Cache::FileStore.new('./tmp')
 
-      if Volt.env.production?
-        # Compress in production
+      # Compress in production
+      if Volt.config.compress_javascript
+        require 'uglifier'
         environment.js_compressor  = Sprockets::UglifierCompressor
-        environment.css_compressor = Sprockets::YUICompressor
+      end
+
+      if Volt.config.compress_css
+        require 'ruby-clean-css'
+        require 'ruby-clean-css/sprockets'
+        RubyCleanCSS::Sprockets.register(environment)
       end
 
       server.append_path(app_path)
@@ -61,10 +70,6 @@ module Volt
         server.append_path(path)
       end
 
-      # opal-jquery gem
-      spec = Gem::Specification.find_by_name('opal-jquery')
-      server.append_path(spec.gem_dir + '/lib')
-
       builder.map '/assets' do
         run server
       end

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

@@ -5,7 +5,7 @@ class QuietCommonLogger < Rack::CommonLogger
   @@ignore_extensions = %w(png jpg jpeg ico gif woff tff svg eot css js)
 
   def call(env)
-    path = env['REQUEST_PATH']
+    path = env['PATH_INFO']
     began_at = Time.now
     status, header, body = @app.call(env)
     header = Utils::HeaderHash.new(header)

data/lib/volt/server.rb

@@ -35,7 +35,7 @@ module Rack
     def call(env)
       status, headers, body = @app.call(env)
 
-      if status == 304 && env['HTTP_CONNECTION'].downcase == 'keep-alive'
+      if status == 304 && env['HTTP_CONNECTION'] && env['HTTP_CONNECTION'].downcase == 'keep-alive'
         headers['Connection'] = 'keep-alive'
       end
 

data/lib/volt/spec/setup.rb

@@ -49,7 +49,7 @@ module Volt
             # Clear the database after each spec where we use store
             # @@db ||= Volt::DataStore.fetch
             # @@db.drop_database
-            ::DataStore.new.drop_database
+            Volt::DataStore.fetch.drop_database
 
             $page.instance_variable_set('@store', nil)
           end

data/lib/volt/version.rb

@@ -0,0 +1,5 @@
+module Volt
+  module Version
+    STRING = '0.9.1.pre5'
+  end
+end

data/lib/volt/volt/app.rb

@@ -1,11 +1,21 @@
 module Volt
   class App
-    attr_reader :component_paths, :router
+    attr_reader :component_paths, :router, :page
 
     def initialize(app_path)
       # Setup root path
       Volt.root = app_path
 
+      # Run the app config to load all users config files
+      unless RUBY_PLATFORM == 'opal'
+        if Volt.server?
+          @page = Page.new
+
+          # Setup a global for now
+          $page = @page unless defined?($page)
+        end
+      end
+
       # Require in app and initializers
       unless RUBY_PLATFORM == 'opal'
         Volt.run_app_and_initializers
@@ -13,7 +23,7 @@ module Volt
 
       # Load component paths
       @component_paths = ComponentPaths.new(app_path)
-      @component_paths.require_in_components
+      @component_paths.require_in_components(@page || $page)
 
       unless RUBY_PLATFORM == 'opal'
         setup_router

data/spec/apps/kitchen_sink/app/main/views/mailers/welcome.email

@@ -0,0 +1,12 @@
+<:Subject>
+  Welcome to the site!
+
+<:Html>
+  <h1>Welcome {{ name }}</h1>
+
+  <p>Glad you signed up!</p>
+
+<:Text>
+Welcome
+
+Glad you signed up!

data/spec/integration/http_endpoints_spec.rb

@@ -7,11 +7,9 @@ describe 'http endpoints', type: :feature, sauce: true do
   end
 
   it 'should have access to the store' do
-    DataStore.new.drop_database
-    $page.store._simple_http_tests << { name: 'hello' }
+    store._simple_http_tests << { name: 'hello' }
     visit '/simple_http/store'
     expect(page).to have_content('You had me at hello')
-    DataStore.new.drop_database
   end
 
   it 'should upload and store a file' do

data/spec/integration/user_spec.rb

@@ -1,16 +1,6 @@
 require 'spec_helper'
 
 describe 'user accounts', type: :feature, sauce: true do
-  before(:each) do
-    # Clear out db
-    DataStore.new.drop_database
-  end
-
-  after(:each) do
-    # Clear out db
-    DataStore.new.drop_database
-  end
-
   it 'should create an account' do
     visit '/'
 

data/spec/models/associations_spec.rb

@@ -11,9 +11,6 @@ end
 describe Volt::Associations do
   if RUBY_PLATFORM != 'opal'
     before do
-      # DataStore.new.drop_database
-      # $page.instance_variable_set('@store', nil)
-
       store._people! << {name: 'Jimmy'}
       @person = store._people[0]
       @person._addresses! << {city: 'Bozeman'}

data/spec/models/model_spec.rb

@@ -540,5 +540,18 @@ describe Volt::Model do
 
       expect(count).to eq(1)
     end
+
+    it 'should query twice and return twice' do
+      store._items << {name: 'One'}
+      store._items << {name: 'Two'}
+
+      a = store._items.fetch.sync
+      b = store._items.fetch.sync
+
+      expect(a.size).to eq(2)
+      expect(b.size).to eq(2)
+
+      expect(a.to_a).to eq(b.to_a)
+    end
   end
 end