volt 0.9.5.pre4 → 0.9.5.pre5

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

@@ -1,6 +1,30 @@
 module Volt
   # Included into ViewScope to provide processing for attributes
   module AttributeScope
+    module ClassMethods
+      def methodize_string(str)
+        # Convert the string passed in to the binding so it returns a ruby Method
+        # instance
+        parts = str.split('.')
+
+        end_call = parts.last.strip
+
+        # If no method(args) is passed, we assume they want to convert the method
+        # to a Method, to be called with *args (from any trigger's), then event.
+        if str !~ /[\[\]\$\@\=]/ && end_call =~ /[_a-z0-9!?]+$/
+          parts[-1] = "method(:#{end_call})"
+
+          str = parts.join('.')
+        end
+
+        str
+      end
+    end
+
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
+
     # Take the attributes and create any bindings
     def process_attributes(tag_name, attributes)
       new_attributes = attributes.dup
@@ -29,6 +53,8 @@ module Volt
       # Remove the e- attribute
       attributes.delete(name)
 
+      value = self.class.methodize_string(value)
+
       save_binding(id, "lambda { |__p, __t, __c, __id| Volt::EventBinding.new(__p, __t, __c, __id, #{event.inspect}, Proc.new {|event| #{value} })}")
     end
 

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

@@ -7,38 +7,46 @@ module Volt
 
       @binding_in_path = path
 
-      component_name = tag_name[1..-1].tr(':', '/')
+      component_name = tag_name[1..-1].tr('-', '_').tr(':', '/')
 
       data_hash = []
       attributes.each_pair do |name, value|
         name = name.tr('-', '_')
-        parts, binding_count = binding_parts_and_count(value)
 
-        # if this attribute has bindings
-        if binding_count > 0
-          if binding_count > 1
-            # Multiple bindings
-          elsif parts.size == 1 && binding_count == 1
-            # A single binding
-            getter = value[2...-2].strip
-            data_hash << "#{name.inspect} => Proc.new { #{getter} }"
+        if name[0..1] == 'e_'
+          # Event binding
+          value = ViewScope.methodize_string(value.strip)
+          data_hash << "#{name.inspect} => Proc.new {|event| #{value} }"
+        else
+          parts, binding_count = binding_parts_and_count(value)
+
+          # if this attribute has bindings
+          if binding_count > 0
+            if binding_count > 1
+              # Multiple bindings
+            elsif parts.size == 1 && binding_count == 1
+              # A single binding
+              getter = value[2...-2].strip
 
-            setter = getter_to_setter(getter)
-            data_hash << "#{(name + '=').inspect} => Proc.new { |val| #{setter} }"
+              data_hash << "#{name.inspect} => Proc.new { #{getter} }"
 
-            # Add an _parent fetcher.  Useful for things like volt-fields to get the parent model.
-            parent = parent_fetcher(getter)
+              setter = getter_to_setter(getter)
+              data_hash << "#{(name + '=').inspect} => Proc.new { |val| #{setter} }"
 
-            # TODO: This adds some overhead, perhaps there is a way to compute this dynamically on the
-            # front-end.
-            data_hash << "#{(name + '_parent').inspect} => Proc.new { #{parent} }"
+              # Add an _parent fetcher.  Useful for things like volt-fields to get the parent model.
+              parent = parent_fetcher(getter)
 
-            # Add a _last_method property.  This is useful
-            data_hash << "#{(name + '_last_method').inspect} => #{last_method_name(getter).inspect}"
+              # TODO: This adds some overhead, perhaps there is a way to compute this dynamically on the
+              # front-end.
+              data_hash << "#{(name + '_parent').inspect} => Proc.new { #{parent} }"
+
+              # Add a _last_method property.  This is useful
+              data_hash << "#{(name + '_last_method').inspect} => #{last_method_name(getter).inspect}"
+            end
+          else
+            # String
+            data_hash << "#{name.inspect} => #{value.inspect}"
           end
-        else
-          # String
-          data_hash << "#{name.inspect} => #{value.inspect}"
         end
       end
 

data/lib/volt/server/middleware/default_middleware_stack.rb

@@ -6,6 +6,7 @@ require 'volt/server/rack/quiet_common_logger'
 require 'volt/server/rack/opal_files'
 require 'volt/server/rack/index_files'
 require 'volt/server/rack/http_resource'
+require 'volt/server/rack/sprockets_helpers_setup'
 
 
 
@@ -33,7 +34,9 @@ module Volt
       }
 
       rack_app.use QuietCommonLogger
-      rack_app.use Rack::ShowExceptions
+      if Volt.env.development? || Volt.env.test?
+        rack_app.use Rack::ShowExceptions
+      end
     end
 
     # Setup the middleware that we need to wait for components to boot before we
@@ -44,6 +47,8 @@ module Volt
       volt_app.opal_files = opal_files
       volt_app.sprockets = opal_files.environment
 
