volt 0.9.2 → 0.9.3.pre1

data/spec/server/component_templates_spec.rb

@@ -0,0 +1,21 @@
+if RUBY_PLATFORM == 'opal'
+else
+  require 'spec_helper'
+  require 'benchmark'
+  require 'volt/server/component_templates'
+
+  describe Volt::ComponentTemplates do
+    let(:haml_handler) do 
+      double(:haml_handler)
+    end
+
+    it 'can be extended' do
+      expect( Volt::ComponentTemplates::Handlers.extensions ).to eq([ :html, :email ])
+
+      Volt::ComponentTemplates.register_template_handler(:haml, haml_handler) 
+
+      expect( Volt::ComponentTemplates::Handlers.extensions ).to eq([ :html, :email, :haml ])
+    end
+  end
+
+end

data/spec/server/html_parser/sandlebars_parser_spec.rb

@@ -20,7 +20,7 @@ class HTMLHandler
   end
 
   def binding(binding)
-    @html << "{#{binding}}"
+    @html << "{{#{binding}}}"
   end
 
   def start_tag(tag_name, attributes, unary)
@@ -94,12 +94,13 @@ describe Volt::SandlebarsParser do
   end
 
   it 'should handle bindings' do
-    html = '<p>some cool {text} is {awesome}</p>'
+    html = '<p>some cool {{ text }} is {{ awesome }}</p>'
+    match = '<p>some cool {{text}} is {{awesome}}</p>'
     test_html(html)
   end
 
-  it 'should handle bindings with nested { and }' do
-    html = "<p>testing with {nested { 'binding stuff' }}</p>"
+  it 'should handle bindings with nested {{and}}' do
+    html = "<p>testing with {{nested {{ 'binding stuff' }} }}</p>"
     test_html(html)
   end
 
@@ -139,7 +140,7 @@ describe Volt::SandlebarsParser do
   end
 
   it 'should not jump bindings' do
-    html = '<p>{some} text {binding}</p>'
+    html = '<p>{{ some }} text {{ binding }}</p>'
     test_html(html)
   end
 
@@ -150,8 +151,8 @@ describe Volt::SandlebarsParser do
   end
 
   it 'should let you escape { and }' do
-    html = 'should escape {{{{}}} and {{{}}}}'
-    match = 'should escape { and }'
+    html = 'should escape {{{{{}}} and {{{}}}}}'
+    match = 'should escape {{ and }}'
     test_html(html, match)
   end
 
@@ -191,11 +192,9 @@ describe Volt::SandlebarsParser do
     test_html(html)
   end
 
-  # it "should warn you when you over close tags" do
-  #   html = "<div><p>test</p></div></div>"
-  #
-  #   handler = HTMLHandler.new
-  #   expect { Volt::SandlebarsParser.new(html, handler) }.to raise_error(Volt::HTMLParseError)
-  # end
+  it 'should close self closing elements' do
+    test_html '<p><p>', '<p></p><p></p>'
+    test_html '<p><span>1</span>2<p>3</p>', '<p><span>1</span>2</p><p>3</p>'
+  end
 end
 end

data/spec/server/html_parser/view_parser_spec.rb

@@ -192,6 +192,9 @@ describe Volt::ViewParser do
     END
 
     view = Volt::ViewParser.new(html, 'main/main/main/body')
+
+    expected = "    <a href=\"{link_name}\">Link</a>\n"
+    expect(view.templates["main/main/main/body/body"]["html"]).to eq expected
   end
 
   it 'should parse components' do

data/spec/server/rack/asset_files_spec.rb

@@ -13,13 +13,13 @@ if RUBY_PLATFORM != 'opal'
       main = Volt::AssetFiles.new('main', @component_paths)
 
       components = main.components
-      expect(components).to eq(%w(volt main shared bootstrap slideshow))
+      expect(components).to eq(%w(volt mongo main shared bootstrap slideshow))
     end
 
     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/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/volt_js_polyfills.js', '/assets/js/volt_watch.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/http_resource_spec.rb

@@ -55,5 +55,15 @@ if RUBY_PLATFORM != 'opal'
       expect(response.status).to eq(200)
       expect(response.body).to eq(['show with id 99 and another_param called'])
     end
+
+    it 'should call the supplied app if routes are not matched and cause a 404' do
+      http_resource = Volt::HttpResource.new(app, @routes)
+      env = Rack::MockRequest.env_for('http://example.com/not_a_valid_param')
+      request = Volt::HttpRequest.new(env)
+      response = http_resource.call(env)
+      expect(response[0]).to eq(404)
+      #expect(response.body).to eq(['show with id 99 and another_param called'])
+    end
+
   end
 end

