volt 0.8.15 → 0.8.16

data/spec/server/rack/asset_files_spec.rb

@@ -1,25 +1,26 @@
 if RUBY_PLATFORM != 'opal'
+  require 'spec_helper'
   require 'volt/server/rack/asset_files'
 
   describe Volt::AssetFiles do
     before do
-      spec_app_root = File.join(File.dirname(__FILE__), "../../apps/file_loading")
+      spec_app_root = File.join(File.dirname(__FILE__), '../../apps/file_loading')
 
-      path_to_main = File.join(File.dirname(__FILE__), "../../apps/file_loading/app/main")
+      path_to_main = File.join(File.dirname(__FILE__), '../../apps/file_loading/app/main')
       @component_paths = Volt::ComponentPaths.new(spec_app_root)
     end
 
-    it "should return the dependencies list" do
-      main = Volt::AssetFiles.new("main", @component_paths)
+    it 'should return the dependencies list' do
+      main = Volt::AssetFiles.new('main', @component_paths)
 
       components = main.components
-      expect(components).to eq(['volt', 'main', 'shared', 'bootstrap', "slideshow"])
+      expect(components).to eq(%w(volt main shared bootstrap slideshow))
     end
 
-    it "should list all JS files" do
-      main = Volt::AssetFiles.new("main", @component_paths)
+    it 'should list all JS files' do
+      main = Volt::AssetFiles.new('main', @component_paths)
 
-      expect(main.javascript_files(nil)).to eq(["/assets/js/jquery-2.0.3.js", "/assets/js/setImmediate.js", "/assets/js/sockjs-0.3.4.min.js", "/assets/js/bootstrap.js", "/assets/js/test2.js", "/assets/js/test3.js", "/assets/js/test1.js", "/assets/volt/page/page.js", "/components/main.js"])
+      expect(main.javascript_files(nil)).to eq(['/assets/js/jquery-2.0.3.js', '/assets/js/setImmediate.js', '/assets/js/sockjs-0.3.4.min.js', '/assets/js/bootstrap.js', '/assets/js/test2.js', '/assets/js/test3.js', '/assets/js/test1.js', '/assets/volt/page/page.js', '/components/main.js'])
     end
   end
 end

data/spec/server/rack/component_paths_spec.rb

@@ -3,13 +3,13 @@ if RUBY_PLATFORM != 'opal'
 
   describe Volt::ComponentPaths do
     before do
-      spec_app_root = File.join(File.dirname(__FILE__), "../../apps/file_loading")
+      spec_app_root = File.join(File.dirname(__FILE__), '../../apps/file_loading')
 
-      path_to_main = File.join(File.dirname(__FILE__), "../../apps/file_loading/app/main")
+      path_to_main = File.join(File.dirname(__FILE__), '../../apps/file_loading/app/main')
       @component_paths = Volt::ComponentPaths.new(spec_app_root)
     end
 
-    it "should return the paths to all app folders" do
+    it 'should return the paths to all app folders' do
       match_count = 0
       @component_paths.app_folders do |app_folder|
         if app_folder[/spec\/apps\/file_loading\/app$/] || app_folder[/spec\/apps\/file_loading\/vendor\/app$/]
@@ -20,8 +20,8 @@ if RUBY_PLATFORM != 'opal'
       expect(match_count).to eq(2)
     end
 
-    it "should return the path to a component" do
-      main_path = @component_paths.component_path('main')
+    it 'should return the path to a component' do
+      main_path = @component_paths.component_paths('main').first
       expect(main_path).to match(/spec\/apps\/file_loading\/app\/main$/)
     end
   end

data/spec/server/rack/rack_requests_spec.rb

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

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'volt/spec/setup'
 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"))
+  kitchen_sink_path = File.expand_path(File.join(File.dirname(__FILE__), 'apps/kitchen_sink'))
   Volt.spec_setup(kitchen_sink_path)
 end
 

data/spec/tasks/live_query_spec.rb

@@ -1,20 +1,19 @@
 if RUBY_PLATFORM != 'opal'
-  describe "LiveQuery" do
+  describe 'LiveQuery' do
     before do
-      load File.join(File.dirname(__FILE__), "../../app/volt/tasks/live_query/live_query.rb")
+      load File.join(File.dirname(__FILE__), '../../app/volt/tasks/live_query/live_query.rb')
     end
 