+      Volt::SprocketsHelpersSetup.new(volt_app.sprockets)
+
       # Serve the main html files from public, also figure out
       # which JS/CSS files to serve.
       rack_app.use IndexFiles, volt_app, volt_app.component_paths, opal_files

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

@@ -172,7 +172,9 @@ module Volt
             # aren't imported by default:
             #  http://sass-lang.com/guide
             css_files += Dir["#{path}/**/[^_]*.{css,scss}"].sort.map do |folder|
-              '/assets' + folder[path.size..-1].gsub(/[.]scss$/, '')
+              css_path = '/assets' + folder[path.size..-1].gsub(/[.]scss$/, '')
+              css_path += '.css' unless css_path =~ /[.]css$/
+              css_path
             end
           when :css_file
             css_files << path
@@ -185,10 +187,10 @@ module Volt
     # #javascript is only used on the server
     unless RUBY_PLATFORM == 'opal'
       # Parses the javascript tags to reutrn the following:
-      # [[:url, '/somefile.js'], [:body, 'var inlinejs = true;']]
+      # [[:src, '/somefile.js'], [:body, 'var inlinejs = true;']]
       def javascript(volt_app)
         javascript_tags(volt_app)
-        .scan(/[<]script([^>]*)[>](.*?)[<]\/script[^>]*[>]/)
+        .scan(/[<]script([^>]*)[>](.*?)[<]\/script[^>]*[>]/m)
         .map do |attrs, body|
           src = attrs.match(/[\s|$]src\s*[=]\s*["']([^"']+?)["']/)
 

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

@@ -41,10 +41,6 @@ module Volt
       # @environment                       = Opal::Environment.new
       @environment                       = @server.sprockets
 
-      # Since the scope changes in builder blocks, we need to capture
-      # environment in closure
-      environment                        = @environment
-
       environment.cache = Sprockets::Cache::FileStore.new('./tmp')
 
       # Compress in production
@@ -60,6 +56,10 @@ module Volt
         Csso.install(environment)
       end
 
+      if Volt.config.compress_images
+        add_image_compression
+      end
+
       @server.append_path(app_path)
 
       volt_gem_lib_path = File.expand_path(File.join(File.dirname(__FILE__), '../../..'))
@@ -67,7 +67,17 @@ module Volt
 
       add_asset_folders(@server)
 
-      env = @enviroment
+
+      # Setup ViewProcessor to parse views
+      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?
+
+      # Since the scope changes in builder blocks, we need to capture
+      # environment in closure
+      environment                        = @environment
+
       builder.map '/assets' do
         run environment
       end
@@ -84,28 +94,30 @@ module Volt
       end
 
       if source_map_enabled
-          builder.map(maps_prefix) do
-            require 'rack/conditionalget'
-            require 'rack/etag'
-            use Rack::ConditionalGet
-            use Rack::ETag
-            run maps_app
-          end
+        builder.map(maps_prefix) do
+          require 'rack/conditionalget'
+          require 'rack/etag'
+          use Rack::ConditionalGet
+          use Rack::ETag
+          run maps_app
         end
+      end
+    end
 
+    def add_image_compression
+      if defined?(ImageOptim)
+        env = @environment
+        image_optim = ImageOptim.new({:pngout => false, :svgo => false})
 
+        processor = proc do |_context, data|
+          image_optim.optimize_image_data(data) || data
+        end
 
-      # map server.source_maps.prefix do
-      #   run server.source_maps
-      # end
-
-      # if Volt.source_maps?
-      #   source_maps = SourceMapServer.new(environment)
-      #
-      #   builder.map(source_maps.prefix) do
-      #     run source_maps
-      #   end
-      # end
+        env.register_preprocessor 'image/gif', :image_optim, &processor
+        env.register_preprocessor 'image/jpeg', :image_optim, &processor
+        env.register_preprocessor 'image/png', :image_optim, &processor
+        env.register_preprocessor 'image/svg+xml', :image_optim, &processor
+      end
     end
 
     def add_asset_folders(environment)

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