data/spec/tasks/dispatcher_spec.rb

@@ -10,6 +10,11 @@ if RUBY_PLATFORM != 'opal'
       Volt.logger = spy('Volt::VoltLogger')
     end
 
+    after do
+      # Cleanup, make volt make a new logger.  Otherwise this will leak out.
+      Volt.logger = nil
+    end
+
     it 'should only allow method calls on Task or above in the inheritance chain' do
       channel = double('channel')
 

data/spec/tasks/user_tasks_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+if RUBY_PLATFORM != 'opal'
+  describe UserTasks do
+    let(:fake_response) { double('FakeResponse', fetch_first: true) }
+
+    let(:fake_users_collection) do
+      double('FakeUsersCollection', where: fake_response)
+    end
+
+    let(:fake_store) { double('FakeStore', :_users => fake_users_collection) }
+
+    let(:login_info) { { 'login' => 'Marty', 'password' => 'McFly' } }
+
+    before do
+      allow($page).to receive(:store).and_return fake_store
+      allow(User).to receive(:login_field).and_return 'user'
+      allow(fake_response).to receive(:fetch_first).and_yield(user)
+    end
+
+    describe '#login' do
+      context 'with no matching user' do
+        let(:user) { false }
+
+        it 'raises VoltUserError' do
+          expect { subject.login(login_info) }.
+            to raise_error('User could not be found')
+        end
+      end
+
+      context 'with a matching user' do
+        let(:password) { BCrypt::Password.create(login_info['password']) }
+        let(:user) { double('User', _id: 1, _hashed_password: password) }
+
+        it 'fails on bad password' do
+          expect { subject.login(login_info.merge 'password' => 'Not McFly') }.
+            to raise_error('Password did not match')
+        end
+
+        it 'fails with missing app_secret' do
+          allow(Volt.config).to receive(:app_secret).and_return false
+
+          expect { subject.login(login_info) }.
+            to raise_error('app_secret is not configured')
+        end
+
+        it 'generates a signature digest' do
+          allow(Digest::SHA256).to receive(:hexdigest).and_call_original
+
+          subject.login(login_info)
+
+          expect(Digest::SHA256).to have_received(:hexdigest).with(
+            "#{Volt.config.app_secret}::#{user._id}"
+          )
+        end
+      end
+    end
+  end
+end

data/spec/utils/task_argument_filtererer_spec.rb

@@ -13,5 +13,11 @@ if RUBY_PLATFORM != 'opal'
 
       expect(filtered_args).to eq([:login, { login: 'jim@jim.com', password: '[FILTERED]' }])
     end
+
+    it 'should create and run a new TaskArgumentFilterer when its filter method is called' do
+      filtered_args = TaskArgumentFilterer.filter([{login: 'jam@jam.com', password: 'some password'}])
+      expect(filtered_args).to eq([{:login=>"jam@jam.com", :password=>"[FILTERED]"}])
+    end
+
   end
 end

data/templates/newgem/app/newgem/config/initializers/boot.rb

@@ -0,0 +1,10 @@
+# Place any code you want to run when the component is included on the client
+# or server.
+
+# To include code only on the client use:
+# if RUBY_PLATFORM == 'opal'
+#
+# To include code only on the server, use:
+# unless RUBY_PLATFORM == 'opal'
+# ^^ this will not send compile in code in the conditional to the client.
+# ^^ this include code required in the conditional.

data/templates/newgem/lib/newgem.rb.tt

@@ -1,3 +1,16 @@
+# If you need to require in code in the gem's app folder, keep in mind that
+# the app is not on the load path when the gem is required.  Use
+# app/{gemname}/config/initializers/boot.rb to require in client or server
+# code.
+#
+# Also, in volt apps, you typically use the lib folder in the
+# app/{componentname} folder instead of this lib folder.  This lib folder is
+# for setting up gem code when Bundler.require is called. (or the gem is
+# required.)
+#
+# If you need to configure volt in some way, you can add a Volt.configure block
+# in this file.
+
 <%- config[:constant_array].each_with_index do |c,i| -%>
 <%= '  '*i %>module <%= c %>
 <%- end -%>

data/templates/project/Gemfile.tt

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 
 gem 'volt', '<%= config[:version] %>'
 
