volt 0.9.1 → 0.9.2

data/lib/volt/server/html_parser/component_view_scope.rb

@@ -48,7 +48,7 @@ module Volt
     def close_scope
       binding_number                    = @handler.scope[-2].binding_number
       @handler.scope[-2].binding_number += 1
-      @path                             += "/__template/#{binding_number}"
+      @path += "/__template/#{binding_number}"
 
       super
 
@@ -56,4 +56,4 @@ module Volt
       @handler.scope.last.save_binding(binding_number, "lambda { |__p, __t, __c, __id| Volt::ComponentBinding.new(__p, __t, __c, __id, #{@binding_in_path.inspect}, Proc.new { [#{@arguments}] }, #{@path.inspect}) }")
     end
   end
-end
+end

data/lib/volt/server/html_parser/each_scope.rb

@@ -15,7 +15,7 @@ module Volt
     def close_scope
       binding_number                    = @handler.scope[-2].binding_number
       @handler.scope[-2].binding_number += 1
-      @path                             += "/__template/#{binding_number}"
+      @path += "/__template/#{binding_number}"
 
       super
 

data/lib/volt/server/html_parser/sandlebars_parser.rb

@@ -156,16 +156,12 @@ module Volt
 
       # Some tags close themselves when a new one of themselves is reached.
       # ex, a tr will close the previous tr
-      if CLOSE_SELF[tag_name] && last == tag_name
-        end_tag(nil, tag_name)
-      end
+      end_tag(nil, tag_name) if CLOSE_SELF[tag_name] && last == tag_name
 
       unary = EMPTY[tag_name] || !unary.blank?
 
       # Section tag's are also unary
-      unless unary || section_tag
-        @stack.push(tag_name)
-      end
+      @stack.push(tag_name) unless unary || section_tag
 
       if @handler.respond_to?(:start_tag)
         attributes = {}

data/lib/volt/server/html_parser/view_handler.rb

@@ -14,7 +14,7 @@ module Volt
       @original_path = initial_path
 
       # Default to the body section
-      initial_path   += '/body' if allow_sections
+      initial_path += '/body' if allow_sections
 
       @scope     = [ViewScope.new(self, initial_path)]
       @templates = {}

data/lib/volt/server/html_parser/view_parser.rb

@@ -20,7 +20,7 @@ module Volt
       # Close out the last scope
       last_scope = handler.scope.last
 
-      raise "Unclosed tag in:\n#{html}" unless last_scope
+      fail "Unclosed tag in:\n#{html}" unless last_scope
 
       last_scope.close_scope
 

data/lib/volt/server/html_parser/view_scope.rb

@@ -99,7 +99,7 @@ module Volt
       @binding_number += 1
     end
 
-    def add_yield(content=nil)
+    def add_yield(content = nil)
       # Strip ( and ) from the outsides
       content ||= ''
       content = content.strip.gsub(/^\(/, '').gsub(/\)$/, '')
@@ -115,9 +115,7 @@ module Volt
     def parent_fetcher(getter)
       parent = getter.strip.gsub(/[.][^.]+$/, '')
 
-      if parent.blank? || !getter.index('.')
-        parent = 'self'
-      end
+      parent = 'self' if parent.blank? || !getter.index('.')
 
       parent
     end

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

@@ -71,9 +71,7 @@ module Volt
 
     def add_assets(path)
       asset_folder = File.join(path, 'assets')
-      if File.directory?(asset_folder)
-        @assets << [:folder, asset_folder]
-      end
+      @assets << [:folder, asset_folder] if File.directory?(asset_folder)
     end
 
     def javascript_files(opal_files)

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

@@ -44,9 +44,7 @@ module Volt
 
             # Add in the folder if it's not alreay in there
             folders = (@components[folder_name] ||= [])
-            unless folders.include?(folder)
-              folders << folder
-            end
+            folders << folder unless folders.include?(folder)
           end
         end
       end

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

@@ -1,7 +1,5 @@
 require 'volt'
-if RUBY_PLATFORM != 'opal'
-  require 'rack'
-end
+require 'rack' if RUBY_PLATFORM != 'opal'
 
 module Volt
   # A request object for a HttpController. See Rack::Request for more details

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

@@ -1,6 +1,4 @@
-if RUBY_PLATFORM != 'opal'
-  require 'rack'
-end
+require 'rack' if RUBY_PLATFORM != 'opal'
 require 'volt'
 require 'volt/router/routes'
 require 'volt/server/rack/http_request'

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

