volt 0.7.20 → 0.7.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa39c02ee12d025fbd0f43f6bcd38928a466e1e1
-  data.tar.gz: 9dd5cce8c4f0b1ccdd5d9772c4c17f46f135746b
+  metadata.gz: 25169a15e3c17969071e5b8a85aa4898ff6c39ed
+  data.tar.gz: 0476ec0206e18da083d7a8f7f535db477abfbcee
 SHA512:
-  metadata.gz: c9c71a4a6718bd7dc334c2f617c780436afd2bf912e5968afcc739bb0495bd2000591b179765f1dcd9bc569be6b5f5002489570b6949e3ebebb134803c1049bc
-  data.tar.gz: 0dec8374eec63d4b4c4db435b9b7f4111935d091e572b9e901f796ffbe46a99a9e611c24f276541c2c635cd48481c9b3d2e492de18241df7eac61291d298f01a
+  metadata.gz: e9eb89123b409c05a1ff10b6e773e8e844c9dc24e13c08660d53710477f0910783cd1c0c764e8edffe5f206db5e72109e0999c0fc9e304c8f0eb3262be08cfb4
+  data.tar.gz: bf7607bf674df1e6566706f960212abbfcdfb2a26c67981ec7469754b5e32f3b4b4dd684da67186b444cc535db7907bee214ce5126bb1241003aad1fbfec7dd3

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.1.3

data/Rakefile

@@ -3,12 +3,19 @@ require 'bundler'
 require "bundler/gem_tasks"
 Bundler.require(:development)
 
+require 'opal'
+
+# Add our opal/ directory to the load path
+Opal.append_path(File.expand_path('../lib', __FILE__))
+
+require 'opal/rspec/rake_task'
+
 
 task :docs do
   `bundle exec yardoc 'lib/**/*.rb' - Readme.md docs/*`
   # require 'yard'
   # require 'yard-docco'
-  # 
+  #
   # YARD::Rake::YardocTask.new do |t|
   #   t.files   = ['lib/**/*.rb']
   #   # t.options = ['--any', '--extra', '--opts'] # optional
@@ -16,8 +23,14 @@ task :docs do
 end
 
 
-# Add our opal/ directory to the load path
-Opal.append_path(File.expand_path('../lib', __FILE__))
 
-require 'opal/rspec/rake_task'
-Opal::RSpec::RakeTask.new(:default)
+Opal::RSpec::RakeTask.new
+
+task default: [:test]
+
+task :test do
+  puts "--------------------------\nRun specs in normal ruby\n--------------------------"
+  system 'bundle exec rspec'
+  puts "--------------------------\nRun specs in Opal\n--------------------------"
+  Rake::Task['opal:rspec'].invoke
+end

data/Readme.md

@@ -770,10 +770,10 @@ This means that routes in Volt have to be able to go both from URL to params and
 Routes are specified on a per-component basis in the config/routes.rb file.  Routes simply map from URL to params.
 
 ```ruby
-    get "/todos", _view: 'todos'
+    get "/todos", {_view: 'todos'}
 ```
 
-Routes take two arguments, a path, and a params hash.  When a new URL is loaded and the path is matched on a route, the params will be set to the params provided for that route.
+Routes take two arguments; a path, and a params hash.  When a new URL is loaded and the path is matched on a route, the params will be set to the params provided for that route.  The specified params hash acts as a constraint.  An empty hash will match any url.  Any params that are not matched will be placed in the query parameters.
 
 When the params are changed, the URL will be set to the path for the route whose params hash matches.
 

data/VERSION

@@ -1 +1 @@
-0.7.20
+0.7.21

data/lib/volt/boot.rb

@@ -0,0 +1,16 @@
+require 'volt/models'
+require 'volt/server/rack/component_paths'
+if RUBY_PLATFORM == 'opal'
+  require 'volt'
+else
+  require 'volt/page/page'
+end
+
+class Volt
+  def self.boot(app_path)
+    component_paths = ComponentPaths.new(app_path)
+    component_paths.require_in_components
+
+    return component_paths
+  end
+end

data/lib/volt/console.rb

@@ -6,18 +6,12 @@ class Console
     ENV['SERVER'] = 'true'
 
     require 'volt'
