volt 0.8.17 → 0.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e97e958515996c80730d0ab074d74eb43a27fe
-  data.tar.gz: 2d6e4c932e26f55dc4a225965a59cf8f5a3b0704
+  metadata.gz: 643b4bf773281e2714b4002a68362b71e886b84b
+  data.tar.gz: c229e47bfe005bbb3e4b5b0cfd54bef225b3eb87
 SHA512:
-  metadata.gz: bf7586b654567deb37578959dcbca1acd0b63edbd20685d4467b31ba7c0ef99b8512594cc372ae33fbab3111461b6151c627efe5f3f23e0a03f04aaf63159b3e
-  data.tar.gz: 91db170065e99364b5172228878af671875f98745841947b010f1cb589382c7506b12152e4b09d35a87cf40196256bac4a964265cf3882f36b0bb7bf341d6595
+  metadata.gz: e794f7cce33a794913abb6c06d516e50d9fb4fe55c099d63c2a478cb2d1339b75c96d46943e0960f6a42c16be8efc9d3526e77613362cc927ac9941955d844e8
+  data.tar.gz: 6e6b49d6d6504f25911bbf766d99453a25c34a9dee63f27b73f73dcfc5dd31f811ef29492a0189ff1ecbbdaa528d4ea5d87677cfef697f044cb3cae433512906

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - "2.1.3"
   # - jruby-19mode # JRuby in 1.9 mode
   # - rbx
-script: bundle exec rspec
+script: bundle exec rake
 notifications:
   webhooks:
     urls:

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Change Log
 
+## 0.8.18 - 2014-10-26
+### Added
+- Added a default app.css.scss file
+
+### Changed
+- back button fixed
+- improve security on task dispatcher
+
 ## 0.8.17 - 2014-10-20
 ### Added
 - Volt now has a runner task (like rails) so you can run .rb files inside of the volt project.  Example: ```volt runner lib/import.rb```
+- New video showing pagination: https://www.youtube.com/watch?v=1uanfzMLP9g
 
 ## 0.8.16 - 2014-10-20
 ### Added

data/Gemfile

@@ -45,3 +45,7 @@ group :development do
   # gem 'opal-rspec', '0.3.0.beta2'#, git: 'https://github.com/adambeynon/opal-rspec.git'
   # gem 'yard', require: false
 end
+
+group :development, :test do
+  gem 'bson_ext'
+end

data/Readme.md

