volt 0.8.15 → 0.8.16

data/lib/volt/utils/generic_counting_pool.rb

@@ -19,14 +19,14 @@ module Volt
 
       item[0] += 1
 
-      return item[1]
+      item[1]
     end
 
     # Lookups an item
     def lookup(*args, &block)
       item = super(*args, &block)
 
-      return item[1]
+      item[1]
     end
 
     def transform_item(item)

data/lib/volt/utils/generic_pool.rb

@@ -21,12 +21,11 @@ module Volt
 
       # TODO: This is to work around opal issue #500
       if RUBY_PLATFORM == 'opal'
-        args.pop if args.last == nil
+        args.pop if args.last.nil?
       end
 
-
       args.each_with_index do |arg, index|
-        last = (args.size-1) == index
+        last = (args.size - 1) == index
 
         if last
           # return, creating if needed
@@ -48,7 +47,7 @@ module Volt
         new_item = create(*args)
       end
 
-      return transform_item(new_item)
+      transform_item(new_item)
     end
 
     # Allow other pools to override how the created item gets stored.
@@ -77,19 +76,19 @@ module Volt
       args.each_with_index do |arg, index|
         stack << section
 
-        if args.size-1 == index
+        if args.size - 1 == index
           section.delete(arg)
         else
           section = section[arg]
         end
       end
 
-      (stack.size-1).downto(1) do |index|
+      (stack.size - 1).downto(1) do |index|
         node   = stack[index]
-        parent = stack[index-1]
+        parent = stack[index - 1]
 
         if node.size == 0
-          parent.delete(args[index-1])
+          parent.delete(args[index - 1])
         end
       end
     end

data/lib/volt/utils/local_storage.rb

@@ -2,10 +2,10 @@ if RUBY_PLATFORM == 'opal'
   module Volt
     module LocalStorage
       def self.[](key)