+# volt uses mongo as the default data store.
+gem 'volt-mongo', '~> 0.0.1'
+
 # The following gem's are optional for themeing
 # Twitter bootstrap
 gem 'volt-bootstrap', '~> 0.0.10'

data/volt.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack', '~> 1.5.0'
   spec.add_dependency 'sprockets-sass', '~> 1.0.0'
   spec.add_dependency 'sass', '~> 3.2.5'
-  spec.add_dependency 'mongo', '~> 1.9.0'
   spec.add_dependency 'listen', '~> 2.8.0'
   spec.add_dependency 'uglifier', '>= 2.4.0'
   spec.add_dependency 'configurations', '~> 2.0.0.pre'
@@ -34,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faye-websocket', '~> 0.9.2'
   spec.add_dependency 'concurrent-ruby', '~> 0.8.0'
 
+
   # For user passwords
   spec.add_dependency 'bcrypt', '~> 3.1.9'
 
@@ -41,6 +41,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.2.0'
   spec.add_development_dependency 'opal-rspec', '~> 0.4.2'
   spec.add_development_dependency 'capybara', '~> 2.4.2'
+
+  # There is a big performance issue with selenium-webdriver on v2.45.0
   spec.add_development_dependency 'selenium-webdriver', '~> 2.43.0'
   spec.add_development_dependency 'chromedriver2-helper', '~> 0.0.8'
   spec.add_development_dependency 'poltergeist', '~> 1.5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3.pre1
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.5
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -496,6 +482,7 @@ files:
 - app/volt/assets/css/notices.css.scss
 - app/volt/assets/js/jquery-2.0.3.js
 - app/volt/assets/js/volt_js_polyfills.js
+- app/volt/assets/js/volt_watch.js
 - app/volt/config/dependencies.rb
 - app/volt/controllers/notices_controller.rb
 - app/volt/models/user.rb
@@ -523,9 +510,9 @@ files:
 - lib/volt/controllers/actions.rb
 - lib/volt/controllers/http_controller.rb
 - lib/volt/controllers/model_controller.rb
-- lib/volt/data_stores/base.rb
+- lib/volt/data_stores/base_adaptor_client.rb
+- lib/volt/data_stores/base_adaptor_server.rb
 - lib/volt/data_stores/data_store.rb
-- lib/volt/data_stores/mongo_driver.rb
 - lib/volt/extra_core/array.rb
 - lib/volt/extra_core/blank.rb
 - lib/volt/extra_core/class.rb
@@ -545,14 +532,15 @@ files:
 - lib/volt/models/associations.rb
 - lib/volt/models/buffer.rb
 - lib/volt/models/cursor.rb
-- lib/volt/models/dirty.rb
 - lib/volt/models/errors.rb
 - lib/volt/models/field_helpers.rb
-- lib/volt/models/listener_tracker.rb
 - lib/volt/models/location.rb
 - lib/volt/models/model.rb
 - lib/volt/models/model_hash_behaviour.rb
-- lib/volt/models/model_helpers.rb
+- lib/volt/models/model_helpers/dirty.rb
+- lib/volt/models/model_helpers/listener_tracker.rb
+- lib/volt/models/model_helpers/model_change_helpers.rb
+- lib/volt/models/model_helpers/model_helpers.rb
 - lib/volt/models/model_wrapper.rb
 - lib/volt/models/permissions.rb
 - lib/volt/models/persistors/array_store.rb
@@ -572,7 +560,8 @@ files:
 - lib/volt/models/state_helpers.rb
 - lib/volt/models/state_manager.rb
 - lib/volt/models/url.rb
-- lib/volt/models/validations.rb
+- lib/volt/models/validations/errors.rb
+- lib/volt/models/validations/validations.rb
 - lib/volt/models/validators/email_validator.rb
 - lib/volt/models/validators/format_validator.rb
 - lib/volt/models/validators/length_validator.rb
@@ -651,6 +640,7 @@ files:
 - lib/volt/server/rack/source_map_server.rb
 - lib/volt/server/socket_connection_handler.rb
 - lib/volt/server/socket_connection_handler_stub.rb
+- lib/volt/server/template_handlers/handlers.rb
 - lib/volt/server/websocket/rack_server_adaptor.rb
 - lib/volt/server/websocket/websocket_handler.rb
 - lib/volt/spec/capybara.rb
@@ -702,6 +692,7 @@ files:
 - spec/apps/kitchen_sink/app/main/views/main/cookie_test.html
 - spec/apps/kitchen_sink/app/main/views/main/first_last.html
 - spec/apps/kitchen_sink/app/main/views/main/flash.html