-    it "should run a query" do
+    it 'should run a query' do
       pool = double('volt/pool')
       data_store = double('volt/data store')
 
       expect(data_store).to receive(:query).with('_items', {}).and_return([
-        {'_id' => 0, '_name' => 'one'}
+        { '_id' => 0, '_name' => 'one' }
       ])
 
       live_query = LiveQuery.new(pool, data_store, '_items', {})
     end
 
-
   end
 end

data/spec/tasks/query_tasks.rb

@@ -1,10 +1,8 @@
 if RUBY_PLATFORM != 'opal'
-  describe "Volt::QueryTasks" do
+  describe 'Volt::QueryTasks' do
     before do
-      load File.join(File.dirname(__FILE__), "../../app/volt/tasks/query_tasks.rb")
+      load File.join(File.dirname(__FILE__), '../../app/volt/tasks/query_tasks.rb')
     end
 
-
-
   end
 end

data/spec/tasks/query_tracker_spec.rb

@@ -1,7 +1,7 @@
 if RUBY_PLATFORM != 'opal'
-  describe "LiveQuery" do
+  describe 'LiveQuery' do
     before do
-      load File.join(File.dirname(__FILE__), "../../app/volt/tasks/live_query/live_query.rb")
+      load File.join(File.dirname(__FILE__), '../../app/volt/tasks/live_query/live_query.rb')
     end
 
     # LiveQueryStub behaves as the front-end would with the changes to a
@@ -18,7 +18,7 @@ if RUBY_PLATFORM != 'opal'
 
       def notify_removed(ids, skip_channel)
         # Remove the id's that need to be removed
-        @items.reject! {|item| ids.include?(item['_id']) }
+        @items.reject! { |item| ids.include?(item['_id']) }
       end
 
       def notify_added(index, data, skip_channel)
@@ -26,7 +26,7 @@ if RUBY_PLATFORM != 'opal'
       end
 
       def notify_moved(id, index, skip_channel)
-        item = @items.find {|item| item['_id'] == id }
+        item = @items.find { |item| item['_id'] == id }
         @items.delete(item)
 
         @items.insert(index, item)
@@ -47,9 +47,9 @@ if RUBY_PLATFORM != 'opal'
 
     end
 
-    it "should add items" do
+    it 'should add items' do
       @items = [
-        {'_id' => 1, '_name' => 'one'}
+        { '_id' => 1, '_name' => 'one' }
       ]
 
       expect(@live_query.items).to eq([])
@@ -59,57 +59,57 @@ if RUBY_PLATFORM != 'opal'
       expect(@live_query.items).to eq(@items)
     end
 
