volt 0.9.5.pre1 → 0.9.5.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a75b8e5c26d8b7a65f1db6e74aa3a439409b9dd
-  data.tar.gz: d672f1462c31eb1dfc1cc757019445290648ba96
+  metadata.gz: a5ad03d3fbc695e769889222bdd6657b969c8f0c
+  data.tar.gz: 71b3134705638ac491e1cdb37859aefafe44d159
 SHA512:
-  metadata.gz: e9462ea295ea9bf43b4e5acdebec5fd6962451a68c2cb656316b0cca67f259f85442df3c1d9ecb7175f8ecbbf9a5402032c552479b5e0164f2e15414c75abf07
-  data.tar.gz: 78804d64f6f96755c02cf27b980e4a831a5cd86fb43679d5dacea621381f0c848a3960510fea4e6da39f0392aec60a85b81652feb5781b285fe81fc59e636624
+  metadata.gz: 97fb9fafd89425cd8a137b9758ebb488a289af1f88b25b4b893693852138a6325e354863d4a737155191f386166af62b54d7e88799b3feef17e74f3f9ef5a9dc
+  data.tar.gz: 8ea29521ba220cfdf866db220bca6e6afc62c2e4086fe4d72b10cbc3964ed7545974ba199ba03a0514c1c620515bc3e139b94506214b6910934dd5a6871823e6

data/CHANGELOG.md

@@ -3,6 +3,8 @@
 ## 0.9.5
 ### Added
 - 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.
 
 ## 0.9.4
 ### Lingo Change

data/README.md