+- spec/apps/kitchen_sink/app/main/views/main/form.html
 - spec/apps/kitchen_sink/app/main/views/main/html_safe.html
 - spec/apps/kitchen_sink/app/main/views/main/index.html
 - spec/apps/kitchen_sink/app/main/views/main/main.html
@@ -756,6 +747,7 @@ files:
 - spec/models/user_spec.rb
 - spec/models/user_validation_spec.rb
 - spec/models/validations_spec.rb
+- spec/models/validators/block_validations_spec.rb
 - spec/models/validators/email_validator_spec.rb
 - spec/models/validators/format_validator_spec.rb
 - spec/models/validators/length_validator_spec.rb
@@ -774,6 +766,7 @@ files:
 - spec/reactive/reactive_array_spec.rb
 - spec/reactive/reactive_hash_spec.rb
 - spec/router/routes_spec.rb
+- spec/server/component_templates_spec.rb
 - spec/server/html_parser/sample_page.html
 - spec/server/html_parser/sandlebars_parser_spec.rb
 - spec/server/html_parser/view_handler_spec.rb
@@ -792,6 +785,7 @@ files:
 - spec/tasks/live_query_spec.rb
 - spec/tasks/query_tasks.rb
 - spec/tasks/query_tracker_spec.rb
+- spec/tasks/user_tasks_spec.rb
 - spec/templates/targets/binding_document/component_node_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb
@@ -826,6 +820,7 @@ files:
 - templates/newgem/app/newgem/assets/css/.empty_directory
 - templates/newgem/app/newgem/assets/js/.empty_directory
 - templates/newgem/app/newgem/config/dependencies.rb
+- templates/newgem/app/newgem/config/initializers/boot.rb
 - templates/newgem/app/newgem/config/routes.rb
 - templates/newgem/app/newgem/controllers/main_controller.rb.tt
 - templates/newgem/app/newgem/controllers/server/.empty_directory
@@ -853,6 +848,7 @@ files:
 - templates/project/app/main/config/dependencies.rb
 - templates/project/app/main/config/routes.rb
 - templates/project/app/main/controllers/main_controller.rb
+- templates/project/app/main/lib/.empty_directory
 - templates/project/app/main/models/.empty_directory
 - templates/project/app/main/models/user.rb
 - templates/project/app/main/tasks/.empty_directory
@@ -863,7 +859,6 @@ files:
 - templates/project/config/app.rb.tt
 - templates/project/config/base/index.html
 - templates/project/config/initializers/.empty_directory
-- templates/project/lib/.empty_directory
 - templates/project/spec/app/main/controllers/server/sample_http_controller_spec.rb
 - templates/project/spec/app/main/integration/sample_integration_spec.rb
 - templates/project/spec/app/main/models/sample_model_spec.rb
@@ -888,9 +883,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -921,6 +916,7 @@ test_files:
 - spec/apps/kitchen_sink/app/main/views/main/cookie_test.html
 - spec/apps/kitchen_sink/app/main/views/main/first_last.html
 - spec/apps/kitchen_sink/app/main/views/main/flash.html
+- spec/apps/kitchen_sink/app/main/views/main/form.html
 - spec/apps/kitchen_sink/app/main/views/main/html_safe.html
 - spec/apps/kitchen_sink/app/main/views/main/index.html
 - spec/apps/kitchen_sink/app/main/views/main/main.html
@@ -975,6 +971,7 @@ test_files:
 - spec/models/user_spec.rb
 - spec/models/user_validation_spec.rb
 - spec/models/validations_spec.rb
+- spec/models/validators/block_validations_spec.rb
 - spec/models/validators/email_validator_spec.rb
 - spec/models/validators/format_validator_spec.rb
 - spec/models/validators/length_validator_spec.rb
@@ -993,6 +990,7 @@ test_files:
 - spec/reactive/reactive_array_spec.rb
 - spec/reactive/reactive_hash_spec.rb
 - spec/router/routes_spec.rb
+- spec/server/component_templates_spec.rb
 - spec/server/html_parser/sample_page.html
 - spec/server/html_parser/sandlebars_parser_spec.rb
 - spec/server/html_parser/view_handler_spec.rb
@@ -1011,6 +1009,7 @@ test_files:
 - spec/tasks/live_query_spec.rb
 - spec/tasks/query_tasks.rb
 - spec/tasks/query_tracker_spec.rb
+- spec/tasks/user_tasks_spec.rb
 - spec/templates/targets/binding_document/component_node_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb