volt 0.9.5.pre3 → 0.9.5.pre4

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

@@ -168,43 +168,23 @@ module Volt
       end
 
       # Call a method on the model once the model is loaded.  Return a promise
-      # that will resolve the result of the method, or reject with any
-      # Exceptions.
-      def run_once_loaded(block)
+      # that will resolve when the model is loaded
+      def run_once_loaded
         promise = Promise.new
 
-        # call once the method is loaded.
-        model_loaded = proc do
-          begin
-            result = yield
-            promise.resolve(result)
-          rescue Exception => error
-            promise.reject(error)
-          end
-        end
-
-        # Run the block after resolve if a block is passed in
-        if block
-          promise2 = promise.then do |val|
-            block.call(val)
-          end
-        else
-          promise2 = promise
-        end
-
         if @model.loaded_state == :loaded
-          model_loaded.call
+          promise.resolve(nil)
         else
           proc do |comp|
             if @model.loaded_state == :loaded
-              model_loaded.call
+              promise.resolve(nil)
 
               comp.stop
             end
           end.watch!
         end
 
-        promise2
+        promise
       end
 
       # Returns a promise that is resolved/rejected when the query is complete.  Any

data/lib/volt/models/root_models/store_root.rb

@@ -25,7 +25,6 @@ module Volt
         super
       end
 
-      # puts "GOT: #{res.inspect}"
       res
     end
 

data/lib/volt/reactive/reactive_array.rb

@@ -11,13 +11,16 @@ module Volt
       @old_size   = 0
     end
 
+    def respond_to_missing?(method_name, include_private = false)
+      @array.respond_to?(method_name, include_private) || super
+    end
+
     # Forward any missing methods to the array
     def method_missing(method_name, *args, &block)
       # Long term we should probably handle all Enum methods
       # directly for smarter updating.  For now, just depend on size
       # so updates retrigger the whole method call.
       @size_dep.depend
-
       @array.send(method_name, *args, &block)
     end
 

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

@@ -77,7 +77,7 @@ module Volt
             connect_to_peers
           end
         else
-          Volt.logger.error('Unable to connect to the database.  Volt will still run, but the message bus requires a database connection to setup connections between nodes, so the message bus has been disabled.  This means updates will not be propagated between instances (server, console, runners, etc...)')
+          Volt.logger.error('Unable to connect to the database.  Currently Volt requires running mongodb for a few things to work.  Volt will still run, but the message bus requires a database connection to setup connections between nodes, so the message bus has been disabled.  Also, the store collection can not be used without a database.  This means updates will not be propagated between instances (server, console, runners, etc...)')
         end
       end
 
@@ -181,7 +181,7 @@ module Volt
       def still_alive?(peer_server_id)
         # Unable to write to the socket, retry until the instance is no
         # longer marking its self as active in the database
-        peer_table = @volt_app.store._active_volt_instances
+        peer_table = @volt_app.store.active_volt_instances
         peer = peer_table.where(server_id: peer_server_id).first.sync
         if peer
           # Found the peer, retry if it has reported in in the last 2

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

@@ -33,7 +33,7 @@ module Volt
 
       # Register this server as active with the database
       def register
-        instances = @volt_app.store._active_volt_instances
+        instances = @volt_app.store.active_volt_instances
         instances.where(server_id: @server_id).first.then do |item|
           ips = local_ips.join(',')
           time = Time.now.to_i

data/lib/volt/server/middleware/default_middleware_stack.rb

@@ -50,10 +50,11 @@ module Volt
 
       rack_app.use HttpResource, volt_app, volt_app.router
 
+      # serve assets from public
       rack_app.use Rack::Static,
                     urls: ['/'],
-                    root: 'config/base',
-                    index: '',
+                    root: 'public',
+                    index: 'index.html',
                     header_rules: [
                       [:all, { 'Cache-Control' => 'public, max-age=86400' }]
                     ]

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

@@ -4,6 +4,16 @@ require 'uri'
 # from the dependencies.rb files.
 module Volt
   class AssetFiles
+    def self.from_cache(component_name, component_paths)
+      # @cache ||= {}
+
+      # @cache[component_name] ||= begin
+        # not cached, create
+
+        self.new(component_name, component_paths)
+      # end
+    end
+
     def initialize(component_name, component_paths)
       @component_paths     = component_paths
       @assets              = []
@@ -61,6 +71,14 @@ module Volt
       end
     end
 
