volt 0.9.5 → 0.9.6.pre1

data/spec/apps/kitchen_sink/app/main/controllers/main_controller.rb

@@ -92,6 +92,9 @@ module Main
       LoginTasks.login_first_user
     end
 
+    def callbacks
+    end
+
     private
 
     # the main template contains a #template binding that shows another

data/spec/apps/kitchen_sink/app/main/models/user.rb

@@ -6,4 +6,22 @@ class User < Volt::User
 
   validate login_field, unique: true, length: 8
   validate :email, email: true
+
+  unless RUBY_PLATFORM == "opal"
+  	Volt.current_app.on("user_connect") do |user_id|
+  		begin
+  			Volt.current_app.store.users.where(id: user_id).first.sync._event_triggered = "user_connect"
+  		rescue
+  			#we rescue as this callback will also get called from the SocketConnectionHandler specs (and will fail)
+  		end
+  	end
+
+  	Volt.current_app.on("user_disconnect") do |user_id|
+  		begin
+  			Volt.current_app.store.users.where(id: user_id).first.sync._event_triggered = "user_disconnect"
+  		rescue
+  			#we rescue as this callback will also get called from the SocketConnectionHandler specs (and will fail)
+  		end
+  	end
+  end
 end

data/spec/apps/kitchen_sink/app/main/views/main/callbacks.html

@@ -0,0 +1,7 @@
+<:Title>
+  Lifecycle Callbacks
+
+<:Body>
+  <h1>Lifecycle Callbacks</h1>
+
+  {{ store.users.first._event_triggered }}

data/spec/integration/bindings_spec.rb

@@ -131,7 +131,7 @@ describe 'bindings test', type: :feature, sauce: true do
     #   expect(find('#pageSelect3')).to have_content('two')
     #
     #   # Fill in one field and see if it updates the rest
-    #   fill_in('pageSelect2', :with => 'three')
+    #   fill_in('pageSelect2', with: 'three')
     #   expect(find('#pageSelect1').value).to eq('three')
     #   expect(find('#pageSelect2').value).to eq('three')
     #   expect(find('#pageSelect3')).to have_content('three')

data/spec/integration/callbacks_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe 'lifecycle callbacks', type: :feature, sauce: true do
+
+	context 'with a user' do
+		before do
+		    # Add the user
+		    store._users! << { email: 'test@test.com', password: 'awes0mesEcRet', name: 'Test Account 9550' }
+		end
+
+		it 'should trigger a user_connect event when a user logs in and a user_disconnect event when a user logs out' do
+			visit '/'
+
+			click_link 'Login'
+
+			fields = all(:css, 'form .form-control')
+			fields[0].set('test@test.com')
+			fields[1].set('awes0mesEcRet')
+			click_button 'Login'
+
+			visit '/callbacks'
+
+			expect(page).to have_content('user_connect')
+
+			click_link 'Test Account 9550'
+			click_link 'Logout'
+
+			expect(page).to have_content('user_disconnect')
+		end
+	end
+end

data/spec/integration/todos_spec.rb

@@ -5,7 +5,7 @@ describe 'todos app', type: :feature, sauce: true do
   it 'should add a todo and remove it' do
     visit '/todos'
 
-    fill_in 'newtodo', :with => 'Todo 1'
+    fill_in 'newtodo', with: 'Todo 1'
     find('#newtodo').native.send_keys(ENTER_KEY)
 
     expect(page).to have_content('Todo 1')
@@ -28,7 +28,7 @@ describe 'todos app', type: :feature, sauce: true do
   it 'should update a todo check state and persist' do
     visit '/todos'
 
-    fill_in 'newtodo', :with => 'Todo 1'
+    fill_in 'newtodo', with: 'Todo 1'
     find('#newtodo').native.send_keys(ENTER_KEY)
 
     expect(page).to have_content('Todo 1')

data/spec/models/array_model_spec.rb

@@ -50,4 +50,17 @@ describe Volt::ArrayModel do
       end
     end
   end
+  context "appending a model" do
+    it "sets the parent to self" do
+      item = Volt::Model.new
+      array = Volt::ArrayModel.new([], { path: [:items],  parent: double("StoreRoot") })
+      array << item
+      expect(item.parent).to eq(array)
+
+      sub = Volt::Model.new
+      item._sub_items << sub
+      expect(sub.parent).to eq(item._sub_items)
+    end
+  end
+
 end

data/spec/models/associations_spec.rb

