volt 0.8.21 → 0.8.22.beta1

data/lib/volt/models/model_hash_behaviour.rb

@@ -21,9 +21,19 @@ module Volt
       @attributes.size
     end
 
+    # Returns all of the keys, skipping over nil models
+    # TODO: We should store nil-models elsewhere so we don't have
+    # to skip.
     def keys
       @size_dep.depend
-      @attributes.keys
+
+      keys = []
+
+      each_pair do |k,v|
+        keys << k
+      end
+
+      keys
     end
 
     def nil?
@@ -44,20 +54,30 @@ module Volt
     end
 
     def clear
-      @attributes.each_pair do |key, value|
-        @deps.changed!(key)
+      @attributes.each_pair do |key, _|
+        delete(key)
       end
 
-      @attributes.clear
+      # @attributes.clear
       @size_dep.changed!
-
-      @persistor.removed(nil) if @persistor
+      #
+      # @persistor.removed(nil) if @persistor
     end
 
     def each_with_object(*args, &block)
       (@attributes || {}).each_with_object(*args, &block)
     end
 
+    def each_pair
+      @attributes.each_pair do |k,v|
+        yield(k,v) unless v.is_a?(Model) && v.nil?
+      end
+    end
+
+    def key?(key)
+      @attributes && @attributes.key?(key)
+    end
+
     # Convert the model to a hash all of the way down.
     def to_h
       @size_dep.depend

data/lib/volt/models/persistors/model_store.rb

@@ -91,7 +91,6 @@ module Volt
 
               queue_client_save
             else
-              puts "Save to DB"
               errors = save_to_db!(self_attributes)
               if errors.size == 0
                 promise.resolve(nil)
@@ -204,7 +203,7 @@ module Volt
             end
           end
 
-          puts "Update Collection: #{collection.inspect} - #{values.inspect} -- #{Thread.current['in_channel'].inspect}"
+          # puts "Update Collection: #{collection.inspect} - #{values.inspect} -- #{Thread.current['in_channel'].inspect}"
           QueryTasks.live_query_pool.updated_collection(collection.to_s, Thread.current['in_channel'])
           return {}
         end

data/lib/volt/models/validations.rb

@@ -84,14 +84,22 @@ module Volt
         end
       end
 
-      errors = run_validations(errors, merge, marked_only)
+      # Get the previous model from the buffer
+      save_to = options[:save_to]
+      if save_to && save_to.is_a?(Volt::Model)
+        old_model = save_to
+      else
+        old_model = nil
+      end
+
+      errors = run_validations(errors, merge, marked_only, old_model)
 
       # See if any server errors are in place and merge them in if they are
       if Volt.client?
         errors = merge.call(server_errors.to_h)
       end
 
-      errors = run_custom_validations(errors, merge)
+      errors = run_custom_validations(errors, merge, old_model)
 
       errors
     end
@@ -99,7 +107,7 @@ module Volt
     private
 
     # Runs through each of the normal validations.
-    def run_validations(errors, merge, marked_only)
+    def run_validations(errors, merge, marked_only, old_model)
       validations = self.class.validations
       if validations
 
@@ -114,7 +122,7 @@ module Volt
             klass = validation_class(validation, args)
 
             if klass
-              validate_with(merge, klass, field_name, args)
+              validate_with(merge, klass, old_model, field_name, args)
             else
               fail "validation type #{validation} is not specified."
             end
@@ -125,13 +133,14 @@ module Volt
       return errors
     end
 
-    def run_custom_validations(errors, merge)
+    def run_custom_validations(errors, merge, old_model)
       # Call all of the custom validations
       custom_validations = self.class.custom_validations
       if custom_validations
         custom_validations.each do |custom_validation|
-          # Run the validator in the context of the model
-          result = instance_eval(&custom_validation)
+          # Run the validator in the context of the model, passes in
+          # the old_model as an argument
+          result = instance_eval(old_model, &custom_validation)
           if result
             errors = merge.call(result)
           end
@@ -143,8 +152,8 @@ module Volt
 
 
     # calls the validate method on the class, passing the right arguments.
-    def validate_with(merge, klass, field_name, args)
-      merge.call(klass.validate(self, field_name, args))
+    def validate_with(merge, klass, old_model, field_name, args)
+      merge.call(klass.validate(self, old_model, field_name, args))
     end
 
     def validation_class(validation, args)

data/lib/volt/models/validators/length_validator.rb

@@ -1,6 +1,6 @@
 module Volt
   class LengthValidator
-    def self.validate(model, field_name, args)
+    def self.validate(model, old_model, field_name, args)
       errors = {}
       value  = model.read_attribute(field_name)
 

data/lib/volt/models/validators/presence_validator.rb