+    # Called when you want to add a gem to the opal load path so it can be
+    # required on the client side.
+    def opal_gem(gem_name)
+      Opal.use_gem(gem_name)
+      Opal.paths.uniq!
+      # require(gem_name)
+    end
+
     def components
       @included_components.keys
     end

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

@@ -17,7 +17,7 @@ module Volt
       # Start with config code
       code = @client ? generate_config_code : ''
 
-      asset_files = AssetFiles.new(@component_name, @component_paths)
+      asset_files = AssetFiles.from_cache(@component_name, @component_paths)
       asset_files.component_paths.each do |component_path, component_name|
         code << ComponentTemplates.new(component_path, component_name, @client).code
         code << "\n\n"

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

@@ -58,11 +58,11 @@ module Volt
 
     def javascript_tags
       # TODO: Cache somehow, this is being loaded every time
-      AssetFiles.new('main', @component_paths).javascript_tags(@volt_app)
+      AssetFiles.from_cache('main', @component_paths).javascript_tags(@volt_app)
     end
 
     def css_tags
-      AssetFiles.new('main', @component_paths).css_tags
+      AssetFiles.from_cache('main', @component_paths).css_tags
     end
   end
 end

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

@@ -72,6 +72,9 @@ module Volt
         run environment
       end
 
+      # Remove dup paths
+      Opal.paths.uniq!
+
       @environment.logger.level ||= Logger::DEBUG
       source_map_enabled = Volt.source_maps?
       if source_map_enabled

data/lib/volt/spec/setup.rb

@@ -29,8 +29,6 @@ module Volt
         RSpec.configuration.filter_run_excluding type: :feature
       end
 
-
-
       cleanup_db = -> do
         volt_app.database.drop_database
 

data/lib/volt/utils/promise_extensions.rb

@@ -1,6 +1,3 @@
-# Require the original promise library first.
-require 'volt/utils/promise'
-
 # A temp patch for promises until https://github.com/opal/opal/pull/725 is released.
 class Promise
   class UnrealizedPromiseException < RuntimeError ; end
@@ -113,6 +110,10 @@ class Promise
     end
 
     if error
+      if error.is_a?(RSpec::Expectations::ExpectationNotMetError)
+        # re-raise
+        raise error
+      end
       err_str = "Exception in Promise at .sync: #{error.inspect}"
       err_str += error.backtrace.join("\n") if error.respond_to?(:backtrace)
       Volt.logger.error(err_str)

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.5.pre3'
+    STRING = '0.9.5.pre4'
   end
 end

data/lib/volt/volt/app.rb

@@ -88,6 +88,11 @@ module Volt
 
         load_app_code
 
+        # Load up the main component dependencies.  This is needed to load in
+        # any opal_gem calls in dependencies.rb
+        # TODO: Needs to support all components
+        AssetFiles.from_cache('main', component_paths)
+
         reset_query_pool!
 
         # Setup the middleware that we can only setup after all components boot.

data/lib/volt/volt/users.rb

@@ -93,12 +93,12 @@ module Volt
 
     # Put in a deprecation placeholder
     def user
-      Volt.logger.warn('deprication: Volt.user has been renamed to Volt.current_user (to be more clear about what it returns).  Volt.user will be deprecated in the future.')
+      Volt.logger.warn('Deprecation: Volt.user has been renamed to Volt.current_user (to be more clear about what it returns).  Volt.user will be deprecated in the future.')
       current_user
     end
 
     def fetch_current_user
-      Volt.logger.warn("Deprication Warning: fetch current user have been depricated, Volt.current_user returns a promise now.")
+      Volt.logger.warn("Deprecation Warning: fetch current user have been depricated, Volt.current_user returns a promise now.")
       current_user
     end
 

data/spec/extra_core/class_spec.rb

@@ -3,6 +3,7 @@ require 'volt/extra_core/array'
 
 class TestClassAttributes
   class_attribute :some_data
+  class_attribute :attr2
 end
 
 class TestSubClassAttributes < TestClassAttributes
@@ -30,4 +31,14 @@ describe 'extra_core class addons' do
     expect(TestSubClassAttributes.some_data).to eq(10)
     expect(TestSubClassAttributes2.some_data).to eq(15)
   end
+
+  it 'should let you change a class attribute on the child without affecting the parent' do
+    TestClassAttributes.attr2 = 1
+    expect(TestSubClassAttributes.attr2).to eq(1)
+
+    TestSubClassAttributes.attr2 = 2
+    expect(TestClassAttributes.attr2).to eq(1)
+    expect(TestSubClassAttributes.attr2).to eq(2)
+    expect(TestSubClassAttributes2.attr2).to eq(1)
+  end
 end

