volt 0.8.27.beta2 → 0.8.27.beta3

data/spec/models/validators/length_validator_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Volt::LengthValidator do
+  subject { Volt::LengthValidator.validate(*params) }
+  let(:params) { [model, nil, field_name, options] }
+
+  let(:model) { Volt::Model.new name: name }
+  let(:field_name) { :name }
+  let(:name) { "John Doe" }
+
+  describe '.validate' do
+    context 'when options is a Fixnum' do
+      let(:options) { 5 }
+
+      context 'when name is "John Doe"' do
+        let(:name) { "John Doe" }
+        it { expect(subject).to eq({}) }
+      end
+
+      context 'when name is "John"' do
+        let(:name) { "John" }
+        it do
+          expect(subject).to eq({
+            name: ["must be at least 5 characters"]
+          })
+        end
+      end
+    end
+
+    context 'when options is a Hash' do
+      let(:options) do
+        { length: 5, maximum: 10 }
+      end
+
+      context 'when name is "John Doe"' do
+        let(:name) { "John Doe" }
+        it { expect(subject).to eq({}) }
+      end
+
+      context 'when name is "John"' do
+        let(:name) { "John" }
+        it do
+          if RUBY_PLATFORM == 'opal'
+            expect(subject).to eq({
+              name: ["must be at least {\"length\"=>5, \"maximum\"=>10} characters"]
+            })
+          else
+            expect(subject).to eq({
+              name: ["must be at least {:length=>5, :maximum=>10} characters"]
+            })
+          end
+        end
+      end
+
+      context 'when name is "Zach Galifianakis"' do
+        let(:name) { "Zach Galifianakis" }
+        it do
+          if RUBY_PLATFORM == 'opal'
+            expect(subject).to eq({
+             name: ["must be less than {\"length\"=>5, \"maximum\"=>10} characters"]
+            })
+          else
+            expect(subject).to eq({
+             name: ["must be less than {:length=>5, :maximum=>10} characters"]
+            })
+          end
+        end
+      end
+    end
+
+    context 'when options not a Fixnum or a Hash' do
+      let(:options) { 'string' }
+
+      it "raises an exception" do
+        expect { subject }.to raise_error(
+          RuntimeError,
+          'The arguments to length must be a number or a hash'
+        )
+      end
+    end
+  end
+end

data/spec/models/validators/phone_number_validator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Volt::PhoneNumberValidator do
   subject { Volt::PhoneNumberValidator.new(*params) }
-  let(:params) { [ model, field_name, options ] }
+  let(:params) { [model, field_name, options] }
 
   let(:model) { Volt::Model.new phone_number: phone_number }
   let(:field_name) { :phone_number }
@@ -131,14 +131,14 @@ describe Volt::PhoneNumberValidator do
     end
 
     context 'when provided a custom error message' do
-      let(:options) { { error_message: custom_message } }
+      let(:options) { { message: custom_message } }
       let(:custom_message) { 'this is a custom message' }
 
       context 'and the phone number is invalid' do
         let(:phone_number) { invalid_number }
 
         it 'returns errors with the custom message' do
-          expect(subject.errors).to eq(phone_number: [ custom_message ])
+          expect(subject.errors).to eq(phone_number: [custom_message])
         end
       end
     end

data/spec/page/bindings/template_binding/view_lookup_for_path_spec.rb