@@ -6,8 +6,8 @@ module Volt
   class HttpResponseRenderer
     @renderers = {}
 
-    def self.renderers
-      @renderers
+    class << self
+      attr_reader :renderers
     end
 
     # Register renderers.

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

@@ -14,7 +14,7 @@ module Volt
         component_paths.components.values.flatten.uniq.each do |component_path|
           routes_path = "#{component_path}/config/routes.rb"
 
-          if File.exists?(routes_path)
+          if File.exist?(routes_path)
             route_file = File.read(routes_path)
             instance_eval(route_file, routes_path, 0)
           end

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

@@ -25,9 +25,7 @@ module Volt
       Gem.loaded_specs.values.each do |gem|
         path = gem.full_gem_path + '/app'
 
-        if Dir.exists?(path)
-          Opal.append_path(path)
-        end
+        Opal.append_path(path) if Dir.exist?(path)
       end
 
       # Don't run arity checks in production

data/lib/volt/server/socket_connection_handler.rb

@@ -21,9 +21,7 @@ module Volt
     def self.send_message_all(skip_channel = nil, *args)
       return unless defined?(@@channels)
       @@channels.each do |channel|
-        if skip_channel && channel == skip_channel
-          next
-        end
+        next if skip_channel && channel == skip_channel
         channel.send_message(*args)
       end
     end

data/lib/volt/server/websocket/rack_server_adaptor.rb

@@ -16,4 +16,4 @@ module Volt
       Faye::WebSocket.load_adapter(RUNNING_SERVER)
     end
   end
-end
+end

data/lib/volt/server/websocket/websocket_handler.rb

@@ -2,7 +2,6 @@ require 'faye/websocket'
 require 'volt/server/socket_connection_handler'
 require 'volt/server/websocket/rack_server_adaptor'
 
-
 module Volt
   # Setup the dispatcher for the socket connection handler.
   # SocketConnectionHandler.dispatcher = Dispatcher.new
@@ -39,4 +38,4 @@ module Volt
       end
     end
   end
-end
+end

data/lib/volt/spec/capybara.rb

@@ -2,7 +2,7 @@ require 'volt/spec/sauce_labs'
 
 module Volt
   class << self
-    def setup_capybara(app_path, volt_app=nil)
+    def setup_capybara(app_path, volt_app = nil)
       browser = ENV['BROWSER']
 
       if browser

data/lib/volt/spec/setup.rb

@@ -1,6 +1,4 @@
-if RUBY_PLATFORM != 'opal'
-  require 'volt/volt/core'
-end
+require 'volt/volt/core' if RUBY_PLATFORM != 'opal'
 
 module Volt
   class << self
@@ -28,7 +26,7 @@ module Volt
 
       unless ENV['BROWSER']
         # Not running integration tests with ENV['BROWSER']
-        RSpec.configuration.filter_run_excluding :type => :feature
+        RSpec.configuration.filter_run_excluding type: :feature
       end
 
       # Setup the spec collection accessors
@@ -44,18 +42,26 @@ module Volt
           $page.store
         end
 
-        after do
-          if @__store_accessed
-            # Clear the database after each spec where we use store
-            # @@db ||= Volt::DataStore.fetch
-            # @@db.drop_database
-            Volt::DataStore.fetch.drop_database
+        def cleanup_after
+          Volt::DataStore.fetch.drop_database
+
+          $page.instance_variable_set('@store', nil)
+        end
+
+        if RUBY_PLATFORM != 'opal'
+          after do
+            if @__store_accessed
+              # Clear the database after each spec where we use store
+              cleanup_after
+            end
+          end
 
-            $page.instance_variable_set('@store', nil)
+          # Cleanup after integration tests also.
+          after(:example, {type: :feature}) do
+            cleanup_after
           end
         end
       end
-
     end
   end
 end

data/lib/volt/tasks/dispatcher.rb

@@ -59,7 +59,7 @@ module Volt
         Volt.logger.log_dispatch(class_name, method_name, run_time, args, error)
       end
 
-        # Run the promise and pass the return value/error back to the client
+      # Run the promise and pass the return value/error back to the client
       promise.then do |result|
         channel.send_message('response', callback_id, result, nil)
 
@@ -91,4 +91,3 @@ module Volt
     end
   end
 end
-

data/lib/volt/tasks/task_handler.rb

@@ -9,9 +9,7 @@ module Volt
         meta_data = {}
 
         user_id = $page.cookies._user_id