data/spec/integration/bindings_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe 'bindings test', type: :feature, sauce: true do
   it 'should load the page' do
     visit '/'
-    sleep 10
 
     expect(page).to have_content('Kitchen Sink')
   end

data/spec/models/array_model_spec.rb

@@ -21,4 +21,20 @@ describe Volt::ArrayModel do
     Volt::Computation.flush!
     expect(count).to eq(2)
   end
+
+  it 'should return the index of a model' do
+    array_model = Volt::ArrayModel.new([1,2,3])
+
+    expect(array_model.index(2)).to eq(1)
+  end
+
+  it 'should flatten' do
+    array = Volt::ArrayModel.new([])
+
+    array << Volt::ArrayModel.new([Volt::ArrayModel.new([1,2]), Volt::ArrayModel.new([3])])
+    array << Volt::ArrayModel.new([Volt::ArrayModel.new([4,5]), Volt::ArrayModel.new([6])])
+
+    expect(array.flatten.size).to eq(6)
+    expect(array.to_a.flatten.size).to eq(6)
+  end
 end

data/spec/models/field_helpers_spec.rb

@@ -6,6 +6,9 @@ class ExampleModelWithField < Volt::Model
   field :value, Numeric
 end
 
+class ExampleModelWithField2 < ExampleModelWithField
+end
+
 describe 'field helpers' do
   let(:model) { ExampleModelWithField.new }
   it 'should allow a user to setup a field that can be written to and read' do
@@ -23,7 +26,7 @@ describe 'field helpers' do
 
   it 'should raise an error when an invalid cast type is provided' do
     expect do
-      ExampleModelWithField.field :awesome, Array
+      ExampleModelWithField2.field :awesome, Array
     end.to raise_error(FieldHelpers::InvalidFieldClass)
   end
 
@@ -42,4 +45,8 @@ describe 'field helpers' do
       expect(error).to eq({})
     end
   end
+
+  it 'should track the fields on the model class' do
+    expect(ExampleModelWithField.fields_data).to eq({:name=>[nil, {}], :value=>[Numeric, {}]})
+  end
 end

data/spec/models/permissions_spec.rb

@@ -46,6 +46,17 @@ class ::TestUpdateReadCheck < Volt::Model
   end
 end
 
+class ::TestPromisePermission < Volt::Model
+  attr_reader :called_deny
+  permissions(:create) do
+    $test_promise = Promise.new
+    $test_promise.then do
+      @called_deny = true
+      deny
+    end
+  end
+end
+
 describe 'model permissions' do
   let(:user_todo) { TestUserTodo.new }
 
@@ -162,5 +173,19 @@ describe 'model permissions' do
 
       expect(model.read_check).to eq(nil)
     end
+
+    it 'should allow permission blocks to return a promise' do
+      promise = store._test_promise_permissions.create({})
+
+      expect(promise.resolved?).to eq(false)
+      expect(promise.rejected?).to eq(false)
+      $test_promise.resolve(nil)
+
+      expect(promise.resolved?).to eq(false)
+      expect(promise.rejected?).to eq(true)
+      # puts "#{promise.error.inspect}"
+      # puts promise.error.backtrace.join("\n")
+      expect(promise.error.to_s).to match(/permissions did not allow create for/)
+    end
   end
 end

data/volt.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   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 'selenium-webdriver', '~> 2.46.2'
   spec.add_development_dependency 'chromedriver2-helper', '~> 0.0.8'
   spec.add_development_dependency 'poltergeist', '~> 1.5.0'
   spec.add_development_dependency 'thin', '~> 1.6.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.5.pre3
+  version: 0.9.5.pre4
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.43.0
+        version: 2.46.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.43.0
+        version: 2.46.2
 - !ruby/object:Gem::Dependency
   name: chromedriver2-helper
   requirement: !ruby/object:Gem::Requirement
@@ -374,6 +374,7 @@ files:
 - app/volt/assets/js/volt_watch.js
 - app/volt/config/dependencies.rb
 - app/volt/controllers/notices_controller.rb
+- app/volt/models/active_volt_instance.rb
 - app/volt/models/user.rb
 - app/volt/tasks/live_query/live_query.rb
 - app/volt/tasks/live_query/live_query_pool.rb
@@ -572,7 +573,6 @@ files:
 - lib/volt/utils/logging/task_logger.rb
 - lib/volt/utils/modes.rb
 - lib/volt/utils/parsing.rb
-- lib/volt/utils/promise.rb
 - lib/volt/utils/promise_extensions.rb
 - lib/volt/utils/read_write_lock.rb
 - lib/volt/utils/set_patch.rb