@@ -0,0 +1,149 @@
+require 'spec_helper'
+require 'volt/page/bindings/template_binding'
+
+# Setup page stub
+
+class Volt::Page
+  attr_accessor :templates
+end
+
+describe Volt::TemplateBinding do
+  before do
+    @page = double('volt/page')
+    expect(@page).to receive(:templates).at_least(1).times { @templates }
+
+    # TODO: We should decouple things so we don't need to allocate
+    @view_lookup = Volt::ViewLookupForPath.new(@page, 'main/main/main')
+  end
+
+  def set_template(templates)
+    @page.instance_variable_set('@templates', templates)
+  end
+
+  it 'should lookup nested controller action' do
+    @templates = {
+      'main/main/blog/nav' => '',
+      'main/comments/new/body' => ''
+    }
+
+    result = @view_lookup.path_for_template('comments/new').last
+    expect(result).to eq(%w(main comments_controller new))
+  end
+
+  it 'it should not look in the local component/controller for a specified controller/action' do
+    @templates = {
+      'main/comments/new/body' => ''
+    }
+
+    path, result = @view_lookup.path_for_template('comments/new')
+    expect(path).to eq('main/comments/new/body')
+    expect(result).to eq(%w(main comments_controller new))
+  end
+
+  it 'should handle a tripple lookup' do
+    @templates = {
+      'main/comments/new/errors' => '',
+      'comments/new/errors/body' => ''
+    }
+
+    path, result = @view_lookup.path_for_template('comments/new/errors')
+    expect(path).to eq('main/comments/new/errors')
+    expect(result).to eq(%w(main comments_controller errors))
+  end
+
+  it 'should handle a tripple lookup to controllers' do
+    @templates = {
+      'comments/new/errors/body' => ''
+    }
+
+    path, result = @view_lookup.path_for_template('comments/new/errors')
+    expect(path).to eq('comments/new/errors/body')
+    expect(result).to eq(%w(comments new_controller errors))
+  end
+
+  it 'should find a matching component' do
+    @templates = {
+      'comments/new/index/body' => ''
+    }
+
+    path, result = @view_lookup.path_for_template('comments/new')
+    expect(path).to eq('comments/new/index/body')
+    expect(result).to eq(%w(comments new_controller index))
+  end
+
+  it 'should lookup sub-templates within its own file' do
+    @templates = {
+      'main/main/blog/nav' => '',
+      'main/main/main/nav' => ''
+    }
+
+    expect(@view_lookup.path_for_template('nav').first).to eq('main/main/main/nav')
+  end
+
+  it 'should lookup sub-templates within another local view' do
+    @templates = {
+      'main/main/blog/nav' => '',
+      'main/main/main/nav' => ''
+    }
+
+    expect(@view_lookup.path_for_template('blog/nav').first).to eq('main/main/blog/nav')
+  end
+
+  it 'should lookup in another view' do
+    @templates = {
+      'main/main/nav/body' => ''
+    }
+
+    expect(@view_lookup.path_for_template('nav').first).to eq('main/main/nav/body')
+  end
+
+  it 'should lookup in a controller' do
+    @templates = {
+      'main/nav/index/body' => ''
+    }
+
+    expect(@view_lookup.path_for_template('nav').first).to eq('main/nav/index/body')
+  end
+
+  it 'should lookup in a controller/view' do
+    @templates = {
+      'main/blog/nav/body' => ''
+    }
+
+    expect(@view_lookup.path_for_template('blog/nav').first).to eq('main/blog/nav/body')
+  end
+
+  it 'should lookup in a controller' do
+    @templates = {
+      'main/nav/index/body' => ''
+    }
+
+    expect(@view_lookup.path_for_template('nav').first).to eq('main/nav/index/body')
+  end
+
+  it 'should lookup in a component' do
+    @templates = {
+      'nav/main/index/body' => ''
+    }
+
+    expect(@view_lookup.path_for_template('nav').first).to eq('nav/main/index/body')
+  end
+
+  it 'should lookup in a component/controller/view' do
+    @templates = {
+      'nav/main/main/body' => '',
+      'auth/login/new/body' => ''
+    }
+
+    expect(@view_lookup.path_for_template('auth/login/new').first).to eq('auth/login/new/body')
+  end
+
+  it 'should let you force a sub template' do
+    @templates = {
+      'nav/main/index/title' => '',
+      'auth/login/new/title' => ''
+    }
+
+    expect(@view_lookup.path_for_template('nav', 'title').first).to eq('nav/main/index/title')
+  end
+end

data/spec/page/bindings/template_binding_spec.rb

@@ -1,151 +0,0 @@
-require 'spec_helper'
-require 'volt/page/bindings/template_binding'
-
-# Setup page stub
-
-class Volt::Page
-  attr_accessor :templates
-end
-
-describe Volt::TemplateBinding do
-  before do
-    @page = double('volt/page')
-    expect(@page).to receive(:templates).at_least(1).times { @templates }
-
-    # TODO: We should decouple things so we don't need to allocate
-    @template_binding = Volt::TemplateBinding.allocate
-    @template_binding.instance_variable_set('@page', @page)
-    @template_binding.setup_path('main/main/main')
-  end
-
-  def set_template(templates)
-    @page.instance_variable_set('@templates', templates)
-  end
-
-  it 'should lookup nested controller action' do
-    @templates = {
-      'main/main/blog/nav' => '',
-      'main/comments/new/body' => ''
-    }
-
-    result = @template_binding.path_for_template('comments/new').last
-    expect(result).to eq(%w(main comments_controller new))
-  end
-
-  it 'it should not look in the local component/controller for a specified controller/action' do
-    @templates = {
-      'main/comments/new/body' => ''
-    }
-
-    path, result = @template_binding.path_for_template('comments/new')
-    expect(path).to eq('main/comments/new/body')
-    expect(result).to eq(%w(main comments_controller new))
-  end
-
-  it 'should handle a tripple lookup' do
-    @templates = {
-      'main/comments/new/errors' => '',
-      'comments/new/errors/body' => ''
-    }
-
-    path, result = @template_binding.path_for_template('comments/new/errors')
-    expect(path).to eq('main/comments/new/errors')
-    expect(result).to eq(["main", "comments_controller", "errors"])
-  end
-
-  it 'should handle a tripple lookup to controllers' do
-    @templates = {
-      'comments/new/errors/body' => ''
-    }
-
-    path, result = @template_binding.path_for_template('comments/new/errors')
-    expect(path).to eq('comments/new/errors/body')
-    expect(result).to eq(%w(comments new_controller errors))
-  end
-
-  it 'should find a matching component' do
-    @templates = {
-      'comments/new/index/body' => ''
-    }
-
-    path, result = @template_binding.path_for_template('comments/new')
-    expect(path).to eq('comments/new/index/body')
-    expect(result).to eq(%w(comments new_controller index))
-  end
-
-  it 'should lookup sub-templates within its own file' do
-    @templates = {
-      'main/main/blog/nav' => '',
-      'main/main/main/nav' => ''
-    }
-
-    expect(@template_binding.path_for_template('nav').first).to eq('main/main/main/nav')
-  end
-
-  it 'should lookup sub-templates within another local view' do
-    @templates = {
-      'main/main/blog/nav' => '',
-      'main/main/main/nav' => ''
-    }
-
-    expect(@template_binding.path_for_template('blog/nav').first).to eq('main/main/blog/nav')
-  end
-
-  it 'should lookup in another view' do
-    @templates = {
-      'main/main/nav/body' => ''
-    }
-
-    expect(@template_binding.path_for_template('nav').first).to eq('main/main/nav/body')
-  end
-
-  it 'should lookup in a controller' do
-    @templates = {
-      'main/nav/index/body' => ''
-    }
-
-    expect(@template_binding.path_for_template('nav').first).to eq('main/nav/index/body')
-  end
-
-  it 'should lookup in a controller/view' do
-    @templates = {
-      'main/blog/nav/body' => ''
-    }
-
-    expect(@template_binding.path_for_template('blog/nav').first).to eq('main/blog/nav/body')
-  end
-
-  it 'should lookup in a controller' do
-    @templates = {
-      'main/nav/index/body' => ''
-    }
-
-    expect(@template_binding.path_for_template('nav').first).to eq('main/nav/index/body')
-  end
-
-  it 'should lookup in a component' do
-    @templates = {
-      'nav/main/index/body' => ''
-    }
-
-    expect(@template_binding.path_for_template('nav').first).to eq('nav/main/index/body')
-  end
-
-  it 'should lookup in a component/controller/view' do
-    @templates = {
-      'nav/main/main/body' => '',
-      'auth/login/new/body' => ''
-    }
-
-    expect(@template_binding.path_for_template('auth/login/new').first).to eq('auth/login/new/body')
-  end
-
-  it 'should let you force a sub template' do
-    @templates = {
-      'nav/main/index/title' => '',
-      'auth/login/new/title' => ''
-    }
-
-    expect(@template_binding.path_for_template('nav', 'title').first).to eq('nav/main/index/title')
-  end
-end

data/spec/reactive/computation_spec.rb

@@ -60,4 +60,50 @@ describe Volt::Computation do
     Volt::Computation.flush!
     expect(values).to eq([nil, nil, 'inner', 'outer', 'inner'])
   end