-    require 'volt/models'
-    require 'volt'
-    require 'volt/page/page'
-    require 'volt/server/rack/component_paths'
+    require 'volt/boot'
     require 'volt/server/socket_connection_handler_stub'
 
     SocketConnectionHandlerStub.dispatcher = Dispatcher.new
 
-
-    app_path = File.expand_path(File.join(Dir.pwd, "app"))
-    component_paths = ComponentPaths.new
-    component_paths.require_in_components
+    Volt.boot(Dir.pwd)
 
     Pry.config.prompt_name = 'volt'
 

data/lib/volt/page/page.rb

@@ -25,7 +25,6 @@ end
 require 'volt/router/routes'
 require 'volt/models/url'
 require 'volt/page/url_tracker'
-require 'volt'
 require 'volt/benchmark/benchmark'
 require 'volt/page/draw_cycle'
 require 'volt/page/tasks'

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

@@ -86,8 +86,19 @@ class DomTemplate
         start_comment, end_comment = anchors
 
         %x{
-          start_comment.textContent = " $" + new_name + " ";
-          end_comment.textContent = " $/" + new_name + " ";
+          if (start_comment.textContent) {
+            // direct update
+            start_comment.textContent = " $" + new_name + " ";
+            end_comment.textContent = " $/" + new_name + " ";
+          } else if (start_comment.innerText) {
+            start_comment.innerText = " $" + new_name + " ";
+            end_comment.innerText = " $/" + new_name + " ";
+          } else {
+            // phantomjs doesn't work with textContent, so we replace the nodes
+            // and update the references
+            start_comment.nodeValue = " $" + new_name + " ";
+            end_comment.nodeValue = " $/" + new_name + " ";
+          }
         }
 
         # %x{

data/lib/volt/page/targets/helpers/comment_searchers.rb

@@ -1,12 +1,49 @@
 module CommentSearchers
+  if RUBY_PLATFORM == 'opal'
+    PHANTOM = `!!window._phantom`
+  else
+    PHANTOM = false
+  end
 
   def find_by_comment(text, in_node=`document`)
-    node = nil
+    if PHANTOM
+      return find_by_comment_without_xml(text, in_node)
+    else
+      node = nil
+
+      %x{
+        node = document.evaluate("//comment()[. = ' " + text + " ']", in_node, null, XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null).iterateNext();
+      }
+      return node
+    end
+  end
 
+  # PhantomJS does not support xpath in document.evaluate
+  def find_by_comment_without_xml(text, in_node)
+    match_text = " #{text} "
     %x{
-      node = document.evaluate("//comment()[. = ' " + text + " ']", in_node, null, XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null).iterateNext();
+      function walk(node) {
+        if (node.nodeType === 8 && node.nodeValue === match_text) {
+          return node;
+        }
+
+        var children = node.childNodes;
+        if (children) {
+          for (var i=0;i < children.length;i++) {
+            var matched = walk(children[i]);
+            if (matched) {
+              return matched;
+            }
+          }
+        }
+
+        return null;
+      }
+
+
+      return walk(in_node);
+
     }
-    return node
   end
 
 

data/lib/volt/server.rb

@@ -17,6 +17,7 @@ require "sprockets-sass"
 require 'listen'
 
 require 'volt'
+require 'volt/boot'
 require 'volt/server/component_handler'
 if RUBY_PLATFORM != 'java'
   require 'volt/server/socket_connection_handler'
@@ -25,7 +26,6 @@ require 'volt/server/rack/component_paths'
 require 'volt/server/rack/index_files'
 require 'volt/server/rack/opal_files'
 require 'volt/tasks/dispatcher'
-require 'volt/page/page'
 
 module Rack
   # TODO: For some reason in Rack (or maybe thin), 304 headers close
@@ -55,7 +55,8 @@ class Server
 
     @app_path = File.expand_path(File.join(root_path, "app"))
 
-    @component_paths = ComponentPaths.new(root_path)
+    # Boot the volt app
+    @component_paths = Volt.boot(root_path)
 
     setup_change_listener
 

data/lib/volt/spec/setup.rb