data/lib/volt/utils/promise.rb

@@ -1,429 +0,0 @@
-# A copy of the opal 0.8 promise library.  The one in 0.7.x has some bugs.
-
-# {Promise} is used to help structure asynchronous code.
-#
-# It is available in the Opal standard library, and can be required in any Opal
-# application:
-#
-#     require 'promise'
-#
-# ## Basic Usage
-#
-# Promises are created and returned as objects with the assumption that they
-# will eventually be resolved or rejected, but never both. A {Promise} has
-# a {#then} and {#fail} method (or one of their aliases) that can be used to
-# register a block that gets called once resolved or rejected.
-#
-#     promise = Promise.new
-#
-#     promise.then {
-#       puts "resolved!"
-#     }.fail {
-#       puts "rejected!"
-#     }
-#
-#     # some time later
-#     promise.resolve
-#
-#     # => "resolved!"
-#
-# It is important to remember that a promise can only be resolved or rejected
-# once, so the block will only ever be called once (or not at all).
-#
-# ## Resolving Promises
-#
-# To resolve a promise, means to inform the {Promise} that it has succeeded
-# or evaluated to a useful value. {#resolve} can be passed a value which is
-# then passed into the block handler:
-#
-#     def get_json
-#       promise = Promise.new
-#
-#       HTTP.get("some_url") do |req|
-#         promise.resolve req.json
-#       end
-#
-#       promise
-#     end
-#
-#     get_json.then do |json|
-#       puts "got some JSON from server"
-#     end
-#
-# ## Rejecting Promises
-#
-# Promises are also designed to handle error cases, or situations where an
-# outcome is not as expected. Taking the previous example, we can also pass
-# a value to a {#reject} call, which passes that object to the registered
-# {#fail} handler:
-#
-#     def get_json
-#       promise = Promise.new
-#
-#       HTTP.get("some_url") do |req|
-#         if req.ok?
-#           promise.resolve req.json
-#         else
-#           promise.reject req
-#         end
-#
-#       promise
-#     end
-#
-#     get_json.then {
-#       # ...
-#     }.fail { |req|
-#       puts "it went wrong: #{req.message}"
-#     }
-#
-# ## Chaining Promises
-#
-# Promises become even more useful when chained together. Each {#then} or
-# {#fail} call returns a new {Promise} which can be used to chain more and more
-# handlers together.
-#
-#     promise.then { wait_for_something }.then { do_something_else }
-#
-# Rejections are propagated through the entire chain, so a "catch all" handler
-# can be attached at the end of the tail:
-#
-#     promise.then { ... }.then { ... }.fail { ... }
-#
-# ## Composing Promises
-#
-# {Promise.when} can be used to wait for more than one promise to resolve (or
-# reject). Using the previous example, we could request two different json
-# requests and wait for both to finish:
-#
-#     Promise.when(get_json, get_json2).then |first, second|
-#       puts "got two json payloads: #{first}, #{second}"
-#     end
-#
-class Promise
-  def self.value(value)
-    new.resolve(value)
-  end
-
-  def self.error(value)
-    new.reject(value)
-  end
-
-  def self.when(*promises)
-    When.new(promises)
-  end
-
-  attr_reader :error, :prev, :next
-
-  def initialize(action = {})
-    @action = action
-
-    @realized  = false
-    @exception = false
-    @value     = nil
-    @error     = nil
-    @delayed   = false
-
-    @prev = nil
-    @next = nil
-  end
-
-  def value
-    if Promise === @value
-      @value.value
-    else
-      @value
-    end
-  end
-
-  def act?
-    @action.has_key?(:success) || @action.has_key?(:always)
-  end
-
-  def action
-    @action.keys
-  end
-
-  def exception?
-    @exception
-  end
-
-  def realized?
-    !!@realized
-  end
-
-  def resolved?
-    @realized == :resolve
-  end
-
-  def rejected?
-    @realized == :reject
-  end
-
-  def ^(promise)
-    promise << self
-    self    >> promise
-
-    promise
-  end
-
-  def <<(promise)
-    @prev = promise
-
-    self
-  end
-
-  def >>(promise)
-    @next = promise
-
-    if exception?
-      promise.reject(@delayed[0])
-    elsif resolved?
-      promise.resolve(@delayed ? @delayed[0] : value)
-    elsif rejected?
-      if !@action.has_key?(:failure) || Promise === (@delayed ? @delayed[0] : @error)
-        promise.reject(@delayed ? @delayed[0] : error)
-      elsif promise.action.include?(:always)
-        promise.reject(@delayed ? @delayed[0] : error)
-      end
-    end
-
-    self
-  end
-
-  def resolve(value = nil)
-    if realized?
-      raise ArgumentError, 'the promise has already been realized'
-    end
-
-    if Promise === value
-      return (value << @prev) ^ self
-    end
-
-    begin
-      if block = @action[:success] || @action[:always]
-        value = block.call(value)
-      end
-
-      resolve!(value)
-    rescue Exception => e
-      exception!(e)
-    end
-
-    self
-  end
-
-  def resolve!(value)
-    @realized = :resolve
-    @value    = value
-
-    if @next
-      @next.resolve(value)
-    else
-      @delayed = [value]
-    end
-  end
-
-  def reject(value = nil)
-    if realized?
-      raise ArgumentError, 'the promise has already been realized'
-    end
-
-    if Promise === value
-      return (value << @prev) ^ self
-    end
-
-    begin
-      if block = @action[:failure] || @action[:always]
-        value = block.call(value)
-      end
-
-      if @action.has_key?(:always)
-        resolve!(value)
-      else
-        reject!(value)
-      end
-    rescue Exception => e
-      exception!(e)
-    end
-
-    self
-  end
-
-  def reject!(value)
-    @realized = :reject
-    @error    = value
-
-    if @next
-      @next.reject(value)
-    else
-      @delayed = [value]
-    end
-  end
-
-  def exception!(error)
-    @exception = true
-
-    reject!(error)
-  end
-
-  def then(&block)
-    if @next
-      raise ArgumentError, 'a promise has already been chained'
-    end
-
-    self ^ Promise.new(success: block)
-  end
-
-  alias do then
-
-  def fail(&block)
-    if @next
-      raise ArgumentError, 'a promise has already been chained'
-    end
-
-    self ^ Promise.new(failure: block)
-  end
-
-  alias rescue fail
-  alias catch fail
-
-  def always(&block)
-    if @next
-      raise ArgumentError, 'a promise has already been chained'
-    end
-
-    self ^ Promise.new(always: block)
-  end
-
-  alias finally always
-  alias ensure always
-
-  def trace(depth = nil, &block)
-    if @next
-      raise ArgumentError, 'a promise has already been chained'
-    end
-
-    self ^ Trace.new(depth, block)
-  end
-
-  def inspect
-    result = "#<#{self.class}(#{object_id})"
-
-    if @next
-      result += " >> #{@next.inspect}"
-    end
-
-    if realized?
-      result += ": #{(@value || @error).inspect}>"
-    else
-      result += ">"
-    end
-
-    result
-  end
-
-  class Trace < self
-    def self.it(promise)
-      current = []
-
-      if promise.act? || promise.prev.nil?
-        current.push(promise.value)
-      end
-
-      if prev = promise.prev
-        current.concat(it(prev))
-      else
-        current
-      end
-    end
-
-    def initialize(depth, block)
-      @depth = depth
-
-      super success: -> {
-        trace = Trace.it(self).reverse
-        trace.pop
-
-        if depth && depth <= trace.length
-          trace.shift(trace.length - depth)
-        end
-
-        block.call(*trace)
-      }
-    end
-  end
-
-  class When < self
-    def initialize(promises = [])
-      super()
-
-      @wait = []
-
-      promises.each {|promise|
-        wait promise
-      }
-    end
-
-    def each(&block)
-      raise ArgumentError, 'no block given' unless block
-
-      self.then {|values|
-        values.each(&block)
-      }
-    end
-
-    def collect(&block)
-      raise ArgumentError, 'no block given' unless block
-
-      self.then {|values|
-        When.new(values.map(&block))
-      }
-    end
-
-    def inject(*args, &block)
-      self.then {|values|
-        values.reduce(*args, &block)
-      }
-    end
-
-    alias map collect
-
-    alias reduce inject
-
-    def wait(promise)
-      unless Promise === promise
-        promise = Promise.value(promise)
-      end
-
-      if promise.act?
-        promise = promise.then
-      end
-
-      @wait << promise
-
-      promise.always {
-        try if @next
-      }
-
-      self
-    end
-
-    alias and wait
-
-    def >>(*)
-      super.tap {
-        try
-      }
-    end
-
-    def try
-      if @wait.all?(&:realized?)
-        if promise = @wait.find(&:rejected?)
-          reject(promise.error)
-        else
-          resolve(@wait.map(&:value))
-        end
-      end
-    end
-  end
-end