+
+  # Currently Class#class_variable_set/get isn't in opal
+  # https://github.com/opal/opal/issues/677
+  unless RUBY_PLATFORM == 'opal'
+    describe '#invalidate!' do
+
+    let(:computation) { Volt::Computation.new ->{} }
+
+    before(:each) do
+      Volt::Computation.class_variable_set :@@flush_queue, []
+    end
+
+    context 'when stopped' do
+      before(:each) { computation.instance_variable_set :@stopped, true }
+
+      it "doesn't add self to flush queue" do
+        computation.invalidate!
+
+        expect(Volt::Computation.class_variable_get :@@flush_queue).to be_empty
+      end
+    end
+
+    context 'when computing' do
+      before(:each) { computation.instance_variable_set :@computing, true }
+
+      it "doesn't add self to flush queue" do
+        computation.invalidate!
+
+        expect(Volt::Computation.class_variable_get :@@flush_queue).to be_empty
+      end
+    end
+
+    context 'when not stopped and not computing' do
+      before(:each) do
+        computation.instance_variable_set :@stopped,   false
+        computation.instance_variable_set :@computing, false
+      end
+
+      it 'adds self to flush queue' do
+        computation.invalidate!
+
+        expect(Volt::Computation.class_variable_get :@@flush_queue).to match_array([computation])
+      end
+    end
+  end
+  end
 end

data/spec/reactive/dependency_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
 
 describe Volt::Dependency do
-
 end

data/spec/reactive/reactive_array_spec.rb

@@ -59,7 +59,6 @@ describe Volt::ReactiveArray do
       expect(values_at_2).to eq([3, 1.3])
       expect(values_at_3).to eq([nil, 1.7])
       expect(values_at_4).to eq([nil, 3])
-
     end
   end
 

data/spec/router/routes_spec.rb

@@ -66,7 +66,6 @@ describe Volt::Routes do
 
     params = @routes.url_to_params('/login/cool')
     expect(params).to eq(false)
-
   end
 
   it 'should setup param matchers' do
@@ -86,7 +85,6 @@ describe Volt::Routes do
       { _view: 'blog/tag', _tag: nil },
       { _view: 'login', _action: 'user', _name: nil, _id: nil }
     ])
-
   end
 
   it 'should go from params to url' do
@@ -136,7 +134,6 @@ describe Volt::Routes do
     match, params = routes.send(:check_params_match, { _view: 'blog', _id: '55', _extra: 'some value' }, _view: 'blog', _id: '55')
     expect(match).to eq(true)
     expect(params).to eq(_extra: 'some value')
-
   end
 
   it 'should match routes' do
@@ -163,6 +160,5 @@ describe Volt::Routes do
     end
 
     params = @routes.url_to_params('/blog/20')
-
   end
 end

data/spec/server/html_parser/view_parser_spec.rb

@@ -51,7 +51,6 @@ describe Volt::ViewParser do
                                      ]
                                    }
                                  })
-
   end
 
   it "should handle nested if's" do
@@ -121,7 +120,6 @@ describe Volt::ViewParser do
                                      ]
                                    }
                                  })
-
   end
 
   it 'should parse a single attribute binding' do
@@ -201,7 +199,6 @@ describe Volt::ViewParser do
   end
 
   it 'should parse components' do
-
   end
 
   it 'should parse sections' do
@@ -221,7 +218,6 @@ describe Volt::ViewParser do
                                  'main/main/main/body' => {
                                    'html' => "\n      <p>This text goes in the body</p>\n"
                                  })
-
   end
 
   it 'should keep the html inside of a textarea if there are no bindings' do

data/spec/server/rack/asset_files_spec.rb

@@ -19,7 +19,7 @@ if RUBY_PLATFORM != 'opal'
     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/sockjs-0.3.4.min.js", "/assets/js/volt_js_polyfills.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/sockjs-0.3.4.min.js', '/assets/js/volt_js_polyfills.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
 
     it 'should raise an exception for a missing component gem' do

data/spec/server/rack/quite_common_logger_spec.rb