@@ -1,6 +1,6 @@
 module Volt
   class PresenceValidator
-    def self.validate(model, field_name, args)
+    def self.validate(model, old_model, field_name, args)
       errors = {}
       value  = model.read_attribute(field_name)
       if !value || value.blank?

data/lib/volt/models/validators/unique_validator.rb

@@ -1,6 +1,6 @@
 module Volt
   class UniqueValidator
-    def self.validate(model, field_name, args)
+    def self.validate(model, old_model, field_name, args)
       errors = {}
 
       if RUBY_PLATFORM != 'opal'

data/lib/volt/page/bindings/template_binding.rb

@@ -161,7 +161,8 @@ module Volt
 
     # The context for templates can be either a controller, or the original context.
     def render_template(full_path, controller_path)
-      args = @arguments ? [SubContext.new(@arguments, nil, true)] : []
+      # If arguments is nil, then an blank SubContext will be created
+      args = [SubContext.new(@arguments, nil, true)]
 
       @controller = nil
 

data/lib/volt/page/page.rb

@@ -140,8 +140,13 @@ module Volt
     attr_reader :events
 
     def add_model(model_name)
-      model_name                 = model_name.camelize.to_sym
-      @model_classes[model_name] = Object.const_get(model_name)
+      begin
+        model_name                 = model_name.camelize.to_sym
+        @model_classes[model_name] = Object.const_get(model_name)
+      rescue NameError => e
+        # Handle if the model is user (Volt's provided user model is scoped under Volt::)
+        raise unless model_name == :User
+      end
     end
 
     def add_template(name, template, bindings)

data/lib/volt/page/sub_context.rb

@@ -8,19 +8,23 @@ module Volt
   class SubContext
     attr_reader :locals
 
-    def initialize(locals, context = nil, return_nils = false)
-      @locals  = locals.stringify_keys
+    def initialize(locals=nil, context = nil, return_nils = false)
+      @locals  = locals.stringify_keys if locals
       @context = context
       @return_nils = return_nils
     end
 
     def respond_to?(method_name)
-      !!(@locals[method_name.to_s] || (@context && @context.respond_to?(method_name)))
+      !!((@locals && @locals[method_name.to_s]) || (@context && @context.respond_to?(method_name)))
+    end
+
+    def inspect
+      "#<SubContext #{@locals.inspect} context:#{@context.inspect}>"
     end
 
     def method_missing(method_name, *args, &block)
       method_name = method_name.to_s
-      if @locals.key?(method_name)
+      if @locals && @locals.key?(method_name)
         obj = @locals[method_name]
 
         # TODORW: Might get a normal proc, flag internal procs

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

@@ -29,7 +29,7 @@ module Volt
           html     = template['html']
           bindings = template['bindings']
         else
-          html     = "<div>-- &lt; missing template #{template_name.inspect.gsub('<', '&lt;').gsub('>', '&gt;')} &gt; --</div>"
+          html     = "<div>-- &lt; missing template #{template_name.inspect.html_inspect}, make sure it's component is included in dependencies.rb &gt; --</div>"
           bindings = {}
         end
 

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

@@ -16,7 +16,7 @@ module Volt
         html      = template['html']
         @bindings = template['bindings']
       else
-        html      = "<div>-- &lt; missing template #{template_name.inspect.gsub('<', '&lt;').gsub('>', '&gt;')} &gt; --</div>"
+        html      = "<div>-- &lt; missing template #{template_name.inspect.html_inspect}, make sure it's component is included in dependencies.rb &gt; --</div>"
         @bindings = {}
       end
 

data/lib/volt/server.rb

@@ -8,11 +8,11 @@ else
 end
 
 require 'rack'
+require 'sass'
 if RUBY_PLATFORM != 'java'
   require 'rack/sockjs'
   require 'eventmachine'
 end
-require 'sass'
 require 'sprockets-sass'
 require 'listen'
 
@@ -27,6 +27,7 @@ end
 require 'volt/server/rack/component_paths'
 require 'volt/server/rack/index_files'
 require 'volt/server/rack/opal_files'
+require 'volt/server/rack/quiet_common_logger'
 require 'volt/page/page'
 
 module Rack
@@ -94,7 +95,7 @@ module Volt
       @app.use Rack::ConditionalGet
       @app.use Rack::ETag
 
-      @app.use Rack::CommonLogger
+      @app.use QuietCommonLogger
       @app.use Rack::ShowExceptions
 
       component_paths = @component_paths

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

@@ -113,6 +113,7 @@ module Volt
 
       data_hash = []
       attributes.each_pair do |name, value|
+        name = name.tr('-', '_')
         parts, binding_count = binding_parts_and_count(value)
 
         # if this attribute has bindings

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

