volt 0.9.5.pre12 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e995f18c906a2379a9a631a32783910067905c19
-  data.tar.gz: fee2b9fc14654a0a3369b72f3e3a3d315af7715b
+  metadata.gz: d8e569efc8f53ee1bf074fa627fe11363ecff05f
+  data.tar.gz: 3cbd7a15e0ff177982e46ab072ff00de7397ccc0
 SHA512:
-  metadata.gz: ccaf2f6f632456efcb2851802d691ae992b150fe0cc84f05d8f7476cebb3b848556f18c11850052fde1a315af3d82fd4c3983c2d5bd1ba4092445451a5da3489
-  data.tar.gz: da08f6eeef5a27ac152827cde226539718e33fb33f6b3c3cdfa2f4a8f783be86b9a7bad1a514a6170b9a83132f55fee31aa59f611915c17bf8db9b1458bd04e1
+  metadata.gz: 00cb9cee43f56ab6ff097bdd4ea449308927563099fb997a2f5d689c68f28e5bcf1dd03e85cf42eb6383db00ac844facce62947cd9db359bf085ca78e307ae43
+  data.tar.gz: c9529a9c9d50431f1756257cbfafb72f6dcf7285a1ba27990f18b2fd2cd5afb09f250a1f4236c313b898366184ab7eca255c66c625d900eeaa28b900fbe86cc9

data/lib/volt/cli/base_index_renderer.rb

@@ -17,7 +17,7 @@ module Volt
 
     # When writing the index, we render the
     def javascript_tags
-      "<script async src=\"#{@volt_app.app_url}/#{@manifest['assets']['main/app.js']}\"></script>"
+      "<script src=\"#{@volt_app.app_url}/#{@manifest['assets']['main/app.js']}\"></script>"
     end
 
     def css_tags

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

@@ -83,8 +83,16 @@ module Volt
           # Multiple bindings
           add_multiple_attribute(tag_name, id, attribute_name, parts, value)
         elsif parts.size == 1 && binding_count == 1