@@ -0,0 +1,71 @@
+require 'sprockets-helpers'
+
+module Volt
+  class SprocketsHelpersSetup
+    def initialize(env)
+      @env = env
+
+      setup_path_helpers
+      add_linking_in_asset_path
+    end
+
+    def setup_path_helpers
+      digest = Volt.env.production?
+
+      # Configure Sprockets::Helpers (if necessary)
+      Sprockets::Helpers.configure do |config|
+        config.environment = @env
+        config.prefix      = '/assets'
+        config.public_path = 'public'
+        config.debug       = false#!Volt.env.production?
+
+        # Force to debug mode in development mode
+        # Debug mode automatically sets
+        # expand = true, digest = false, manifest = false
+
+        config.digest      = digest
+
+      end
+
+      Sprockets::Helpers.digest = digest
+
+    end
+
+    def add_linking_in_asset_path
+      @env.context_class.class_eval do
+        # We "freedom-patch" sprockets-helpers asset_path method to
+        # automatically link assets.
+        def asset_path(source, options = {})
+          uri = URI.parse(source)
+          return source if uri.absolute?
+
+          options[:prefix] = Sprockets::Helpers.prefix unless options[:prefix]
+
+          if Sprockets::Helpers.debug || options[:debug]
+            options[:manifest] = false
+            options[:digest] = false
+            options[:asset_host] = false
+          end
+
+          source_ext = File.extname(source)
+
+          if options[:ext] && source_ext != ".#{options[:ext]}"
+            uri.path << ".#{options[:ext]}"
+          end
+
+          # Link all assets out of the box
+          # Added by volt
+          link_asset(uri)
+
+          path = find_asset_path(uri, source, options)
+          if options[:expand] && path.respond_to?(:to_a)
+            path.to_a
+          else
+            path.to_s
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -67,8 +67,7 @@ module Volt
       Opal.compile(code)
     end
 
-    def self.setup
-      sprockets = $volt_app.sprockets
+    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

data/lib/volt/utils/promise_extensions.rb

@@ -64,7 +64,7 @@ class Promise
 
   # When testing with rspec, add in a custom exception! method that doesn't
   # swallow ExpectationNotMetError's.
-  if defined?(RSpec::Expectations::ExpectationNotMetError)
+  if defined?(RSpec) && defined?(RSpec::Expectations::ExpectationNotMetError)
     def exception!(error)
       if error.is_a?(RSpec::Expectations::ExpectationNotMetError)
         raise error

data/lib/volt/version.rb

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

data/lib/volt/volt/app.rb

@@ -99,8 +99,6 @@ module Volt
         setup_postboot_middleware
 
         start_message_bus
-
-        Volt::ViewProcessor.setup
       end
     end
 

data/lib/volt/volt/client_setup/browser.rb

@@ -39,6 +39,17 @@ module Volt
     end
 
     def link_clicked(url = '', event = nil)
+      target = nil
+      `target = $(event.target).attr('target');`
+      `if (!target) {`
+        `target = #{nil};`
+      `}`
+
+      if target.present? && target != '_self'
+        # Don't handle if they are opening in a new window
+        return true
+      end
+
       # Skip when href == ''
       return false if url.blank?
 

data/spec/apps/kitchen_sink/Gemfile

@@ -2,31 +2,54 @@ source 'https://rubygems.org'
 
 gem 'volt', path: '../../../'
 
-# The following gem's are optional for themeing
+# volt uses mongo as the default data store.
+gem 'volt-mongo'
 
+# The following gem's are optional for themeing
 # Twitter bootstrap
-gem 'volt-bootstrap'
+gem 'volt-bootstrap', '~> 0.0.10'
 
 # Simple theme for bootstrap, remove to theme yourself.
-gem 'volt-bootstrap_jumbotron_theme'
+gem 'volt-bootstrap_jumbotron_theme', '~> 0.1.0'
 
-gem 'volt-fields'
-gem 'volt-user_templates'
+# User templates for login, signup, and logout menu.
+gem 'volt-user_templates', '~> 0.4.0'
 
-# use mongo for data store while testing
-gem 'volt-mongo'
+# Add ability to send e-mail from apps.
+gem 'volt-mailer', '~> 0.1.0'
+
+gem 'volt-fields'
 
-gem 'opal'
+# Use rbnacl for message bus encrpytion
+# (optional, if you don't need encryption, disable in app.rb and remove)
+#
+# Message Bus encryption is not supported on Windows at the moment.
+platform :ruby, :jruby do
+  gem 'rbnacl', require: false
+  gem 'rbnacl-libsodium', require: false
+end
 
-gem 'concurrent-ruby-ext'
+# Asset compilation gems, they will be required when needed.
+gem 'csso-rails', '~> 0.3.4', require: false
+gem 'uglifier', '>= 2.4.0', require: false
+
+group :test do
+  # Testing dependencies
+  gem 'rspec', '~> 3.2.0'
+  gem 'opal-rspec', '~> 0.4.2'
+  gem 'capybara', '~> 2.4.2'
+  gem 'selenium-webdriver', '~> 2.43.0'
+  gem 'chromedriver2-helper', '~> 0.0.8'
+  gem 'poltergeist', '~> 1.5.0'
+end
 
 # Server for MRI
 platform :mri do
+  # The implementation of ReadWriteLock in Volt uses concurrent ruby and ext helps performance.
+  gem 'concurrent-ruby-ext', '~> 0.8.0'
+
+  # Thin is the default volt server, you Puma is also supported
   gem 'thin', '~> 1.6.0'
+  # gem 'puma'
   gem 'bson_ext', '~> 1.9.0'
 end
-
-# Server for jruby
-platform :jruby do
-  gem 'jubilee'
-end