volt 0.9.6 → 0.9.7.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe04baec1557acb6a08015750b7d20fad493f47
-  data.tar.gz: e2da487f9ee5fb406dcf7f4090bed2dda65f92f3
+  metadata.gz: 25051871468c59824f6199f8656f30ebb31134a4
+  data.tar.gz: 0a9d1c61f06188fd8395abbe62a05aa7535d297c
 SHA512:
-  metadata.gz: 1f71474b6ed762a6662e38d6ab179e50003ce21a172b4514d9608283b90f2f24c93a8ced63284795a5e23e028a0208061c29651441c27d5cc5958d5e2517501d
-  data.tar.gz: d2ae18337a6654e85864f98b8adf4cd081c0d401045d5882a82b62fbcaf8284c5d1a6f5d6c531dfb6383670c795e56b0570c69f71ee64a97b0c049642b6ca9fa
+  metadata.gz: ca789facecc7f76aaa5b2f92e2c8b900113d2b390cfa2a5aca6e771ad4dc3ff32659e578a8fba23bb3243dbc6e4061aad7d842374401dd181c77c46e26465537
+  data.tar.gz: 40c1a6edf970b4eac77087023a4d2b94b420cd92b2d28b588e92b0ef70ab23c3080b59b9e6a785f74173924e09fb47dae0a16928e606a3f91390f5c76040a6ed

data/.gitignore

@@ -22,4 +22,5 @@ tmp
 sauce_connect.log
 .ruby-gemset
 tags
-config/db/
+config/db/
+spec/apps/kitchen_sink/config/db

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Change Log
 
+## 0.9.7
+
+### Added
+You can now do "splat" matches in routes.  Splat matches let you match multiple sections at the end of a url.
+```ruby
+client '/info/{{ *rest_of_path }}', component: 'main', controller: 'main', action: 'info'
+```
+
+By doing the above, anything after /info/ will be matched and placed into the rest_of_path param.
+
+- Add send_file(path) to HttpController, send_file streams the file off of disk.
+- ```field``` now accepts :default
+- ```index``` has been added for sql databases:
+      ```index :user_id``` (single)
+      ```index [:user_id, :name]``` (compound)
+      ```index [:user_id, :username], unique: true``` (unique)
+
+
+### Changed
+- fixed the issue with serving precompiled assets in production. It also fixes the issue where sometimes non-root urls wouldn't load correctly.
+- fixed issue with some routes not matching
+- fixed issue with attribute bindings in mailer templates
+
+
+
 ## 0.9.6
 0.9.6 is mostly a bug fix release with a few minor features.
 
@@ -17,6 +42,7 @@ Volt.boot(Dir.pwd)
 - Finally tracked down an illusive memory leak.
 - Computations now raise an error on their inital run, then log errors (via Volt.logger.error(..)) when running again (since they update on next tick)
 - fixed template caching issue
+- .validate! return a promise that now rejects when the model is invalid
 - upgrade the volt-mongo gem to mongo gem 2.1
 - fixed issue with https web socket connection
 - improved errors when returning objects from Tasks that can't be serialized

data/Gemfile

@@ -3,7 +3,8 @@ source 'http://rubygems.org'
 gemspec
 
 # volt-mongo gem for testing
-gem 'volt-mongo'
+# gem 'volt-mongo'
+gem 'volt-sql'
 
 # Use rbnacl for message bus encrpytion
 # (optional, if you don't need encryption, disable in app.rb and remove)
@@ -12,6 +13,10 @@ gem 'rbnacl-libsodium', require: false
 
 # temp until 0.8.0 of opal
 # gem 'opal-rspec', github: 'opal/opal-rspec'
+gem 'sqlite3'
+gem 'pg', '~> 0.18.2'
+gem 'pg_json', '~> 0.1.29'
+
 
 group :development, :test do
   # For testing the kitchen sink app

data/README.md

@@ -27,6 +27,8 @@ Check out demo apps:
  - https://github.com/voltrb/todomvc
  - https://github.com/voltrb/blog5
 
+For a full list of all things volt, check out [awesome-volt](https://github.com/heri/awesome-volt)
+
 # Docs
 
 Read the [full docs on Volt here](http://voltframework.com/docs)

data/Rakefile

@@ -31,6 +31,7 @@ task :test do
   Rake::Task['ruby:rspec'].invoke
 end
 
+desc "Run opal specs in the browser"
 task :opal_specs_in_browser do
   require 'volt/server/websocket/rack_server_adaptor'
   require 'rack/cascade'

data/app/volt/models/active_volt_instance.rb

@@ -1,6 +1,8 @@
-class ActiveVoltInstance < Volt::Model
-  field :server_id, String
-  field :ips, String
-  field :port, Fixnum
-  field :time#, Time
-end
+unless ENV['NO_MESSAGE_BUS']
+  class ActiveVoltInstance < Volt::Model
+    field :server_id, String
+    field :ips, String
+    field :port, Fixnum
+    field :time#, Time
+  end
+end

data/app/volt/models/user.rb

@@ -2,7 +2,15 @@ require 'bcrypt' unless RUBY_PLATFORM == 'opal'
 
 module Volt
   class User < Model
-    field :password
+    field :hashed_password
+
+    def password=(val)
+      set(:password, val)
+    end
+
+    def password
+      get(:password)
+    end
 
     # returns login field name depending on config settings
     def self.login_field
@@ -44,10 +52,11 @@ module Volt
 
         if password.present?
           # Clear the password
-          set('password', nil)
+          # set('password', nil)
 
           # Set the hashed_password field instead
           set('hashed_password', BCrypt::Password.create(password))
+          delete('password')
         end
       end
     end

data/app/volt/models/volt_app_property.rb

@@ -0,0 +1,8 @@
+# VoltAppProperty backs the volt_app.properties hash.  properties is designed
+# to allow things like gems that have external setup processes (creating an
+# S3 bucket for example) to keep track of if that action has been completed on
+# a global level.
+class VoltAppProperty < Volt::Model
+  field :name, String
+  field :value, String
+end

data/app/volt/tasks/query_tasks.rb

@@ -1,8 +1,10 @@
+# QueryTasks is responsible for passing back the data from a query.  It will
+# be run both from the client side and server side.  From the client it passed
+# data with websockets.  From the server it uses the stub channel to pass data
+# directly.
+
 class QueryTasks < Volt::Task
   def add_listener(collection, query)
-    live_query = @volt_app.live_query_pool.lookup(collection, query)
-    track_channel_in_live_query(live_query)
-
     if @channel
       # For requests from the client (with @channel), we track the channel
       # so we can send the results back.  Server side requests don't stay live,
@@ -11,61 +13,51 @@ class QueryTasks < Volt::Task
 
       # live_query.add_channel(@channel)
     end
-    live_query.add_channel(@channel)
+
+    query_subscription = subscription(collection, query)
 
     errors = {}
 
     begin
       # Get the initial data
-      initial_data = live_query.initial_data
+      initial_data = query_subscription.initial_data
     rescue => exception
       # Capture and pass up any exceptions
       error = { error: exception.message }
     end
 
-    if initial_data
-      # Only send the filtered attributes for this user
-      initial_data.map! do |data|
-        [data[0], live_query.model_for_filter(data[1]).filtered_attributes.sync]
-      end
-    end
-
     [initial_data, error]
   end
 
   def initial_data
-    data = live_query.initial_data
-    data[:id] = data[:id].to_s
-
-    data
+    live_query.initial_data(@channel)
   end
 
   # Remove a listening channel, the LiveQuery will automatically remove
   # itsself from the pool when there are no channels.
   def remove_listener(collection, query)
-    live_query = @volt_app.live_query_pool.lookup(collection, query)
-    live_query.remove_channel(@channel)
+    # TODO: Need LiveQueryPool to be counting, and we need to remove it
+    query_sub = subscription(collection, query)
+    query_sub.remove
   end
 
-  # Removes a channel from all associated live queries
+  # Remove all QuerySubscriptions for a channel
   def close!
-    live_queries = @volt_app.channel_live_queries[@channel]
+    query_subscriptions = @volt_app.channel_query_subscriptions[@channel]
 
-    if live_queries
-      live_queries.each do |live_query|
-        live_query.remove_channel(@channel)
-      end
+    if query_subscriptions
+      query_subscriptions.keys.reverse.each(&:remove)
     end
-
-    @volt_app.channel_live_queries.delete(@channel)
   end
 
   private
 
-  # Tracks that this channel will be notified from the live query.
-  def track_channel_in_live_query(live_query)
-    channel_live_queries = @volt_app.channel_live_queries
-    channel_live_queries[@channel] ||= []
-    channel_live_queries[@channel] << live_query
+  def subscription(collection, query)
+    # Lookup or create the live query
+    live_query = @volt_app.live_query_pool.lookup(collection, query)
+
+    # Find or create a QuerySubscription for this channel
+    live_query.query_subscription_for_channel(@channel)
   end
+
 end

data/app/volt/tasks/store_tasks.rb

@@ -2,7 +2,7 @@ require 'volt/models'
 
 class StoreTasks < Volt::Task
   def db
-    @@db ||= Volt::DataStore.fetch
+    @@db ||= Volt::DataStore.fetch(Volt.current_app)
   end
 
   def load_model(collection, path, data)
@@ -66,7 +66,7 @@ class StoreTasks < Volt::Task
 
     query.first.then do |model|
       if model
-        if model.can_delete?
+        if model.can_delete?.sync
           db.delete(collection, 'id' => id)
         else
           fail "Permissions did not allow #{collection} #{id} to be deleted."

data/app/volt/tasks/volt_admin_tasks.rb

@@ -0,0 +1,24 @@
+class VoltAdminTasks < Volt::Task
+  def live_queries
+    pool = @volt_app.live_query_pool.pool
+
+    live_queries = []
+
+    pool.each_pair do |collection, queries|
+      if queries
+        queries.each do |query, live_query|
+          live_queries << live_query
+        end
+      end
+    end
+
+    data = live_queries.map do |lq|
+      [lq.collection, lq.query]
+    end
+
+    puts "--- current query pool ---"
+    puts data.map {|collection, query| "#{collection}:\t#{query.inspect}" }
+
+    data
+  end
+end

data/docs/UPGRADE_GUIDE.md

@@ -1,3 +1,9 @@
+# 0.9.5 to 0.9.7
+
+- 0.9.7 adds the awesome VoltTime class.
+    To make this work, some stuff had to change in volt-mongo, upgrade volt-mongo to at least 0.2.0.  Also, switch any instances of Time to VoltTime.
+-
+
 # 0.9.4 to 0.9.5
 
 CSS url's now should be referenced either 1) as relative paths from the css file, or 2) using the full path from inside of app (eg: main/assets/images/background.jpg)

data/lib/volt.rb

@@ -6,6 +6,7 @@ require 'volt/utils/modes'
 require 'volt/utils/volt_user_error'
 require 'volt/utils/boolean_patch'
 require 'volt/utils/time_patch'
+require 'volt/utils/time_opal_patch' if RUBY_PLATFORM == 'opal'
 
 require 'volt/config'
 require 'volt/data_stores/data_store' unless RUBY_PLATFORM == 'opal'
@@ -13,12 +14,12 @@ require 'volt/volt/users'
 
 module Volt
   @in_browser = if RUBY_PLATFORM == 'opal'
-                  # When testing with opal-rspec, it technically is in a browser
-                  # but its not setup with our own app code.
-                  `!!document && !window.OPAL_SPEC_PHANTOM && window.$`
-                else
-                  false
-                end
+    # When testing with opal-rspec, it technically is in a browser
+    # but its not setup with our own app code.
+    `!!document && !window.OPAL_SPEC_PHANTOM && window.$`
+  else
+    false
+  end
 
   include Modes
 
@@ -38,12 +39,18 @@ module Volt
       !ENV['SERVER']
     end
 
-    def source_maps?
-      if !ENV['MAPS']
-        # If no MAPS is specified, enable it in dev
-        Volt.env.development?
-      else
-        ENV['MAPS'] != 'false'
+    if RUBY_PLATFORM != 'opal'
+      def console?
+        !!ENV['CONSOLE']
+      end
+
+      def source_maps?
+        if !ENV['MAPS']
+          # If no MAPS is specified, enable it in dev
+          Volt.env.development?
+        else
+          ENV['MAPS'] != 'false'
+        end
       end
     end
 

data/lib/volt/boot.rb

@@ -2,6 +2,7 @@ unless RUBY_PLATFORM == 'opal'
   # An option to skip requiring.
   unless ENV['SKIP_BUNDLER_REQUIRE']
     # Require in gems
+    require 'bundler'
     Bundler.require(:default, (ENV['VOLT_ENV'] || ENV['RACK_ENV'] || :development).to_sym)
   end
 end

data/lib/volt/cli.rb

@@ -6,9 +6,15 @@ require 'volt/extra_core/extra_core'
 require 'volt/cli/generators'
 require 'volt/cli/generate'
 require 'volt/cli/destroy'
+require 'volt/cli/migrate'
 require 'volt/version'
 require 'volt/cli/bundle'
 
+# new doesn't run inside of a Gemfile, so don't boot the volt app
+unless ARGV[0] == 'new'
+  require 'volt/boot'
+end
+
 module Volt
   class CLI < Thor
     include Thor::Actions
@@ -16,10 +22,12 @@ module Volt
 
     register(Generate, 'generate', 'generate GENERATOR [args]', 'Run a generator.')
     register(Destroy, 'destroy', 'destroy GENERATOR [args]', 'Delete files created by a generator.')
+    register(CliSubclasses::Migrate, 'migrate', 'migrate up/down', 'Migrate your app data')
 
     desc 'new PROJECT_NAME', 'generates a new project.'
 
     def new(name)
+      ENV['SKIP_BUNDLER_REQUIRE'] = 'true'
       new_project(name)
 
       say ""
@@ -35,6 +43,7 @@ module Volt
     desc 'console', 'run the console on the project in the current directory'
 
     def console
+      ENV['CONSOLE'] = 'true'
       require 'volt/cli/console'
       Console.start
     end
@@ -109,11 +118,10 @@ module Volt
     def drop_collection(collection)
       ENV['SERVER'] = 'true'
       move_to_root
-      require 'volt/boot'
 
-      Volt.boot(Dir.pwd)
+      volt_app = Volt.boot(Dir.pwd)
 
-      db = Volt::DataStore.fetch
+      db = Volt::DataStore.fetch(volt_app)
       drop = db.drop_collection(collection)
 
       say("Collection #{collection} could not be dropped", :red) if drop == false
@@ -128,11 +136,11 @@ module Volt
 
         # Grab the current volt version
         directory('project', name, {
-          version: Volt::Version::STRING,
-          name: name,
-          domain: name.dasherize.downcase,
-          app_name: name.capitalize,
-          disable_encryption: disable_encryption
+                    version: Volt::Version::STRING,
+                    name: name,
+                    domain: name.dasherize.downcase,
+                    app_name: name.capitalize,
+                    disable_encryption: disable_encryption
         })
 
         unless skip_gemfile
@@ -172,6 +180,9 @@ module Volt
     def self.source_root
       File.expand_path(File.join(File.dirname(__FILE__), '../../templates'))
     end
+
+    map "d" => "destroy"
+    map "dc" => "drop_collection"
   end
 end
 

data/lib/volt/cli/console.rb

@@ -67,7 +67,6 @@ module Volt
       ENV['SERVER'] = 'true'
 
       require 'volt'
-      require 'volt/boot'
       require 'volt/volt/core'
       require 'volt/server/socket_connection_handler_stub'