volt 0.7.19 → 0.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e52814d6fe0018d0ed9ff87c726b083c0d97c6d6
-  data.tar.gz: e45c97fe12819f7ab1abe17d9d0166379fa61a30
+  metadata.gz: aa39c02ee12d025fbd0f43f6bcd38928a466e1e1
+  data.tar.gz: 9dd5cce8c4f0b1ccdd5d9772c4c17f46f135746b
 SHA512:
-  metadata.gz: fccff09f4fe9c5ddeaf5d41a8e8fe4e284c9f1af137a11578ba08f6eafc336a6b13e27c4b3bf54665e6d6933c6c3e4f328db1b574e514a49764d188a223a64d7
-  data.tar.gz: ee4387876d87956bb39127f2fad009f42fc7c1078e50b409a1fa3f4c88a2e91c1ebf4b267b56acdaa711faceff03e6f8d402ceb3beeb56462247f63bbf8a1c6e
+  metadata.gz: c9c71a4a6718bd7dc334c2f617c780436afd2bf912e5968afcc739bb0495bd2000591b179765f1dcd9bc569be6b5f5002489570b6949e3ebebb134803c1049bc
+  data.tar.gz: 0dec8374eec63d4b4c4db435b9b7f4111935d091e572b9e901f796ffbe46a99a9e611c24f276541c2c635cd48481c9b3d2e492de18241df7eac61291d298f01a

data/Readme.md