@@ -85,7 +85,7 @@ describe Volt::Associations do
       bob = store.people.create.sync
 
       expect(bob.path).to eq([:people, :[]])
-      address = bob.addresses.create({:street => '1234 awesome street'})
+      address = bob.addresses.create({street: '1234 awesome street'})
 
       expect(bob.addresses[0].sync.person_id).to eq(bob.id)
       expect(bob.id).to_not eq(nil)

data/spec/models/field_helpers_spec.rb

@@ -47,6 +47,6 @@ describe 'field helpers' do
   end
 
   it 'should track the fields on the model class' do
-    expect(ExampleModelWithField.fields_data).to eq({:name=>[nil, {}], :value=>[[Numeric, NilClass], {}]})
+    expect(ExampleModelWithField.fields_data).to eq({name:[nil, {}], value:[[Numeric, NilClass], {}]})
   end
 end

data/spec/models/model_spec.rb

@@ -9,6 +9,9 @@ end
 class Items < Volt::ArrayModel
 end
 
+class SubItem < Item
+end
+
 class TestAssignsMethod < Volt::Model
   def name=(val)
     self._name = val
@@ -147,6 +150,15 @@ describe Volt::Model do
     expect(values).to eq([nil, 'one'])
   end
 
+  if RUBY_PLATFORM != 'opal'
+    it 'should allow a create/destroy from an existing model class' do
+      item = Item.new(name: 'The item')
+      store._items.create(item)
+
+      item.destroy
+    end
+  end
+
   it 'should trigger changed for any indicies after a deleted index' do
     model = Volt::Model.new
 
@@ -612,4 +624,10 @@ describe Volt::Model do
     model._items << {}
     expect(model._items).to be_instance_of Items
   end
+
+  it 'assigns the superclass\'s custom ArrayModel if it exists' do
+    model = Volt::Model.new
+    model._sub_items << {}
+    expect(model._sub_items).to be_instance_of Items
+  end
 end

data/spec/models/permissions_spec.rb

@@ -61,8 +61,7 @@ describe 'model permissions' do
   let(:user_todo) { TestUserTodo.new }
 
   it 'auto-associates users via own_by_user' do
-    #TODO: better assertions
-    expect(user_todo.respond_to?(:user)).to be(true)
+    expect(user_todo).to respond_to(:user)
   end
 
   it 'should follow CRUD states when checking permissions' do

data/spec/models/persistors/page_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module Volt
+  module Persistors
+    describe Page do
+      describe '#where' do
+        it 'searches for records in the page collection with the given values' do
+          juan  = Volt::Model.new(name: 'Juan', city: 'Quito', age: 13)
+          pedro = Volt::Model.new(name: 'Pedro', city: 'Quito', age: 15)
+          jose  = Volt::Model.new(name: 'Jose', city: 'Quito', age: 13)
+
+          page = described_class.new [jose, juan, pedro]
+
+          expect(page.where age: 13, city: 'Quito').to match_array [juan, jose]
+        end
+      end
+    end
+  end
+end

data/spec/reactive/computation_spec.rb

@@ -112,6 +112,39 @@ describe Volt::Computation do
     expect(values).to eq([nil, nil, 'inner', 'outer', 'inner'])
   end
 
