volt 0.9.3.pre1 → 0.9.3.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e09afcd5fa1abe6f17a9c2912bc79cf4cf74aa
-  data.tar.gz: f0ee7b0085bddf48461122bfccec1b21b06b2e3e
+  metadata.gz: 424f310e39b6096bf3372ff3dd5b90e6936718ef
+  data.tar.gz: fa76365d2cc587f7985e39008f13825f02c6515d
 SHA512:
-  metadata.gz: ed02ac1418ee8f8ed50a67331dfb58eeabf933a55ecb60a2cb05052245164e851331fea5a5de8977a1fbfa31859bedea4dcaf8117b28258559c0954c5ff3f9e3
-  data.tar.gz: 7069f1ac08014813da1501c252fed11031c248b479d7b7323ff49a69b17cdc5dc54e793f48b48b199a6e23fd56178ff6684b47151640ab321af3fd0cfcfe5d71
+  metadata.gz: c6371586b5afc5278951bf89478153b6e854edb444503ca8ea312071f74d350c2807aa67eede9f8d64a97bc8c8208649dafd46ae723f58c1cb4308566b3a0ce5
+  data.tar.gz: 86c5ef5a2b1da23d537103884ee7cdd840be23dae4a59ae22e0c2be0b3ac56652541fcbd5dd808b79c474cda6846e4847ef2839c9a91c5009da931952937c563

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.2.0

data/CHANGELOG.md

@@ -1,17 +1,31 @@
 # Change Log
 
-## 0.9.3.pre1
+## 0.9.3.pre2
 ### Added
 - Added validations block for conditional validation runs
+- you can now set the NO_FORKING=true ENV to prevent using the forking server in development.
+- models without an assigned persistor now use the page persistor (which now can provide basic querying)
+- Volt now pushes updates between mulitple app instances.  Updates are pushed between any servers, clients, runners, etc.. that are connected to the same database via the MessageBus (see next)
+- Volt now comes with a "MessageBus" built in.  The message bus provides a pub/sub interface for the app "cluster".  Volt provides a default message bus implementation using peer to peer sockets that are automatically managed via the database.
 
 ### Changed
 - All logic associated with mongo has been moved into the volt-mongo gem.  If you are migrating from a previous version, be sure to add ```gem 'volt-mongo'``` to the Gemfile.
+- models using the page or store persistor now auto-generate an id when created.  This simplifies things since models always have an id.  It makes association easier as well. (internally that is)
+- models now use ```.id``` instead of ```._id```  Queries and saves are mapped to _id in the volt-mongo gem
+- fixed issue where ```volt precompile``` would compile in extra assets from non-component gems.
+- Lots of internal changes:
+    - bindings were refactored to pass around a Volt::App instead of a Volt::Page.
+    - controllers now take a Volt::App when created directly.
+- You can now use .each in attribute bindings.
+- We moved to csso as the css compressor because it does not require libv8, only an execjs runtime.
 
 ## 0.9.2
 ### Changed
 - We released 0.9.1 with a bug for destroy (doh!).  Specs added and bug fixed.
 
 ## 0.9.1