-    it "should remove items" do
+    it 'should remove items' do
       @items = [
-        {'_id' => 1, '_name' => 'one'},
-        {'_id' => 2, '_name' => 'two'}
+        { '_id' => 1, '_name' => 'one' },
+        { '_id' => 2, '_name' => 'two' }
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
 
       @items = [
-        {'_id' => 2, '_name' => 'two'}
+        { '_id' => 2, '_name' => 'two' }
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
     end
 
-    it "should move items" do
+    it 'should move items' do
       @items = [
-        {'_id' => 1, '_name' => 'one'},
-        {'_id' => 2, '_name' => 'two'},
-        {'_id' => 3, '_name' => 'three'}
+        { '_id' => 1, '_name' => 'one' },
+        { '_id' => 2, '_name' => 'two' },
+        { '_id' => 3, '_name' => 'three' }
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
 
       @items = [
-        {'_id' => 2, '_name' => 'two'},
-        {'_id' => 3, '_name' => 'three'},
-        {'_id' => 1, '_name' => 'one'}
+        { '_id' => 2, '_name' => 'two' },
+        { '_id' => 3, '_name' => 'three' },
+        { '_id' => 1, '_name' => 'one' }
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
     end
 
-    it "should handle complex transforms" do
+    it 'should handle complex transforms' do
       @items = [
-        {'_id' => 1, '_name' => 'one'},
-        {'_id' => 2, '_name' => 'two'},
-        {'_id' => 3, '_name' => 'three'},
-        {'_id' => 4, '_name' => 'four'},
-        {'_id' => 5, '_name' => 'five'}
+        { '_id' => 1, '_name' => 'one' },
+        { '_id' => 2, '_name' => 'two' },
+        { '_id' => 3, '_name' => 'three' },
+        { '_id' => 4, '_name' => 'four' },
+        { '_id' => 5, '_name' => 'five' }
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)
 
       @items = [
-        {'_id' => 7, '_name' => 'seven'},
-        {'_id' => 4, '_name' => 'four'},
-        {'_id' => 1, '_name' => 'one'},
-        {'_id' => 5, '_name' => 'five'},
-        {'_id' => 3, '_name' => 'three'},
-        {'_id' => 6, '_name' => 'five'}
+        { '_id' => 7, '_name' => 'seven' },
+        { '_id' => 4, '_name' => 'four' },
+        { '_id' => 1, '_name' => 'one' },
+        { '_id' => 5, '_name' => 'five' },
+        { '_id' => 3, '_name' => 'three' },
+        { '_id' => 6, '_name' => 'five' }
       ]
       @query_tracker.run
       expect(@live_query.items).to eq(@items)

data/spec/templates/targets/binding_document/component_node_spec.rb

@@ -10,7 +10,7 @@ describe Volt::ComponentNode do
     @component.html = html
   end
 
-  it "should find a component from a binding id" do
+  it 'should find a component from a binding id' do
     expect(@component.find_by_binding_id(1).to_html).to eq('Inside')
     expect(@component.find_by_binding_id(0).to_html).to eq('Before  Inside  After')
 

data/spec/utils/generic_counting_pool_spec.rb

@@ -1,8 +1,8 @@
 require 'volt/utils/generic_counting_pool'
 
 class CountingPoolTest < Volt::GenericCountingPool
-  def create(id, name=nil)
-    return Object.new
+  def create(id, name = nil)
+    Object.new
   end
 end
 
@@ -11,7 +11,7 @@ describe Volt::GenericCountingPool do
     @count_pool = CountingPoolTest.new
   end
 
-  it "should lookup and retrieve" do
+  it 'should lookup and retrieve' do
     item1 = @count_pool.find('one')
 
     item2 = @count_pool.find('one')
@@ -21,7 +21,7 @@ describe Volt::GenericCountingPool do
     expect(item2).to_not eq(item3)
   end
 
-  it "should only remove items when the same number have been removed as have been added" do
+  it 'should only remove items when the same number have been removed as have been added' do
     item1 = @count_pool.find('_items', 'one')
     item2 = @count_pool.find('_items', 'one')
     expect(@count_pool.instance_variable_get('@pool')).to_not eq({})

data/spec/utils/generic_pool_spec.rb

@@ -1,8 +1,8 @@
 require 'volt/utils/generic_pool'
 
 class PoolTest < Volt::GenericPool
-  def create(collection, query, other=nil)
-    return Object.new
+  def create(collection, query, other = nil)
+    Object.new
   end
 end
 
@@ -12,18 +12,18 @@ describe Volt::GenericPool do
     @pool_test = PoolTest.new
   end
 
-  it "should insert nested for fast lookup at a path" do
+  it 'should insert nested for fast lookup at a path' do
     item1 = @pool_test.lookup('_items', 'one')
-    expect(@pool_test.instance_variable_get('@pool')).to eq({'_items' => {'one' => item1}})
+    expect(@pool_test.instance_variable_get('@pool')).to eq('_items' => { 'one' => item1 })
   end
 
-  it "should retrieve the same item both times" do
+  it 'should retrieve the same item both times' do
     item1 = @pool_test.lookup('_items', {})
     item2 = @pool_test.lookup('_items', {})
     expect(item1.object_id).to eq(item2.object_id)
   end
 
-  it "should recreate after being removed" do
+  it 'should recreate after being removed' do
     item1 = @pool_test.lookup('_items', {})
     item2 = @pool_test.lookup('_items', {})
     expect(item1.object_id).to eq(item2.object_id)
@@ -33,17 +33,17 @@ describe Volt::GenericPool do
     expect(item3.object_id).to_not eq(item2.object_id)
   end
 
-  it "should remove all of the way down" do
-    @pool_test.instance_variable_set('@pool', {:name => {:ok => true}, :yep => true})
+  it 'should remove all of the way down' do
+    @pool_test.instance_variable_set('@pool', name: { ok: true }, yep: true)
 
     @pool_test.remove(:name, :ok)
 
-    expect(@pool_test.instance_variable_get('@pool')).to eq({:yep => true})
+    expect(@pool_test.instance_variable_get('@pool')).to eq(yep: true)
   end
 
-  it "should lookup all items at a path" do
-    item1 = @pool_test.lookup('_items', '_some', {:name => 'bob'})
-    item2 = @pool_test.lookup('_items', '_some', {:name => 'jim'})
+  it 'should lookup all items at a path' do
+    item1 = @pool_test.lookup('_items', '_some', name: 'bob')
+    item2 = @pool_test.lookup('_items', '_some', name: 'jim')
 
     expect(@pool_test.lookup_all('_items', '_some')).to eq([item1, item2])
   end

data/templates/component/config/routes.rb

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

data/templates/component/controllers/main_controller.rb

@@ -8,10 +8,11 @@ class MainController < Volt::ModelController
   end
 
   private
-    # the main template contains a #template binding that shows another
-    # template.  This is the path to that template.  It may change based
-    # on the params._controller and params._action values.
-    def main_path
-      params._controller.or('main') + "/" + params._action.or('index')
-    end
+
+  # the main template contains a #template binding that shows another
+  # template.  This is the path to that template.  It may change based
+  # on the params._controller and params._action values.
+  def main_path
+    params._controller.or('main') + '/' + params._action.or('index')
+  end
 end

data/templates/newgem/app/newgem/config/dependencies.rb

@@ -1 +1 @@
-# Component dependencies
+# Component dependencies

data/templates/newgem/app/newgem/config/routes.rb

@@ -1 +1 @@
-# Component routes
+# Component routes

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

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

data/templates/project/app/main/controllers/main_controller.rb

@@ -8,10 +8,11 @@ class MainController < Volt::ModelController
   end
 
   private
-    # the main template contains a #template binding that shows another
-    # template.  This is the path to that template.  It may change based
-    # on the params._controller and params._action values.
-    def main_path
-      params._controller.or('main') + "/" + params._action.or('index')
-    end
+
+  # the main template contains a #template binding that shows another
+  # template.  This is the path to that template.  It may change based
+  # on the params._controller and params._action values.
+  def main_path
+    params._controller.or('main') + '/' + params._action.or('index')
+  end
 end

data/templates/project/spec/sample_spec.rb

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

data/volt.gemspec

@@ -5,50 +5,49 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 version = File.read(File.expand_path('../VERSION', __FILE__)).strip
 
 Gem::Specification.new do |spec|
-  spec.name          = "volt"
+  spec.name          = 'volt'
   spec.version       = version
-  spec.authors       = ["Ryan Stout"]
-  spec.email         = ["ryan@agileproductions.com"]
-  spec.summary       = %q{A ruby web framework where your ruby runs on both server and client (via Opal)}
+  spec.authors       = ['Ryan Stout']
+  spec.email         = ['ryan@agileproductions.com']
+  spec.summary       = 'A ruby web framework where your ruby runs on both server and client (via Opal)'
   # spec.description   = %q{}
-  spec.homepage      = "http://voltframework.com"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://voltframework.com'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "thor", "~> 0.19.0"
-  spec.add_dependency "pry", "~> 0.9.12.0"
-  spec.add_dependency "rack", "~> 1.5.0"
-  spec.add_dependency "sprockets-sass", "~> 1.0.0"
-  spec.add_dependency "sass", "~> 3.2.5"
-  spec.add_dependency "mongo", "~> 1.9.0"
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'thor', '~> 0.19.0'
+  spec.add_dependency 'pry', '~> 0.9.12.0'
+  spec.add_dependency 'rack', '~> 1.5.0'
+  spec.add_dependency 'sprockets-sass', '~> 1.0.0'
+  spec.add_dependency 'sass', '~> 3.2.5'
+  spec.add_dependency 'mongo', '~> 1.9.0'
   # spec.add_dependency "bson_ext", "~> 1.9.0"
   # spec.add_dependency "thin", "~> 1.6.0"
-  spec.add_dependency "rake", "~> 10.0.4"
-  spec.add_dependency "listen", "~> 2.7.0"
-  spec.add_dependency "uglifier", "~> 2.4.0"
-  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 "bundler", ">= 1.5"
-
+  spec.add_dependency 'rake', '~> 10.0.4'
+  spec.add_dependency 'listen', '~> 2.7.0'
+  spec.add_dependency 'uglifier', '~> 2.4.0'
+  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 'bundler', '>= 1.5'
 
   # spec.add_dependency "promise.rb", "~> 0.6.1"
 
   # spec.add_dependency "rack-colorized_logger", "~> 1.0.4"
 
-  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 "yard", "~> 0.8.7.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 'yard', '~> 0.8.7.0'
 
 end