+  it 'should raise an exception on a .watch! on the initial run' do
+    comp = nil
+    count = 1
+    expect do
+      comp = -> { count += 1 ; wrong_method }.watch!
+    end.to raise_error(/method `wrong_method'/)
+    # comp.stop
+  end
+
+  it 'should log an exception on the 2nd run, but not raise it' do
+    comp = nil
+    count = 0
+    dep = Volt::Dependency.new
+
+    expect(Volt.logger).to receive(:error) { nil }
+
+    expect do
+      comp = proc do
+        dep.depend
+        count += 1
+        if count > 1
+          raise "Count gt one"
+        end
+      end.watch!
+    end.not_to raise_error
+
+    dep.changed!
+
+    expect do
+      Volt::Computation.flush!
+    end.not_to raise_error
+  end
+
   describe 'watch_and_resolve!' do
     it 'should resolve any returnted promises' do
       promise = Promise.new

data/spec/server/socket_connection_handler_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+if RUBY_PLATFORM != 'opal'
+  require 'volt/server/socket_connection_handler'
+  describe Volt::SocketConnectionHandler do
+    let(:fake_dispatcher) { double("Dispatcher", volt_app: Volt.current_app)}
+
+    let(:fake_session) {double("Faye::WebSocket")}
+
+    before do
+      @old_dispatcher = Volt::SocketConnectionHandler.dispatcher
+      Volt::SocketConnectionHandler.dispatcher = fake_dispatcher
+    end
+
+    after do
+      Volt::SocketConnectionHandler.dispatcher = @old_dispatcher
+    end
+
+    let(:connection_handler) { Volt::SocketConnectionHandler.new(fake_session) }
+
+    subject!{ connection_handler }
+
+    describe '#creation' do
+
+      context 'with valid session' do
+
+        it 'should append itself to @@channels' do
+          expect(Volt::SocketConnectionHandler.channels).to include(subject)
+        end
+
+        it 'should trigger a client_connect event' do
+          val = 0
+
+          Volt.current_app.on("client_connect") do
+            val = 1
+          end
+
+          # TODO: change the way this is handled, we shouldn't have to instantiate a new SocketConnectionHandler just for this test
+          expect{Volt::SocketConnectionHandler.new(fake_session)}.to change{val}.by(1)
+        end
+      end
+    end
+
+    describe '#update' do
+      context 'with nil user_id' do
+        it 'should trigger a user_connect event when given a valid user_id' do
+          id = 0
+          Volt.current_app.on("user_connect") do |user_id|
+            id = user_id
+          end
+
+          expect{subject.update_user_id(123)}.to change{id}.by(123)
+        end
+      end
+
+      context 'with valid user_id' do
+        it 'should trigger a user_disconnect event when given a nil user_id' do
+          id = 0
+          Volt.current_app.on("user_disconnect") do |user_id|
+            id = user_id
+          end
+
+          subject.user_id = 123
+
+          expect{subject.update_user_id(nil)}.to change{id}.by(123)
+        end
+      end
+    end
+
+    describe '#close' do
+      it 'should trigger a client_disconnect event' do
+        allow(Volt::SocketConnectionHandler.dispatcher).to receive(:close_channel).and_return true
+
+        val = 0
+
+        Volt.current_app.on("client_disconnect") do
+          val = 1
+        end
+
+        expect{subject.closed}.to change{val}.by(1)
+      end
+      context 'with valid user_id' do
+        it 'should trigger a user_disconnect event' do
+          allow(Volt::SocketConnectionHandler.dispatcher).to receive(:close_channel).and_return true
+
+          subject.user_id = 123
+
+          id = 0
+
+          Volt.current_app.on("user_disconnect") do |user_id|
+            id = user_id
+          end
+
+          expect{subject.closed}.to change{id}.by(123)
+        end
+      end
+    end
+  end
+end

data/spec/tasks/dispatcher_spec.rb

@@ -76,7 +76,7 @@ if RUBY_PLATFORM != 'opal'
     it 'should let you set a cookie' do
       channel = double('channel')
 
-      allow(channel).to receive(:send_message).with('response', 0, 'yes it works', {:something=>"awesome"})
+      allow(channel).to receive(:send_message).with('response', 0, 'yes it works', {something:"awesome"})
       expect(Volt.logger).to receive(:log_dispatch)
 
       dispatcher.dispatch(channel, [0, 'TestTask', :set_cookie, {}])

data/spec/tasks/user_tasks_spec.rb

@@ -9,7 +9,7 @@ if RUBY_PLATFORM != 'opal'
       double('FakeUsersCollection', where: fake_response)
     end
 
-    let(:fake_store) { double('FakeStore', :_users => fake_users_collection) }
+    let(:fake_store) { double('FakeStore', _users: fake_users_collection) }
 
     let(:login_info) { { 'login' => 'Marty', 'password' => 'McFly' } }
 

data/spec/utils/task_argument_filtererer_spec.rb

@@ -16,7 +16,7 @@ if RUBY_PLATFORM != 'opal'
 
     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]"}])
+      expect(filtered_args).to eq([{login:"jam@jam.com", password:"[FILTERED]"}])
     end
 
   end

data/templates/project/Gemfile.tt

@@ -38,7 +38,7 @@ group :test do
 end
 
 # Server for MRI
-platform :mri, :mingw do
+platform :mri, :mingw, :x64_mingw do
   # The implementation of ReadWriteLock in Volt uses concurrent ruby and ext helps performance.
   gem 'concurrent-ruby-ext', '~> 0.8.0'
 

data/templates/project/README.md.tt

@@ -1,4 +1,4 @@
 # Place your app's docs here.
 
 ## New to Volt?
-Be sure to read the volt docs at http://docs.voltframework.com
+Be sure to read the volt docs at http://voltframework.com/docs

data/templates/project/config/app.rb.tt

@@ -51,6 +51,16 @@ Volt.configure do |config|
   # have rack deflate all files.
   # config.deflate = true
 
+  #########################
+  # Websocket configuration
+  #########################
+  # If you need to use a different domain or path for the websocket connection,
+  # you can set it here.  Volt provides the socket connection url at /socket,
+  # but if for example you are using a proxy server that doesn't support
+  # websockets, you can point the websocket connection at the app server
+  # directly.
+  # config.public.websocket_url = '/socket'
+
   #######################
   # Public configurations
   #######################

data/templates/view/index.html.tt

@@ -2,4 +2,4 @@
   <%= config[:view_name] %> index
 
 <:Body>
-  <h1>Find me in app/<%= config[:component] %>/<%= config[:view_name] %>/index.html</h1>
+  <h1>Find me in app/<%= config[:component] %>/views/<%= config[:view_name] %>/index.html</h1>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6.pre1
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -415,7 +415,9 @@ files:
 - lib/volt/cli/base_index_renderer.rb
 - lib/volt/cli/bundle.rb
 - lib/volt/cli/console.rb
+- lib/volt/cli/destroy.rb
 - lib/volt/cli/generate.rb
+- lib/volt/cli/generators.rb
 - lib/volt/cli/new_gem.rb
 - lib/volt/cli/runner.rb
 - lib/volt/config.rb
@@ -600,7 +602,6 @@ files:
 - lib/volt/utils/promise_extensions.rb
 - lib/volt/utils/read_write_lock.rb
 - lib/volt/utils/recursive_exists.rb
-- lib/volt/utils/set_patch.rb
 - lib/volt/utils/tilt_patch.rb
 - lib/volt/utils/time_patch.rb
 - lib/volt/utils/timers.rb
@@ -646,6 +647,7 @@ files:
 - spec/apps/kitchen_sink/app/main/views/events/index.html
 - spec/apps/kitchen_sink/app/main/views/mailers/welcome.email
 - spec/apps/kitchen_sink/app/main/views/main/bindings.html
+- spec/apps/kitchen_sink/app/main/views/main/callbacks.html
 - 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
@@ -679,6 +681,7 @@ files:
 - spec/extra_core/string_transformations_spec.rb
 - spec/extra_core/symbol_spec.rb
 - spec/integration/bindings_spec.rb
+- spec/integration/callbacks_spec.rb
 - spec/integration/client_require_spec.rb
 - spec/integration/cookies_spec.rb
 - spec/integration/event_spec.rb
@@ -706,6 +709,7 @@ files:
 - spec/models/model_state_spec.rb
 - spec/models/permissions_spec.rb
 - spec/models/persistors/flash_spec.rb
+- spec/models/persistors/page_spec.rb
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
 - spec/models/url_spec.rb
@@ -757,6 +761,7 @@ files:
 - spec/server/rack/quite_common_logger_spec.rb
 - spec/server/rack/rack_requests_spec.rb
 - spec/server/rack/sprockets_helpers_setup.rb
+- spec/server/socket_connection_handler_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
 - spec/tasks/dispatcher_spec.rb
@@ -875,9 +880,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
@@ -917,6 +922,7 @@ test_files:
 - spec/apps/kitchen_sink/app/main/views/events/index.html
 - spec/apps/kitchen_sink/app/main/views/mailers/welcome.email
 - spec/apps/kitchen_sink/app/main/views/main/bindings.html
+- spec/apps/kitchen_sink/app/main/views/main/callbacks.html
 - 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
@@ -950,6 +956,7 @@ test_files:
 - spec/extra_core/string_transformations_spec.rb
 - spec/extra_core/symbol_spec.rb
 - spec/integration/bindings_spec.rb
+- spec/integration/callbacks_spec.rb
 - spec/integration/client_require_spec.rb
 - spec/integration/cookies_spec.rb
 - spec/integration/event_spec.rb
@@ -977,6 +984,7 @@ test_files:
 - spec/models/model_state_spec.rb
 - spec/models/permissions_spec.rb
 - spec/models/persistors/flash_spec.rb
+- spec/models/persistors/page_spec.rb
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
 - spec/models/url_spec.rb
@@ -1028,6 +1036,7 @@ test_files:
 - spec/server/rack/quite_common_logger_spec.rb
 - spec/server/rack/rack_requests_spec.rb
 - spec/server/rack/sprockets_helpers_setup.rb
+- spec/server/socket_connection_handler_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
 - spec/tasks/dispatcher_spec.rb