volt 0.8.15 → 0.8.16

data/lib/volt/reactive/reactive_hash.rb

@@ -2,7 +2,7 @@ require 'volt/reactive/hash_dependency'
 
 module Volt
   class ReactiveHash
-    def initialize(values={})
+    def initialize(values = {})
       @hash     = values
       @deps     = HashDependency.new
       @all_deps = Dependency.new
@@ -17,13 +17,13 @@ module Volt
     def method_missing(method_name, *args, &block)
       @all_deps.depend
 
-      return @hash.send(method_name, *args, &block)
+      @hash.send(method_name, *args, &block)
     end
 
     def [](key)
       @deps.depend(key)
 
-      return @hash[key]
+      @hash[key]
     end
 
     def []=(key, value)

data/lib/volt/router/routes.rb

@@ -53,11 +53,11 @@ module Volt
     def define(&block)
       instance_eval(&block)
 
-      return self
+      self
     end
 
     # Add a route
-    def get(path, params={})
+    def get(path, params = {})
       params = params.symbolize_keys
       if has_binding?(path)
         add_indirect_path(path, params)
@@ -88,7 +88,7 @@ module Volt
         end
       end
 
-      return nil, nil
+      [nil, nil]
     end
 
     # Takes in a path and returns the matching params.
@@ -105,6 +105,7 @@ module Volt
     end
 
     private
+
     # Recursively walk the @indirect_routes hash, return the params for a route, return
     # false for non-matches.
     def match_path(original_parts, remaining_parts, node)
@@ -114,7 +115,7 @@ module Volt
       # really I just got lucky)
       part, *parts = remaining_parts
 
-      if part == nil
+      if part.nil?
         if node[part]
           # We found a match, replace the bindings and return
           # TODO: Handvle nested
@@ -144,10 +145,9 @@ module Volt
         end
       end
 
-      return params
+      params
     end
 
-
     # Build up the @indirect_routes data structure.
     # '*' means wildcard match anything
     # nil means a terminal, who's value will be the params.
@@ -172,7 +172,6 @@ module Volt
       node[nil] = params
     end
 
-
     def add_param_matcher(path, params)
       params = params.dup
       parts  = url_parts(path)
@@ -194,7 +193,7 @@ module Volt
     # a url with the bindings filled in, and params with the binding params
     # removed.  (So the remaining can be added onto the end of the url ?params1=...)
     def create_path_transformer(parts)
-      return lambda do |input_params|
+      lambda do |input_params|
         input_params = input_params.dup
 
         url = parts.map do |part|
@@ -234,8 +233,8 @@ module Volt
             # test_params did not have matching key
             return false
           end
-        elsif value == nil
-          unless test_params.has_key?(key)
+        elsif value.nil?
+          unless test_params.key?(key)
             return false
           end
         else
@@ -247,14 +246,13 @@ module Volt
         end
       end
 
-      return true, test_params
+      [true, test_params]
     end
 
     def url_parts(path)
-      return path.split('/').reject(&:blank?)
+      path.split('/').reject(&:blank?)
     end
 
-
     # Check if a string has a binding in it
     def has_binding?(string)
       string.index('{{') && string.index('}}')

data/lib/volt/server.rb

@@ -7,13 +7,13 @@ else
   require 'thin'
 end
 
-require "rack"
+require 'rack'
 if RUBY_PLATFORM != 'java'
-  require "rack/sockjs"
-  require "eventmachine"
+  require 'rack/sockjs'
+  require 'eventmachine'
 end
-require "sass"
-require "sprockets-sass"
+require 'sass'
+require 'sprockets-sass'
 require 'listen'
 
 require 'volt'
@@ -52,11 +52,11 @@ end
 
 module Volt
   class Server
-    def initialize(root_path=nil)
+    def initialize(root_path = nil)
       root_path ||= Dir.pwd
       Volt.root = root_path
 
-      @app_path        = File.expand_path(File.join(root_path, "app"))
+      @app_path        = File.expand_path(File.join(root_path, 'app'))
 
       # Boot the volt app
       @component_paths = Volt.boot(root_path)
@@ -67,13 +67,13 @@ module Volt
     end
 
     def display_welcome
-      puts File.read(File.join(File.dirname(__FILE__), "server/banner.txt"))
+      puts File.read(File.join(File.dirname(__FILE__), 'server/banner.txt'))
     end
 
     def setup_change_listener
       # Setup the listeners for file changes
       listener = Listen.to("#{@app_path}/") do |modified, added, removed|
-        puts "file changed, sending reload"
+        puts 'file changed, sending reload'
         SocketConnectionHandler.send_message_all(nil, 'reload')
       end
       listener.start
@@ -115,20 +115,20 @@ module Volt
       if RUBY_PLATFORM != 'java'
         SocketConnectionHandler.dispatcher = Dispatcher.new
 
-        @app.map "/channel" do
-          run Rack::SockJS.new(SocketConnectionHandler) #, :websocket => false
+        @app.map '/channel' do
+          run Rack::SockJS.new(SocketConnectionHandler) # , :websocket => false
         end
       end
 
       @app.use Rack::Static,