@@ -16,6 +16,7 @@ Pages HTML is written in a template language where you can put ruby between ```{
 
 See some demo videos here:
 - [Volt Todos Example](https://www.youtube.com/watch?v=Tg-EtRnMz7o)
+- [Pagination Example](https://www.youtube.com/watch?v=1uanfzMLP9g)
 - [Build a Blog with Volt](https://www.youtube.com/watch?v=c478sMlhx1o)
 ** Note: The blog video is outdated, expect an updated version soon.
 

data/VERSION

@@ -1 +1 @@
-0.8.17
+0.8.18

data/app/volt/tasks/store_tasks.rb

@@ -1,4 +1,5 @@
 require 'mongo'
+require 'volt/models'
 
 class StoreTasks < Volt::TaskHandler
   def initialize(channel = nil, dispatcher = nil)
@@ -10,7 +11,7 @@ class StoreTasks < Volt::TaskHandler
     @@db ||= Volt::DataStore.fetch
   end
 
-  def model_values_and_errors(collection, data)
+  def load_model(collection, path, data)
     model_name = collection.singularize.camelize
 
     # TODO: Security check to make sure we have a valid model
@@ -18,44 +19,37 @@ class StoreTasks < Volt::TaskHandler
     begin
       model_class = Object.send(:const_get, model_name)
     rescue NameError => e
-      model_class = nil
+      model_class = Volt::Model
     end
 
     if model_class
-      model = model_class.new(data)
-      return model.to_h, model.errors
+      # Load the model, use the Store persistor and set the path
+      model = model_class.new(data, persistor: Volt::Persistors::StoreFactory.new(nil), path: path)
+      return model
     end
 
-    [data, {}]
+    return nil
   end
 
-  def save(collection, data)
+  def save(collection, path, data)
     data = data.symbolize_keys
-    values, errors = model_values_and_errors(collection, data)
+    model = load_model(collection, path, data)
 
-    if errors.size == 0
-      # id = BSON::ObjectId(values[:_id])
-      id = values[:_id]
+    errors = model.errors
 
-      # Try to create
-      # TODO: Seems mongo is dumb and doesn't let you upsert with custom id's
-      begin
-        # values['_id'] = BSON::ObjectId('_id') if values['_id']
-        db[collection].insert(values)
-      rescue Mongo::OperationFailure => error
-        # Really mongo client?
-        if error.message[/^11000[:]/]
-          # Update because the id already exists
-          update_values = values.dup
-          update_values.delete(:_id)
-          db[collection].update({ _id: id }, update_values)
-        else
-          return { error: error.message }
-        end
-      end
+    if model.errors.size == 0
+
+      # On the backend, the promise is resolved before its returned, so we can
+      # return from within it.
+      #
+      # Pass the channel as a thread-local so that we don't update the client
+      # who sent the update.
+      Thread.current['in_channel'] = @channel
+      model.persistor.changed do |errors|
+        Thread.current['in_channel'] = nil
 
-      QueryTasks.live_query_pool.updated_collection(collection, @channel)
-      return {}
+        return errors
+      end
     else
       return errors
     end

data/lib/volt/cli.rb

@@ -23,7 +23,7 @@ module Volt
     desc 'console', 'run the console on the project in the current directory'
 
     def console
-      require 'volt/console'
+      require 'volt/cli/console'
       Console.start
     end
 

data/lib/volt/cli/runner.rb

@@ -7,6 +7,7 @@ module Volt
       def self.run_file(path)
         Volt.boot(Dir.pwd)
 
+        # Require in the file at path
         require './' + path
       end
     end

data/lib/volt/controllers/model_controller.rb

@@ -22,10 +22,8 @@ module Volt
         else
           fail "#{val} is not the name of a valid model, choose from: #{collections.join(', ')}"
         end
-      elsif val
-        self.current_model = val
       else
-        fail "model can not be #{val.inspect}"
+        self.current_model = val
       end
     end
 
@@ -43,7 +41,7 @@ module Volt
     def self.new(*args, &block)
       inst = allocate
 
-      inst.model = (@default_model || :controller)
+      inst.model = @default_model if @default_model
 
       inst.initialize(*args, &block)
 
@@ -73,10 +71,6 @@ module Volt
       $page.page
     end
 
-    def paged
-      $page.page
-    end
-
     def store
       $page.store
     end
@@ -109,8 +103,27 @@ module Volt
       @controller ||= Model.new
     end
 
+    def loaded?
+      respond_to?(:state) && state == :loaded
+    end
+
+    # Check if this controller responds_to method, or the model
+    def respond_to?(method_name)
+      super || begin
+        model = self.model
+
+        model.respond_to?(method_name) if model
+      end
+    end
+
     def method_missing(method_name, *args, &block)
-      model.send(method_name, *args, &block)
+      model = self.model
+
+      if model
+        model.send(method_name, *args, &block)
+      else
+        super
+      end
     end
   end
 end

data/lib/volt/models/model_hash_behaviour.rb

@@ -46,7 +46,7 @@ module Volt
 
     # Convert the model to a hash all of the way down.
     def to_h
-      if empty?
+      if @attributes.nil?
         nil
       else
         hash = {}

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

@@ -158,7 +158,7 @@ module Volt
       def add(index, data)
         $loading_models = true
 
-        data_id = data[:_id]
+        data_id = data['_id'] || data[:_id]
 
         # Don't add if the model is already in the ArrayModel
         unless @model.array.find { |v| v._id == data_id }

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

@@ -1,6 +1,11 @@
 require 'volt/models/persistors/store'
 require 'volt/models/persistors/store_state'
 
+if RUBY_PLATFORM == 'opal'
+else
+  require 'mongo'
+end
+
 module Volt
   module Persistors
     class ModelStore < Store
@@ -52,6 +57,14 @@ module Volt
         id.join
       end
 
+      def save_changes?
+        if RUBY_PLATFORM == 'opal'
+          return !(defined?($loading_models) && $loading_models) && @tasks
+        else
+          return true
+        end
+      end
+
       # Called when the model changes
       def changed(attribute_name = nil)
         path = @model.path
@@ -61,7 +74,7 @@ module Volt
         ensure_setup
 
         path_size = path.size
-        if !(defined?($loading_models) && $loading_models) && @tasks && path_size > 0 && !@model.nil?
+        if save_changes? && path_size > 0 && !@model.nil?
           if path_size > 3 && (parent = @model.parent) && (source = parent.parent)
             @model.attributes[:"#{path[-4].singularize}_id"] = source._id
           end
@@ -70,7 +83,16 @@ module Volt
             puts 'Attempting to save model directly on store.'
             fail 'Attempting to save model directly on store.'
           else
-            StoreTasks.save(collection, self_attributes).then do |errors|
+            if RUBY_PLATFORM == 'opal'
+              StoreTasks.save(collection, path, self_attributes).then do |errors|
+                if errors.size == 0
+                  promise.resolve(nil)
+                else
+                  promise.reject(errors)
+                end
+              end
+            else
+              errors = save_to_db!(self_attributes)
               if errors.size == 0
                 promise.resolve(nil)
               else
@@ -117,6 +139,38 @@ module Volt
       def collection
         @model.path[-2]
       end
+
+      if RUBY_PLATFORM != 'opal'
+        def db
+          @@db ||= Volt::DataStore.fetch
+        end
+
+        # Do the actual writing of data to the database, only runs on the backend.
+        def save_to_db!(values)
+          id = values[:_id]
+
+          # Try to create
+          # TODO: Seems mongo is dumb and doesn't let you upsert with custom id's
+          begin
+            # values['_id'] = BSON::ObjectId('_id') if values['_id']
+            db[collection].insert(values)
+          rescue Mongo::OperationFailure => error
+            # Really mongo client?
+            if error.message[/^11000[:]/]
+              # Update because the id already exists
+              update_values = values.dup
+              update_values.delete(:_id)
+              db[collection].update({ _id: id }, update_values)
+            else
+              return { error: error.message }
+            end
+          end
+
+          # puts "Update Collection: #{collection.inspect} - #{values.inspect}"
+          QueryTasks.live_query_pool.updated_collection(collection.to_s, Thread.current['from_channel'])
+          return {}
+        end
+      end
     end
   end
 end

data/lib/volt/models/url.rb

@@ -109,7 +109,7 @@ module Volt
     def scroll
       if Volt.client?
         frag = fragment
-        if frag
+        if frag.present?
           # Scroll to anchor via http://www.w3.org/html/wg/drafts/html/master/browsers.html#scroll-to-fragid
           `
           var anchor = $('#' + frag);

data/lib/volt/page/bindings/each_binding.rb

@@ -129,11 +129,15 @@ module Volt
       # Clear value
       @value       = nil
 
-      @added_listener.remove
-      @added_listener = nil
+      if @added_listener
+        @added_listener.remove
+        @added_listener = nil
+      end
 
-      @removed_listener.remove
-      @removed_listener = nil
+      if @removed_listener
+        @removed_listener.remove
+        @removed_listener = nil
+      end
 
       if @templates
         template_count = @templates.size

data/lib/volt/page/url_tracker.rb

@@ -12,14 +12,8 @@ module Volt
         # Setup popstate on the dom ready event.  Prevents an extra
         # popstate trigger
         `
-          var first = true;
           window.addEventListener("popstate", function(e) {
-            if (first === false) {
-              that.$url_updated();
-            }
-
-            first = false;
-
+            that.$url_updated();
             return true;
           });
         `

data/lib/volt/tasks/dispatcher.rb

@@ -4,28 +4,53 @@ module Volt
   class Dispatcher
     def dispatch(channel, message)
       callback_id, class_name, method_name, *args = message
+      method_name = method_name.to_sym
 
       # Get the class
       klass = Object.send(:const_get, class_name)
 
-      if klass.ancestors.include?(TaskHandler)
+      result = nil
+      error = nil
+
+      if safe_method?(klass, method_name)
         # Init and send the method
         begin
           result = klass.new(channel, self).send(method_name, *args)
-          error = nil
         rescue => e
           # TODO: Log these errors better
           puts e.inspect
           puts e.backtrace
-          result = nil
           error = e
         end
+      else
+        # Unsafe method
+        error = RuntimeError.new("unsafe method: #{method_name}")
+      end
 
-        if callback_id
-          # Callback with result
-          channel.send_message('response', callback_id, result, error)
+      if callback_id
+        # Callback with result
+        channel.send_message('response', callback_id, result, error)
+      end
+    end
+
+    # Check if it is safe to use this method
+    def safe_method?(klass, method_name)
+      # Make sure the class being called is a TaskHandler.
+      return false unless klass.ancestors.include?(TaskHandler)
+
+      # Make sure the method is defined on the klass we're using and not up the hiearchy.
+      #   ^ This check prevents methods like #send, #eval, #instance_eval, #class_eval, etc...
+      klass.ancestors.each do |ancestor_klass|
+        if ancestor_klass.instance_methods(false).include?(method_name)
+          return true
+        elsif ancestor_klass == TaskHandler
+          # We made it to TaskHandler and didn't find the method, that means it
+          # was defined above TaskHandler, so we reject the call.
+          return false
         end
       end