+[0.9.1 Update Blog Post](http://blog.voltframework.com/post/118260814159/0-9-1-already-thats-how-we-roll)
+
 ### Added
 - Mailer! - volt now includes the volt-mailer gem out of the box.  (you can remove it if you don't need/want it).  See https://github.com/voltrb/volt-mailer for more info.
 

data/Gemfile

@@ -5,6 +5,12 @@ gemspec
 # volt-mongo gem for testing
 gem 'volt-mongo'
 
+# Use rbnacl for message bus encrpytion
+# (optional, if you don't need encryption, disable in app.rb and remove)
+gem 'rbnacl', require: false
+gem 'rbnacl-libsodium', require: false
+
+
 group :development do
   # For testing the kitchen sink app
   # Twitter bootstrap
@@ -24,13 +30,34 @@ group :development do
 end
 
 group :development, :test do
-  gem 'bson_ext'
+  platform :mri do
+    gem 'bson_ext'
 
-  # For running tests
-  gem 'thin'
+    # For running tests
+    gem 'thin'
+  end
+
+  platform :jruby do
+    # For running tests
+    gem 'puma'
+  end
 end
 
 platform :mri do
   # The implementation of ReadWriteLock in Volt uses concurrent ruby and ext helps performance.
   gem 'concurrent-ruby-ext'
+
+  # For debugging
+  gem 'pry-byebug', '~> 2.0.0', require: false
+
+  # For Yard Formatting, in MRI block because redcarpet doesn't install on jruby
+  gem 'redcarpet', '~> 3.2.2', require: false
+  gem 'github-markup', '~> 1.3.1', require: false
+
+  # Sauce has a dependency that doesn't run on ruby <= 2.0.0
+  # (which older jruby versions don't support)
+  # TODO: Move out of MRI block once jruby 9k is outs
+  gem 'sauce', '~> 3.5.3', require: false
+  gem 'sauce-connect', '~> 3.5.0', require: false
+
 end

data/README.md

@@ -1,4 +1,4 @@
-[![Gratipay](http://img.shields.io/gratipay/voltframework.svg)](https://www.gratipay.com/voltframework/)
+[![Pledgie](https://pledgie.com/campaigns/26731.png?skin_name=chrome)](https://pledgie.com/campaigns/26731)
 [![Gem Version](https://badge.fury.io/rb/volt.svg)](http://badge.fury.io/rb/volt)
 [![Code Climate](https://codeclimate.com/github/voltrb/volt/badges/gpa.svg)](https://codeclimate.com/github/voltrb/volt)
 [![Coverage Status](https://coveralls.io/repos/voltrb/volt/badge.svg?branch=master)](https://coveralls.io/r/voltrb/volt?branch=master)[![Build Status](http://img.shields.io/travis/voltrb/volt/master.svg?style=flat)](https://travis-ci.org/voltrb/volt)
@@ -36,5 +36,10 @@ There is also a [work in progress tutorial](https://github.com/rhgraysonii/volt_
 
 You want to contribute? Great! Thanks for being awesome! At the moment, we have a big internal todo list, hop on https://gitter.im/voltrb/volt so we don't duplicate work. Pull requests are always welcome, but asking about helping on Gitter should save some duplication.
 
+# Support
 
-[![Gratipay](http://img.shields.io/gratipay/voltframework.svg)](https://www.gratipay.com/voltframework/)
+VoltFramework is currently a labor of love mainly built by a small group of core developers.  Donations are always welcome and will help Volt get to production faster :-)  Also, if you or your company is interested in sponsoring Volt, please talk to @ryanstout in the [gitter](https://gitter.im/voltrb/volt)
+
+[![Pledgie](https://pledgie.com/campaigns/26731.png?skin_name=chrome)](https://pledgie.com/campaigns/26731)
+
+Bitcoins can also be sent to 1AYiL3MiSVe2QFyexzozUvFFH7uGCJgJMZ

data/Rakefile

@@ -31,6 +31,23 @@ task :test do
   Rake::Task['ruby:rspec'].invoke
 end
 
+task :opal_specs_in_browser do
+  require 'volt/server/websocket/rack_server_adaptor'
+  require 'rack/cascade'
+
+  server = Rack::Handler.get(RUNNING_SERVER)
+
+  Opal::Processor.source_map_enabled = false
+  app = Opal::Server.new { |s|
+    s.main = 'opal/rspec/sprockets_runner'
+    s.append_path 'spec'
+    s.append_path 'app'
+    s.debug = false
+  }
+
+  server.run(app, {})
+end
+
 # Rubocop task
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.options = ['--display-cop-names']

data/app/volt/models/user.rb

@@ -19,7 +19,7 @@ module Volt
       deny :hashed_password
 
       # Deny all if this isn't the owner
-      deny if !_id == Volt.current_user_id && !new?
+      deny if !id == Volt.current_user_id && !new?
     end
 
     if RUBY_PLATFORM == 'opal'

data/app/volt/tasks/live_query/live_query.rb

@@ -68,7 +68,6 @@ class LiveQuery
   def initial_data
     @query_tracker.results.map.with_index do |data, index|
       data = data.dup
-      data['_id'] = data['_id'].to_s
 
       [index, data]
     end

data/app/volt/tasks/live_query/live_query_pool.rb

@@ -5,8 +5,9 @@ require 'volt/utils/generic_pool'
 # queries.
 
 class LiveQueryPool < Volt::GenericPool
-  def initialize(data_store)
+  def initialize(data_store, volt_app)
     @data_store = data_store
+    @volt_app = volt_app
     super()
   end
 
@@ -17,11 +18,16 @@ class LiveQueryPool < Volt::GenericPool
     super(collection, query)
   end
 
-  def updated_collection(collection, skip_channel)
+  def updated_collection(collection, skip_channel, from_message_bus=false)
     # collection = collection.to_sym
     lookup_all(collection).each do |live_query|
       live_query.run(skip_channel)
     end
+
+    msg_bus = @volt_app.message_bus
+    if !from_message_bus && collection != 'active_volt_instances' && msg_bus
+      msg_bus.publish('volt_collection_update', collection)
+    end
   end
 
   private

data/app/volt/tasks/live_query/query_tracker.rb

@@ -23,8 +23,8 @@ class QueryTracker
     @results = @data_store.query(@live_query.collection, @live_query.query)
 
     # Update the current_ids
-    @current_ids = @results.map { |r| r['_id'] }
-    @results_hash = Hash[@results.map { |r| [r['_id'], r] }]
+    @current_ids = @results.map { |r| r[:id] }
+    @results_hash = Hash[@results.map { |r| [r[:id], r] }]
 
     process_changes(skip_channel)
   end

data/app/volt/tasks/query_tasks.rb

@@ -1,29 +1,13 @@
-require_relative 'live_query/live_query_pool'
-
 class QueryTasks < Volt::Task
-  @@channel_live_queries = {}
-
-  def self.live_query_pool
-    @@live_query_pool ||= LiveQueryPool.new(Volt::DataStore.fetch)
-  end
-
   # The dispatcher passes its self in
-  def initialize(channel, dispatcher = nil)
+  def initialize(volt_app, channel, dispatcher = nil)
+    @volt_app = volt_app
     @channel = channel
     @dispatcher = dispatcher
-
-    # Load the query pool if not already setup
-    self.class.live_query_pool
-  end
-
-  def self.reset!
-    @@channel_live_queries = {}
-    @@live_query_pool = nil
-    live_query_pool
   end
 
   def add_listener(collection, query)
-    live_query = @@live_query_pool.lookup(collection, query)
+    live_query = @volt_app.live_query_pool.lookup(collection, query)
     track_channel_in_live_query(live_query)
 
     if @channel
@@ -53,14 +37,12 @@ class QueryTasks < Volt::Task
       end
     end
 
-    # @@live_query_pool.print
-
     [initial_data, error]
   end
 
   def initial_data
     data = live_query.initial_data
-    data[:_id] = data[:_id].to_s
+    data[:id] = data[:id].to_s
 
     data
   end
@@ -68,13 +50,13 @@ class QueryTasks < Volt::Task
   # 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 = @@live_query_pool.lookup(collection, query)
+    live_query = @volt_app.live_query_pool.lookup(collection, query)
     live_query.remove_channel(@channel)
   end
 
   # Removes a channel from all associated live queries
   def close!
-    live_queries = @@channel_live_queries[@channel]
+    live_queries = @volt_app.channel_live_queries[@channel]
 
     if live_queries
       live_queries.each do |live_query|
@@ -82,14 +64,15 @@ class QueryTasks < Volt::Task
       end
     end
 
-    @@channel_live_queries.delete(@channel)
+    @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[@channel] ||= []
-    @@channel_live_queries[@channel] << live_query
+    channel_live_queries = @volt_app.channel_live_queries
+    channel_live_queries[@channel] ||= []
+    channel_live_queries[@channel] << live_query
   end
 end

data/app/volt/tasks/store_tasks.rb

@@ -2,7 +2,8 @@ require 'mongo'
 require 'volt/models'
 
 class StoreTasks < Volt::Task
-  def initialize(channel = nil, dispatcher = nil)
+  def initialize(volt_app, channel = nil, dispatcher = nil)
+    @volt_app = volt_app
     @channel = channel
     @dispatcher = dispatcher
   end
@@ -18,7 +19,7 @@ class StoreTasks < Volt::Task
     collection = store.send(:"_#{path[-2]}")
 
     # See if the model has already been made
-    collection.find(_id: data[:_id]).fetch_first do |model|
+    collection.where(id: data[:id]).fetch_first do |model|
       # Otherwise assign to the collection
       model ||= collection
 
@@ -70,18 +71,18 @@ class StoreTasks < Volt::Task
     query = nil
 
     Volt.skip_permissions do
-      query = store.send(:"_#{collection}").where(_id: id)
+      query = store.get(collection).where(id: id)
     end
 
     query.fetch_first do |model|
       if model
         if model.can_delete?
-          db.delete(collection, '_id' => id)
+          db.delete(collection, 'id' => id)
         else
           fail "Permissions did not allow #{collection} #{id} to be deleted."
         end
 
-        QueryTasks.live_query_pool.updated_collection(collection, @channel)
+        @volt_app.live_query_pool.updated_collection(collection, @channel)
       else
         fail "Could not find #{id} in #{collection}"
       end

data/app/volt/tasks/user_tasks.rb

@@ -21,10 +21,10 @@ class UserTasks < Volt::Task
         # TODO: returning here should be possible, but causes some issues
         # Salt the user id with the app_secret so the end user can't
         # tamper with the cookie
-        signature = Digest::SHA256.hexdigest(salty_user_id(user._id))
+        signature = Digest::SHA256.hexdigest(salty_user_id(user.id))
 
         # Return user_id:hash on user id
-        next "#{user._id}:#{signature}"
+        next "#{user.id}:#{signature}"
       end
     end
   end

data/docs/UPGRADE_GUIDE.md

@@ -0,0 +1,14 @@
+# 0.9.2 to 0.9.3
+
+Add the following to your gemfile:
+
+```ruby
+# Use rbnacl for message bus encrpytion
+# (optional, if you don't need encryption, disable in app.rb and remove)
+gem 'rbnacl', require: false
+gem 'rbnacl-libsodium', require: false
+
+# Asset compilation gems, they will be required when needed.
+gem 'csso-rails', '~> 0.3.4', require: false
+gem 'uglifier', '>= 2.4.0', require: false
+```

data/lib/volt/boot.rb

@@ -16,6 +16,7 @@ else
 end
 require 'volt/volt/app'
 
+
 module Volt
   def self.boot(app_path)
     # Boot the app

data/lib/volt/cli/asset_compile.rb

@@ -9,7 +9,7 @@ module Volt
     private
 
     def compile
-      print 'compiling project...'
+      puts 'compiling project...'
       require 'fileutils'
       ENV['SERVER'] = 'true'
 
@@ -38,20 +38,35 @@ module Volt
       @index_files       = IndexFiles.new(@app, @component_paths, @opal_files)
       @component_handler = ComponentHandler.new(@component_paths)
 
+      puts 'Compile Opal for components'
       write_component_js
+      puts 'Copy assets'
       write_sprockets
+      puts 'Compile JS/CSS'
       write_js_and_css
+      puts 'Write index files'
       write_index
 
-      puts "\rcompiled                             "
+      puts "compiled"
+    end
+
+    def logical_paths_and_full_paths
+      @opal_files.environment.each_file do |full_path|
+        logical_path = @opal_files.environment.send(:logical_path_for_filename, full_path, []).to_s
+
+        yield(logical_path, full_path.to_s)
+      end
+
     end
 
     def write_sprockets
       # Serve the opal files
-      @opal_files.environment.each_logical_path do |logical_path|
-        logical_path = logical_path.to_s
+      logical_paths_and_full_paths do |logical_path, full_path|
         # Only include files that aren't compiled elsewhere, like fonts
-        if !logical_path[/[.](y|css|js|html|erb)$/] && File.extname(logical_path) != ''
+        if !logical_path[/[.](y|css|js|html|erb)$/] &&
+          File.extname(logical_path) != '' &&
+          # opal includes some node modules in the standard lib that we don't need to compile in
+          (full_path !~ /\/opal/ && full_path !~ /\/stdlib\// && logical_path !~ /^node_js\//)
           write_sprocket_file(logical_path)
         end
       end
@@ -70,8 +85,11 @@ module Volt
       path = "#{@root_path}/public/assets/#{logical_path}"
 
       begin
-        content = @opal_files.environment[logical_path].to_s
-        write_file(path, content)
+        # Only write out the assets
+        # if logical_path =~ /\/assets\//
+          content = @opal_files.environment[logical_path].to_s
+          write_file(path, content)
+        # end
       rescue Sprockets::FileNotFound, SyntaxError => e
         # ignore
       end

data/lib/volt/cli/console.rb

@@ -31,11 +31,11 @@ module Volt
   class Console
     module Helpers
       def store
-        $page.store
+        @volt_app.page.store
       end
 
       def page
-        $page.page
+        @volt_app.page.page
       end
     end
 
@@ -50,15 +50,16 @@ module Volt
       require 'volt/volt/core'
       require 'volt/server/socket_connection_handler_stub'
 
-      SocketConnectionHandlerStub.dispatcher = Dispatcher.new
+      # Boot the volt app
+      volt_app = Volt.boot(Dir.pwd)
 
-      Volt.boot(Dir.pwd)
+      SocketConnectionHandlerStub.dispatcher = Dispatcher.new(volt_app)
 
       Pry.config.prompt_name = 'volt'
 
+      Pry.main.instance_variable_set('@volt_app', volt_app)
       Pry.main.send(:include, Volt::Console::Helpers)
 
-      # $page.pry
       Pry.start
     end
   end

data/lib/volt/cli/generate.rb

@@ -62,7 +62,7 @@ class Generate < Thor
   method_option :name, type: :string, banner: 'The name of the model controller.'
   method_option :component, type: :string, default: 'main', banner: 'The component the controller should be created in.', required: false
   def controller(name, component = 'main')
-    controller_name = name.underscore.singularize + '_controller' unless name =~ /_controller$/
+    controller_name = name.underscore.pluralize + '_controller' unless name =~ /_controller$/
     output_file = Dir.pwd + "/app/#{component.underscore}/controllers/#{controller_name}.rb"
     spec_file = Dir.pwd + "/spec/app/#{component.underscore}/integration/#{name.underscore.pluralize}_spec.rb"
 
@@ -85,7 +85,7 @@ class Generate < Thor
   method_option :name, type: :string, banner: 'The name of the view.'
   method_option :component, type: :string, default: 'main', banner: 'The component the view should be created in.', required: false
   def view(name, component = 'main')
-    name = name.underscore.singularize
+    name = name.underscore.pluralize
     view_folder = Dir.pwd + "/app/#{component}/views/#{name}/"
     directory('view', view_folder, view_name: name, component: component)
     controller(name, component) unless controller_exists?(name, component)

data/lib/volt/config.rb

@@ -59,7 +59,8 @@ else
           default_components: ['volt'],
 
           compress_javascript: Volt.env.production?,
-          compress_css:        Volt.env.production?
+          compress_css:        Volt.env.production?,
+          abort_on_exception:  true
         }
       end
 

data/lib/volt/controllers/http_controller.rb

@@ -8,11 +8,12 @@ module Volt
     attr_reader :params, :response_headers, :request
 
     # Initialzed with the params parsed from the route and the HttpRequest
-    def initialize(params, request)
+    def initialize(volt_app, params, request)
+      @volt_app = volt_app
       @response_headers = HttpResponseHeader.new
       @response_body = []
       @request = request
-      @params = Volt::Model.new(params.symbolize_keys.merge(request.params))
+      @params = Volt::Model.new(params.symbolize_keys.merge(request.params), persistor: Volt::Persistors::Params)
     end
 
     def perform(action)
@@ -25,7 +26,7 @@ module Volt
     private
 
     def store
-      $page.store
+      @volt_app.page.store
     end
 
     def head(status, additional_headers = {})

data/lib/volt/controllers/model_controller.rb

@@ -1,11 +1,18 @@
 require 'volt/reactive/reactive_accessors'
 require 'volt/controllers/actions'
+require 'volt/controllers/template_helpers'
 
 module Volt
   class ModelController
     include ReactiveAccessors
     include Actions
 
+    # A model controller will have its
+    # class VoltTemplates
+    #   include TemplateHelpers
+    # end
+
+    class_attribute :default_model
     reactive_accessor :current_model
     reactive_accessor :last_promise
 
@@ -29,8 +36,7 @@ module Volt
     # ```yield_html``` and it will be run again when anything in the template changes.
     def yield_html
       if (template_path = attrs.content_template_path)
-        # TODO: Don't use $page global
-        @yield_renderer ||= StringTemplateRenderer.new($page, self, template_path)
+        @yield_renderer ||= StringTemplateRenderer.new(@volt_app, self, template_path)
         @yield_renderer.html
       else
         # no template, empty string
@@ -39,7 +45,7 @@ module Volt
     end
 
     def self.model(val)
-      @default_model = val
+      self.default_model = val
     end
 
     # Sets the current model on this controller
@@ -85,20 +91,35 @@ module Volt
       model
     end
 
-    def self.new(*args, &block)
+    def self.new(volt_app, *args, &block)
       inst = allocate
 
-      inst.model = @default_model if @default_model
-
       # In MRI initialize is private for some reason, so call it with send
-      inst.send(:initialize, *args, &block)
+      inst.send(:initialize, volt_app, *args, &block)
+
+      if inst.instance_variable_get('@__init_called')
+        inst.instance_variable_set('@__init_called', nil)
+      else
+        # Initialize was not called, we should warn since this is probably not
+        # the intended behavior.
+        Volt.logger.warn("super should be called when creating a custom initialize on class #{inst.class.to_s}")
+      end
 
       inst
     end
 
     attr_accessor :attrs
 
-    def initialize(*args)
+    def initialize(volt_app, *args)
+      @volt_app = volt_app
+      @page = volt_app.page
+
+      # Track that the initialize was called
+      @__init_called = true
+
+      default_model = self.class.default_model
+      self.model = default_model if default_model
+
       if args[0]
         # Assign the first passed in argument to attrs
         self.attrs = args[0]
@@ -106,6 +127,7 @@ module Volt
         # If a model attribute is passed in, we assign it directly
         self.model = attrs.locals[:model] if attrs.respond_to?(:model)
       end
+
     end
 
     def go(url)
@@ -124,39 +146,39 @@ module Volt
     end
 
     def page
-      $page.page
+      @page.page
     end
 
     def store
-      $page.store
+      @page.store
     end
 
     def flash
-      $page.flash
+      @page.flash
     end
 
     def params
-      $page.params
+      @page.params
     end
 
     def local_store
-      $page.local_store
+      @page.local_store
     end
 
     def cookies
-      $page.cookies
+      @page.cookies
     end
 
     def url
-      $page.url
+      @page.url
     end
 
     def channel
-      $page.channel
+      @page.channel
     end
 
     def tasks
-      $page.tasks
+      @page.tasks
     end
 
     def controller
@@ -164,11 +186,11 @@ module Volt
     end
 
     def url_for(params)
-      $page.url.url_for(params)
+      @page.url.url_for(params)
     end
 
     def url_with(params)
-      $page.url.url_with(params)
+      @page.url.url_with(params)
     end
 
     # loaded? is a quick way to see if the model for the controller is loaded