volt 0.9.5.pre7 → 0.9.5.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f390816bb9edfcbfae226435bb32d20e2d70ea4
-  data.tar.gz: ea40df8a4eceb9edc38baa64cd70499537d8d4aa
+  metadata.gz: c66c8281cc4ad10eadde2b575b4ca2606cf270e8
+  data.tar.gz: f76598259c1dcd62376c61efb2f208295bc221cd
 SHA512:
-  metadata.gz: 12e637430dd9d239703bf3383132610128245e3b0ec1509bd027ba6ed9835aac3538c5e15e5f9be35a58bb4fde768aec0f001c88226e4e8b25abf0b95e70539c
-  data.tar.gz: 0ed51b143c52f690c813afe97b7e1decd282b6800269af5b8b9d3953dc742e60da863b5608c7a7cb3881fffe3935c3a9c5f0558d51fa12f028f2f051d100cbb9
+  metadata.gz: a5f7e6b83f481e1c81222c93df07f77a2fc3dc8715de60712950701cda264c6192fa9ce294d680f4ce77fba651948562386d774e312893862a374e0b7253218a
+  data.tar.gz: 89030a005ae230751ed6f45f0afaa1ac190fbe0c0abe3fb63f9e7643ffda2675904748251f86dd4bbab53a84fb70af0bb208f5e42ef95bb7a6591d6d25668dde

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 
 ## 0.9.5
+### Breaking Changes
+- previously, we mounted the asset folders in components at /assets, and we also mounted the /app folder (and any gem's app folders') at /assets.  This allowed you to usually access what you wanted at /assets, but resulted in conflicts.  To ensure better component isolation, we now only mount the ```app``` folders.  To make things clear, instead of sprockets being mounted at /assets, it is now mounted at /app.  So the url for something in /app/main/assets/css/something.css can be accessed at (you guessed it) /app/main/assets/css/something.css
+
 ### 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!)
@@ -12,6 +15,8 @@
 - Rewrote the precompile pipeline.
     - Added image compression by default. (using image_optim)
 - All volt CLI tasks now can run from inside of any directory in the volt app (or the root)