+
+      return false
     end
   end
 end

data/lib/volt/tasks/task_handler.rb

@@ -38,6 +38,11 @@ module Volt
 
         promise
       end
+
+      # Provide access to the store collection
+      def store
+        $page.store
+      end
     end
   end
 end

data/spec/extra_core/array_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'volt/extra_core/array'
+
+describe Array do
+  it 'should sum an array of integers' do
+    expect([1,2,3].sum).to eq(6)
+  end
+end

data/spec/extra_core/inflector_spec.rb

@@ -6,4 +6,8 @@ describe Volt::Inflector do
     expect('car'.pluralize).to eq('cars')
     # expect('database'.pluralize).to eq('database')
   end
+
+  it 'should singularize correctly' do
+    expect('cars'.singularize).to eq('car')
+  end
 end

data/spec/extra_core/object_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'volt/extra_core/blank'
+
+describe Object do
+  it 'should add blank? to all objects' do
+    expect(Object.new.blank?).to be_false
+    expect(nil.blank?).to be_true
+  end
+
+  it 'should add present? to all objects' do
+    expect(Object.new.present?).to be_true
+    expect(nil.present?).to be_false
+  end
+end

data/spec/extra_core/string_transformation_test_cases.rb

@@ -12,27 +12,6 @@
     'area51_controller'      => 'area51Controller'
   }
 