@@ -14,7 +14,8 @@ module Volt
 
     # The client argument is for if this code is being generated for the client
     def code(client=true)
-      code = ''
+      # Start with config code
+      code = generate_config_code
 
       asset_files = AssetFiles.new(@component_name, @component_paths)
       asset_files.component_paths.each do |component_path, component_name|
@@ -24,5 +25,11 @@ module Volt
 
       code
     end
+
+
+    def generate_config_code
+      "\nVolt.setup_client_config(#{Volt.config.public.to_h.inspect})\n"
+    end
+
   end
 end

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

@@ -18,7 +18,7 @@ module Volt
         # TODO: we should probably qualify this a bit more
         app_folders += Gem.loaded_specs.values.map(&:full_gem_path).reject { |g| g !~ /volt/ }.map { |f| f + '/app' }
 
-        app_folders
+        app_folders.uniq
       end
 
       # Yield each app folder and return a flattened array with
@@ -71,6 +71,7 @@ module Volt
             # Add models to page
             Dir["#{app_folder}/*/models/*.rb"].each do |ruby_file|
               class_name = File.basename(ruby_file).gsub(/[.]rb$/, '')
+
               $page.add_model(class_name)
             end
           end

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

@@ -0,0 +1,34 @@
+class QuietCommonLogger < Rack::CommonLogger
+  include Rack
+
+  @@ignore_extensions = %w(png jpg jpeg ico gif woff tff svg eot css js)
+
+  def call(env)
+    path = env['REQUEST_PATH']
+    began_at = Time.now
+    status, header, body = @app.call(env)
+    header = Utils::HeaderHash.new(header)
+    base = ::File.basename(path)
+    if base.index('.')
+      ext = base.split('.').last
+    else
+      ext = nil
+    end
+
+    body = BodyProxy.new(body) do
+
+      # Don't log on ignored extensions
+      unless @@ignore_extensions.include?(ext)
+        log(env, status, header, began_at)
+      end
+    end
+
+    # Because of web sockets, the initial request doesn't finish, so we
+    # can just trigger it now.
+    if !ext && !path.start_with?('/channel')
+      log(env, status, header, began_at)
+    end
+
+    [status, header, body]
+  end
+end

data/lib/volt/spec/setup.rb

@@ -4,6 +4,7 @@ module Volt
       require 'volt'
     else
       ENV['SERVER'] = 'true'
+      ENV['VOLT_ENV'] = 'test'
 
       if ENV['BROWSER']
         require 'capybara'
@@ -16,7 +17,7 @@ module Volt
       require 'volt/boot'
 
       # Require in app
-      Volt.boot(Dir.pwd)
+      Volt.boot(app_path)
 
       if ENV['BROWSER']
         require 'volt/server'
@@ -53,6 +54,34 @@ module Volt
             Capybara::Selenium::Driver.new(app, browser: :safari)
           end
           Capybara.default_driver = :safari
+        elsif ENV['BROWSER'] == 'sauce'
+          require "sauce"
+          require "sauce/capybara"
+
+          Sauce.config do |c|
+            if ENV['OS']
+              # Use a specifc OS, BROWSER, VERSION combo (for travis)
+              c[:browsers] = [
+                [ENV['OS'], ENV['USE_BROWSER'], ENV['VERSION']]
+              ]
+            else
+              # Run all
+              c[:browsers] = [
+                # ["Windows 7", "Chrome", "30"],
+                # ["Windows 8", "Firefox", "28"],
+                ["Windows 8.1", "Internet Explorer", "11"],
+                ["Windows 8.0", "Internet Explorer", "10"],
+                ["Windows 7.0", "Internet Explorer", "9"],
+                # ["OSX 10.9", "iPhone", "8.1"],
+                # ["OSX 10.8", "Safari", "6"],
+                # ["Linux", "Chrome", "26"]
+              ]
+            end
+            c[:start_local_application] = false
+          end
+
+          Capybara.default_driver = :sauce
+          Capybara.javascript_driver = :sauce
         end
       end
     end

data/lib/volt/utils/generic_pool.rb

@@ -16,6 +16,10 @@ module Volt
       @pool = {}
     end
 
+    def clear
+      @pool = {}
+    end
+
     def lookup(*args, &block)
       section = @pool
 

data/lib/volt/volt/users.rb

@@ -0,0 +1,18 @@
+module Volt
+
+  # Login the user, return a promise for success
+  def self.login(username, password)
+    UserTasks.login(username, password).then do |result|
+
+      # Assign the user_id cookie for the user
+      $page.cookies._user_id = result
+
+      # Pass nil back
+      nil
+    end
+  end
+
+  def self.logout
+    $page.cookies.delete(:user_id)
+  end
+end