+- Asset precompilation has been reworked to use Sprockets::Manifest.  The results are written to /public, and an index.html file is created.  The entire app loading up until the websocket connect can be served statically (via nginx for example)  All js and css is written to a single file.
+- The ```generate gem``` generator has been improved to setup a dummy app and integration specs out of the box.
 
 ### Changed
 - fix issue with ```raw``` and promises (#275)

data/lib/volt/cli.rb

@@ -17,16 +17,7 @@ module Volt
     desc 'new PROJECT_NAME', 'generates a new project.'
 
     def new(name)
-      require 'securerandom'
-
-      # Grab the current volt version
-      directory('project', name, version: Volt::Version::STRING, name: name, domain: name.dasherize.downcase, app_name: name.capitalize)
-
-      # Move into the directory
-      Dir.chdir(name) do
-        # bundle
-        bundle_command('install')
-      end
+      new_project(name)
 
       say ""
       say "Your app is now ready in the #{name} directory.", :green
@@ -63,11 +54,12 @@ module Volt
 
       require 'fileutils'
       require 'volt/server'
+      require 'volt/utils/recursive_exists'
 
       # If we're in a Volt project, clear the temp directory
       # 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')
+      if RecursiveExists.exists_here_or_up?('config.ru') && RecursiveExists.exists_here_or_up?('Gemfile')
         # FileUtils.rm_rf('tmp/sass')
         # FileUtils.rm_rf('tmp/sprockets')
       else
@@ -126,13 +118,30 @@ module Volt
     end
 
     no_tasks do
+      # The logic for creating a new project.  We want to be able to invoke this
+      # inside of a method so we can run it with Dir.chdir
+      def new_project(name, skip_gemfile = false)
+        require 'securerandom'
+
+        # Grab the current volt version
+        directory('project', name, version: Volt::Version::STRING, name: name, domain: name.dasherize.downcase, app_name: name.capitalize)
+
+        unless skip_gemfile
+          # Move into the directory
+          Dir.chdir(name) do
+            # bundle
+            bundle_command('install')
+          end
+        end
+      end
+
       def move_to_root
         unless Gem.win_platform?
           # Change CWD to the root of the volt project
           pwd = Dir.pwd
           changed = false
           loop do
-            if File.exists?(pwd + '/Gemfile')
+            if File.exists?(pwd + '/config.ru') || File.exists?(pwd + '/Gemfile')
               Dir.chdir(pwd) if changed
               break
             else

data/lib/volt/cli/asset_compile.rb

@@ -16,6 +16,11 @@ module Volt
       ENV['MAPS'] = 'false'
       ENV['NO_FORKING'] = 'true'
 
+      if !ENV['VOLT_ENV'] && !ENV['RACK_ENV']
+        # Set the default env for compile
+        ENV['VOLT_ENV'] = 'production'
+      end
+
       require 'opal'
       require 'rack'
       require 'volt'
@@ -41,7 +46,7 @@ module Volt
     end
 
     def write_files_and_manifest
-      asset_files = AssetFiles.from_cache('main', @volt_app.component_paths)
+      asset_files = AssetFiles.from_cache(@volt_app.app_url, 'main', @volt_app.component_paths)
       # Write a temp css file
       js = asset_files.javascript(@volt_app)
       css = asset_files.css
@@ -51,7 +56,7 @@ module Volt
         js.each do |type, src_or_body|
           if type == :src
             src = src_or_body
-            url = src.gsub(/^\/assets\//, '')
+            url = src.gsub(/^#{@volt_app.app_url}\//, '')
             file.write("//= require '#{url}'\n")
           else
             body = src_or_body
@@ -73,14 +78,14 @@ module Volt
 
       File.open(Volt.root + '/app/main/app.scss', 'wb') do |file|
         css.each do |link|
-          url = link.gsub(/^\/assets\//, '')
+          url = link.gsub(/^#{@volt_app.app_url}\//, '')
           file.write("//= require '#{url}'\n")
         end
       end
     end
 
     def compile_manifests
-      manifest = Sprockets::Manifest.new(@volt_app.sprockets, './public/assets/manifest.json')
+      manifest = Sprockets::Manifest.new(@volt_app.sprockets, "./public#{@volt_app.app_url}/manifest.json")
 
       # Compile the files (and linked assets)
       manifest.compile('main/app.js')
@@ -90,8 +95,8 @@ module Volt
       @tmp_files.each {|path| FileUtils.rm(path) }
 
       # Remove the temp files
-      FileUtils.rm(Volt.root + '/app/main/app.js')
-      FileUtils.rm(Volt.root + '/app/main/app.scss')
+      FileUtils.rm(Volt.root + "#{@volt_app.app_url}/main/app.js")
+      FileUtils.rm(Volt.root + "#{@volt_app.app_url}/main/app.scss")
     end
 
     def write_index
@@ -100,8 +105,8 @@ module Volt
       output_path = "#{@root_path}/public/index.html"
       require 'json'
 
-      @manifest = JSON.parse(File.read(@root_path + '/public/assets/manifest.json'))
-      output_html = BaseIndexRenderer.new(@manifest).html
+      @manifest = JSON.parse(File.read(@root_path + "/public#{@volt_app.app_url}/manifest.json"))
+      output_html = BaseIndexRenderer.new(@volt_app, @manifest).html
 
       write_file(output_path, output_html)
     end

data/lib/volt/cli/base_index_renderer.rb

@@ -3,7 +3,8 @@
 
 module Volt
   class BaseIndexRenderer
-    def initialize(manifest)
+    def initialize(volt_app, manifest)
+      @volt_app = volt_app
       @manifest = manifest
     end
 
@@ -16,11 +17,11 @@ module Volt
 
     # When writing the index, we render the
     def javascript_tags
-      "<script src=\"/assets/#{@manifest['assets']['main/app.js']}\"></script>"
+      "<script async src=\"#{@volt_app.app_url}/#{@manifest['assets']['main/app.js']}\"></script>"
     end
 
     def css_tags
-      "<link href=\"/assets/#{@manifest['assets']['main/app.css']}\" media=\"all\" rel=\"stylesheet\" type=\"text/css\" />"
+      "<link href=\"#{@volt_app.app_url}/#{@manifest['assets']['main/app.css']}\" media=\"all\" rel=\"stylesheet\" type=\"text/css\" />"
     end
   end
 end

data/lib/volt/cli/new_gem.rb

@@ -25,6 +25,25 @@ class NewGem
 
     copy_files
     copy_options
+
+    # Create a sample project inside of the specs folder
+    Dir.chdir(@target + '/spec') do
+      @thor.say 'Generating dummy project for integration specs', :green
+      cli = Volt::CLI.new
+      cli.shell.mute do
+        cli.new_project('dummy', true)
+      end
+
+      # Remove gemfile
+      FileUtils.rm('dummy/Gemfile')
+
+      # Remove spec directory inside of dummy app
+      FileUtils.rm_rf('dummy/spec')
+    end
+
+    puts "Initializing git repo in #{@target}"
+    Dir.chdir(@target) { `git init`; `git add .` }
+
   end
 
   # Check with the rubygems api to see if this gem name is available.
@@ -78,9 +97,8 @@ at choosealicense.com/licenses/mit.\n\ny/(n):")
     copy('newgem/bin/newgem.tt', "bin/#{@name}") if @options[:bin]
     copy('newgem/rspec.tt', '.rspec')
     copy('newgem/spec/spec_helper.rb.tt', 'spec/spec_helper.rb')
-    copy('newgem/spec/newgem_spec.rb.tt', "spec/#{@namespaced_path}_spec.rb")
-    puts "Initializing git repo in #{@target}"
-    Dir.chdir(@target) { `git init`; `git add .` }
+    copy('newgem/spec/newgem_spec.rb.tt', "spec/sample_spec.rb")
+    copy('newgem/spec/integration/sample_integration_spec.rb', "spec/integration/sample_integration_spec.rb")
 
     if @options[:edit]
       run("#{@options['edit']} \"#{gemspec_dest}\"")  # Open gemspec in editor
@@ -115,7 +133,7 @@ at choosealicense.com/licenses/mit.\n\ny/(n):")
 
   def volt_version_base
     require 'volt/version'
-    Volt::Version::STRING.split('.').tap { |v| v[v.size - 1] = 0 }.join('.')
+    Volt::Version::STRING
   end
 
   def get_constant_name

data/lib/volt/models/model.rb

@@ -365,6 +365,9 @@ module Volt
             # Revert wholesale
             @attributes = old_attrs
             Promise.new.resolve(errs)
+          else
+            # Persist
+            persist_changes(nil)
           end
         end
       end

data/lib/volt/models/validators/length_validator.rb

@@ -19,9 +19,9 @@ module Volt
       end
 
       if !value || value.size < min
-        errors[field_name] = [message || "must be at least #{args} characters"]
+        errors[field_name] = [message || "must be at least #{min} characters"]
       elsif max && value.size > max
-        errors[field_name] = [message || "must be less than #{args} characters"]
+        errors[field_name] = [message || "must be less than #{max} characters"]
       end
 
       errors

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

@@ -13,19 +13,19 @@ module Volt
     end
 
     def key_code
-      `this.js_event.keyCode`
+      `self.js_event.keyCode`
     end
 
     def stop!
-      `this.js_event.stopPropagation();`
+      `self.js_event.stopPropagation();`
     end
 
     def prevent_default!
-      `this.js_event.preventDefault();`
+      `self.js_event.preventDefault();`
     end
 
     def target
-      `this.js_event.toElement`
+      `self.js_event.toElement || self.js_event.target`
     end
   end
 

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

@@ -43,11 +43,11 @@ module Volt
     # can set them up.
     def self.postboot_setup(volt_app, rack_app)
       # Serve the opal files
-      opal_files = OpalFiles.new(rack_app, volt_app.app_path, volt_app.component_paths)
+      opal_files = OpalFiles.new(rack_app, volt_app.app_url, volt_app.app_path, volt_app.component_paths)
       volt_app.opal_files = opal_files
       volt_app.sprockets = opal_files.environment
 
-      Volt::SprocketsHelpersSetup.new(volt_app.sprockets)
+      Volt::SprocketsHelpersSetup.new(volt_app)
 
       # Serve the main html files from public, also figure out
       # which JS/CSS files to serve.

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

@@ -4,17 +4,18 @@ require 'uri'
 # from the dependencies.rb files.
 module Volt
   class AssetFiles
-    def self.from_cache(component_name, component_paths)
+    def self.from_cache(app_url, component_name, component_paths)
       # @cache ||= {}
 
       # @cache[component_name] ||= begin
         # not cached, create
 
-        self.new(component_name, component_paths)
+        self.new(app_url, component_name, component_paths)
       # end
     end
 
-    def initialize(component_name, component_paths)
+    def initialize(app_url, component_name, component_paths)
+      @app_url = app_url
       @component_paths     = component_paths
       @assets              = []
       @included_components = {}
@@ -93,7 +94,7 @@ module Volt
 
     def prepare_locator(locator, valid_extensions)
       unless url_or_path?(locator)
-        locator = File.join('/assets', @current_component, '/assets', valid_extensions.first, "#{locator}")
+        locator = File.join(@app_url, @current_component, '/assets', valid_extensions.first, "#{locator}")
         locator += '.css' unless locator =~ /^.*\.(#{valid_extensions.join('|')})$/
       end
       locator
@@ -129,7 +130,10 @@ module Volt
         case type
           when :folder
             # for a folder, we search for all .js files and return a tag for them
-            javascript_files += Dir["#{path}/**/*.js"].sort.map { |folder| '/assets' + folder[path.size..-1] }
+            javascript_files += Dir["#{path}/**/*.js"].sort.map do |folder|
+              # Grab the component folder/assets/js/file.js
+              @app_url + '/' + folder.split('/')[-4..-1].join('/')
+            end
           when :javascript_file
             # javascript_file is a cdn path to a JS file
             javascript_files << path
@@ -146,7 +150,7 @@ module Volt
       if ENV['MAPS'] == 'all'
         scripts << @opal_tag_generator.javascript_include_tag(volt_path)
       else
-        scripts << "<script src=\"/assets/#{volt_path}.js\"></script>"
+        scripts << "<script src=\"#{volt_app.app_url}/#{volt_path}.js\"></script>"
         scripts << "<script>#{Opal::Processor.load_asset_code(volt_app.sprockets, volt_path)}</script>"
       end
 
@@ -172,7 +176,8 @@ module Volt
             # aren't imported by default:
             #  http://sass-lang.com/guide
             css_files += Dir["#{path}/**/[^_]*.{css,scss}"].sort.map do |folder|
-              css_path = '/assets' + folder[path.size..-1].gsub(/[.]scss$/, '')
+              last4 = folder.split('/')[-4..-1].join('/').gsub(/[.]scss$/, '')
+              css_path = @app_url + '/' + last4
               css_path += '.css' unless css_path =~ /[.]css$/
               css_path
             end

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

@@ -6,7 +6,8 @@ require 'volt/server/rack/asset_files'
 # method that returns all of the ruby setup code for the component.
 module Volt
   class ComponentCode
-    def initialize(component_name, component_paths, client = true)
+    def initialize(volt_app, component_name, component_paths, client = true)
+      @volt_app        = volt_app
       @component_name  = component_name
       @component_paths = component_paths
       @client          = client
@@ -17,7 +18,7 @@ module Volt
       # Start with config code
       code = @client ? generate_config_code : ''
 
-      asset_files = AssetFiles.from_cache(@component_name, @component_paths)
+      asset_files = AssetFiles.from_cache(@volt_app.app_url, @component_name, @component_paths)
       asset_files.component_paths.each do |component_path, component_name|
         code << ComponentTemplates.new(component_path, component_name, @client).code
         code << "\n\n"

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

@@ -84,7 +84,7 @@ module Volt
       # Load in all views and routes
       # 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
+        code = Volt::ComponentCode.new(volt_app, component_name, self, false).code
         # Evaluate returned code, the ```volt_app``` variable is set for access.
         eval(code)
       end

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

@@ -4,8 +4,8 @@ require 'volt/router/routes'
 # Serves the main pages
 module Volt
   class IndexFiles
-    def initialize(app, volt_app, component_paths, opal_files)
-      @app             = app
+    def initialize(rack_app, volt_app, component_paths, opal_files)
+      @rack_app        = rack_app
       @volt_app        = volt_app
       @component_paths = component_paths
       @opal_files      = opal_files
@@ -37,7 +37,7 @@ module Volt
       if route_match?(env['PATH_INFO'])
         [200, { 'Content-Type' => 'text/html; charset=utf-8' }, [html]]
       else
-        @app.call env
+        @rack_app.call env
       end
     end
 
@@ -58,11 +58,11 @@ module Volt
 
     def javascript_tags
       # TODO: Cache somehow, this is being loaded every time
-      AssetFiles.from_cache('main', @component_paths).javascript_tags(@volt_app)
+      AssetFiles.from_cache(@volt_app.app_url, 'main', @component_paths).javascript_tags(@volt_app)
     end
 
     def css_tags
-      AssetFiles.from_cache('main', @component_paths).css_tags
+      AssetFiles.from_cache(@volt_app.app_url, 'main', @component_paths).css_tags
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Volt
   class OpalFiles
     attr_reader :environment, :server
 
-    def initialize(builder, app_path, component_paths)
+    def initialize(builder, app_url, app_path, component_paths)
       Opal::Processor.source_map_enabled = Volt.source_maps?
       Opal::Processor.const_missing_enabled = true
 
@@ -34,7 +34,7 @@ module Volt
       # Opal::Processor.arity_check_enabled = !Volt.env.production?
       # Opal::Processor.dynamic_require_severity = :raise
 
-      @server = Opal::Server.new(prefix: '/assets', debug: Volt.source_maps?)
+      @server = Opal::Server.new(prefix: app_url, debug: Volt.source_maps?)
       @server.use_index = false
 
       @component_paths                   = component_paths
@@ -78,7 +78,7 @@ module Volt
       # environment in closure
       environment                        = @environment
 
-      builder.map '/assets' do
+      builder.map(app_url) do
         run environment
       end
 
@@ -121,9 +121,10 @@ module Volt
     end
 
     def add_asset_folders(environment)
-      @component_paths.asset_folders do |asset_folder|
-        environment.append_path(asset_folder)
-      end
+      # @component_paths.asset_folders do |asset_folder|
+      #   puts "ADD ASSET FOLDER: #{asset_folder.inspect}"
+      #   environment.append_path(asset_folder)
+      # end
     end
   end
 end

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

@@ -2,8 +2,9 @@ require 'sprockets-helpers'
 
 module Volt
   class SprocketsHelpersSetup
-    def initialize(env)
-      @env = env
+    def initialize(volt_app)
+      @volt_app = volt_app
+      @env = volt_app.sprockets
 
       setup_path_helpers
       add_linking_in_asset_path
@@ -15,7 +16,7 @@ module Volt
       # Configure Sprockets::Helpers (if necessary)
       Sprockets::Helpers.configure do |config|
         config.environment = @env
-        config.prefix      = '/assets'
+        config.prefix      = @volt_app.app_url
         config.public_path = 'public'
         config.debug       = false#!Volt.env.production?
 
@@ -36,9 +37,27 @@ module Volt
         # We "freedom-patch" sprockets-helpers asset_path method to
         # automatically link assets.
         def asset_path(source, options = {})
+          relative_path = source =~ /^[.][.]\//
+          if relative_path
+            component_root = logical_path.gsub(/\/[^\/]+$/, '')
+            path = File.join(component_root, source)
+            source = Volt::SprocketsHelpersSetup.expand(path)
+          end
+
+          if relative_path
+            link_path = source
+          else
+            link_path = source.gsub(/^#{@volt_app.app_path}\//, '')
+          end
+
+          # Return for absolute urls (one's off site)
           uri = URI.parse(source)
           return source if uri.absolute?
 
+          # Link all assets out of the box
+          # Added by volt
+          link_asset(link_path)
+
           options[:prefix] = Sprockets::Helpers.prefix unless options[:prefix]
 
           if Sprockets::Helpers.debug || options[:debug]
@@ -53,11 +72,8 @@ module Volt
             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
@@ -67,5 +83,23 @@ module Volt
       end
 
     end
+
+    private
+
+    def self.expand(path)
+      parts = path.split('/')
+
+      output = []
+
+      parts.each do |part|
+        if part == '..'
+          output.pop
+        else
+          output << part
+        end
+      end
+
+      output.join('/')
+    end
   end
 end

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

@@ -49,7 +49,7 @@ module Sprockets
 
         # Working with a component path
         volt_app = Thread.current['volt_app'] || $volt_app
-        data = Volt::ComponentCode.new(component_name, volt_app.component_paths, true).code
+        data = Volt::ComponentCode.new(volt_app, component_name, volt_app.component_paths, true).code
       else
         data = env.read_file(input[:filename], input[:content_type])
       end

data/lib/volt/utils/recursive_exists.rb

@@ -0,0 +1,19 @@
+module Volt
+  module RecursiveExists
+    def self.exists_here_or_up?(file)
+      # Check for a gemfile here or up a directory
+      pwd = Dir.pwd
+
+      loop do
+        if File.exists?("#{pwd}/#{file}")
+          return true
+        else
+          pwd = pwd.gsub(/\/[^\/]+$/, '')
+          return false if pwd == ''
+        end
+      end
+
+      false
+    end
+  end
+end

data/lib/volt/version.rb

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

data/lib/volt/volt/app.rb

@@ -91,7 +91,9 @@ module Volt
         # Load up the main component dependencies.  This is needed to load in
         # any opal_gem calls in dependencies.rb
         # TODO: Needs to support all components
-        AssetFiles.from_cache('main', component_paths)
+        if Dir.exists?(Volt.root + '/app/main')
+          AssetFiles.from_cache(app_url, 'main', component_paths)
+        end
 
         reset_query_pool!
 

data/lib/volt/volt/server_setup/app.rb

@@ -10,6 +10,11 @@ end
 module Volt
   module ServerSetup
     module App
+      # The root url is where the volt app is mounted
+      attr_reader :root_url
+      # The app url is where the app folder (and sprockets) is mounted
+      attr_reader :app_url
+
       def setup_paths
         # Load component paths
         @component_paths = ComponentPaths.new(@app_path)
@@ -19,6 +24,9 @@ module Volt
       def load_app_code
         setup_router
         require_http_controllers
+
+        @root_url = '/'
+        @app_url = '/app'
       end
 
       def setup_router

data/spec/apps/file_loading/app/disable_auto/config/dependencies.rb

@@ -1,3 +1,3 @@
 disable_auto_import
-javascript_file '/assets/disable_auto/assets/js/test1.js'
+javascript_file '/app/disable_auto/assets/js/test1.js'
 css_file 'test1'

data/spec/apps/kitchen_sink/Gemfile

@@ -7,7 +7,7 @@ gem 'volt-mongo'
 
 # The following gem's are optional for themeing
 # Twitter bootstrap
-gem 'volt-bootstrap', '~> 0.0.10'
+gem 'volt-bootstrap', '~> 0.1.0'
 
 # Simple theme for bootstrap, remove to theme yourself.
 gem 'volt-bootstrap_jumbotron_theme', '~> 0.1.0'

data/spec/apps/kitchen_sink/app/main/views/main/store_demo.html

@@ -2,8 +2,4 @@
   Store
 
 <:Body>
-  <h1>Store</h1>
-
-  <p>Sync between nested root properties.</p>
-  <input id="field1" value="{{ store._name }}" /><br />
-  <!-- <input id="field2" value="{{ store._name }}" /> -->
+  <h1>Store Test</h1>

data/spec/integration/todos_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
 describe 'todos app', type: :feature, sauce: true do
+  ENTER_KEY = ENV["BROWSER"] == 'phantom' ? :Enter : :return
   it 'should add a todo and remove it' do
     visit '/todos'
 
     fill_in 'newtodo', :with => 'Todo 1'
-    find('#newtodo').native.send_keys(:return)
+    find('#newtodo').native.send_keys(ENTER_KEY)
 
     expect(page).to have_content('Todo 1')
 
@@ -16,7 +17,30 @@ describe 'todos app', type: :feature, sauce: true do
     expect(page).to_not have_content('Todo 1')
 
     # Make sure it deleted
-    page.driver.browser.navigate.refresh
+    if ENV['BROWSER'] == 'phantom'
+        visit '/todos'
+    else
+        page.driver.browser.navigate.refresh
+    end
     expect(page).to_not have_content('Todo 1')
   end
+
+  it 'should update a todo check state and persist' do
+    visit '/todos'
+
+    fill_in 'newtodo', :with => 'Todo 1'
+    find('#newtodo').native.send_keys(ENTER_KEY)
+
+    expect(page).to have_content('Todo 1')
+
+    find("input[type='checkbox']").click
+
+    if ENV['BROWSER'] == 'phantom'
+        visit '/todos'
+    else
+        page.evaluate_script('document.location.reload()')
+    end
+
+    expect(find("input[type='checkbox']").checked?).to eq(true)
+  end
 end

data/spec/models/validators/length_validator_spec.rb

@@ -38,22 +38,14 @@ describe Volt::LengthValidator do
       describe 'when name is "John"' do
         let(:name) { 'John' }
         it do
-          if RUBY_PLATFORM == 'opal'
-            expect(subject).to eq(name: ["must be at least {\"length\"=>5, \"maximum\"=>10} characters"])
-          else
-            expect(subject).to eq(name: ['must be at least {:length=>5, :maximum=>10} characters'])
-          end
+          expect(subject).to eq(name: ["must be at least 5 characters"])
         end
       end
 
       describe 'when name is "Zach Galifianakis"' do
         let(:name) { 'Zach Galifianakis' }
         it do
-          if RUBY_PLATFORM == 'opal'
-            expect(subject).to eq(name: ["must be less than {\"length\"=>5, \"maximum\"=>10} characters"])
-          else
-            expect(subject).to eq(name: ['must be less than {:length=>5, :maximum=>10} characters'])
-          end
+          expect(subject).to eq(name: ['must be less than 10 characters'])
         end
       end
     end

data/spec/server/rack/asset_files_spec.rb

@@ -11,7 +11,7 @@ if RUBY_PLATFORM != 'opal'
     end
 
     it 'should return the dependencies list' do
-      main = Volt::AssetFiles.new('main', @component_paths)
+      main = Volt::AssetFiles.new('/app', 'main', @component_paths)
 
       components = main.components
       expect(components).to eq(%w(volt mongo main shared bootstrap slideshow))
@@ -20,31 +20,31 @@ if RUBY_PLATFORM != 'opal'
     describe 'js files' do
       context "when the component's dependencies.rb does not contain .disable_auto_import" do
         it 'should list all JS files' do
-          main = Volt::AssetFiles.new('main', @component_paths)
+          main = Volt::AssetFiles.new('/app', 'main', @component_paths)
           expect(main.javascript(volt_app).reject{|v| v[0] != :src }).to eq([
-            [:src, '/assets/js/jquery-2.0.3.js'],
-            [:src, '/assets/js/volt_js_polyfills.js'],
-            [:src, '/assets/js/volt_watch.js'],
-            [:src, '/assets/js/bootstrap.js'],
-            [:src, '/assets/js/test2.js'],
-            [:src, '/assets/js/test3.js'],
-            [:src, '/assets/js/test1.js'],
-            [:src, '/assets/volt/volt/app.js'],
-            [:src, '/assets/components/main.js']
+            [:src, "/app/volt/assets/js/jquery-2.0.3.js"],
+            [:src, "/app/volt/assets/js/volt_js_polyfills.js"],
+            [:src, "/app/volt/assets/js/volt_watch.js"],
+            [:src, "/app/bootstrap/assets/js/bootstrap.js"],
+            [:src, "/app/shared/assets/js/test2.js"],
+            [:src, "/app/slideshow/assets/js/test3.js"],
+            [:src, "/app/main/assets/js/test1.js"],
+            [:src, "/app/volt/volt/app.js"],
+            [:src, "/app/components/main.js"]
           ])
         end
       end
 
       context "when the component's dependencies.rb contains .disable_auto_import" do
         it 'should list only the files included via the css_file helpers' do
-          disabled_auto = Volt::AssetFiles.new('disable_auto', @component_paths)
+          disabled_auto = Volt::AssetFiles.new('/app', 'disable_auto', @component_paths)
           expect(disabled_auto.javascript(volt_app).reject{|v| v[0] != :src }).to eq([
-            [:src, '/assets/js/jquery-2.0.3.js'],
-            [:src, '/assets/js/volt_js_polyfills.js'],
-            [:src, '/assets/js/volt_watch.js'],
-            [:src, '/assets/disable_auto/assets/js/test1.js'],
-            [:src, '/assets/volt/volt/app.js'],
-            [:src, '/assets/components/main.js']
+            [:src, "/app/volt/assets/js/jquery-2.0.3.js"],
+            [:src, "/app/volt/assets/js/volt_js_polyfills.js"],
+            [:src, "/app/volt/assets/js/volt_watch.js"],
+            [:src, "/app/disable_auto/assets/js/test1.js"],
+            [:src, "/app/volt/volt/app.js"],
+            [:src, "/app/components/main.js"]
           ])
         end
       end
@@ -54,23 +54,23 @@ if RUBY_PLATFORM != 'opal'
 
       context "when the component's dependencies.rb does not contain .disable_auto_import" do
         it 'should list all the asset files in that component' do
-          main = Volt::AssetFiles.new('main', @component_paths)
+          main = Volt::AssetFiles.new('/app', 'main', @component_paths)
 
           expect(main.css).to eq([
-            '/assets/css/notices.css',
-            '/assets/css/01-bootstrap.css',
-            '/assets/css/test3.css'
+            "/app/volt/assets/css/notices.css",
+            "/app/bootstrap/assets/css/01-bootstrap.css",
+            "/app/main/assets/css/test3.css"
           ])
         end
       end
 
       context "when the component's dependencies.rb contains .disable_auto_import" do
         it 'should list only the files included via the css_file helpers' do
-          disabled_auto = Volt::AssetFiles.new('disable_auto', @component_paths)
+          disabled_auto = Volt::AssetFiles.new('/app', 'disable_auto', @component_paths)
 
           expect(disabled_auto.css).to eq([
-            '/assets/css/notices.css',
-            '/assets/disable_auto/assets/css/test1.css'
+            "/app/volt/assets/css/notices.css",
+            "/app/disable_auto/assets/css/test1.css"
           ])
         end
       end
@@ -78,33 +78,33 @@ if RUBY_PLATFORM != 'opal'
 
     describe '.is_url?' do
       it 'should return true for URIs like //something.com/something.js' do
-        main = Volt::AssetFiles.new('main', @component_paths)
+        main = Volt::AssetFiles.new('/app', 'main', @component_paths)
         expect(main.url_or_path? '//something.com/a-folder/something.js').to eq(true)
       end
 
       it 'should return true for HTTP and HTTPS urls' do
-        main = Volt::AssetFiles.new('main', @component_paths)
+        main = Volt::AssetFiles.new('/app', 'main', @component_paths)
         expect(main.url_or_path? 'http://something.com/a-folder/something.js').to eq(true)
         expect(main.url_or_path? 'https://something.com/a-folder/something.js').to eq(true)
       end
 
       it 'should return true for paths' do
-        main = Volt::AssetFiles.new('main', @component_paths)
+        main = Volt::AssetFiles.new('/app', 'main', @component_paths)
         expect(main.url_or_path? 'something.js').to eq(false)
-        expect(main.url_or_path? '/assets/something.js').to eq(true)
-        expect(main.url_or_path? '/assets/something/something.js').to eq(true)
+        expect(main.url_or_path? '/app/something.js').to eq(true)
+        expect(main.url_or_path? '/app/something/something.js').to eq(true)
       end
 
       it 'should return false for file names' do
-        main = Volt::AssetFiles.new('main', @component_paths)
+        main = Volt::AssetFiles.new('/app', 'main', @component_paths)
         expect(main.url_or_path? 'something.js').to eq(false)
-        expect(main.url_or_path? 'assets/something/something.js').to eq(false)
+        expect(main.url_or_path? 'app/something/something.js').to eq(false)
       end
 
     end
 
     it 'should raise an exception for a missing component gem' do
-      main = Volt::AssetFiles.new('main', @component_paths)
+      main = Volt::AssetFiles.new('/app', 'main', @component_paths)
 
       relative_dep_path = '../../apps/file_loading/app/missing_deps'
       path_to_missing_deps = File.join(File.dirname(__FILE__), relative_dep_path)
@@ -115,7 +115,7 @@ if RUBY_PLATFORM != 'opal'
     end
 
     it 'should not raise an exception for a dependency file with valid components' do
-      main = Volt::AssetFiles.new('main', @component_paths)
+      main = Volt::AssetFiles.new('/app', 'main', @component_paths)
 
       path_to_main = File.join(File.dirname(__FILE__), '../../apps/file_loading/app/main')
       path_to_missing_deps = File.join(File.dirname(__FILE__), path_to_main)
@@ -125,7 +125,7 @@ if RUBY_PLATFORM != 'opal'
     end
 
     it 'should parse javascript src/body from the javascript tags' do
-      main = Volt::AssetFiles.new('main', @component_paths)
+      main = Volt::AssetFiles.new('/app', 'main', @component_paths)
 
       expect(main).to receive(:javascript_tags).and_return("<script src='/someurl.js'></script><script>var inlinejs = true;</script>")
 

data/spec/server/rack/rack_requests_spec.rb

@@ -1,8 +1,9 @@
+require 'spec_helper'
 
 if ENV['BROWSER'] && ENV['BROWSER'] == 'phantom'
   describe 'Rack Requests', type: :feature do
     it 'should send JS file with JS mimetype' do
-      visit '/components/main.js'
+      visit '/app/components/main.js'
 
       expect(page.response_headers['Content-Type']).to include 'application/javascript'
     end

data/spec/server/rack/sprockets_helpers_setup.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe "sprockets helpers" do
+  it 'should expand paths' do
+    result = Volt::SprocketsHelpersSetup.expand('/something/cool/../awesome/beans/../../five/six/seven')
+
+    expect(result).to eq('/something/five/six/seven')
+  end
+
+  it 'should expand paths2' do
+    result = Volt::SprocketsHelpersSetup.expand('bootstrap/assets/css/../fonts/glyphicons-halflings-regular.svg')
+
+    expect(result).to eq('bootstrap/assets/fonts/glyphicons-halflings-regular.svg')
+  end
+end

data/templates/newgem/Gemfile.tt

@@ -2,3 +2,14 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in <%=config[:name]%>.gemspec
 gemspec
+
+# Optional Gems for testing/dev
+
+# The implementation of ReadWriteLock in Volt uses concurrent ruby and ext helps performance.
+gem 'concurrent-ruby-ext', '~> 0.8.0'
+
+# For mongo (optional)
+gem 'bson_ext', '~> 1.9.0'
+
+# Gems you use for development should be added to the gemspec file as
+# development dependencies.

data/templates/newgem/newgem.gemspec.tt

@@ -19,8 +19,23 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "volt", "~> <%= config[:volt_version_base] %>"
-  spec.add_development_dependency 'rspec', '~> 3.2.0'
   spec.add_development_dependency "rake"
+
+  # Testing gems
+  spec.add_development_dependency 'rspec', '~> 3.2.0'
+  spec.add_development_dependency 'opal-rspec', '~> 0.4.2'
+  spec.add_development_dependency 'capybara', '~> 2.4.2'
+  spec.add_development_dependency 'selenium-webdriver', '~> 2.43.0'
+  spec.add_development_dependency 'chromedriver2-helper', '~> 0.0.8'
+  spec.add_development_dependency 'poltergeist', '~> 1.5.0'
+
+  # Gems to run the dummy app
+  spec.add_development_dependency 'volt-mongo', '0.1.1'
+  spec.add_development_dependency 'volt-bootstrap', '~> 0.1.0'
+  spec.add_development_dependency 'volt-bootstrap_jumbotron_theme', '~> 0.1.0'
+  spec.add_development_dependency 'volt-user_templates', '~> 0.4.0'
+  spec.add_development_dependency 'thin', '~> 1.6.0'
+
 <% if config[:test] -%>
   spec.add_development_dependency "<%=config[:test]%>"
 <% end -%>

data/templates/newgem/spec/integration/sample_integration_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'sample integration test', type: :feature do
+  # An example integration spec, this will only be run if ENV['BROWSER'] is
+  # specified.  Current values for ENV['BROWSER'] are 'firefox' and 'phantom'
+  it 'should load the page' do
+    visit '/'
+
+    expect(page).to have_content('Home')
+  end
+end

data/templates/newgem/spec/newgem_spec.rb.tt

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe <%= config[:constant_name] %> do
-  it 'should have a version number' do
-    expect(<%= config[:constant_name] %>::VERSION).not_to be nil
-  end
-
   it 'should do something useful' do
     expect(false).to be true
   end

data/templates/newgem/spec/spec_helper.rb.tt

@@ -1,6 +1,10 @@
 # Volt sets up rspec and capybara for testing.
 require 'volt/spec/setup'
-Volt.spec_setup
+
+# When testing Volt component gems, we boot up a dummy app first to run the
+# test in, so we have access to Volt itself.
+dummy_app_path = File.join(File.dirname(__FILE__), 'dummy')
+Volt.spec_setup(dummy_app_path)
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

data/templates/project/Gemfile.tt

@@ -7,7 +7,7 @@ gem 'volt-mongo', '~> 0.1.0'
 
 # The following gem's are optional for themeing
 # Twitter bootstrap
-gem 'volt-bootstrap', '~> 0.0.10'
+gem 'volt-bootstrap', '~> 0.1.0'
 
 # Simple theme for bootstrap, remove to theme yourself.
 gem 'volt-bootstrap_jumbotron_theme', '~> 0.1.0'
@@ -27,10 +27,6 @@ platform :ruby, :jruby do
   gem 'rbnacl-libsodium', require: false
 end
 
-# 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'
@@ -52,6 +48,10 @@ platform :mri, :mingw do
 end
 
 group :production do
+  # Asset compilation gems, they will be required when needed.
+  gem 'csso-rails', '~> 0.3.4', require: false
+  gem 'uglifier', '>= 2.4.0', require: false
+
   # Image compression gem for precompiling assets
   gem 'image_optim'
 

data/volt.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
 
   # There is a big performance issue with selenium-webdriver on v2.45.0
   spec.add_development_dependency 'selenium-webdriver', '~> 2.46.2'
-  spec.add_development_dependency 'chromedriver2-helper', '~> 0.0.8'
+  spec.add_development_dependency 'chromedriver-helper', '~> 1.0.0'
   spec.add_development_dependency 'poltergeist', '~> 1.5.0'
   spec.add_development_dependency 'thin', '~> 1.6.3'
   spec.add_development_dependency 'coveralls', '~> 0.8.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.5.pre7
+  version: 0.9.5.pre8
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -235,19 +235,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.46.2
 - !ruby/object:Gem::Dependency
-  name: chromedriver2-helper
+  name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -591,6 +591,7 @@ files:
 - lib/volt/utils/parsing.rb
 - lib/volt/utils/promise_extensions.rb
 - lib/volt/utils/read_write_lock.rb
+- lib/volt/utils/recursive_exists.rb
 - lib/volt/utils/set_patch.rb
 - lib/volt/utils/tilt_patch.rb
 - lib/volt/utils/time_patch.rb
@@ -739,6 +740,7 @@ files:
 - spec/server/rack/http_response_renderer_spec.rb
 - spec/server/rack/quite_common_logger_spec.rb
 - spec/server/rack/rack_requests_spec.rb
+- spec/server/rack/sprockets_helpers_setup.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
 - spec/tasks/dispatcher_spec.rb
@@ -796,6 +798,7 @@ files:
 - templates/newgem/app/newgem/controllers/server/.empty_directory
 - templates/newgem/app/newgem/lib/.empty_directory
 - templates/newgem/app/newgem/models/.empty_directory
+- templates/newgem/app/newgem/tasks/.empty_directory
 - templates/newgem/app/newgem/views/main/index.html
 - templates/newgem/bin/newgem.tt
 - templates/newgem/gitignore.tt
@@ -804,6 +807,7 @@ files:
 - templates/newgem/lib/newgem/version.rb.tt
 - templates/newgem/newgem.gemspec.tt
 - templates/newgem/rspec.tt
+- templates/newgem/spec/integration/sample_integration_spec.rb
 - templates/newgem/spec/newgem_spec.rb.tt
 - templates/newgem/spec/spec_helper.rb.tt
 - templates/newgem/test/minitest_helper.rb.tt
@@ -1001,6 +1005,7 @@ test_files:
 - spec/server/rack/http_response_renderer_spec.rb
 - spec/server/rack/quite_common_logger_spec.rb
 - spec/server/rack/rack_requests_spec.rb
+- spec/server/rack/sprockets_helpers_setup.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
 - spec/tasks/dispatcher_spec.rb