@@ -41,7 +41,7 @@ Rick Carlino has been putting together some great volt tutorial videos also.
 - [Build a Realtime Chat App with Volt](http://datamelon.io/blog/2015/building-a-chat-app-in-volt.html)
 - [Understanding Volt Views](http://datamelon.io/blog/2015/understanding-views-in-volt-with-a-card-game.html)
 
-@anhbizcad maintains a [playlist of Volt related videos](https://www.youtube.com/watch?v=McxtO8ybxy8&list=PLmQFeDKFCPXatHb-zEXwfeMH01DPiZjP7).
+@ahnbizcad maintains a [playlist of Volt related videos](https://www.youtube.com/watch?v=McxtO8ybxy8&list=PLmQFeDKFCPXatHb-zEXwfeMH01DPiZjP7).
 
 # Getting Help
 
@@ -58,3 +58,7 @@ VoltFramework is currently a labor of love mainly built by a small group of core
 [![Pledgie](https://pledgie.com/campaigns/26731.png?skin_name=chrome)](https://pledgie.com/campaigns/26731)
 
 Bitcoins can also be sent to 1AYiL3MiSVe2QFyexzozUvFFH7uGCJgJMZ
+
+
+Timings:
+- view:

data/lib/volt/cli.rb

@@ -67,8 +67,8 @@ module Volt
       # TODO: this is a work around for a bug when switching between
       # source maps and non-source maps.
       if File.exist?('config.ru') && File.exist?('Gemfile')
-        FileUtils.rm_rf('tmp/sass')
-        FileUtils.rm_rf('tmp/sprockets')
+        # FileUtils.rm_rf('tmp/sass')
+        # FileUtils.rm_rf('tmp/sprockets')
       else
         say('Current folder is not a Volt project', :red)
         return

data/lib/volt/models/associations.rb

@@ -2,7 +2,7 @@ module Volt
   module Associations
     module ClassMethods
       def belongs_to(method_name, options = {})
-        collection  ||= options.fetch(:collection, method_name)
+        collection  ||= options.fetch(:collection, method_name).pluralize
         foreign_key ||= options.fetch(:foreign_key, :id)
         local_key   ||= options.fetch(:local_key, "#{method_name}_id")
 
@@ -16,7 +16,7 @@ module Volt
             lookup_key = get(local_key)
 
             # Return a promise for the belongs_to
-            root.get(collection.pluralize).where(foreign_key => lookup_key).first
+            root.get(collection).where(foreign_key => lookup_key).first
           end
         end
 
@@ -28,9 +28,16 @@ module Volt
         end
       end
 
-      def has_many(method_name, remote_key_name = nil)
+      def has_many(method_name, options = {})
+        collection  ||= options.fetch(:collection, method_name).pluralize
+
+        # Use the underscored current class name as the something_id.
+        foreign_key ||= options.fetch(:foreign_key, "#{to_s.underscore.singularize}_id")
+        local_key   ||= options.fetch(:local_key, :id)
+
         define_method(method_name) do
-          get(method_name.pluralize, true)
+          lookup_key = get(local_key)
+          get(collection).where(foreign_key => lookup_key)
         end
       end
 

data/lib/volt/server/component_templates.rb

@@ -1,5 +1,7 @@
 require 'volt/server/html_parser/view_parser'
 require 'volt/tasks/task'
+require 'volt/server/template_handlers/preprocessors'
+
 
 # Initialize with the path to a component and returns all the front-end
 # setup code (for controllers, models, views, and routes)
@@ -11,39 +13,7 @@ module Volt
   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
-
+    extend ComponentTemplates::Preprocessors
 
     # client is if we are generating for the client or backend
     def initialize(component_path, component_name, client = true)
@@ -75,52 +45,39 @@ module Volt
       code = ''
       views_path = "#{@component_path}/views/"
 
-      exts = Handlers.extensions
+      exts = Preprocessors.extensions
 
       # Load all templates in the folder
       Dir["#{views_path}*/*.{#{exts.join(',')}}"].sort.each do |view_path|
-        path_parts = view_path.scan(/([^\/]+)\/([^\/]+)\/[^\/]+\/([^\/]+)[.](html|email)$/)
-        component_name, controller_name, view, _ = path_parts[0]
-
-        # 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}"
+        if @client
+          require_path = view_path.split('/')[-4..-1].join('/').gsub(/[.][^.]*$/, '')
 
-        file_contents = File.read(view_path)
-
-        # template_calls = []
-
-        # Process template if we have a handler for this file type
-        if handler = ComponentTemplates.handler_for_extension(format)
-          file_contents = handler.call(file_contents)
+          # On the client side, we can just require the file and let sprockets
+          # handle things.
+          code << "\nrequire '#{require_path}'\n"
+        else
+          # On the sever side, we eval the compiled code
+          path_parts = view_path.scan(/([^\/]+)\/([^\/]+)\/[^\/]+\/([^\/]+)[.](html|email)$/)
+          component_name, controller_name, view, _ = path_parts[0]
 
-          all_templates = ViewParser.new(file_contents, template_path)
+          # file extension
+          format = File.extname(view_path).downcase.delete('.').to_sym
 
-          binding_initializers = []
-          all_templates.templates.each_pair do |name, template|
-            binding_code = []
+          # 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}"
 
-            if template['bindings']
-              template['bindings'].each_pair do |key, value|
-                binding_code << "#{key.inspect} => [#{value.join(', ')}]"
-              end
-            end
+          html = File.read(view_path)
 
-            binding_code = "{#{binding_code.join(', ')}}"
+          if handler = ComponentTemplates.handler_for_extension(format)
+            html = handler.call(html)
 
-            code << "#{app_reference}.add_template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})\n"
-            # template_calls << "template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})"
+            code << ViewParser.new(html, template_path).code(app_reference)
           end
         end
-
-        # puts "module #{component_name.camelize}\n  class #{controller_name.camelize}\n    class VoltTemplates < VoltTemplates\n      #{template_calls.join("\n")}\n    end\n  end\nend"
       end
 
       code
-
     end
 
     def generate_controller_code
@@ -141,7 +98,7 @@ module Volt
 
       controllers.each do |path|
         if File.exists?(path)
-          code << "require '#{localize_path(path)}'\n"
+          code << "\nrequire '#{localize_path(path)}'\n"
         else
           # parts = path.scan(/([^\/]+)\/controllers\/([^\/]+)_controller[.]rb$/)
           # component, controller = parts[0]

data/lib/volt/server/forking_server.rb

@@ -31,6 +31,9 @@ module Volt
 
       @server = server
 
+      # Set the mod time on boot
+      update_mod_time
+
       start_child
     end
 
@@ -216,6 +219,14 @@ module Volt
 
       Volt.logger.log_with_color(msg, :light_blue)
 
+
+      # Figure out if any views or routes were changed:
+      # TODO: Might want to only check for /config/ under the CWD
+      if changed_files.any? {|path| path =~ /\/config\// }
+        update_mod_time
+        sync_mod_time
+      end
+
       begin
         SocketConnectionHandler.send_message_all(nil, 'reload')
       rescue => e
@@ -227,11 +238,25 @@ module Volt
         @child_lock.with_write_lock do
           stop_child
           start_child
+          sync_mod_time
         end
       end
     end
 
+    def update_mod_time
+      @last_mod_time = Time.now.to_i.to_s
+    end
+
+    def sync_mod_time
+      disp = SocketConnectionHandler.dispatcher
+
+      unless disp.is_a?(ErrorDispatcher)
+        disp.component_modified(@last_mod_time)
+      end
+    end
+
     def start_change_listener
+      sync_mod_time
       # Setup the listeners for file changes
       @listener = Listen.to("#{@server.app_path}/") do |modified, added, removed|
         Thread.new do

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

@@ -42,5 +42,25 @@ module Volt
 
       templates
     end
+
+    # Generate code for the view that can be evaled.
+    def code(app_reference)
+      code = ''
+      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
+
+        binding_code = "{#{binding_code.join(', ')}}"
+
+        code << "#{app_reference}.add_template(#{name.inspect}, #{template['html'].inspect}, #{binding_code})\n"
+      end
+
+      code
+    end
   end
 end

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

@@ -20,7 +20,9 @@ class QuietCommonLogger < Rack::CommonLogger
 
     body = BodyProxy.new(body) do
       # Don't log on ignored extensions
-      if !@@ignore_extensions.include?(ext) && !@logged
+      if !@@ignore_extensions.include?(ext) &&
+         !path.start_with?('/__OPAL_SOURCE_MAPS__/') &&
+         !@logged
         log(env, status, header, began_at)
       end
     end

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

@@ -0,0 +1,33 @@
+module Volt
+  class ComponentTemplates
+    module Preprocessors #: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
+  end
+end

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

@@ -1,3 +1,6 @@
+require 'volt/server/template_handlers/view_processor'
+require 'sprockets'
+
 # This file Monkeypatches sprockets to provide custom file loading (from volt
 # instead disk) for component root files.  These files then require in all parts
 # or include generated ruby for templates, routes, and tasks.
@@ -19,9 +22,9 @@ module Volt
       "stub-digest-#{mtime}"
     end
 
+    # Get the mtime from the forking server
     def mtime
-      # return a random mtime so it always reloads
-      rand(2_000_000_000)
+      Volt::Dispatcher.component_last_modified_time.to_s
     end
   end
 end
@@ -45,7 +48,8 @@ module Sprockets
         stats[path] = Volt::StatStub.new
 
         # Working with a component path
-        data = Volt::ComponentCode.new(component_name, $volt_app.component_paths, true).code
+        volt_app = Thread.current['volt_app'] || $volt_app
+        data = Volt::ComponentCode.new(component_name, volt_app.component_paths, true).code
       else
         data = env.read_file(input[:filename], input[:content_type])
       end
@@ -72,10 +76,6 @@ module Sprockets
     #
     # Returns true path exists and is a file.
     def file?(path)
-      # if path =~  /\/components\/[^.]+[.]rb$/
-      #   return true
-      # end
-
       if stat = self.stat(path)
         stat.file?
       elsif path =~ /^#{Volt.root}\/app\/components\/[^\/]+[.]rb$/
@@ -85,27 +85,6 @@ module Sprockets
         false
       end
     end
-
-    # Public: Like `File.directory?`.
-    #
-    # path - String file path.
-    #
-    # Returns true path exists and is a directory.
-    def directory?(path)
-      # if path == '/Users/ryanstout/Sites/volt/volt/app/components/main'
-      #   return true
-      # end
-
-      if stat = self.stat(path)
-        stat.directory?
-      # else
-      elsif path =~ /^#{Volt.root}\/app\/components\/[^\/]+$/
-        # Matches a component
-        return true
-      else
-        false
-      end
-    end
   end
 end
 
@@ -128,6 +107,30 @@ module Sprockets
   end
 end
 
+module Sprockets
+  class Base
+    def file_digest(path)
+      if stat = self.stat(path)
+        # Caveat: Digests are cached by the path's current mtime. Its possible
+        # for a files contents to have changed and its mtime to have been
+        # negligently reset thus appearing as if the file hasn't changed on
+        # disk. Also, the mtime is only read to the nearest second. Its
+        # also possible the file was updated more than once in a given second.
+        cache.fetch("file_digest:#{path}:#{stat.mtime.to_i}") do
+          self.stat_digest(path, stat)
+        end
+      elsif path =~ /^#{Volt.root}\/app\/components\/[^\/]+$/
+        # Return a random mtime
+        # puts "LMT: #{Volt::Dispatcher.last_modified_time.inspect}"
+        mtime = Volt::Dispatcher.component_last_modified_time.to_s
+
+        # puts "STUB: #{mtime}"
+        "stub-digest-#{mtime}"
+      end
+    end
+  end
+end
+
 module Sprockets
   module Resolve
     def path_matches(load_path, logical_name, logical_basename)

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

@@ -0,0 +1,77 @@
+require 'volt/server/component_templates'
+require 'opal/sprockets/processor'
+require 'sprockets'
+require 'tilt'
+require 'opal/sprockets/processor'
+
+module Volt
+
+
+
+  class ViewProcessor < ::Opal::TiltTemplate
+
+    def initialize(client)
+      @client = client
+    end
+
+    def app_reference
+      if @client
+        'Volt.current_app'
+      else
+        'volt_app'
+      end
+    end
+
+    def cache_key
+      @cache_key ||= "#{self.class.name}:0.1".freeze
+    end
+
+    # def evaluate(context, locals, &block)
+    #   binding.pry
+    #   @data = compile(@data)
+    #   super
+    # end
+
+    def call(input)
+      # 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
+        filename = input[:filename]
+        # puts input[:data].inspect
+        # Remove all semicolons from source
+        # input[:content_type] = 'application/javascript'
+        compile(filename, input[:data])
+      end
+    end
+
+    def compile(view_path, html)
+      exts = ComponentTemplates::Preprocessors.extensions
+      template_path = view_path.split('/')[-4..-1].join('/').gsub('/views/', '/').gsub(/[.](#{exts.join('|')})$/, '')
+
+      exts = ComponentTemplates::Preprocessors.extensions
+
+      format = File.extname(view_path).downcase.delete('.').to_sym
+      code = ''
+
+      # Process template if we have a handler for this file type
+      if handler = ComponentTemplates.handler_for_extension(format)
+        html = handler.call(html)
+
+        code = ViewParser.new(html, template_path).code(app_reference)
+      end
+
+      Opal.compile(code)
+    end
+
+    def self.setup
+      sprockets = $volt_app.sprockets
+      sprockets.register_mime_type 'application/vtemplate', extensions: ['.html', '.email']
+      sprockets.register_transformer 'application/vtemplate', 'application/javascript', Volt::ViewProcessor.new(true)
+    end
+  end
+end
+

data/lib/volt/tasks/dispatcher.rb

@@ -30,6 +30,23 @@ module Volt
       @worker_timeout = Volt.config.worker_timeout || 60
     end
 
+    # Mark the last time of the component modification for caching in sprockets
+    def self.component_modified(time)
+      @last_modified_time = time
+    end
+
+    def component_modified(time)
+      self.class.component_modified(time)
+    end
+
+    def self.component_last_modified_time
+      unless @last_modified_time
+        component_modified(Time.now.to_i.to_s)
+      end
+
+      @last_modified_time
+    end
+
     # 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/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.5.pre1'
+    STRING = '0.9.5.pre2'
   end
 end

data/lib/volt/volt/app.rb

@@ -30,6 +30,7 @@ if RUBY_PLATFORM == 'opal'
   require 'volt/volt/client_setup/browser'
 else
   require 'volt/volt/server_setup/app'
+  require 'volt/server/template_handlers/view_processor'
 end
 
 module Volt
@@ -51,6 +52,9 @@ module Volt
         raise "Volt::App.new requires an app path to boot"
       end
 
+      # Expand to a full path
+      app_path = File.expand_path(app_path)
+
       @app_path = app_path
       $volt_app = self
 
@@ -90,6 +94,8 @@ module Volt
         setup_postboot_middleware
 
         start_message_bus
+
+        Volt::ViewProcessor.setup
       end
     end
 

data/spec/models/associations_spec.rb

@@ -30,6 +30,7 @@ describe Volt::Associations do
       it 'should associate via belongs_to' do
         address = store.addresses.first.sync
 
+        expect(address.person_id).to eq(@person.id)
         expect(address.person.sync.id).to eq(@person.id)
       end
 
@@ -83,6 +84,7 @@ describe Volt::Associations do
     it 'should assign the reference_id for has_many' do
       bob = store.people.create.sync
       address = bob.addresses.create({:street => '1234 awesome street'})
+
       expect(bob.addresses[0].sync.person_id).to eq(bob.id)
       expect(bob.id).to_not eq(nil)
     end

data/spec/server/component_templates_spec.rb

@@ -5,16 +5,16 @@ else
   require 'volt/server/component_templates'
 
   describe Volt::ComponentTemplates do
-    let(:haml_handler) do 
+    let(:haml_handler) do
       double(:haml_handler)
     end
 
     it 'can be extended' do
-      expect( Volt::ComponentTemplates::Handlers.extensions ).to eq([ :html, :email ])
+      expect( Volt::ComponentTemplates::Preprocessors.extensions ).to eq([ :html, :email ])
 
-      Volt::ComponentTemplates.register_template_handler(:haml, haml_handler) 
+      Volt::ComponentTemplates.register_template_handler(:haml, haml_handler)
 
-      expect( Volt::ComponentTemplates::Handlers.extensions ).to eq([ :html, :email, :haml ])
+      expect( Volt::ComponentTemplates::Preprocessors.extensions ).to eq([ :html, :email, :haml ])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.5.pre1
+  version: 0.9.5.pre2
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -549,7 +549,9 @@ 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/template_handlers/preprocessors.rb
 - lib/volt/server/template_handlers/sprockets_component_handler.rb
+- lib/volt/server/template_handlers/view_processor.rb
 - lib/volt/server/websocket/rack_server_adaptor.rb
 - lib/volt/server/websocket/websocket_handler.rb
 - lib/volt/spec/capybara.rb