volt 0.9.4.pre5 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 336fa7176c4a60f3ea2757f0e78917d40f0faee7
-  data.tar.gz: 2911281e8bea55eca1fdc94568452f75012ee0aa
+  metadata.gz: b818f9b2d02006b327aab20af6df7bb258b94ce6
+  data.tar.gz: 186ea61b4516a781fb3bac6b800e7e10a3bf1bef
 SHA512:
-  metadata.gz: cb4724687642e194094184b6cd515da2fc1f78ff273ce2049d727dc1c3ea7f3fa07756827bb6b167545aea7f0cad83e40941cf0588a173c847901bd6359b7507
-  data.tar.gz: cb51999eb63a80ad0606e457457325a22fadcba5ec7453b1068d227885e65fec1de5fc4f063b6633fab8d310d92b6ae8976013526f2ec23afb6c0d276a2aeb73
+  metadata.gz: 0a3898e2d3cab1dfe549cd34538f74df0ba5e9dc0587f94a426480badc4d606a67a51349d9c2f07a2a36881213699ed58d8fe5c04eab9d51a8e95cfecf901e45
+  data.tar.gz: 235f5228b227b80a07179c6f8ac309474e7dbeb209b48318c324c970a5d93810c67c76aa827871138eca29767f96d4bea30413e75081a62f0bb82bd06d53b2e5

data/CHANGELOG.md

@@ -24,6 +24,8 @@ the base collections will now be called "Repositories" or "Repo's" for short.  T
 - fixed issue with user password change
 - fix issue storing Time in a hash
 - fixed issue with local_store not persisting in some cases