@@ -0,0 +1,55 @@
+unless RUBY_PLATFORM == 'opal'
+  require 'spec_helper'
+  require 'volt/server/rack/quiet_common_logger'
+
+  describe QuietCommonLogger do
+    subject { QuietCommonLogger.new(nil, nil) }
+    let(:fake_class) { Class.new }
+    let(:app) { double 'App', call: [:status, :header, :body] }
+
+    before(:each) do
+      allow(app).to receive(:call)
+      # puts "SUBJECT: #{subject.inspect}"
+      subject.instance_variable_set :@app, app
+    end
+
+    describe '#call' do
+      before(:each) do
+        header_hash = stub_const('Rack::Utils::HeaderHash', fake_class)
+        allow(header_hash).to receive(:new)
+
+        proxy = stub_const('Rack::BodyProxy', fake_class)
+        allow(proxy).to receive(:new)
+
+        allow(subject).to receive(:log)
+      end
+
+      context 'when request path has no file extension and request run over web socket' do
+        let(:env) { {'REQUEST_PATH' => '/file'} }
+
+        it "calls 'log' method" do
+          expect(subject).to receive(:log)
+          subject.call env
+        end
+      end
+
+      context 'when request path has file extension' do
+        let(:env) { {'REQUEST_PATH' => '/file.ext'} }
+
+        it "doesn't call 'log' method" do
+          expect(subject).not_to receive(:log)
+          subject.call env
+        end
+      end
+
+      context 'when request run over web socket' do
+        let(:env) { {'REQUEST_PATH' => '/channel'} }
+
+        it "doesn't call 'log' method" do
+          expect(subject).not_to receive(:log)
+          subject.call env
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,10 @@
 require 'volt/spec/setup'
 
-if RUBY_PLATFORM == 'opal'
-else
+unless RUBY_PLATFORM == 'opal'
+  require 'pry-byebug'
   # Specs are run against the kitchen sink app
   kitchen_sink_path = File.expand_path(File.join(File.dirname(__FILE__), 'apps/kitchen_sink'))
   Volt.spec_setup(kitchen_sink_path)
-end
-
-if RUBY_PLATFORM != 'opal'
 
   RSpec.configure do |config|
     # config.before(:each) do

data/spec/tasks/dispatcher_spec.rb

@@ -1,19 +1,21 @@
 if RUBY_PLATFORM != 'opal'
   class TestTask < Volt::TaskHandler
-    def allowed_method(arg1)
-      return 'yes' + arg1
+    def allowed_method(arg1, arg2)
+      return 'yes' + arg1 + arg2
     end
   end
 
-
   describe Volt::Dispatcher do
+    before do
+      Volt.logger = spy('Volt::VoltLogger')
+    end
 
     it 'should only allow method calls on TaskHandler or above in the inheritance chain' do
       channel = double('channel')
 
-      expect(channel).to receive(:send_message).with('response', 0, 'yes works', nil)
+      expect(channel).to receive(:send_message).with('response', 0, 'yes it works', nil)
 
-      Volt::Dispatcher.new.dispatch(channel, [0, 'TestTask', :allowed_method, {}, ' works'])
+      Volt::Dispatcher.new.dispatch(channel, [0, 'TestTask', :allowed_method, {}, ' it', ' works'])
     end
 
     it 'should not allow eval' do
@@ -39,5 +41,14 @@ if RUBY_PLATFORM != 'opal'
 
       Volt::Dispatcher.new.dispatch(channel, [0, 'TestTask', :methods])
     end
+
+    it 'should log an info message before and after the dispatch' do
+      channel = double('channel')
+
+      allow(channel).to receive(:send_message).with('response', 0, 'yes it works', nil)
+      expect(Volt.logger).to receive(:log_dispatch)
+
+      Volt::Dispatcher.new.dispatch(channel, [0, 'TestTask', :allowed_method, {}, ' it', ' works'])
+    end
   end
 end

data/spec/tasks/live_query_spec.rb

@@ -14,6 +14,5 @@ if RUBY_PLATFORM != 'opal'
 
       live_query = LiveQuery.new(pool, data_store, '_items', {})
     end
-
   end
 end

data/spec/tasks/query_tasks.rb

@@ -3,6 +3,5 @@ if RUBY_PLATFORM != 'opal'
     before do
       load File.join(File.dirname(__FILE__), '../../app/volt/tasks/query_tasks.rb')
     end
-
   end
 end