-  SymbolToLowerCamel = {
-    product: 'product',
-    special_guest: 'specialGuest',
-    application_controller: 'applicationController',
-    area51_controller: 'area51Controller'
-  }
-
-  CamelToUnderscoreWithoutReverse = {
-    'HTMLTidy'              => 'html_tidy',
-    'HTMLTidyGenerator'     => 'html_tidy_generator',
-    'FreeBSD'               => 'free_bsd',
-    'HTML'                  => 'html',
-    'ForceXMLController'    => 'force_xml_controller'
-  }
-
-  CamelWithModuleToUnderscoreWithSlash = {
-    'Admin::Product' => 'admin/product',
-    'Users::Commission::Department' => 'users/commission/department',
-    'UsersSection::CommissionDepartment' => 'users_section/commission_department'
-  }
-
   UnderscoresToDashes = {
     'street'                => 'street',
     'street_address'        => 'street-address',

data/spec/extra_core/symbol_spec.rb

@@ -0,0 +1,15 @@
+if RUBY_PLATFORM == 'opal'
+else
+  require 'spec_helper'
+  require 'volt/extra_core/symbol'
+
+  describe Symbol do
+    it 'should pluralize correctly' do
+      expect(:car.pluralize).to eq(:cars)
+    end
+
+    it 'should singularize correctly' do
+      expect(:cars.singularize).to eq(:car)
+    end
+  end
+end

data/spec/integration/url_spec.rb

@@ -0,0 +1,31 @@
+if ENV['BROWSER'] && ENV['BROWSER'] != 'phantom'
+  require 'spec_helper'
+
+  describe 'url features', type: :feature do
+    it 'should update the page when using the back button' do
+      visit '/'
+      expect(current_url).to match(/\/$/)
+
+      click_link 'Bindings'
+      expect(current_url).to match(/\/bindings$/)
+      expect(page).to have_content('Checkbox')
+
+      click_link 'Todos'
+      expect(current_url).to match(/\/todos$/)
+      expect(page).to have_content('Todos Example')
+
+      # "Click" back button
+      page.evaluate_script('window.history.back()')
+
+      click_link 'Bindings'
+      expect(current_url).to match(/\/bindings$/)
+      expect(page).to have_content('Checkbox')
+
+      # "Click" back button
+      page.evaluate_script('window.history.back()')
+
+      expect(current_url).to match(/\/$/)
+    end
+
+  end
+end

data/spec/router/routes_spec.rb

@@ -17,7 +17,7 @@ describe Volt::Routes do
     expect(direct_routes).to eq('/' => { _view: 'index' }, '/page1' => { _view: 'first_page' })
   end
 
-  it 'should setup indiect routes' do
+  it 'should setup indirect routes' do
     routes do
       get '/blog/{{ _id }}/edit', _view: 'blog/edit'
       get '/blog/{{ _id }}', _view: 'blog/show'

data/spec/tasks/dispatcher_spec.rb

@@ -0,0 +1,43 @@
+if RUBY_PLATFORM != 'opal'
+  class TestTask < Volt::TaskHandler
+    def allowed_method(arg1)
+      return 'yes' + arg1
+    end
+  end
+
+
+  describe Volt::Dispatcher do
+
+    it 'should only allow method calls on TaskHandler or above in the inheritance chain' do
+      channel = double('channel')
+
+      expect(channel).to receive(:send_message).with('response', 0, 'yes works', nil)
+
+      Volt::Dispatcher.new.dispatch(channel, [0, 'TestTask', :allowed_method, ' works'])
+    end
+
+    it 'should not allow eval' do
+      channel = double('channel')
+
+      expect(channel).to receive(:send_message).with('response', 0, nil, RuntimeError.new('unsafe method: eval'))
+
+      Volt::Dispatcher.new.dispatch(channel, [0, 'TestTask', :eval, '5 + 10'])
+    end
+
+    it 'should not allow instance_eval' do
+      channel = double('channel')
+
+      expect(channel).to receive(:send_message).with('response', 0, nil, RuntimeError.new('unsafe method: instance_eval'))
+
+      Volt::Dispatcher.new.dispatch(channel, [0, 'TestTask', :instance_eval, '5 + 10'])
+    end
+
+    it 'should not allow #methods' do
+      channel = double('channel')
+
+      expect(channel).to receive(:send_message).with('response', 0, nil, RuntimeError.new('unsafe method: methods'))
+
+      Volt::Dispatcher.new.dispatch(channel, [0, 'TestTask', :methods])
+    end
+  end
+end

data/templates/project/app/main/assets/css/app.css.scss

@@ -0,0 +1 @@
+// Place your apps css here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.8.17
+  version: 0.8.18
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -379,11 +379,11 @@ files:
 - lib/volt/boot.rb
 - lib/volt/cli.rb
 - lib/volt/cli/asset_compile.rb
+- lib/volt/cli/console.rb
 - lib/volt/cli/generate.rb
 - lib/volt/cli/new_gem.rb
 - lib/volt/cli/runner.rb
 - lib/volt/config.rb
-- lib/volt/console.rb
 - lib/volt/controllers/model_controller.rb
 - lib/volt/data_stores/data_store.rb
 - lib/volt/data_stores/mongo_driver.rb
@@ -513,12 +513,16 @@ files:
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/public/index.html
 - spec/controllers/reactive_accessors_spec.rb
+- spec/extra_core/array_spec.rb
 - spec/extra_core/inflector_spec.rb
+- spec/extra_core/object_spec.rb
 - spec/extra_core/string_transformation_test_cases.rb
 - spec/extra_core/string_transformations_spec.rb
+- spec/extra_core/symbol_spec.rb
 - spec/integration/bindings_spec.rb
 - spec/integration/list_spec.rb
 - spec/integration/templates_spec.rb
+- spec/integration/url_spec.rb
 - spec/models/model_spec.rb
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
@@ -539,6 +543,7 @@ files:
 - spec/server/rack/rack_requests_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
+- spec/tasks/dispatcher_spec.rb
 - spec/tasks/live_query_spec.rb
 - spec/tasks/query_tasks.rb
 - spec/tasks/query_tracker_spec.rb
@@ -580,6 +585,7 @@ files:
 - templates/project/README.md.tt
 - templates/project/app/.empty_directory
 - templates/project/app/main/assets/css/.empty_directory
+- templates/project/app/main/assets/css/app.css.scss
 - templates/project/app/main/assets/js/.empty_directory
 - templates/project/app/main/config/dependencies.rb
 - templates/project/app/main/config/routes.rb
@@ -642,12 +648,16 @@ test_files:
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/public/index.html
 - spec/controllers/reactive_accessors_spec.rb
+- spec/extra_core/array_spec.rb
 - spec/extra_core/inflector_spec.rb
+- spec/extra_core/object_spec.rb
 - spec/extra_core/string_transformation_test_cases.rb
 - spec/extra_core/string_transformations_spec.rb
+- spec/extra_core/symbol_spec.rb
 - spec/integration/bindings_spec.rb
 - spec/integration/list_spec.rb
 - spec/integration/templates_spec.rb
+- spec/integration/url_spec.rb
 - spec/models/model_spec.rb
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
@@ -668,6 +678,7 @@ test_files:
 - spec/server/rack/rack_requests_spec.rb
 - spec/spec_helper.rb
 - spec/store/mongo_spec.rb
+- spec/tasks/dispatcher_spec.rb
 - spec/tasks/live_query_spec.rb
 - spec/tasks/query_tasks.rb
 - spec/tasks/query_tracker_spec.rb