-          # A single binding
-          add_single_attribute(id, attribute_name, parts)
+          getter = parts[0][2...-2].strip
+
+          if getter =~ /^asset_url[ \(]/
+            # asset url helper
+            add_asset_url_attribute(getter, attributes)
+            return # don't delete attr
+          else
+            # A single binding
+            add_single_attribute(id, attribute_name, getter)
+          end
         end
 
         # Remove the attribute
@@ -118,18 +126,26 @@ module Volt
     end
 
     # Add an attribute binding on the tag, bind directly to the getter in the binding
-    def add_single_attribute(id, attribute_name, parts)
-      getter = parts[0][2...-2].strip
-
-      # if getter.index('@')
-      #   raise "Bindings currently do not support instance variables"
-      # end
-
+    def add_single_attribute(id, attribute_name, getter)
       setter = getter_to_setter(getter)
 
       save_binding(id, "lambda { |__p, __t, __c, __id| Volt::AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { #{getter} }, Proc.new { |val| #{setter} }) }")
     end
 
+    def add_asset_url_attribute(getter, attributes)
+      # Asset url helper binding
+      asset_url_parts = getter.split(/[\s\(\)\'\"]/).reject(&:blank?)
+      url = asset_url_parts[1]
+
+      unless url
+        raise "the `asset_url` helper requries a url argument ```{{ asset_url 'pic.png' }}```"
+      end
+
+      link_url = @handler.link_asset(url, false)
+
+      attributes['src'] = link_url
+    end
+
     def add_multiple_attribute(tag_name, id, attribute_name, parts, content)
       case attribute_name
         when 'checked', 'value'
@@ -150,7 +166,7 @@ module Volt
 
     def add_string_template_renderer(content)
       path            = @path + "/_rv#{@binding_number}"
-      new_handler     = ViewHandler.new(path, false)
+      new_handler     = ViewHandler.new(path, nil, false)
       @binding_number += 1
 
       SandlebarsParser.new(content, new_handler)

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

@@ -1,6 +1,6 @@
 module Volt
   class ViewHandler
-    attr_reader :templates, :scope
+    attr_reader :templates, :scope, :links
 
     def html
       last.html
@@ -10,8 +10,13 @@ module Volt
       @scope.last
     end
 
-    def initialize(initial_path, allow_sections = true)
+    # @param [String] - the path to the template file being processed
+    # @param - the sprockets context, used for asset_url bindings
+    # @param [Boolean] - if the processing should  default to body section
+    def initialize(initial_path, sprockets_context=nil, allow_sections = true)
       @original_path = initial_path
+      @sprockets_context = sprockets_context
+      @links = []
 
       # Default to the body section
       initial_path += '/body' if allow_sections
@@ -82,5 +87,22 @@ module Volt
       new_path    = @original_path + '/' + @in_section
       @scope      = [ViewScope.new(self, new_path)]
     end
+
+    # Called from the view scope when an asset_url binding is hit.
+    def link_asset(url, link=true)
+      if @sprockets_context
+        # Getting the asset_path also links to the context.
+        linked_url = @sprockets_context.asset_path(url)
+      else
+        # When compiling on the server, we don't use sprockets (atm), so the
+        # context won't exist.  Typically compiling on the server is just used
+        # to test, so we simply return the url.
+        linked_url = url
+      end
+
+      last << url if link
+
+      linked_url
+    end
   end
 end

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

@@ -8,12 +8,12 @@ require 'volt/server/html_parser/textarea_scope'
 
 module Volt
   class ViewParser
-    attr_reader :templates
+    attr_reader :templates, :links
 
-    def initialize(html, template_path)
+    def initialize(html, template_path, sprockets_context=nil)
       @template_path = template_path
 
-      handler = ViewHandler.new(template_path)
+      handler = ViewHandler.new(template_path, sprockets_context)
 
       SandlebarsParser.new(html, handler)
 
@@ -25,6 +25,7 @@ module Volt
       last_scope.close_scope
 
       @templates = handler.templates
+      @links     = handler.links
     end
 
     # Returns a parsed version of the data (useful for backend rendering

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

@@ -47,6 +47,8 @@ module Volt
             add_template(args)
           when 'yield'
             add_yield(args)
+          when 'asset_url'
+            add_asset_url(args)
           else
             if content =~ /.each\s+do\s+\|/
               add_each(content, false)
@@ -71,6 +73,8 @@ module Volt
             add_content_binding(content)
         end
       end
+
+      nil
     end
 
     def add_content_binding(content)
@@ -142,6 +146,13 @@ module Volt
       @handler.last.close_scope if unary
     end
 
+    # The asset_url binding handles linking assets so they will be precompiled
+    # properly using the sprockets pipeline.
+    def add_asset_url(args)
+      # Add a link to the handler
+      @handler.link_asset(args.gsub(/["']/, '').strip)
+    end
+
     # Called when this scope should be closed out
     def close_scope(pop = true)
       if pop

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

@@ -72,7 +72,10 @@ module Volt
       Volt::ViewProcessor.setup(@environment)
 
       # Use the cached env in production so it doesn't have to stat the FS
-      @environment = @environment.cached if Volt.env.production?
+      if Volt.env.production?
+        @environment = @environment.cached
+        @server.sprockets = @environment
+      end
 
       # Since the scope changes in builder blocks, we need to capture
       # environment in closure

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

@@ -35,24 +35,33 @@ module Volt
     def call(input)
       context = input[:environment].context_class.new(input)
       # context.link_asset('main/assets/images/lombard.jpg')
+      # puts context.asset_path('main/assets/images/lombard.jpg').inspect
       # pp input
       data = input[:data]
 
       # input[:accept] = 'application/javascript'
       # input[:content_type] = 'application/javascript'
       # input[:environment].content_type = 'application/javascript'
-      data = input[:cache].fetch([self.cache_key, data]) do
+      compiled = false
+      data, links = input[:cache].fetch([self.cache_key, data]) do
+        compiled = true
         filename = input[:filename]
         # puts input[:data].inspect
         # Remove all semicolons from source
         # input[:content_type] = 'application/javascript'
-        compile(filename, input[:data])
+        compile(filename, input[:data], context)
+      end
+
+      unless compiled
+        links.each do |link|
+          context.link_asset(link)
+        end
       end
 
       context.metadata.merge(data: data.to_str)
     end
 
-    def compile(view_path, html)
+    def compile(view_path, html, context)
       exts = ComponentTemplates::Preprocessors.extensions
       template_path = view_path.split('/')[-4..-1].join('/').gsub('/views/', '/').gsub(/[.](#{exts.join('|')})$/, '')
 
@@ -65,10 +74,11 @@ module Volt
       if handler = ComponentTemplates.handler_for_extension(format)
         html = handler.call(html)
 
-        code = ViewParser.new(html, template_path).code(app_reference)
+        parser = ViewParser.new(html, template_path, context)
+        code = parser.code(app_reference)
       end
 
-      Opal.compile(code)
+      return [Opal.compile(code), parser.links]
     end
 
     def self.setup(sprockets=$volt_app.sprockets)

data/lib/volt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.5.pre12
+  version: 0.9.5
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -875,9 +875,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5