@@ -2,9 +2,7 @@
 [![Code Climate](https://codeclimate.com/github/voltrb/volt.png)](https://codeclimate.com/github/voltrb/volt)
 [![Build Status](https://travis-ci.org/voltrb/volt.png?branch=master)](https://travis-ci.org/voltrb/volt)
 [![Volt Chat](https://badges.gitter.im/voltrb/volt.png)](https://gitter.im/voltrb/volt)
-[![Pledgie](https://pledgie.com/campaigns/26731.png?skin_name=chrome)](https://pledgie.com/campaigns/26731)
 
-=======
 ** For the current status of volt, read: http://voltframework.com/blog
 
 # Volt
@@ -64,11 +62,11 @@ Then create a new project:
 
 This will setup a basic project.  Now let's run the server:
 
-    volt server
+    bundle exec volt server
 
 You can access the Volt console with:
 
-    volt console
+    bundle exec volt console
 
 # Guide Sections
 
@@ -838,3 +836,5 @@ store._things
 # Contributing
 
 You want to contribute?  Great!  Thanks for being awesome!  At the moment, we have a big internal todo list, hop on https://gitter.im/voltrb/volt so we don't duplicate work.  Pull requests are always welcome, but asking about helping on gitter should save some duplication.
+
+[![Pledgie](https://pledgie.com/campaigns/26731.png?skin_name=chrome)](https://pledgie.com/campaigns/26731)

data/VERSION

@@ -1 +1 @@
-0.7.19
+0.7.20

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

@@ -26,7 +26,7 @@ class DomTemplate
 
   # Returns the dom nodes and bindings
   def make_new
-    bindings = update_binding_anchors!
+    bindings = update_binding_anchors!(`self.nodes`)
 
     new_nodes = `self.nodes.cloneNode(true)`
 
@@ -60,7 +60,7 @@ class DomTemplate
 
   # Takes the binding_anchors and updates them with new numbers (comments and id's)
   # then returns the bindings updated to the new numbers.
-  def update_binding_anchors!
+  def update_binding_anchors!(nodes)
     new_bindings = {}
 
     @binding_anchors.each_pair do |name, anchors|
@@ -90,6 +90,11 @@ class DomTemplate
           end_comment.textContent = " $/" + new_name + " ";
         }
 
+        # %x{
+        #   start_comment.innerText = " $" + new_name + " ";
+        #   end_comment.innerText = " $/" + new_name + " ";
+        # }
+
         new_bindings[new_name] = @bindings[name]
       end
     end

data/lib/volt/server/component_handler.rb

@@ -15,7 +15,7 @@ class ComponentHandler
 
     javascript_code = compile_for_component(component_name)
 
-    return [200, {"Content-Type" => "text/html; charset=utf-8"}, StringIO.new(javascript_code)]
+    return [200, {"Content-Type" => "application/javascript; charset=utf-8"}, StringIO.new(javascript_code)]
   end
 
   def compile_for_component(component_name)

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

@@ -55,7 +55,8 @@ class ComponentPaths
       app_folders do |app_folder|
         $LOAD_PATH.unshift(app_folder)
 
-        Dir["#{app_folder}/*/{controllers,models}/*.rb"].each do |ruby_file|
+        # Sort so we get consistent load order across platforms
+        Dir["#{app_folder}/*/{controllers,models}/*.rb"].sort.each do |ruby_file|
           path = ruby_file.gsub(/^#{app_folder}\//, '')[0..-4]
           require(path)
         end
@@ -63,8 +64,8 @@ class ComponentPaths
     end
 
     # add each tasks folder directly
-    components.each do |name,component_folders|
-      component_folders.each do |component_folder|
+    components.sort.each do |name,component_folders|
+      component_folders.sort.each do |component_folder|
         Dir["#{component_folder}/tasks"].sort.each do |tasks_folder|
           $LOAD_PATH.unshift(tasks_folder)
         end

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

@@ -0,0 +1,2 @@
+<:Body>
+	<h2>Index Template</h2>

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

@@ -3,3 +3,7 @@
 
 <:Body>
   <h1>Home</h1>
+	
+  {#template "index"}
+  
+  <p>After template</p>

data/spec/apps/kitchen_sink/public/index.html

@@ -2,14 +2,14 @@
 <html>
 	<head>
 		<meta charset="UTF-8" />
-    <% javascript_files.each do |javascript_file| %>
-      <script src="<%= javascript_file %>"></script>
-    <% end %>
-
-    <% css_files.each do |css_file| %>
-      <link href="<%= css_file %>" media="all" rel="stylesheet" type="text/css" />
-    <% end %>
+	    <% javascript_files.each do |javascript_file| %>
+	      <script src="<%= javascript_file %>"></script>
+	    <% end %>
 
+	    <% css_files.each do |css_file| %>
+	      <link href="<%= css_file %>" media="all" rel="stylesheet" type="text/css" />
+	    <% end %>
+    
 	</head>
 	<body>
 

data/spec/integration/test_integration_spec.rb

@@ -1,11 +1,14 @@
-if ENV['IN_BROWSER']
+if ENV['BROWSER'] && ENV['BROWSER'] == 'firefox'
   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')
+      # expect(page).to have_content('About')
+      # page.has_text?('About')
+      # puts "HAS CONTENT: #{page.has_text?('About')}"
     end
   end
 end

data/spec/page/bindings/template_binding_spec.rb

@@ -11,7 +11,7 @@ end
 describe TemplateBinding do
   before do
     @page = double('page')
-    expect(@page).to receive(:templates).at_least(1).times.and_return { @templates }
+    expect(@page).to receive(:templates).at_least(1).times { @templates }
 
     # TODO: We should decouple things so we don't need to allocate
     @template_binding = TemplateBinding.allocate

data/spec/server/rack/rack_requests_spec.rb

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

data/spec/spec_helper.rb

@@ -5,59 +5,53 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
-ENV['SERVER'] = 'true'
-ENV['SAUCE_USERNAME'] = 'ryanstout'
-ENV['SAUCE_ACCESS_KEY'] = 'a537b01d-33ed-4028-9e80-eeb602748a5f'
-
-if ENV['IN_BROWSER']
+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 'chromedriver2/helper'
     require 'capybara/poltergeist'
-    # require "sauce/capybara"
-    # require 'sauce/connect'
   end
 end
 
 require 'volt'
 
-# Capybara.default_driver = :sauce
-# Capybara.server_port = 2020
-#
-# Sauce.config do |conf|
-#   conf[:start_tunnel] = true
-#   conf[:browsers] = [
-#     ["Windows 7","Firefox","26"]
-#   ]
-#   # conf[:application_host] = "127.0.0.1"
-#   # conf[:application_port] = "2020"
-#   # conf[:browser_url] = "http://127.0.0.1:2020/"
-# end
-
-# Capybara.register_driver :selenium do |app|
-#   Capybara::Selenium::Driver.new(app, :browser => :chrome)
-# end
-
-if ENV['IN_BROWSER']
+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
 
-    Capybara.default_driver = :poltergeist
-
-    # Capybara.register_driver :chrome do |app|
-    #   Capybara::Selenium::Driver.new(app, :browser => :chrome)
-    # end
-    #
-    # Capybara.default_driver = :chrome
+    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 = :selenium
+      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
 end
 

data/volt.gemspec

@@ -21,7 +21,7 @@ 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 "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"
@@ -39,14 +39,13 @@ Gem::Specification.new do |spec|
 
   # spec.add_dependency "rack-colorized_logger", "~> 1.0.4"
 
-
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "guard", "2.0.1" # bug in current guard
-  spec.add_development_dependency "guard-rspec", "~> 1.2.0"
+  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.2.0"
-  spec.add_development_dependency "selenium-webdriver", "~> 2.39.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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.7.19
+  version: 0.7.20
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.12.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -212,28 +198,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -268,28 +254,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.43.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.43.0
 - !ruby/object:Gem::Dependency
   name: chromedriver2-helper
   requirement: !ruby/object:Gem::Requirement
@@ -513,6 +499,7 @@ files:
 - spec/apps/kitchen_sink/Gemfile
 - spec/apps/kitchen_sink/app/main/config/routes.rb
 - spec/apps/kitchen_sink/app/main/controllers/main_controller.rb
+- spec/apps/kitchen_sink/app/main/views/main/index.html
 - spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/public/index.html
@@ -543,6 +530,7 @@ files:
 - spec/server/html_parser/view_parser_spec.rb
 - spec/server/rack/asset_files_spec.rb
 - spec/server/rack/component_paths_spec.rb
+- spec/server/rack/rack_requests_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
 - spec/tasks/live_query_spec.rb
@@ -627,6 +615,7 @@ test_files:
 - spec/apps/kitchen_sink/Gemfile
 - spec/apps/kitchen_sink/app/main/config/routes.rb
 - spec/apps/kitchen_sink/app/main/controllers/main_controller.rb
+- spec/apps/kitchen_sink/app/main/views/main/index.html
 - spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/public/index.html
@@ -657,6 +646,7 @@ test_files:
 - spec/server/html_parser/view_parser_spec.rb
 - spec/server/rack/asset_files_spec.rb
 - spec/server/rack/component_paths_spec.rb
+- spec/server/rack/rack_requests_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
 - spec/tasks/live_query_spec.rb