+- runners now block until messages have propigated to the message bus and updates have been pushed.
+- upgraded some dependency gems to fix a conflict
 
 ## 0.9.3
 [0.9.3 Update Blog Post](http://blog.voltframework.com/post/121128931859/0-9-3-stuff-you-asked-for)

data/docs/UPGRADE_GUIDE.md

@@ -17,6 +17,8 @@ validate login_field, unique: true, length: 8
 validate :email, email: true
 ```
 
+If you are using $page, it has been removed and you can now access any collection (which we're now calling repo's) via ```Volt.current_app.store``` or ```.page```, ```.params```, etc...
+
 # 0.9.2 to 0.9.3
 
 Upgrading from 0.9.2 should be fairly simple, just implement the following:

data/lib/volt/cli.rb

@@ -32,6 +32,7 @@ module Volt
       say "Your app is now ready in the #{name} directory.", :green
       say ""
       say "To run your app: "
+      say ""
       say "  cd #{name}"
       say "  bundle exec volt server"
     end

data/lib/volt/cli/runner.rb

@@ -5,10 +5,13 @@ module Volt
     class Runner
       # Runs the ruby file at the path
       def self.run_file(path)
-        Volt.boot(Dir.pwd)
+        app = Volt.boot(Dir.pwd)
 
         # Require in the file at path
         require './' + path
+
+        # disconnect from the message bus and flush all messages
+        app.message_bus.disconnect!
       end
     end
   end

data/lib/volt/models/array_model.rb

@@ -322,9 +322,8 @@ module Volt
       promise
     end
 
-
     # We need to setup the proxy methods below where they are defined.
-    proxy_with_load :[], :size, :last, :reverse, :all, :to_a
+    proxy_with_load :[], :size, :last, :reverse, :all, :to_a, :empty?
 
   end
 end

data/lib/volt/server/message_bus/base_message_bus.rb

@@ -47,6 +47,11 @@ module Volt
       def publish(channel_name, message)
         raise "Not implemented"
       end
+
+      # waits for all messages to be flushed and closes connections
+      def disconnect!
+        raise "Not implemented"
+      end
     end
   end
 end

data/lib/volt/server/message_bus/peer_to_peer.rb

@@ -71,9 +71,9 @@ module Volt
           setup_peer_server
           start_tracker
 
-          Thread.new do
-            sleep 1
+          @peer_connection_threads = []
 
+          @connect_thread = Thread.new do
             connect_to_peers
           end
         else
@@ -121,22 +121,20 @@ module Volt
         peers.each do |peer|
           # Start connecting to all at the same time.  Since most will connect or
           # timeout, this is the desired behaviour.
-          Thread.new do
-            # sometimes we get nil peers for some reason
-            if peer
-              peer_connection = PeerConnection.connect_to(self, peer._ips, peer._port)
-
-              if peer_connection
-                add_peer_connection(peer_connection)
-              else
-                # remove if not alive anymore.
-                still_alive?(peer._server_id)
-              end
-            end
+          # sometimes we get nil peers for some reason
+          if peer
+            peer_connection = PeerConnection.new(nil, peer._ips, peer._port, self, false, peer._server_id)
+            add_peer_connection(peer_connection)
           end
         end
       end
 
+      # Blocks until all peers have connected or timed out.
+      def disconnect!
+        # Wait for disconnect on each
+        @peer_connections.keys.each(&:disconnect!)
+      end
+
       def add_peer_connection(peer_connection)
         @peer_connections[peer_connection] = true
         @peer_server_ids[peer_connection.peer_server_id] = true
@@ -167,7 +165,7 @@ module Volt
 
             if peer_server_ids[peer_id]
               # Peer is already connected somewhere else, remove connection
-              peer.disconnect
+              peer.disconnect!
 
               # remove the connection
               @peer_connections.delete(peer)

data/lib/volt/server/message_bus/peer_to_peer/peer_connection.rb

@@ -14,23 +14,47 @@ module Volt
       # The server id for the connected server
       attr_reader :peer_server_id, :socket
 
-      def initialize(socket, ip, port, message_bus, server=false)
+      def initialize(socket, ips, port, message_bus, server=false, peer_server_id=nil)
         @message_bus = message_bus
-        @ip = ip
+        @ips = ips
         @port = port
         @server = server
         @socket = socket
         @server_id = message_bus.server_id
+        @peer_server_id = peer_server_id
         @message_queue = SizedQueue.new(500)
         @reconnect_mutex = Mutex.new
 
         # The encoder handles things like formatting and encryption
         @message_encoder = MessageEncoder.new
 
+        @worker_thread = Thread.new do
+          # Connect to the remote if this PeerConnection was created from the
+          # active_volt_instances collection.
+          #
+          # reconnect! will setup the @socket
+          if @socket || reconnect!
+            # Announce checks to make sure we didn't connect to ourselves
+            if announce
+              # Setp the listen thread.
+              @listen_thread = Thread.new do
+                # Listen for messages in a new thread
+                listen
+              end
+
+              run_worker
+            end
 
+          end
+        end
+      end
+
+      # Tells the other connect its server_id.  In the event we connected to
+      # ourself, close.
+      def announce
         failed = false
         begin
-          if server
+          if @server
             # Wait for announcement
             @peer_server_id = @message_encoder.receive_message(@socket)
             @message_encoder.send_message(@socket, @server_id)
@@ -47,25 +71,19 @@ module Volt
         @message_bus.remove_duplicate_connections
 
         # Don't connect to self
-        if @failed || @peer_server_id == @server_id
+        if failed || @peer_server_id == @server_id
           # Close the connection
-          close
-          return
-        end
-
-        @listen_thread = Thread.new do
-          # Listen for messages in a new thread
-          listen
+          disconnect!
+          return false
         end
 
-        @worker_thread = Thread.new do
-          run_worker
-        end
+        # Success
+        return true
       end
 
-      # Close the socket, kill worker threads, and remove from
-      # message_bus's peer_connections
-      def disconnect
+      # Close the socket, kill listener thread, wait for worker thread to send
+      # all messages, and remove from message_bus's peer_connections.
+      def disconnect!
         @disconnected = true
         @message_queue.push(:QUIT)
         begin
@@ -74,8 +92,11 @@ module Volt
           # Ignore close error, since we may not be connected
         end
 
-        @listen_thread.kill
-        @worker_thread.kill
+        @listen_thread.kill if @listen_thread
+        # @worker_thread.kill
+
+        # Wait for the worker to publish all messages
+        @worker_thread.join if Thread.current != @worker_thread
 
         @message_bus.remove_peer_connection(self)
       end
@@ -102,12 +123,10 @@ module Volt
         end
       end
 
-
       def listen
         loop do
           begin
             while (message = @message_encoder.receive_message(@socket))
-              # puts "Message: #{message.inspect}"
               break if @disconnected
               @message_bus.handle_message(message)
             end
@@ -129,45 +148,50 @@ module Volt
         end
       end
 
+      private
+
+      def still_alive?
+        @message_bus.still_alive?(@peer_server_id)
+      end
 
       # Because servers can have many ips, we try the various ip's until we are
       # able to connect to one.
-      # @param [Array] an array of ip strings
-      def self.connect_to(message_bus, ips, port)
-        ips.split(',').each do |ip|
+      def connect!
+        @ips.split(',').each do |ip|
           begin
-            socket = SocketWithTimeout.new(ip, port, CONNECT_TIMEOUT)
-            return PeerConnection.new(socket, ip, port, message_bus)
-          rescue Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::ETIMEDOUT => e
+            socket = SocketWithTimeout.new(ip, @port, CONNECT_TIMEOUT)
+
+            @socket = socket
+
+            return
+          rescue Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::ETIMEDOUT, SocketError => e
             # Unable to connect, next
             next
           end
         end
 
-        return false
-      end
-
-      private
-
-      def still_alive?
-        @message_bus.still_alive?(@peer_server_id)
+        raise Errno::ECONNREFUSED
       end
 
       def reconnect!
+        # Stop trying to reconnect if we are disconnected
+        return false if @disconnected
+
         # Don't reconnect on the server instances
         return false if @server
+
         @reconnect_mutex.synchronize do
           loop do
             # Server is no longer reporting as alive, give up on reconnecting
             unless still_alive?
               # Unable to connect, let peer connection die
-              disconnect
+              disconnect!
               return false
             end
 
             failed = false
             begin
-              socket = SocketWithTimeout.new(@ip, @port, CONNECT_TIMEOUT)
+              connect!
             rescue Errno::ECONNREFUSED, SocketError => e
               # Unable to cnnect, wait 10, try again
               sleep 10

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.4.pre5'
+    STRING = '0.9.4'
   end
 end

data/lib/volt/volt/client_setup/browser.rb

@@ -94,6 +94,7 @@ module Volt
     def load_stored_page
       if Volt.client?
         if `sessionStorage`
+          page = Volt.current_app.page
           page_obj_str = nil
 
           `page_obj_str = sessionStorage.getItem('___page');`

data/spec/models/array_model_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+# TODO: ArrayModel and Model specs are mixed in model_spec atm.  Need to move
+# ArrayModel specs here.
+describe Volt::ArrayModel do
+  unless RUBY_PLATFORM == 'opal'
+    it 'should return a Promise for empty? on store' do
+      expect(store._posts.empty?.class).to eq(Promise)
+    end
+  end
+
+  it 'should reactively update .empty? when an item is added to a collection' do
+    Volt::Computation.flush!
+    count = 0
+    comp = -> { the_page._names.empty? ; count += 1 }.watch!
+
+    expect(count).to eq(1)
+
+    the_page._names.create({name: 'Bob'})
+
+    Volt::Computation.flush!
+    expect(count).to eq(2)
+  end
+end

data/spec/server/message_bus/peer_to_peer/peer_connection_spec.rb

@@ -24,11 +24,11 @@ unless RUBY_PLATFORM == 'opal'
       end
 
       it 'should on server' do
-        Volt::MessageBus::PeerConnection.new(@socket, nil, nil, @bus, true)
+        Volt::MessageBus::PeerConnection.new(@socket, nil, nil, @bus, true).announce
       end
 
       it 'should pass the server_id back and forth to client' do
-        Volt::MessageBus::PeerConnection.new(@socket, nil, nil, @bus)
+        Volt::MessageBus::PeerConnection.new(@socket, nil, nil, @bus).announce
       end
     end
 
@@ -89,7 +89,7 @@ unless RUBY_PLATFORM == 'opal'
 
         conn2 = nil
         threads << Thread.new do
-          conn2 = Volt::MessageBus::PeerConnection.new(@client, nil, nil, bus2)
+          conn2 = Volt::MessageBus::PeerConnection.new(@client, nil, nil, bus2, false, bus2.server_id)
         end
 
         threads.each(&:join)
@@ -103,8 +103,8 @@ unless RUBY_PLATFORM == 'opal'
 
         expect(responses2).to eq(['test message'])
 
-        conn1.disconnect
-        conn2.disconnect
+        conn1.disconnect!
+        conn2.disconnect!
 
       end
     end

data/spec/server/middleware/{middleware_handler.rb → middleware_stack_spec.rb}

@@ -6,12 +6,6 @@ unless RUBY_PLATFORM == 'opal'
       @stack = Volt::MiddlewareStack.new
     end
 
-    it 'should set_app' do
-      app = double('rack app')
-      @stack.set_app(app)
-      expect(@stack.instance_variable_get('@app')).to eq(app)
-    end
-
     it 'should insert a middleware at the end of the stack when calling use' do
       middleware1 = double('middleware1')
       @stack.use(middleware1, 'arg1')

data/volt.gemspec

@@ -24,7 +24,7 @@ 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 'listen', '~> 2.8.0'
+  spec.add_dependency 'listen', '~> 3.0.1'
   spec.add_dependency 'configurations', '~> 2.0.0.pre'
   spec.add_dependency 'opal', '~> 0.7.2'
   spec.add_dependency 'bundler', '>= 1.5'
@@ -50,7 +50,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'thin', '~> 1.6.3'
   spec.add_development_dependency 'coveralls', '~> 0.8.1'
 
-  spec.add_development_dependency 'guard', '2.6.0' # bug in current guard
+  spec.add_development_dependency 'guard', '2.12.7' # bug in current guard
   spec.add_development_dependency 'guard-rspec', '~> 4.3.0'
   spec.add_development_dependency 'rake', '~> 10.0.4'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.4.pre5
+  version: 0.9.4
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: configurations
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.12.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.12.7
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -673,6 +673,7 @@ files:
 - spec/integration/url_spec.rb
 - spec/integration/user_spec.rb
 - spec/integration/yield_spec.rb
+- spec/models/array_model_spec.rb
 - spec/models/associations_spec.rb
 - spec/models/buffer_spec.rb
 - spec/models/dirty_spec.rb
@@ -721,7 +722,7 @@ files:
 - spec/server/message_bus/peer_to_peer/peer_server_spec.rb
 - spec/server/message_bus/peer_to_peer/socket_with_timeout_spec.rb
 - spec/server/message_bus/peer_to_peer_spec.rb
-- spec/server/middleware/middleware_handler.rb
+- spec/server/middleware/middleware_stack_spec.rb
 - spec/server/rack/asset_files_spec.rb
 - spec/server/rack/component_paths_spec.rb
 - spec/server/rack/http_request_spec.rb
@@ -848,9 +849,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -929,6 +930,7 @@ test_files:
 - spec/integration/url_spec.rb
 - spec/integration/user_spec.rb
 - spec/integration/yield_spec.rb
+- spec/models/array_model_spec.rb
 - spec/models/associations_spec.rb
 - spec/models/buffer_spec.rb
 - spec/models/dirty_spec.rb
@@ -977,7 +979,7 @@ test_files:
 - spec/server/message_bus/peer_to_peer/peer_server_spec.rb
 - spec/server/message_bus/peer_to_peer/socket_with_timeout_spec.rb
 - spec/server/message_bus/peer_to_peer_spec.rb
-- spec/server/middleware/middleware_handler.rb
+- spec/server/middleware/middleware_stack_spec.rb
 - spec/server/rack/asset_files_spec.rb
 - spec/server/rack/component_paths_spec.rb
 - spec/server/rack/http_request_spec.rb