-        unless user_id.nil?
-          meta_data['user_id'] = user_id
-        end
+        meta_data['user_id'] = user_id unless user_id.nil?
 
         $page.tasks.call(self.name, name, meta_data, *args, &block)
       end

data/lib/volt/utils/boolean_patch.rb

@@ -5,4 +5,4 @@ if RUBY_PLATFORM == 'opal'
       self ? 'Boolean:true' : 'Boolean:false'
     end
   end
-end
+end

data/lib/volt/utils/event_counter.rb

@@ -21,9 +21,9 @@ module Volt
     def remove
       @count -= 1
 
-      raise "count below 0" if @count < 0
+      fail 'count below 0' if @count < 0
 
       @stop.call if @count == 0
     end
   end
-end
+end

data/lib/volt/utils/generic_pool.rb

@@ -9,7 +9,7 @@ module Volt
   # all of the items at a sub-path with #lookup_all
   #
   # TODO: make the lookup/create threadsafe
-  class GenericPoolDeleteException < StandardError ; end
+  class GenericPoolDeleteException < StandardError; end
 
   class GenericPool
     attr_reader :pool
@@ -26,9 +26,7 @@ module Volt
       section = @pool
 
       # TODO: This is to work around opal issue #500
-      if RUBY_PLATFORM == 'opal'
-        args.pop if args.last.nil?
-      end
+      args.pop if args.last.nil? if RUBY_PLATFORM == 'opal'
 
       args.each_with_index do |arg, index|
         last = (args.size - 1) == index
@@ -96,7 +94,7 @@ module Volt
 
         if args.size - 1 == index
           unless section
-            raise GenericPoolDeleteException, "An attempt was made to delete at #{arg}, full path: #{args.inspect} in #{inspect}"
+            fail GenericPoolDeleteException, "An attempt was made to delete at #{arg}, full path: #{args.inspect} in #{inspect}"
           end
 
           section.delete(arg)
@@ -109,14 +107,12 @@ module Volt
         node   = stack[index]
         parent = stack[index - 1]
 
-        if node.size == 0
-          parent.delete(args[index - 1])
-        end
+        parent.delete(args[index - 1]) if node.size == 0
       end
     end
 
     def inspect
-      "<#{self.class.to_s} #{@pool.inspect}>"
+      "<#{self.class} #{@pool.inspect}>"
     end
 
     def print

data/lib/volt/utils/logging/task_argument_filterer.rb

@@ -3,7 +3,7 @@
 # more with Volt.config.filter_keys
 class TaskArgumentFilterer
   def self.filter(args)
-    self.new(args).run
+    new(args).run
   end
 
   def initialize(args)
@@ -24,9 +24,9 @@ class TaskArgumentFilterer
 
   def filter_args(args)
     if args.is_a?(Array)
-      args.map {|v| filter_args(v) }
+      args.map { |v| filter_args(v) }
     elsif args.is_a?(Hash)
-      args.map do |k,v|
+      args.map do |k, v|
         if @@filter_args.include?(k.to_sym)
           # filter
           [k, '[FILTERED]']
@@ -39,4 +39,4 @@ class TaskArgumentFilterer
       return args
     end
   end
-end
+end

data/lib/volt/utils/logging/task_logger.rb

@@ -5,10 +5,10 @@ module Volt
     def self.task_dispatch_message(logger, args)
       msg = "task #{logger.class_name}##{logger.method_name} in #{logger.run_time}\n"
       if args.size > 0
-        arg_str = TaskArgumentFilterer.filter(args).map {|v| v.inspect }.join(', ')
+        arg_str = TaskArgumentFilterer.filter(args).map(&:inspect).join(', ')
         msg += "with args: #{arg_str}\n"
       end
       msg
     end
   end
-end
+end

data/lib/volt/utils/modes.rb

@@ -41,7 +41,7 @@ module Volt
 
       # Check to see if we are in the specified mode
       def in_mode?(mode_name)
-        return defined?(Thread) && Thread.current[mode_name]
+        defined?(Thread) && Thread.current[mode_name]
       end
     end
 
@@ -49,4 +49,4 @@ module Volt
       base.send :extend, ClassMethods
     end
   end
-end
+end

data/lib/volt/utils/promise_patch.rb

@@ -14,7 +14,6 @@ class Promise
     @next = nil
   end
 
-
   def >>(promise)
     @next = promise
 