-        %x{
+        `
           var val = localStorage.getItem(key);
           return val === null ? nil : val;
-        }
+        `
       end
 
       def self.[]=(key, value)
@@ -18,11 +18,11 @@ if RUBY_PLATFORM == 'opal'
       end
 
       def self.delete(key)
-        %x{
+        `
           var val = localStorage.getItem(key);
           localStorage.removeItem(key);
           return val === null ? nil : val;
-        }
+        `
       end
     end
   end

data/lib/volt/volt/environment.rb

@@ -7,7 +7,7 @@ module Volt
       if RUBY_PLATFORM == 'opal'
         unless @env
           `if (window.start_env) {`
-            @env = `window.start_env`
+          @env = `window.start_env`
           `}`
         end
       end

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

@@ -1 +1 @@
-component 'bootstrap'
+component 'bootstrap'

data/spec/apps/kitchen_sink/Gemfile

@@ -10,7 +10,6 @@ gem 'volt-bootstrap'
 # Simple theme for bootstrap, remove to theme yourself.
 gem 'volt-bootstrap-jumbotron-theme'
 
-
 # Server for MRI
 platform :mri do
   gem 'thin', '~> 1.6.0'
@@ -22,7 +21,6 @@ platform :jruby do
   gem 'jubilee'
 end
 
-
 #---------------------
 # Needed at the moment
 gem 'volt-sockjs', require: false, platforms: :mri

data/spec/apps/kitchen_sink/app/main/config/routes.rb

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

data/spec/apps/kitchen_sink/app/main/controllers/main_controller.rb

@@ -2,10 +2,11 @@ class MainController < Volt::ModelController
   model :page
 
   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/spec/apps/kitchen_sink/app/main/controllers/todos_controller.rb

@@ -2,16 +2,15 @@ class TodosController < Volt::ModelController
   model :page
 
   def add_todo
-    self._todos << {name: self._new_todo}
+    _todos << { name: _new_todo }
     self._new_todo = ''
   end
 
   def remove_todo(todo)
-    self._todos.delete(todo)
+    _todos.delete(todo)
   end
 
   def completed
-    self._todos.count {|t| t._completed }
+    _todos.count(&:_completed)
   end
-
 end

data/spec/controllers/reactive_accessors_spec.rb

@@ -8,14 +8,14 @@ class TestReactiveAccessors
 end
 
 describe Volt::ReactiveAccessors do
-  it "should assign a reactive value" do
+  it 'should assign a reactive value' do
     inst = TestReactiveAccessors.new
 
     inst._name = 'Ryan'
     expect(inst._name).to eq('Ryan')
   end
 
-  it "should start nil" do
+  it 'should start nil' do
     inst = TestReactiveAccessors.new
 
     expect(inst._name).to eq(nil)
@@ -31,10 +31,10 @@ describe Volt::ReactiveAccessors do
 
     inst._name = 'Ryan'
     Volt::Computation.flush!
-    expect(values).to eq([nil,'Ryan'])
+    expect(values).to eq([nil, 'Ryan'])
 
     inst._name = 'Stout'
     Volt::Computation.flush!
-    expect(values).to eq([nil,'Ryan','Stout'])
+    expect(values).to eq([nil, 'Ryan', 'Stout'])
   end
 end

data/spec/extra_core/inflector_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'volt/extra_core/inflector'
 
 describe Volt::Inflector do
-  it "should pluralize correctly" do
+  it 'should pluralize correctly' do
     expect('car'.pluralize).to eq('cars')
     # expect('database'.pluralize).to eq('database')
   end

data/spec/extra_core/string_transformation_test_cases.rb

@@ -1,41 +1,40 @@
   CamelToUnderscore = {
-    "Product"               => "product",
-    "SpecialGuest"          => "special_guest",
-    "ApplicationController" => "application_controller",
-    "Area51Controller"      => "area51_controller"
+    'Product'               => 'product',
+    'SpecialGuest'          => 'special_guest',
+    'ApplicationController' => 'application_controller',
+    'Area51Controller'      => 'area51_controller'
   }
 
   UnderscoreToLowerCamel = {
-    "product"                => "product",
-    "special_guest"          => "specialGuest",
-    "application_controller" => "applicationController",
-    "area51_controller"      => "area51Controller"
+    'product'                => 'product',
+    'special_guest'          => 'specialGuest',
+    'application_controller' => 'applicationController',
+    'area51_controller'      => 'area51Controller'
   }
 
   SymbolToLowerCamel = {
-    :product                => 'product',
-    :special_guest          => 'specialGuest',
-    :application_controller => 'applicationController',
-    :area51_controller      => 'area51Controller'
+    product: 'product',
+    special_guest: 'specialGuest',
+    application_controller: 'applicationController',
+    area51_controller: 'area51Controller'
   }
 
   CamelToUnderscoreWithoutReverse = {
-    "HTMLTidy"              => "html_tidy",
-    "HTMLTidyGenerator"     => "html_tidy_generator",
-    "FreeBSD"               => "free_bsd",
-    "HTML"                  => "html",
-    "ForceXMLController"    => "force_xml_controller",
+    'HTMLTidy'              => 'html_tidy',
+    'HTMLTidyGenerator'     => 'html_tidy_generator',
+    'FreeBSD'               => 'free_bsd',
+    'HTML'                  => 'html',
+    'ForceXMLController'    => 'force_xml_controller'
   }
 
   CamelWithModuleToUnderscoreWithSlash = {
-    "Admin::Product" => "admin/product",
-    "Users::Commission::Department" => "users/commission/department",
-    "UsersSection::CommissionDepartment" => "users_section/commission_department",
+    'Admin::Product' => 'admin/product',
+    'Users::Commission::Department' => 'users/commission/department',
+    'UsersSection::CommissionDepartment' => 'users_section/commission_department'
   }
 
   UnderscoresToDashes = {
-    "street"                => "street",
-    "street_address"        => "street-address",
-    "person_street_address" => "person-street-address"
+    'street'                => 'street',
+    'street_address'        => 'street-address',
+    'person_street_address' => 'person-street-address'
   }
-  

data/spec/extra_core/string_transformations_spec.rb

@@ -3,47 +3,46 @@ require 'spec_helper'
 require 'extra_core/string_transformation_test_cases'
 require 'volt/extra_core/string'
 
-describe "#camelize" do
+describe '#camelize' do
   CamelToUnderscore.each do |camel, underscore|
-    it "camelizes" do
+    it 'camelizes' do
       expect(underscore.camelize).to eq(camel)
     end
   end
 
-  it "camelizes lower" do
+  it 'camelizes lower' do
     expect('capital_city'.camelize(:lower)).to eq('capitalCity')
   end
 
-  it "camelizes upper" do
+  it 'camelizes upper' do
     expect('capital_city'.camelize(:upper)).to eq('CapitalCity')
   end
 
-  it "camelizes upper default" do
+  it 'camelizes upper default' do
     expect('capital_city'.camelize).to eq('CapitalCity')
   end
 
   UnderscoreToLowerCamel.each do |underscored, lower_camel|
-    it "camelizes lower" do
+    it 'camelizes lower' do
       expect(underscored.camelize(:lower)).to eq(lower_camel)
     end
   end
 
   UnderscoresToDashes.each do |underscored, dasherized|
-    it "dasherizes" do
+    it 'dasherizes' do
       expect(underscored.dasherize).to eq(dasherized)
     end
   end
 
   CamelToUnderscore.each do |camel, underscore|
-    it "underscores" do
+    it 'underscores' do
       expect(camel.underscore).to eq(underscore)
     end
   end
 
-  it "underscores acronyms" do
-    expect("HTMLTidy".underscore).to eq("html_tidy")
-    expect("HTMLTidyGenerator".underscore).to eq("html_tidy_generator")
+  it 'underscores acronyms' do
+    expect('HTMLTidy'.underscore).to eq('html_tidy')
+    expect('HTMLTidyGenerator'.underscore).to eq('html_tidy_generator')
   end
 
 end
-

data/spec/integration/bindings_spec.rb

@@ -1,26 +1,26 @@
 if ENV['BROWSER']
   require 'spec_helper'
 
-  describe "bindings test", :type => :feature do
-    it "should load the page" do
+  describe 'bindings test', type: :feature do
+    it 'should load the page' do
       visit '/'
 
       expect(page).to have_content('Kitchen Sink')
     end
 
-    describe "text/fields" do
+    describe 'text/fields' do
       it 'should load the bindings page and update bindings' do
         visit '/'
 
         click_link 'Bindings'
 
         # Fill in one field and see if it updates the rest
-        fill_in('pageName1', :with => 'Page bindings')
+        fill_in('pageName1', with: 'Page bindings')
         expect(find('#pageName1').value).to eq('Page bindings')
         expect(find('#pageName2').value).to eq('Page bindings')
         expect(find('#pageName3')).to have_content('Page bindings')
 
-        fill_in('pageName2', :with => 'Update everywhere')
+        fill_in('pageName2', with: 'Update everywhere')
         expect(find('#pageName1').value).to eq('Update everywhere')
         expect(find('#pageName2').value).to eq('Update everywhere')
         expect(find('#pageName3')).to have_content('Update everywhere')
@@ -38,12 +38,12 @@ if ENV['BROWSER']
         end
 
         # Fill in one field and see if it updates the rest
-        fill_in('paramsName1', :with => 'Params bindings')
+        fill_in('paramsName1', with: 'Params bindings')
         expect(find('#paramsName1').value).to eq('Params bindings')
         expect(find('#paramsName2').value).to eq('Params bindings')
         expect(find('#paramsName3')).to have_content('Params bindings')
 
-        fill_in('paramsName2', :with => 'Update everywhere')
+        fill_in('paramsName2', with: 'Update everywhere')
         expect(find('#paramsName1').value).to eq('Update everywhere')
         expect(find('#paramsName2').value).to eq('Update everywhere')
         expect(find('#paramsName3')).to have_content('Update everywhere')
@@ -65,12 +65,12 @@ if ENV['BROWSER']
         end
 
         # Fill in one field and see if it updates the rest
-        fill_in('routesName1', :with => 'Routes bindings')
+        fill_in('routesName1', with: 'Routes bindings')
         expect(find('#routesName1').value).to eq('Routes bindings')
         expect(find('#routesName2').value).to eq('Routes bindings')
         expect(find('#routesName3')).to have_content('Routes bindings')
 
-        fill_in('routesName2', :with => 'bound_url')
+        fill_in('routesName2', with: 'bound_url')
         expect(find('#routesName1').value).to eq('bound_url')
         expect(find('#routesName2').value).to eq('bound_url')
         expect(find('#routesName3')).to have_content('bound_url')
@@ -93,12 +93,12 @@ if ENV['BROWSER']
         click_link 'Bindings'
 
         # Fill in one field and see if it updates the rest
-        fill_in('textareaName1', :with => 'Page bindings')
+        fill_in('textareaName1', with: 'Page bindings')
         expect(find('#textareaName1').value).to eq('Page bindings')
         expect(find('#textareaName2').value).to eq('Page bindings')
         expect(find('#textareaName3')).to have_content('Page bindings')
 
-        fill_in('textareaName2', :with => 'Update everywhere')
+        fill_in('textareaName2', with: 'Update everywhere')
         expect(find('#textareaName1').value).to eq('Update everywhere')
         expect(find('#textareaName2').value).to eq('Update everywhere')
         expect(find('#textareaName3')).to have_content('Update everywhere')
@@ -110,12 +110,12 @@ if ENV['BROWSER']
         click_link 'Bindings'
 
         # Fill in one field and see if it updates the rest
-        fill_in('localstoreName1', :with => 'Page bindings')
+        fill_in('localstoreName1', with: 'Page bindings')
         expect(find('#localstoreName1').value).to eq('Page bindings')
         expect(find('#localstoreName2').value).to eq('Page bindings')
         expect(find('#localstoreName3')).to have_content('Page bindings')
 
-        fill_in('localstoreName2', :with => 'Update everywhere')
+        fill_in('localstoreName2', with: 'Update everywhere')
         expect(find('#localstoreName1').value).to eq('Update everywhere')
         expect(find('#localstoreName2').value).to eq('Update everywhere')
         expect(find('#localstoreName3')).to have_content('Update everywhere')
@@ -143,7 +143,7 @@ if ENV['BROWSER']
       # end
     end
 
-    describe "check boxes" do
+    describe 'check boxes' do
       it 'should load the bindings page and update checkboxes' do
         visit '/'
 
@@ -193,7 +193,7 @@ if ENV['BROWSER']
       end
     end
 
-    describe "content escaping" do
+    describe 'content escaping' do
       it 'should escape in a tripple stash' do
         visit '/'