volt 0.9.3 → 0.9.4.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73635c7ae6b384dcaecd996e5c28bd99773c508d
-  data.tar.gz: 73703d5c1aff47c1ac8d7cd2fa514da542b1ee28
+  metadata.gz: 390291d6628b74ad144ac393109c5beab7ed1184
+  data.tar.gz: c4cf1d8701aeddbcda38c2e87f03db1b3a4c9db9
 SHA512:
-  metadata.gz: 6faeee73ca44c142b8c88264dd89599d0351a6638b962d5b127aa54656bec4549caa22ba753a3b506a634bb212e3d1ef46175ec68b63c0e21f1bd58b6ebf009d
-  data.tar.gz: 83ef2428fe1b75ae3e7140f0acbb3008a31c22c0643adacabe27844ab3921457eca5bbf7e6370cf5328cd9b113cd3c205266424b82cb9cf267d4cfcb2813f8b0
+  metadata.gz: d31cb4efd187cb590793c53fb23bae2a9a3f53d4ab86090b22c4c611a97bdfb06444b43c630c19ecb266cd59e41a0e8655542de52f5377ea7b981412b914235a
+  data.tar.gz: 8b5eca835a00949d4107b6257e8d18ffd34cf41514e94087e0a3e6aa2a0c04533861b318d2fed09ce7b20b2fe7930a8d5037bc59ad5da124c9ed16a6a885a02c

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 
+## 0.9.4.pre1
+### Added
+
+### Changed
+- fixed bug with ReactiveHash#to_json
+- fixed bug with field Numeric coersion
+
 ## 0.9.3