@@ -0,0 +1,60 @@
+class Volt
+  def self.spec_setup(app_path='.')
+    if RUBY_PLATFORM == 'opal'
+      require 'volt'
+    else
+      ENV['SERVER'] = 'true'
+
+      if ENV['BROWSER']
+        require 'capybara'
+        require 'capybara/dsl'
+        require 'capybara/rspec'
+        require 'capybara/poltergeist'
+      end
+
+      require 'volt'
+      require 'volt/boot'
+
+      # Require in app
+      Volt.boot(Dir.pwd)
+
+      if ENV['BROWSER']
+        require 'volt/server'
+
+        Capybara.server do |app, port|
+          require 'rack/handler/thin'
+          Rack::Handler::Thin.run(app, :Port => port)
+        end
+
+        Capybara.app = Server.new(app_path).app
+
+        if ENV['BROWSER'] == 'phantom'
+          Capybara.default_driver = :poltergeist
+        elsif ENV['BROWSER'] == 'chrome'
+          Capybara.register_driver :chrome do |app|
+            Capybara::Selenium::Driver.new(app, :browser => :chrome)
+          end
+
+          Capybara.default_driver = :chrome
+        elsif ENV['BROWSER'] == 'firefox'
+
+          # require 'selenium/webdriver'
+          # # require 'selenium/client'
+          #
+          Capybara.default_driver = :selenium
+
+          # Capybara.register_driver :selenium_firefox do |app|
+          #   Capybara::Selenium::Driver.new(app, :browser => :firefox)
+          # end
+          # Capybara.current_driver = :selenium_firefox
+        elsif ENV['BROWSER'] == 'safari'
+          # Needs extension
+          Capybara.register_driver :safari do |app|
+            Capybara::Selenium::Driver.new(app, :browser => :safari)
+          end
+          Capybara.default_driver = :safari
+        end
+      end
+    end
+  end
+end

data/spec/controllers/reactive_accessors_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'volt/controllers/reactive_accessors'
 
 class TestReactiveAccessors

data/spec/extra_core/inflector_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'volt/extra_core/inflector'
 
 describe Inflector do

data/spec/integration/test_integration_spec.rb

@@ -1,8 +1,8 @@
-if ENV['BROWSER'] && ENV['BROWSER'] == 'firefox'
+if ENV['BROWSER']
   require 'spec_helper'
 
   describe "integration test", :type => :feature do
-    it "should load the page" do      
+    it "should load the page" do
       visit '/'
 
       expect(page).to have_content('Home')

data/spec/models/event_chain_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'volt/models'
 
 describe EventChain do

data/spec/models/persistors/params_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'volt/models'
 
 describe Persistors::Params do

data/spec/models/persistors/store_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'volt/models'
 
 describe Persistors::Store do

data/spec/server/rack/rack_requests_spec.rb

@@ -1,5 +1,5 @@
 
-if ENV['BROWSER'] && ENV['BROWSER'] == 'poltergeist'
+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'

data/spec/spec_helper.rb

@@ -1,62 +1,14 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require 'volt/spec/setup'
 
-if ENV['BROWSER']
-  if RUBY_PLATFORM == 'opal'
-  else
-    require 'capybara'
-    require 'capybara/dsl'
-    require 'capybara/rspec'
-    # Needed at the moment to get chrome tests working
-    require 'capybara/poltergeist'
-  end
-end
-
-require 'volt'
-
-if ENV['BROWSER']
-  if RUBY_PLATFORM == 'opal'
-  else
-
-    require 'volt/server'
-
-    Capybara.server do |app, port|
-      require 'rack/handler/thin'
-      Rack::Handler::Thin.run(app, :Port => port)
-    end
-
-    kitchen_sink_path = File.expand_path(File.join(File.dirname(__FILE__), "apps/kitchen_sink"))
-    Capybara.app = Server.new(kitchen_sink_path).app
-
-    if ENV['BROWSER'] == 'poltergeist'
-      Capybara.default_driver = :poltergeist
-    elsif ENV['BROWSER'] == 'chrome'
-      Capybara.register_driver :chrome do |app|
-        Capybara::Selenium::Driver.new(app, :browser => :chrome)
-      end
-
-      Capybara.default_driver = :chrome
-    elsif ENV['BROWSER'] == 'firefox'
-    
-      # require 'selenium/webdriver'
-      # # require 'selenium/client'
-      #
-      Capybara.default_driver = :selenium
-    
-      # Capybara.register_driver :selenium_firefox do |app|
-      #   Capybara::Selenium::Driver.new(app, :browser => :firefox)
-      # end
-      # Capybara.current_driver = :selenium_firefox
-    end
-  end
+if RUBY_PLATFORM == 'opal'
+else
+  # Specs are run against the kitchen sink app
+  kitchen_sink_path = File.expand_path(File.join(File.dirname(__FILE__), "apps/kitchen_sink"))
+  Volt.spec_setup(kitchen_sink_path)
 end
 