-               :urls         => ["/"],
-               :root         => "public",
-               :index        => "",
-               :header_rules => [
-                   [:all, {'Cache-Control' => 'public, max-age=86400'}]
+               urls: ['/'],
+               root: 'public',
+               index: '',
+               header_rules: [
+                 [:all, { 'Cache-Control' => 'public, max-age=86400' }]
                ]
 
-      @app.run lambda { |env| [404, {'Content-Type' => 'text/html; charset=utf-8'}, ['404 - page not found']] }
+      @app.run lambda { |env| [404, { 'Content-Type' => 'text/html; charset=utf-8' }, ['404 - page not found']] }
 
       @app
     end

data/lib/volt/server/component_handler.rb

@@ -16,7 +16,7 @@ module Volt
 
       javascript_code = compile_for_component(component_name)
 
-      return [200, {"Content-Type" => "application/javascript; charset=utf-8"}, StringIO.new(javascript_code)]
+      [200, { 'Content-Type' => 'application/javascript; charset=utf-8' }, StringIO.new(javascript_code)]
     end
 
     def compile_for_component(component_name)
@@ -28,7 +28,7 @@ module Volt
       # Compile the code
       javascript_code = Opal.compile(code)
 
-      return javascript_code
+      javascript_code
     end
   end
 end

data/lib/volt/server/component_templates.rb

@@ -4,7 +4,7 @@ require 'volt/server/html_parser/view_parser'
 # setup code (for controllers, models, views, and routes)
 module Volt
   class ComponentTemplates
-    def initialize(component_path, component_name, client=true)
+    def initialize(component_path, component_name, client = true)
       @component_path = component_path
       @component_name = component_name
       @client         = true
@@ -17,7 +17,7 @@ module Volt
         code << generate_controller_code + generate_model_code + generate_routes_code + generate_tasks_code
       end
 
-      return code
+      code
     end
 
     def page_reference
@@ -56,7 +56,7 @@ module Volt
         end
       end
 
-      return code
+      code
     end
 
     def generate_controller_code
@@ -67,7 +67,7 @@ module Volt
         code << File.read(controller_path) + "\n\n"
       end
 
-      return code
+      code
     end
 
     def generate_model_code
@@ -82,24 +82,24 @@ module Volt
         code << "#{page_reference}.add_model(#{model_name.inspect})\n\n"
       end
 
-      return code
+      code
     end
 
     def generate_routes_code
       code        = ''
       routes_path = "#{@component_path}/config/routes.rb"
 
-      if File.exists?(routes_path)
+      if File.exist?(routes_path)
         code << "#{page_reference}.add_routes do\n"
         code << "\n" + File.read(routes_path) + "\n"
         code << "end\n\n"
       end
 
-      return code
+      code
     end
 
     def generate_tasks_code
-      return TaskHandler.known_handlers.map do |handler|
+      TaskHandler.known_handlers.map do |handler|
         "class #{handler.name} < Volt::TaskHandler; end"
       end.join "\n"
     end

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

@@ -13,7 +13,7 @@ module Volt
         end
       end
 
-      return new_attributes
+      new_attributes
     end
 
     def process_event_binding(tag_name, attributes, name, value)
@@ -38,7 +38,7 @@ module Volt
       parts         = value.split(/(\{\{[^\}]+\}\})/).reject(&:blank?)
       binding_count = parts.count { |p| p[0] == '{' && p[1] == '{' && p[-2] == '}' && p[-1] == '}' }
 
-      return parts, binding_count
+      [parts, binding_count]
     end
 
     def process_attribute(tag_name, attributes, attribute_name, value)
@@ -73,7 +73,7 @@ module Volt
         prefix = 'self.'
       end
 
-      return "#{prefix}#{getter}=(val)"
+      "#{prefix}#{getter}=(val)"
     end
 
     # Add an attribute binding on the tag, bind directly to the getter in the binding
@@ -89,16 +89,15 @@ module Volt
       save_binding(id, "lambda { |__p, __t, __c, __id| Volt::AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { #{getter} }, Proc.new { |val| #{setter} }) }")
     end
 
-
     def add_multiple_attribute(tag_name, id, attribute_name, parts, content)
       case attribute_name
         when 'checked', 'value'
           if parts.size > 1
             if tag_name == 'textarea'
-              raise "The content of text area's can not be bound to multiple bindings."
+              fail "The content of text area's can not be bound to multiple bindings."
             else
               # Multiple values can not be passed to value or checked attributes.
-              raise "Multiple bindings can not be passed to a #{attribute_name} binding: #{parts.inspect}"
+              fail "Multiple bindings can not be passed to a #{attribute_name} binding: #{parts.inspect}"
             end
           end
       end
@@ -123,24 +122,24 @@ module Volt
         @handler.templates[key] = value
       end
 
-      return path
+      path
     end
 
     def add_id_to_attributes(attributes)
       id              = attributes['id'] ||= "id#{@binding_number}"
       @binding_number += 1
 