+[0.9.3 Update Blog Post](http://blog.voltframework.com/post/121128931859/0-9-3-stuff-you-asked-for)
+[Upgrade Guide](https://github.com/voltrb/volt/blob/master/docs/UPGRADE_GUIDE.md)
 
 ### Added
 - Added validations block for conditional validation runs

data/README.md

@@ -33,6 +33,18 @@ Read the [full docs on Volt here](http://voltframework.com/docs)
 
 There is also a [work in progress tutorial](https://github.com/rhgraysonii/volt_tutorial) by @rhgraysonii
 
+# More Videos
+
+Rick Carlino has been putting together some great volt tutorial videos also.
+
+- [Volt Tasks](http://datamelon.io/blog/2015/creating-volt-task-objects.html)
+- [Build a Realtime Chat App with Volt](http://datamelon.io/blog/2015/building-a-chat-app-in-volt.html)
+- [Understanding Volt Views](http://datamelon.io/blog/2015/understanding-views-in-volt-with-a-card-game.html)
+
+# Getting Help
+
+Have a question and need help?  The volt team watches [stackoverflow](http://stackoverflow.com/search?q=voltrb) for questions and will get back to you quickly.  Be sure to post the question with the #voltrb tag.  If you have something you need to discuss, drop into our [gitter room](gitter.im/voltrb/volt).
+
 # Contributing
 
 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.

data/docs/UPGRADE_GUIDE.md

@@ -1,5 +1,9 @@
 # 0.9.2 to 0.9.3
 
+Upgrading from 0.9.2 should be fairly simple, just implement the following:
+
+## Gemfile
+
 Add the following to your gemfile:
 
 ```ruby
@@ -13,4 +17,12 @@ gem 'csso-rails', '~> 0.3.4', require: false
 gem 'uglifier', '>= 2.4.0', require: false
 
 gem 'volt-mongo'
-```
+```
+
+## Store Promises
+
+The api for accessing the store collection has changed, to better understand the changes, watch [this explainer video](https://www.youtube.com/watch?v=1RX9i8ivtWI).
+
+## id vs _id
+
+Everywhere you were using ```_id```, you should now just use ```id```.  Volt's mongo adaptor will map ```id``` to ```_id``` when saving or querying.  This change will make moving between databases easier.

data/lib/volt/cli.rb

@@ -36,6 +36,16 @@ module Volt
     method_option :bind, type: :string, aliases: '-b', banner: 'the ip the server should bind to'
 
     def server
+      if ENV['PROFILE_BOOT']
+        begin
+          require 'ruby-prof'
+
+          RubyProf.start
+        rescue LoadError => e
+          puts "To run volt in a profile mode, you must add ruby-prof gem to the app's Gemfile"
+        end
+      end
+
       require 'fileutils'
       require 'volt/server'
 

data/lib/volt/config.rb

@@ -48,7 +48,7 @@ else
     class << self
       def defaults
         app_name = File.basename(Dir.pwd)
-        {
+        opts = {
           app_name:  app_name,
           db_name:   (ENV['DB_NAME'] || (app_name + '_' + Volt.env.to_s)).gsub('.', '_'),
           db_host:   ENV['DB_HOST'] || 'localhost',
@@ -66,6 +66,10 @@ else
           max_worker_threads: 10,
           worker_timeout: 60
         }
+
+        opts[:db_uri] = ENV['DB_URI'] if ENV['DB_URI']
+
+        opts
       end
 
       # Resets the configuration to the default (empty hash)

data/lib/volt/controllers/actions.rb

@@ -1,7 +1,7 @@
 # The Actions module adds helpers for setting up and using
 # actions on a class.  You can setup helpers for an action with
 #
-#   setup_action_helpers_in_class(:before, :after)
+#   setup_action_helpers_in_class(:before_action, :after_action)
 #
 # The above will setup before_action and after_action methods on
 # the class.  Typically setup_action_helpers_in_class will be run
@@ -21,11 +21,11 @@ module Volt
       def setup_action_helpers_in_class(*groups)
         groups.each do |group|
           # Setup a class attribute to track the
-          callbacks_var_name = :"#{group}_action_callbacks"
+          callbacks_var_name = :"#{group}_callbacks"
           class_attribute(callbacks_var_name)
 
           # Create the method on the class
-          define_singleton_method(:"#{group}_action") do |*args, &block|
+          define_singleton_method(group) do |*args, &block|
             # Add the block in place of the symbol
             args.unshift(block) if block
 
@@ -56,7 +56,7 @@ module Volt
     # and the action being called on.  If the callback chain was stopped with
     # #stop_chain, it will return true, otherwise false.
     def run_actions(group, action)
-      callbacks = self.class.send(:"#{group}_action_callbacks")
+      callbacks = self.class.send(:"#{group}_callbacks")
 
       filtered_callbacks = filter_actions_by_only_exclude(callbacks || [], action)
 

data/lib/volt/controllers/http_controller.rb

@@ -11,7 +11,7 @@ module Volt
     attr_accessor :params
 
     # Setup before_action and after_action
-    setup_action_helpers_in_class(:before, :after)
+    setup_action_helpers_in_class(:before_action, :after_action)
 
     # Initialzed with the params parsed from the route and the HttpRequest
     def initialize(volt_app, params, request)
@@ -23,9 +23,9 @@ module Volt
     end
 
     def perform(action='index')
-      filtered = run_actions(:before, action)
+      filtered = run_actions(:before_action, action)
       send(action.to_sym) unless filtered
-      run_actions(:after, action) unless filtered
+      run_actions(:after_action, action) unless filtered
       respond
     end
 

data/lib/volt/controllers/model_controller.rb

@@ -23,7 +23,7 @@ module Volt
     attr_accessor :section
 
     # Setup before_action and after_action
-    setup_action_helpers_in_class(:before, :after)
+    setup_action_helpers_in_class(:before_action, :after_action)
 
     # Container returns the node that is parent to all nodes in the section.
     def container

data/lib/volt/models/field_helpers.rb

@@ -10,6 +10,11 @@ module FieldHelpers
         fail FieldHelpers::InvalidFieldClass, 'valid field types is currently limited to String or Numeric'
       end
 
+      if klass
+      # Add type validation
+        validate name, type: klass
+      end
+
       define_method(name) do
         get(name)
       end
@@ -21,7 +26,20 @@ module FieldHelpers
           if klass == String
             val = val.to_s
           elsif klass == Numeric
-            val = val.to_f
+            begin
+              orig = val
+              unless val.is_a?(Numeric)
+                val = Float(val)
+              end
+
+              if RUBY_PLATFORM == 'opal'
+                # Opal has a bug in 0.7.2 that gives us back NaN without an
+                # error sometimes.
+                val = orig if val.nan?
+              end
+            rescue TypeError, ArgumentError => e
+              # ignore, unmatched types will be caught below.
+            end
           end
         end
 

data/lib/volt/models/model.rb

@@ -334,7 +334,7 @@ module Volt
         result = parent.delete(self)
 
         # Wrap result in a promise if it isn't one
-        return Promise.new.then { result }
+        return result.then
       else
         fail 'Model does not have a parent and cannot be deleted.'
       end

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

@@ -19,7 +19,12 @@ end
 
 module Volt
   class RootModels
+    class_attribute :model_classes
+    self.model_classes = []
+
     def self.add_model_class(klass)
+      self.model_classes << klass
+
       method_name = klass.to_s.underscore.pluralize
 
       # Create a getter for each model class off of root.

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

@@ -20,7 +20,6 @@ module Volt
 
     def get(attr_name, expand = false)
       res = if attr_name.singular? && attr_name.to_sym != :id
-        puts "GET: #{attr_name}"
         model_for_root.get(attr_name, expand)
       else
         super
@@ -32,7 +31,6 @@ module Volt
 
     def set(attr_name, value, &block)
       if attr_name.singular? && attr_name.to_sym != :id
-        puts "SET ATTR NAME: #{attr_name.inspect}: #{value.inspect}"
         Volt::Computation.run_without_tracking do
           model_for_root.then do |model|
             model.set(attr_name, value, &block)

data/lib/volt/models/validations/validations.rb

@@ -6,6 +6,7 @@ require 'volt/models/validators/numericality_validator'
 require 'volt/models/validators/phone_number_validator'
 require 'volt/models/validators/presence_validator'
 require 'volt/models/validators/unique_validator'
+require 'volt/models/validators/type_validator'
 
 module Volt
   # Include in any class to get validation logic

data/lib/volt/models/validators/type_validator.rb

@@ -0,0 +1,23 @@
+# Enforces a type on a field.  Typically setup from ```field :name, Type```
+module Volt
+  class TypeValidator
+    def self.validate(model, field_name, args)
+      errors = {}
+      value  = model.get(field_name)
+
+      type_restriction = args.is_a?(Hash) ? args[:type] : args
+
+      unless value.is_a?(type_restriction)
+        if args.is_a?(Hash) && args[:message]
+          message = args[:message]
+        else
+          message = "must be of type #{type_restriction.to_s}"
+        end
+
+        errors[field_name] = [message]
+      end
+
+      errors
+    end
+  end
+end

data/lib/volt/page/bindings/view_binding/controller_handler.rb

@@ -25,7 +25,7 @@ module Volt
       # If no stage, then we are calling the main action method,
       # so we should call the before/after actions
       unless has_stage
-        if @controller.run_actions(:before, @action)
+        if @controller.run_actions(:before_action, @action)
           # stop_chain was called
           return true
         end
@@ -33,7 +33,7 @@ module Volt
 
       @controller.send(method_name) if @controller.respond_to?(method_name)
 
-      @controller.run_actions(:after, @action) unless has_stage
+      @controller.run_actions(:after_action, @action) unless has_stage
 
       # before_action chain was not stopped
       false

data/lib/volt/reactive/reactive_hash.rb

@@ -65,6 +65,10 @@ module Volt
       @hash
     end
 
+    def to_json
+      @hash.to_json
+    end
+
     def inspect
       @all_deps.depend
       "#<#{self.class.name} #{@hash.inspect}>"

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

@@ -91,7 +91,7 @@ module Volt
           begin
             @message_encoder.send_message(@socket, message)
             # 'Error: closed stream' comes in sometimes
-          rescue Errno::ECONNREFUSED, Errno::EPIPE, IOError => e # was also rescuing Error
+          rescue Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::EPIPE, IOError => e # was also rescuing Error
             if reconnect!
               retry
             else
@@ -113,7 +113,7 @@ module Volt
             end
 
             # Got nil from socket
-          rescue Errno::ECONNRESET, Errno::EPIPE, IOError => e
+          rescue Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EPIPE, IOError => e
             # handle below
           end
 
@@ -138,7 +138,7 @@ module Volt
           begin
             socket = SocketWithTimeout.new(ip, port, CONNECT_TIMEOUT)
             return PeerConnection.new(socket, ip, port, message_bus)
-          rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
+          rescue Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::ETIMEDOUT => e
             # Unable to connect, next
             next
           end

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

@@ -9,14 +9,8 @@ module Volt
     def initialize
       # Setup the next app
       @middlewares = []
-      @maps = []
     end
 
-    # Set the app that gets called after the middleware runs
-    # def set_app(app)
-    #   @app = app
-    # end
-
     def use(*args, &block)
       @middlewares << [args, block]
 
@@ -25,7 +19,10 @@ module Volt
     end
 
     def map(path, &block)
-      @maps << [path, block]
+      @middlewares << [:map, path, block]
+
+      # invalidate builder
+      @builder = nil
     end
 
     def run(app)
@@ -36,12 +33,12 @@ module Volt
     def build
       @builder = Rack::Builder.new
 
-      @maps.each do |path, block|
-        @builder.map(path, &block)
-      end
-
       @middlewares.each do |middleware|
-        @builder.use(*middleware[0], &middleware[1])
+        if middleware[0] == :map
+          @builder.map(middleware[1], &middleware[2])
+        else
+          @builder.use(*middleware[0], &middleware[1])
+        end
       end
 
       @builder.run(@app)

data/lib/volt/server/websocket/websocket_handler.rb

@@ -1,6 +1,14 @@
 require 'faye/websocket'
 require 'volt/server/socket_connection_handler'
 
+# Load websocket options once at boot
+# The ENV['DYNO'] option lets it kick in automatically if we're on heroku.
+WEBSOCKET_OPTIONS = if !ENV['NO_WEBSOCKET_PING'] &&
+  (ENV['WEBSOCKET_PING_TIME'] || ENV['DYNO'])
+  {ping: (ENV['WEBSOCKET_PING_TIME'] || 30).to_i}
+else
+  {}
+end
 
 module Volt
   class WebsocketHandler
@@ -10,7 +18,7 @@ module Volt
 
     def call(env)
       if Faye::WebSocket.websocket?(env)
-        ws = Faye::WebSocket.new(env)
+        ws = Faye::WebSocket.new(env, nil, WEBSOCKET_OPTIONS)
 
         socket_connection_handler = SocketConnectionHandler.new(ws)
 

data/lib/volt/version.rb

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

data/lib/volt/volt/users.rb

@@ -15,6 +15,10 @@ module Volt
         nil
       else
         index = user_id_signature.index(':')
+
+        # If no index, the cookie is invalid
+        return nil unless index
+
         user_id = user_id_signature[0...index]
 
         if RUBY_PLATFORM != 'opal'

data/spec/controllers/actions_spec.rb

@@ -4,7 +4,7 @@ require 'volt/controllers/model_controller'
 class BaseTestActions
   include Volt::Actions
 
-  setup_action_helpers_in_class(:before, :after)
+  setup_action_helpers_in_class(:before_action, :after_action)
 end
 
 class TestActionsBlocks < BaseTestActions
@@ -77,7 +77,7 @@ describe Volt::Actions do
     expect(test_class.ran_before1).to eq(nil)
     expect(test_class.ran_before2).to eq(nil)
 
-    test_class.run_actions(:before, :index)
+    test_class.run_actions(:before_action, :index)
 
     expect(test_class.ran_before1).to eq(true)
     expect(test_class.ran_before2).to eq(true)
@@ -89,7 +89,7 @@ describe Volt::Actions do
     expect(test_class.ran_one).to eq(nil)
     expect(test_class.ran_two).to eq(nil)
 
-    test_class.run_actions(:before, :index)
+    test_class.run_actions(:before_action, :index)
 
     expect(test_class.ran_one).to eq(true)
     expect(test_class.ran_two).to eq(true)
@@ -107,7 +107,7 @@ describe Volt::Actions do
     expect(test_class.ran_one).to eq(nil)
     expect(test_class.ran_two).to eq(nil)
 
-    result = test_class.run_actions(:before, :index)
+    result = test_class.run_actions(:before_action, :index)
     expect(result).to eq(false)
 
     expect(test_class.ran_one).to eq(true)
@@ -117,7 +117,7 @@ describe Volt::Actions do
   it 'should stop the chain when #stop_chain is called and return false from #run_actions' do
     test_class = TestStopCallbacks.new
 
-    result = test_class.run_actions(:before, :index)
+    result = test_class.run_actions(:before_action, :index)
     expect(result).to eq(true)
 
     expect(test_class.ran_one).to eq(true)
@@ -129,18 +129,18 @@ describe Volt::Actions do
   it 'should call without any callbacks' do
     test_class = TestNoCallbacks.new
 
-    result = test_class.run_actions(:before, :index)
+    result = test_class.run_actions(:before_action, :index)
     expect(result).to eq(false)
   end
 
   it 'should follow only limitations' do
     test_only = TestOnlyCallbacks.new
 
-    test_only.run_actions(:before, :index)
+    test_only.run_actions(:before_action, :index)
     expect(test_only.ran_one).to eq(nil)
     expect(test_only.ran_two).to eq(nil)
 
-    test_only.run_actions(:before, :new)
+    test_only.run_actions(:before_action, :new)
     expect(test_only.ran_one).to eq(true)
     expect(test_only.ran_two).to eq(true)
   end

data/spec/models/field_helpers_spec.rb

@@ -7,8 +7,8 @@ class ExampleModelWithField < Volt::Model
 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
-    model = ExampleModelWithField.new
 
     expect(model.name).to eq(nil)
     model.name = 'jimmy'
@@ -26,4 +26,20 @@ describe 'field helpers' do
       ExampleModelWithField.field :awesome, Array
     end.to raise_error(FieldHelpers::InvalidFieldClass)
   end
+
+  it 'should convert numeric strings to Fixnum when Fixnum is specified as a type restriction' do
+    model.value = '22'
+    expect(model.value).to eq(22)
+  end
+
+  it 'should not convert non-numeric strings (and have a validation error)' do
+    # use a buffer, so we can put the model into an invalid state
+    buf = model.buffer
+    buf.value = 'cats'
+    expect(buf.value).to eq('cats')
+
+    buf.validate!.fail do |error|
+      expect(error).to eq({})
+    end
+  end
 end

data/spec/models/validators/type_validator_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Volt::TypeValidator do
+  subject { Volt::TypeValidator.validate(*use_params) }
+  let(:use_params) { [model, field_name, options] }
+
+  let(:model) { Volt::Model.new count: count }
+  let(:field_name) { :count }
+  let(:name) { 'John Doe' }
+
+  describe '.validate' do
+    describe 'when options is a Numeric' do
+      let(:options) { Numeric }
+
+      describe 'when count is a Numeric' do
+        let(:count) { 5 }
+        it { expect(subject).to eq({}) }
+      end
+
+      describe 'when count is a string' do
+        let(:count) { 'Cats' }
+        it do
+          expect(subject).to eq({count: ['must be of type Numeric']})
+        end
+      end
+    end
+
+    describe 'when options is a Hash' do
+      let(:options) do
+        { type: Numeric, message: 'must be a number' }
+      end
+
+      describe 'when count is a Numeric' do
+        let(:count) { 5 }
+        it { expect(subject).to eq({}) }
+      end
+
+      describe 'when count is a string' do
+        let(:count) { 'Cats' }
+        it do
+          expect(subject).to eq(count: ['must be a number'])
+        end
+      end
+    end
+  end
+end

data/spec/reactive/reactive_hash_spec.rb

@@ -9,4 +9,9 @@ describe Volt::ReactiveHash do
     a.clear
     expect(a[:name]).to eq(nil)
   end
+
+  it 'should return to_json' do
+    a = Volt::ReactiveHash.new({name: 'bob'})
+    expect(a.to_json).to eq("{\"name\":\"bob\"}")
+  end
 end

data/templates/project/Gemfile.tt

@@ -42,11 +42,11 @@ group :test do
 end
 
 # Server for MRI
-platform :mri do
+platform :mri, :mingw do
   # The implementation of ReadWriteLock in Volt uses concurrent ruby and ext helps performance.
   gem 'concurrent-ruby-ext', '~> 0.8.0'
 
-  # Thin is the default volt server, you Puma is also supported
+  # Thin is the default volt server, Puma is also supported
   gem 'thin', '~> 1.6.0'
   gem 'bson_ext', '~> 1.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4.pre1
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -475,6 +475,7 @@ files:
 - lib/volt/models/validators/numericality_validator.rb
 - lib/volt/models/validators/phone_number_validator.rb
 - lib/volt/models/validators/presence_validator.rb
+- lib/volt/models/validators/type_validator.rb
 - lib/volt/models/validators/unique_validator.rb
 - lib/volt/models/validators/user_validation.rb
 - lib/volt/page/bindings/attribute_binding.rb
@@ -679,6 +680,7 @@ files:
 - spec/models/validators/length_validator_spec.rb
 - spec/models/validators/phone_number_validator_spec.rb
 - spec/models/validators/shared_examples_for_validators.rb
+- spec/models/validators/type_validator_spec.rb
 - spec/models/validators/unique_validator_spec.rb
 - spec/page/bindings/content_binding_spec.rb
 - spec/page/bindings/each_binding_spec.rb
@@ -828,9 +830,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -924,6 +926,7 @@ test_files:
 - spec/models/validators/length_validator_spec.rb
 - spec/models/validators/phone_number_validator_spec.rb
 - spec/models/validators/shared_examples_for_validators.rb
+- spec/models/validators/type_validator_spec.rb
 - spec/models/validators/unique_validator_spec.rb
 - spec/page/bindings/content_binding_spec.rb
 - spec/page/bindings/each_binding_spec.rb