-
 if RUBY_PLATFORM != 'opal'
+
   RSpec.configure do |config|
     config.run_all_when_everything_filtered = true
     config.filter_run :focus

data/templates/project/app/main/config/routes.rb

@@ -1,4 +1,6 @@
+# See https://github.com/voltrb/volt#routes for more info on routes
+
 get "/about", _action: 'about'
 
-# The main route
-get '/'
+# The main route, this should be last.  It will match any params not previously matched.
+get '/', {}

data/templates/project/spec/spec_helper.rb

@@ -1,12 +1,8 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+# Volt sets up rspec and capybara for testing.
+require 'volt/spec/setup'
+Volt.spec_setup
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -15,6 +11,4 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-
-  config.enable_any_instance_mocks = true
 end

data/volt.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor", "~> 0.18.0"
   spec.add_dependency "pry", "~> 0.9.12.0"
-  # spec.add_dependency "rspec", "3.0.0.beta1"
   spec.add_dependency "rack", "~> 1.5.0"
   spec.add_dependency "sprockets-sass", "~> 1.0.0"
   spec.add_dependency "sass", "~> 3.2.5"
@@ -34,6 +33,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "yui-compressor", "~> 0.12.0"
   spec.add_dependency "opal", "~> 0.6.0"
   spec.add_dependency "opal-jquery", "~> 0.2.0"
+  spec.add_dependency "rspec-core", "~> 3.1.0"
+  spec.add_dependency "rspec-expectations", "~> 3.1.0"
+  spec.add_dependency "capybara", "~> 2.4.2"
+  spec.add_dependency "selenium-webdriver", "~> 2.43.0"
+  spec.add_dependency "chromedriver2-helper", "~> 0.0.8"
+  spec.add_dependency "poltergeist", "~> 1.5.0"
+  spec.add_dependency "opal-rspec", "0.3.0.beta3"
 
   # spec.add_dependency "promise.rb", "~> 0.6.1"
 
@@ -42,13 +48,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "guard", "2.6.0" # bug in current guard
   spec.add_development_dependency "guard-rspec", "~> 4.3.0"
-  spec.add_development_dependency "opal-rspec", "0.3.0.beta3"
   spec.add_development_dependency "yard", "~> 0.8.7.0"
-  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"
-  spec.add_development_dependency "sauce", "~> 3.3.0"
-  spec.add_development_dependency "sauce-connect", "~> 3.3.0"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.7.20
+  version: 0.7.21
 platform: ruby
 authors:
 - Ryan Stout
@@ -179,159 +179,159 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: 3.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :development
+        version: 3.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
-  type: :development
+        version: 2.4.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
-  name: opal-rspec
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta3
-  type: :development
+        version: 2.43.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta3
+        version: 2.43.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: chromedriver2-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.0
-  type: :development
+        version: 0.0.8
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.0
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
-  type: :development
+        version: 1.5.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.43.0
-  type: :development
+        version: 0.3.0.beta3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.43.0
+        version: 0.3.0.beta3
 - !ruby/object:Gem::Dependency
-  name: chromedriver2-helper
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: sauce
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
-  name: sauce-connect
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 0.8.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 0.8.7.0
 description: 
 email:
 - ryan@agileproductions.com
@@ -370,6 +370,7 @@ files:
 - lib/volt.rb
 - lib/volt/assets/test.rb
 - lib/volt/benchmark/benchmark.rb
+- lib/volt/boot.rb
 - lib/volt/cli.rb
 - lib/volt/cli/asset_compile.rb
 - lib/volt/cli/new_gem.rb
@@ -482,6 +483,7 @@ 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/spec/setup.rb
 - lib/volt/store/mongo.rb
 - lib/volt/tasks/dispatcher.rb
 - lib/volt/utils/ejson.rb