-      return id.to_s
+      id.to_s
     end
 
     def attribute_string(attributes)
       attr_str = attributes.map { |v| "#{v[0]}=\"#{v[1]}\"" }.join(' ')
       if attr_str.size > 0
         # extra space
-        attr_str = " " + attr_str
+        attr_str = ' ' + attr_str
       end
 
-      return attr_str
+      attr_str
     end
   end
 end

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

@@ -42,7 +42,7 @@ module Volt
       new_path
     end
 
-    def close_scope(final=true)
+    def close_scope(final = true)
       @branches << [@last_content, path]
 
       super()
@@ -51,7 +51,7 @@ module Volt
         # Add the binding to the parent
         branches = @branches.map do |branch|
           content = branch[0]
-          if content == nil
+          if content.nil?
             content = nil.inspect
           else
             content = "Proc.new { #{branch[0]} }"

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

@@ -16,7 +16,7 @@ module Volt
       hash = {}
       array.each { |v| hash[v] = true }
 
-      return hash
+      hash
     end
 
     # regex matchers
@@ -25,15 +25,15 @@ module Volt
     ATTRIBUTES = /([-\:A-Za-z0-9_]+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/
 
     # Types of elements
-    BLOCK      = truth_hash(%w{a address applet blockquote button center dd del dir div dl dt fieldset form frameset hr iframe ins isindex li map menu noframes noscript object ol p pre script table tbody td tfoot th thead tr ul})
-    EMPTY      = truth_hash(%w{area base basefont br col frame hr img input isindex link meta param embed})
-    INLINE     = truth_hash(%w{abbr acronym applet b basefont bdo big br button cite code del dfn em font i iframe img input ins kbd label map object q s samp script select small span strike strong sub sup textarea tt u var})
-    CLOSE_SELF = truth_hash(%w{colgroup dd dt li options p td tfoot th thead tr})
-    SPECIAL    = truth_hash(%w{script style})
+    BLOCK      = truth_hash(%w(a address applet blockquote button center dd del dir div dl dt fieldset form frameset hr iframe ins isindex li map menu noframes noscript object ol p pre script table tbody td tfoot th thead tr ul))
+    EMPTY      = truth_hash(%w(area base basefont br col frame hr img input isindex link meta param embed))
+    INLINE     = truth_hash(%w(abbr acronym applet b basefont bdo big br button cite code del dfn em font i iframe img input ins kbd label map object q s samp script select small span strike strong sub sup textarea tt u var))
+    CLOSE_SELF = truth_hash(%w(colgroup dd dt li options p td tfoot th thead tr))
+    SPECIAL    = truth_hash(%w(script style))
 
-    FILL_IN_ATTRIBUTES = truth_hash(%w{checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected})
+    FILL_IN_ATTRIBUTES = truth_hash(%w(checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected))
 
-    def initialize(html, handler, file_path=nil)
+    def initialize(html, handler, file_path = nil)
       @html      = StringScanner.new(html)
       @handler   = handler
       @file_path = file_path
@@ -122,7 +122,7 @@ module Volt
           # or end of doc before closed binding
           raise_parse_error("unclosed binding: {#{binding.strip}")
         else
-          raise "should not reach here"
+          fail 'should not reach here'
         end
       end
 
@@ -136,7 +136,7 @@ module Volt
       error_str = error + " on line: #{line_number}"
       error_str += " of #{@file_path}" if @file_path
 
-      raise HTMLParseError, error_str
+      fail HTMLParseError, error_str
     end
 
     def start_tag(tag, tag_name, rest, unary)
@@ -197,7 +197,7 @@ module Volt
 
       if tag
         # Find the closest tag that closes.
-        (@stack.size-1).downto(0) do |index|
+        (@stack.size - 1).downto(0) do |index|
           if @stack[index] == tag_name
             new_size = index
             break
@@ -207,7 +207,7 @@ module Volt
 
       if new_size >= 0
         if @handler.respond_to?(:end_tag)
-          (@stack.size-1).downto(new_size) do |index|
+          (@stack.size - 1).downto(new_size) do |index|
             @handler.end_tag(@stack[index])
           end
         end
@@ -217,9 +217,9 @@ module Volt
     end
 
     def special_tag(close_tag, body)
-      body = body[0..((-1 * close_tag.size)-1)]
+      body = body[0..((-1 * close_tag.size) - 1)]
 
-      body = body.gsub(/\<\!--(.*?)--\>/, "\\1").gsub(/\<\!\[CDATA\[(.*?)\]\]\>/, "\\1")
+      body = body.gsub(/\<\!--(.*?)--\>/, '\\1').gsub(/\<\!\[CDATA\[(.*?)\]\]\>/, '\\1')
 
       text(body)
 

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

@@ -10,7 +10,7 @@ module Volt
       @html << "{{#{content}}}"
     end
 
-    def close_scope(pop=true)
+    def close_scope(pop = true)
       # Remove from the scope
       @handler.scope.pop
 
@@ -27,7 +27,6 @@ module Volt
       attributes = @handler.last.process_attributes('textarea', attributes)
 
       @handler.last.html << "<textarea#{attribute_string(attributes)}>#{@html}</textarea>"
-
     end
   end
 end