volt 0.9.6 → 0.9.7.pre2

data/lib/volt/utils/time_patch.rb

@@ -1,12 +1,19 @@
-# Patchs a bug in the Time class, where two instances of time with the same
-# value do not hash to the same hash as they do in MRI.
-# https://github.com/opal/opal/issues/963
 if RUBY_PLATFORM == 'opal'
   require 'time'
 
   class Time
+    # Patchs a bug in the Time class, where two instances of time with the same
+    # value do not hash to the same hash as they do in MRI.
+    # https://github.com/opal/opal/issues/963
     def hash
       "Time:#{to_i}"
     end
+   
+    # Patches backported Opal Time because it's missing
+    # this method 
+    def getlocal  
+      s = self.to_f - self.utc_offset
+      ::Time.at(self.to_f)
+    end
   end
-end
+end

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.6'
+    STRING = '0.9.7.pre2'
   end
 end

data/lib/volt/volt/app.rb

@@ -47,9 +47,7 @@ module Volt
       include Volt::ServerSetup::App
     end
 
-    attr_reader :component_paths, :router, :live_query_pool,
-                :channel_live_queries, :app_path, :database, :message_bus,
-                :middleware, :browser
+    attr_reader :component_paths, :router, :app_path, :database, :message_bus, :middleware, :browser
     attr_accessor :sprockets, :opal_files
 
     def initialize(app_path=nil)
@@ -77,6 +75,12 @@ module Volt
         # middleware.
         run_config
 
+        # abort_on_exception is a useful debugging tool, and in my opinion something
+        # you probbaly want on.  That said you can disable it if you need.
+        unless RUBY_PLATFORM == 'opal'
+          Thread.abort_on_exception = Volt.config.abort_on_exception
+        end
+
         # Setup all of the middleware we can before we load the users components
         # since the users components might want to add middleware during boot.
         setup_preboot_middleware
@@ -87,13 +91,9 @@ module Volt
         # Require in app and initializers
         run_app_and_initializers unless RUBY_PLATFORM == 'opal'
 
-        require_components
+        reset_query_pool!
 
-        # abort_on_exception is a useful debugging tool, and in my opinion something
-        # you probbaly want on.  That said you can disable it if you need.
-        unless RUBY_PLATFORM == 'opal'
-          Thread.abort_on_exception = Volt.config.abort_on_exception
-        end
+        require_components
 
         load_app_code
 
@@ -104,14 +104,18 @@ module Volt
           AssetFiles.from_cache(app_url, 'main', component_paths)
         end
 
-        reset_query_pool!
-
         # Setup the middleware that we can only setup after all components boot.
         setup_postboot_middleware
 
         setup_routes
 
+        # Try to load the db to make sure its connected.  Also will run
+        # migrations on volt-sql in dev
+        trigger!('boot')
+
         start_message_bus
+
+        trigger!('post_boot')
       end
     end
 
@@ -149,6 +153,10 @@ module Volt
     def setup_browser
       @browser = Browser.new(self)
     end
+
+    def inspect
+      "#<#{self.class.to_s}:#{object_id}>"
+    end
   end
 end
 

data/lib/volt/volt/properties.rb

@@ -0,0 +1,24 @@
+# Volt.current_app.properties provides a hash like collection that backs to
+# the database.  This is useful for storing global app property.  (A common use
+# might be checking if something like an S3 bucket has been created without
+# the need to make an external API request.)
+class Properties
+  def [](key)
+    prop = Volt.current_app.store.volt_app_properties.where(name: key).first.sync
+
+    if prop
+      prop.value
+    else
+      nil
+    end
+  end
+
+  def []=(key, value)
+    unless value.is_a?(String)
+      raise "property values must be a string, you passed #{value.inspect}"
+    end
+
+    Volt.current_app.store.volt_app_properties.
+      update_or_create({name: key}, {value: value}).sync
+  end
+end

data/lib/volt/volt/server_setup/app.rb

@@ -4,15 +4,19 @@ unless RUBY_PLATFORM == 'opal'
   require 'volt/server/middleware/middleware_stack'
   require 'volt/server/middleware/default_middleware_stack'
   require 'volt/volt/core'
+  require 'volt/volt/properties'
 
 end
 
 module Volt
   module ServerSetup
     module App
+      attr_reader :live_query_pool, :query_subscription_pool,
+        :channel_query_subscriptions
+
       # Include Eventable to allow for lifecycle callbacks
       include Eventable
-      
+
       # The root url is where the volt app is mounted
       attr_reader :root_url
       # The app url is where the app folder (and sprockets) is mounted
@@ -56,6 +60,10 @@ module Volt
 
       end
 
+      def properties
+        @properties ||= Properties.new
+      end
+
       def setup_preboot_middleware
         @middleware = MiddlewareStack.new
         DefaultMiddlewareStack.preboot_setup(self, @middleware)
@@ -106,12 +114,22 @@ module Volt
       def reset_query_pool!
         if RUBY_PLATFORM != 'opal'
           # The load path isn't setup at the top of app.rb, so we wait to require
-          require 'volt/tasks/live_query/live_query_pool'
+          require 'volt/queries/live_query_pool'
+          require 'volt/queries/query_subscription_pool'
+
+          # Try to reset the previous
+          @database.try(:reset!)
 
           # Setup LiveQueryPool for the app
-          @database = Volt::DataStore.fetch
+          @query_subscription_pool.clear if @query_subscription_pool
+          @database = Volt::DataStore.fetch(self)
           @live_query_pool = LiveQueryPool.new(@database, self)
-          @channel_live_queries = {}
+          @query_subscription_pool = QuerySubscriptionPool.new(self)
+
+          # The channel_query_subscriptions, keeps a list of query subscriptions
+          # for each channel.  We store this here instead of on the channel
+          # because in ForkingServer, channel is a DrbObject instance.
+          @channel_query_subscriptions = {}
         end
       end
 
@@ -125,12 +143,17 @@ module Volt
           # updating each other.
           unless Volt.env.test?
             # Start the message bus
-            bus_name = Volt.config.message_bus.try(:bus_name) || 'peer_to_peer'
+            bus_name = if ((bus = Volt.config.message_bus) && name = bus.bus_name)
+              name
+            else
+              'peer_to_peer'
+            end
+
             begin
               message_bus_class = MessageBus.const_get(bus_name.camelize)
             rescue NameError => e
               raise "message bus name #{bus_name} was not found, be sure its "
-                    + "gem is included in the gemfile."
+              + "gem is included in the gemfile."
             end
 
             @message_bus = message_bus_class.new(self)
@@ -148,4 +171,4 @@ module Volt
       end
     end
   end
-end
+end

data/lib/volt/volt/users.rb

@@ -47,9 +47,21 @@ module Volt
       previous_id = Thread.current['with_user_id']
       Thread.current['with_user_id'] = user_id
 
-      yield
+      # In the console, you can use without a block
+      if block_given?
+        begin
+          result = yield
+        ensure
+          Thread.current['with_user_id'] = previous_id
+        end
+      else
+        # No block given, only allowed in the console
+        unless Volt.try(:console?)
+          raise "as_user requires a block, except in the console."
+        end
+      end
 
-      Thread.current['with_user_id'] = previous_id
+      result
     end
 
     unless RUBY_PLATFORM == 'opal'
@@ -116,7 +128,7 @@ module Volt
     def logout
       # Notify the backend so we can remove the user_id from the user's channel
       UserTasks.logout
-      
+
       # Remove the cookie so user is no longer logged in
       Volt.current_app.cookies.delete(:user_id)
     end

data/spec/apps/kitchen_sink/Gemfile

@@ -3,7 +3,11 @@ source 'https://rubygems.org'
 gem 'volt', path: '../../../'
 
 # volt uses mongo as the default data store.
-gem 'volt-mongo'
+gem 'volt-sql'
+gem 'sqlite3'
+gem 'pg', '~> 0.18.2'
+gem 'pg_json', '~> 0.1.29'
+
 
 # The following gem's are optional for themeing
 # Twitter bootstrap

data/spec/apps/kitchen_sink/app/main/config/routes.rb

@@ -29,6 +29,7 @@ client '/login', component: 'user_templates', controller: 'login'
 get '/simple_http', controller: 'simple_http', action: 'index'
 get '/simple_http/store', controller: 'simple_http', action: 'show'
 post '/simple_http/upload', controller: 'simple_http', action: 'upload'
+post '/simple_http', controller: 'simple_http', action: 'create'
 
 # Route for file uploads
 client '/upload', controller: 'upload', action: 'index'

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

@@ -2,7 +2,7 @@ module Main
   class SaveController < Volt::ModelController
     def add_post
       store.posts.create(page._new_post.to_h).fail do |err|
-        flash._notices << err.inspect
+        flash._notices << err.message
       end
     end
   end

data/spec/apps/kitchen_sink/app/main/controllers/server/simple_http_controller.rb

@@ -8,6 +8,10 @@ module Main
       render text: "You had me at #{store._simple_http_tests.first._name.sync}"
     end
 
+    def create
+      render text: params.inspect
+    end
+
     def upload
       uploaded = params._file._tempfile
       File.open('tmp/uploaded_file', 'wb') { |f| f.write(uploaded.read) }

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

@@ -1,9 +1,11 @@
+require 'volt/helpers/time'
+
 module Main
   class TodosController < Volt::ModelController
     model :store
 
     def add_todo
-      _todos << { name: page._new_todo }
+      _todos.create({ name: page._new_todo, created_at: VoltTime.new })
       page._new_todo = ''
     end
 
@@ -12,7 +14,7 @@ module Main
     end
 
     def completed
-      _todos.count(&:_completed)
+      todos.count(&:completed)
     end
   end
 end

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

@@ -2,5 +2,4 @@ class Post < Volt::Model
   field :title, String
 
   validate :title, length: 5
-
 end

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

@@ -0,0 +1,4 @@
+class Todo < Volt::Model
+  field :name, String
+  field :completed, Volt::Boolean
+end

data/spec/apps/kitchen_sink/app/main/views/mailers/reset_password.html

@@ -0,0 +1,10 @@
+<:Subject>
+  Password Reset
+
+<:Html>
+  Reset your password <a href="{{ reset_url }}" target="_new">here</a>.
+
+  <a href="{{ reset_url }}">Reset Password</a>
+
+<:Text>
+Password Reset

data/spec/apps/kitchen_sink/app/main/views/todos/index.html

@@ -12,6 +12,7 @@
         <td>{{ idx+1 }}.</td>
         <td><input type="checkbox" checked="{{ todo._completed }}"></td>
         <td class="name {{ if todo._completed }}complete{{ end }}">{{todo._name}}</td>
+        <td>{{ todo._created_at.time_distance_in_words }}</td>
         <td><button e-click="remove_todo(todo)">X</button></td>
       </tr>
     {{ end }}
@@ -21,5 +22,6 @@
     <div class="form-group">
        <label>Todo</label>
        <input class="form-control" id="newtodo" type="text" value="{{ page._new_todo }}" />
+
     </div>
   </form>

data/spec/apps/kitchen_sink/config/app.rb

@@ -1,3 +1,5 @@
 Volt.setup do |config|
   config.app_secret = 'vFYUzMiPIdMw1Iox0ggDpBYorLm_d55YtRPc0eGrdCpoN4h9E5FcWySIT_D8JIEOllU'
+
+  # config.db.uri = 'postgres://ryanstout:@localhost:5432/kitchen_sink'
 end

data/spec/apps/migrations/config/db/migrations/1445111704_migration1.rb

@@ -0,0 +1,7 @@
+class Migration1 < Volt::Migration
+  def up
+  end
+
+  def down
+  end
+end

data/spec/apps/migrations/config/db/migrations/1445113517_migration2.rb

@@ -0,0 +1,7 @@
+class Migration2 < Volt::Migration
+  def up
+  end
+
+  def down
+  end
+end

data/spec/apps/migrations/config/db/migrations/1445115200_migration3.rb

@@ -0,0 +1,7 @@
+class Migration3 < Volt::Migration
+  def up
+  end
+
+  def down
+  end
+end

data/spec/extra_core/class_spec.rb

@@ -4,6 +4,7 @@ require 'volt/extra_core/array'
 class TestClassAttributes
   class_attribute :some_data
   class_attribute :attr2
+  class_attribute :dup_test
 end
 
 class TestSubClassAttributes < TestClassAttributes
@@ -41,4 +42,13 @@ describe 'extra_core class addons' do
     expect(TestSubClassAttributes.attr2).to eq(2)
     expect(TestSubClassAttributes2.attr2).to eq(1)
   end
+
+  it 'should dup the class_attribute when you read it from a child class' do
+    TestClassAttributes.dup_test = {one: 1}
+
+    TestSubClassAttributes.dup_test[:two] = 2
+
+    expect(TestClassAttributes.dup_test).to eq({one: 1})
+    expect(TestSubClassAttributes.dup_test).to eq({one: 1, two: 2})
+  end
 end

data/spec/helpers/distance_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'volt/helpers/time'
+
+describe Volt::Duration do
+  it 'should return a sentence describing the time' do
+    dist = 1.hour + 2.days + 1.month + 305.seconds + 1.5.days
+
+    expect(dist.duration_in_words(nil, :seconds)).to eq('1 month, 3 days, 13 hours, 5 minutes, and 5 seconds')
+  end
+
+  it 'should show a recent_message and' do
+    expect(0.seconds.duration_in_words).to eq('just now')
+    expect(1.minute.duration_in_words).to eq('1 minute')
+    expect(0.seconds.duration_in_words(nil)).to eq('just now')
+  end
+
+  it 'should trim to the unit count' do
+    dist = 1.hour + 2.days + 1.month + 305.seconds + 1.5.days
+    expect(dist.duration_in_words(3)).to eq('1 month, 3 days, and 13 hours')
+    expect(dist.duration_in_words(2)).to eq('1 month and 3 days')
+  end
+
+  it 'should return distance in words' do
+    time1 = (1.hours + 5.minutes).ago
+    expect(time1.time_distance_in_words).to eq('1 hour and 5 minutes ago')
+
+    time2 = VoltTime.now
+    time3 = time2 - (3.hours + 1.day + 2.seconds)
+
+    expect(time3.time_distance_in_words(time2, nil, :seconds)).to eq('1 day, 3 hours, and 2 seconds ago')
+
+    time4 = 1.second.ago
+    expect(time4.time_distance_in_words).to eq('just now')
+  end
+end