@@ -58,7 +57,7 @@ class Promise
     end
 
     if error
-      raise error
+      fail error
     else
       return result
     end

data/lib/volt/utils/read_write_lock.rb

@@ -68,9 +68,9 @@ class ReadWriteLock
   end
 
   def acquire_read_lock
-    while(true)
+    loop do
       c = @counter.value
-      raise "Too many reader threads!" if (c & MAX_READERS) == MAX_READERS
+      fail 'Too many reader threads!' if (c & MAX_READERS) == MAX_READERS
 
       # If a writer is waiting when we first queue up, we need to wait
       if c >= WAITING_WRITER
@@ -82,26 +82,26 @@ class ReadWriteLock
 
         # after a reader has waited once, they are allowed to "barge" ahead of waiting writers
         # but if a writer is *running*, the reader still needs to wait (naturally)
-        while(true)
+        loop do
           c = @counter.value
           if c >= RUNNING_WRITER
             @reader_mutex.synchronize do
               @reader_q.wait(@reader_mutex) if @counter.value >= RUNNING_WRITER
             end
           else
-            return if @counter.compare_and_swap(c,c+1)
+            return if @counter.compare_and_swap(c, c + 1)
           end
         end
       else
-        break if @counter.compare_and_swap(c,c+1)
+        break if @counter.compare_and_swap(c, c + 1)
       end
     end
   end
 
   def release_read_lock
-    while(true)
+    loop do
       c = @counter.value
-      if @counter.compare_and_swap(c,c-1)
+      if @counter.compare_and_swap(c, c - 1)
         # If one or more writers were waiting, and we were the last reader, wake a writer up
         if c >= WAITING_WRITER && (c & MAX_READERS) == 1
           @writer_mutex.synchronize { @writer_q.signal }
@@ -112,15 +112,15 @@ class ReadWriteLock
   end
 
   def acquire_write_lock
-    while(true)
+    loop do
       c = @counter.value
-      raise "Too many writers!" if (c & MAX_WRITERS) == MAX_WRITERS
+      fail 'Too many writers!' if (c & MAX_WRITERS) == MAX_WRITERS
 
       if c == 0 # no readers OR writers running
         # if we successfully swap the RUNNING_WRITER bit on, then we can go ahead
-        break if @counter.compare_and_swap(0,RUNNING_WRITER)
-      elsif @counter.compare_and_swap(c,c+WAITING_WRITER)
-        while(true)
+        break if @counter.compare_and_swap(0, RUNNING_WRITER)
+      elsif @counter.compare_and_swap(c, c + WAITING_WRITER)
+        loop do
           # Now we have successfully incremented, so no more readers will be able to increment
           #   (they will wait instead)
           # However, readers OR writers could decrement right here, OR another writer could increment
@@ -138,7 +138,7 @@ class ReadWriteLock
           c = @counter.value
           break if (c < RUNNING_WRITER) &&
                    ((c & MAX_READERS) == 0) &&
-                   @counter.compare_and_swap(c,c+RUNNING_WRITER-WAITING_WRITER)
+                   @counter.compare_and_swap(c, c + RUNNING_WRITER - WAITING_WRITER)
         end
         break
       end
@@ -146,13 +146,11 @@ class ReadWriteLock
   end
 
   def release_write_lock
-    while(true)
+    loop do
       c = @counter.value
-      if @counter.compare_and_swap(c,c-RUNNING_WRITER)
+      if @counter.compare_and_swap(c, c - RUNNING_WRITER)
         @reader_mutex.synchronize { @reader_q.broadcast }
-        if (c & MAX_WRITERS) > 0 # if any writers are waiting...
-          @writer_mutex.synchronize { @writer_q.signal }
-        end
+        @writer_mutex.synchronize { @writer_q.signal } if (c & MAX_WRITERS) > 0 # if any writers are waiting...
         break
       end
     end
@@ -161,11 +159,11 @@ class ReadWriteLock
   def to_s
     c = @counter.value
     s = if c >= RUNNING_WRITER
-      "1 writer running, "
-    elsif (c & MAX_READERS) > 0
-      "#{c & MAX_READERS} readers running, "
-    else
-      ""
+          '1 writer running, '
+        elsif (c & MAX_READERS) > 0
+          "#{c & MAX_READERS} readers running, "
+        else
+          ''
     end
 
     "#<ReadWriteLock:#{object_id.to_s(16)} #{s}#{(c & MAX_WRITERS) / WAITING_WRITER} writers waiting>"