volt 0.8.27.beta2 → 0.8.27.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8216481df968b9b14ca2012121437a9a1c238ac2
-  data.tar.gz: 227dc9d5fd4540fb6870797ecb6d869fad1043ec
+  metadata.gz: e86338c95256cca4f64bc6889a2e6f86626c3e23
+  data.tar.gz: 71e9eef1f83c4a1fc2213b8ca9610da56518a401
 SHA512:
-  metadata.gz: d21c46f836fd782f9d950a05799bd09ea5d9f62949cb516c85647721d656b51b2a060d050825d0f0bcd978346aaaf1f96c943672619e38174af5feea3d2b9725
-  data.tar.gz: c7e55d8e6be62c7040ad98456a227779e6d8177dd453feaca9639883de0ad41479115c12e022e2e4aecc9962bd26569d5f4262cbe45905e29520f5fe1492088a
+  metadata.gz: e689c874e137c1e7aa59303238aa6d287f89e407b8c003bbcd43242201ac7fb2ab3254fafa5ccaa4f105fdfcf4c720d76a631684e8224511c9b8f62d92227f54
+  data.tar.gz: ed08a559fb6f89a85bf41f19822316195653acac6a0dda68c6f261e4e3e53c6677fe84b5525207c5a5fea3c01f2db64ef5faf547fd607db338d6adba21d9b4e0

data/.ruby-version

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

data/.travis.yml

@@ -1,10 +1,13 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
 - 2.1.0
 - 2.1.1
 - 2.1.2
 - 2.1.3
 - 2.1.5
+- 2.2.0
 env:
   global:
   - secure: W03bt+hqLkAenymipqADIuRGZMiqu/sKx+9PXJJzCy0qAgmKs/PhPpHRpGpSmaYvVQQuiWX/rsw7xWXc2CHDJSp5aInd693xhJuSKXmnUp00r14/io+VWI9LE0lWjx4qdb6YQhdBTaxJB0+1sHDwU088yWBNnri/KwU4UlUgO5M=

data/CHANGELOG.md

@@ -2,9 +2,14 @@
 
 ## 0.8.27 - WIP
 ### Added
-- Added email validator
+- the {action}_remove method had been changed to before_{action}_remove and after_{action}_remove to provide more hooks and a clearer understanding of when it is happening.
+- Changed it so content bindings escape all html (for CSRF - thanks @ChaosData)
+- Added formats, email, phone validators (thanks @lexun and @kxcrl)
 - each_with_index is now supported in views and the ```index``` value is no longer provided by default.
-
+- fixed bug with cookie parsing with equals in them
+- fixed bug appending existing models to a collection
+- refactored TemplateBinding, moved code into ViewLookupForPath (SRP)
+- reserved fields now get a warning in models
 
 ## 0.8.24 - 2014-12-05
 ### Added

data/CONTRIBUTING.md

@@ -0,0 +1,133 @@
+Contributing to Volt
+=====================
+
+You want to contribute? Great! Thanks for being awesome!  Volt is work of [hundreds of contributors](https://github.com/voltrb/volt/graphs/contributors). You're encouraged to submit [pull requests](https://github.com/voltrb/volt/pulls), [propose features and discuss issues](https://github.com/voltrb/volt/issues). When in doubt, ask a question in the [Volt gitter.im chatroom](https://gitter.im/voltrb/volt).
+
+#### Find Something to Work on
+
+If you want to contribute, but aren't sure what to work on, we keep our list of current todos in Trello at https://trello.com/b/QdCx9Tqb/volt  Before starting, feel free to chat with me @ryanstout on [gitter](https://gitter.im/voltrb/volt).
+
+#### Fork the Project
+
+Fork the [project on Github](https://github.com/voltrb/volt) and check out your copy.
+
+```
+git clone https://github.com/contributor/volt.git
+cd volt
+git remote add upstream https://github.com/voltrb/volt.git
+```
+
+#### Create a Topic Branch
+
+Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
+
+```
+git checkout master
+git pull upstream master
+git checkout -b my-feature-branch
+```
+
+#### Bundle Install and Test
+Ensure that PhantomJS is installed on your computer.
+
+```
+phantomjs --version
+```
+
+If not installed, you can install from the source or use Homebrew:
+
+```
+brew upgrade && brew install phantomjs
+```
+
+#### Bundle Install and Test
+
+Ensure that you can build the project and run tests.
+
+```
+bundle install
+bundle exec rake
+```
+
+By default rake doesn't run the integration tests.  The integration tests use capybara to run the tests in a real browser, (read more [here](https://github.com/voltrb/docs/blob/master/en/docs/testing.md)).  You can run with integration tests in a browser with:
+
+```
+BROWSER=firefox bundle exec rake
+````
+
+#### Write Tests
+
+Try to write a test that reproduces the problem you're trying to fix or describes a feature that you want to build. Add to [spec/volt](spec/volt).
+
+We definitely appreciate pull requests that highlight or reproduce a problem, even without a fix.
+
+#### Write Code
+
+Implement your feature or bug fix.
+
+Ruby style is enforced with [Rubocop](https://github.com/bbatsov/rubocop), run `bundle exec rubocop` and fix any style issues highlighted.
+
+Make sure that `bundle exec rake` completes without errors.
+
+#### Write Documentation
+
+Document any external behavior in the [README](README.md).
+
+#### Commit Changes
+
+Make sure git knows your name and email address:
+
+```
+git config --global user.name "Your Name"
+git config --global user.email "contributor@example.com"
+```
+
+Writing good commit logs is important. A commit log should describe what changed and why.
+
+```
+git add ...
+git commit
+```
+
+#### Push
+
+```
+git push origin my-feature-branch
+```
+
+#### Make a Pull Request
+
+Go to https://github.com/contributor/volt and select your feature branch. Click the 'Pull Request' button and fill out the form. Pull requests are usually reviewed within a few days.
+
+#### Rebase
+
+If you've been working on a change for a while, rebase with upstream/master.
+
+```
+git fetch upstream
+git rebase upstream/master
+git push origin my-feature-branch -f
+```
+
+#### Update CHANGELOG Again
+
+Update the [CHANGELOG](CHANGELOG.md) with the pull request number. A typical entry looks as follows.
+
+```
+* [#123](https://github.com/voltrb/volt/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
+```
+
+Amend your previous commit and force push the changes.
+
+```
+git commit --amend
+git push origin my-feature-branch -f
+```
+
+#### Check on Your Pull Request
+
+Go back to your pull request after a few minutes and see whether it passed muster with Travis-CI. Everything should look green, otherwise fix issues and amend your commit as described above.
+
+#### Thank You
+
+Please do know that we really appreciate and value your time and work. We love you, really.

data/Gemfile

@@ -6,7 +6,6 @@ group :development do
   # For testing the kitchen sink app
   # Twitter bootstrap
   gem 'volt-bootstrap'
-  gem 'byebug'
 
   # Simple theme for bootstrap, remove to theme yourself.
   gem 'volt-bootstrap-jumbotron-theme'

data/Rakefile

@@ -20,15 +20,23 @@ task :docs do
   # end
 end
 
-Opal::RSpec::RakeTask.new
+# Setup the opal:rspec task
+Opal::RSpec::RakeTask.new('opal:rspec') do |s|
+  # Add the app folder to the opal load path.
+  s.append_path('app')
+end
+
 
 task default: [:test]
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('ruby:rspec')
+
 task :test do
-  puts "--------------------------\nRun specs in normal ruby\n--------------------------"
-  system 'bundle exec rspec'
   puts "--------------------------\nRun specs in Opal\n--------------------------"
   Rake::Task['opal:rspec'].invoke
+  puts "--------------------------\nRun specs in normal ruby\n--------------------------"
+  Rake::Task['ruby:rspec'].invoke
 end
 
 # Rubocop task

data/Readme.md

@@ -1,9 +1,8 @@
 [![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)
-[![Build Status](http://img.shields.io/travis/voltrb/volt/master.svg)](https://travis-ci.org/voltrb/volt)
+[![Build Status](http://img.shields.io/travis/voltrb/volt/master.svg?style=flat)](https://travis-ci.org/voltrb/volt)
 [![Inline docs](http://inch-ci.org/github/voltrb/volt.svg?branch=master)](http://inch-ci.org/github/voltrb/volt)
 [![Volt Chat](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/voltrb/volt)
-[![Stories in Ready](https://badge.waffle.io/voltrb/volt.png?label=ready&title=Ready)](https://waffle.io/voltrb/volt)
 
 ** For the current status of volt, read: http://voltframework.com/blog
 
@@ -18,8 +17,9 @@ 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.
+- [Routes and Templates](https://www.youtube.com/watch?v=1yNMP3XR6jU)
+- [Isomorphic App Development - Rubyconf 2014](https://www.youtube.com/watch?v=7i6AL7Walc4)
+- [Build a Blog with Volt](https://www.youtube.com/watch?v=c478sMlhx1o) ** Note: The blog video is outdated, expect an updated version soon.
 
 Check out demo apps:
  - https://github.com/voltrb/todos3

data/VERSION

@@ -1 +1 @@
-0.8.27.beta2
+0.8.27.beta3

data/app/volt/models/user.rb

@@ -1,10 +1,12 @@
-require 'bcrypt' if RUBY_PLATFORM != 'opal'
+unless RUBY_PLATFORM == 'opal'
+  require 'bcrypt'
+end
 
 module Volt
   class User < Model
-    # returns true if the user configured using the username
+    # returns login field name depending on config settings
     def self.login_field
-      if Volt.config.public.try(:auth).try(:use_username)
+      if Volt.config.try(:public).try(:auth).try(:use_username)
         :username
       else
         :email
@@ -24,6 +26,7 @@ module Volt
         # on the server, we bcrypt the password and store the result
         self._hashed_password = BCrypt::Password.create(val)
       else
+        # Assign the attribute
         self._password = val
       end
     end

data/lib/volt/cli/console.rb

@@ -1,19 +1,28 @@
 require 'pry'
 
 class Pry
-  # To make the console more useful, we make it so we flush the event registry
-  # after each line.  This makes it so events are triggered after each line.
-  # To accomplish this we monkey-patch pry.
-  def rep(target = TOPLEVEL_BINDING)
-    target = Pry.binding_for(target)
-    result = re(target)
-
-    Pry.critical_section do
-      show_result(result)
+  class REPL
+    # To make the console more useful, we make it so we flush the event registry
+    # after each line.  This makes it so events are triggered after each line.
+    # To accomplish this we monkey-patch pry.
+    def repl
+      loop do
+        case val = read
+        when :control_c
+          output.puts ""
+          pry.reset_eval_string
+        when :no_more_input
+          output.puts "" if output.tty?
+          break
+        else
+          output.puts "" if val.nil? && output.tty?
+          return pry.exit_value unless pry.eval(val)
+        end
+
+        # Flush after each line
+        Volt::Computation.flush!
+      end
     end
-
-    # Automatically flush after each line
-    Volt::Computation.flush!
   end
 end
 

data/lib/volt/cli/runner.rb

@@ -12,4 +12,4 @@ module Volt
       end
     end
   end
-end
+end

data/lib/volt/cli.rb

@@ -48,7 +48,8 @@ module Volt
       # TODO: this is a work around for a bug when switching between
       # source maps and non-source maps.
       if File.exist?('config.ru') && File.exist?('Gemfile')
-        FileUtils.rm_rf('tmp/.')
+        FileUtils.rm_rf('tmp/sass')
+        FileUtils.rm_rf('tmp/sprockets')
       else
         say('Current folder is not a Volt project', :red)
         return
@@ -82,9 +83,9 @@ module Volt
     method_option :bin, type: :boolean, default: false, aliases: '-b', banner: 'Generate a binary for your library.'
     method_option :test, type: :string, lazy_default: 'rspec', aliases: '-t', banner: "Generate a test directory for your library: 'rspec' is the default, but 'minitest' is also supported."
     method_option :edit, type: :string, aliases: '-e',
-                  lazy_default: [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find { |e| !e.nil? && !e.empty? },
-                  required: false, banner: '/path/to/your/editor',
-                  desc: 'Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)'
+                         lazy_default: [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find { |e| !e.nil? && !e.empty? },
+                         required: false, banner: '/path/to/your/editor',
+                         desc: 'Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)'
 
     def gem(name)
       require 'volt/cli/new_gem'

data/lib/volt/config.rb

@@ -13,14 +13,12 @@ if RUBY_PLATFORM == 'opal'
   module Volt
     class << self
       # Returns the config
-      def config
-        @config
-      end
+      attr_reader :config
 
       # Called on page load to pass the backend config to the client
       def setup_client_config(config_hash)
         # Only Volt.config.public is passed from the server (for security reasons)
-        @config = wrap_config({public: config_hash})
+        @config = wrap_config(public: config_hash)
       end
 
       # Wraps the config hash in an OpenStruct so it can be accessed in the same way
@@ -49,17 +47,17 @@ else
       def defaults
         app_name = File.basename(Dir.pwd)
         {
-            app_name:  app_name,
-            db_name:   ENV['DB_NAME'] || (app_name + '_' + Volt.env.to_s),
-            db_host:   ENV['DB_HOST'] || 'localhost',
-            db_port:   (ENV['DB_PORT'] || 27_017).to_i,
-            db_driver: ENV['DB_DRIVER'] || 'mongo',
-          }
+          app_name:  app_name,
+          db_name:   ENV['DB_NAME'] || (app_name + '_' + Volt.env.to_s),
+          db_host:   ENV['DB_HOST'] || 'localhost',
+          db_port:   (ENV['DB_PORT'] || 27_017).to_i,
+          db_driver: ENV['DB_DRIVER'] || 'mongo'
+        }
       end
 
       # Resets the configuration to the default (empty hash)
       def reset_config!
-        self.configure do |c|
+        configure do |c|
           c.from_h(defaults)
         end
       end

data/lib/volt/controllers/model_controller.rb

@@ -6,6 +6,22 @@ module Volt
 
     reactive_accessor :current_model
 
+    # The section is assigned a reference to a "DomSection" which has
+    # the dom for the controllers view.
+    attr_accessor :section
+
+
+    # Container returns the node that is parent to all nodes in the section.
+    def container
+      section.container_node
+    end
+
+    def dom_nodes
+      section.range
+    end
+
+
+
     def self.model(val)
       @default_model = val
     end

data/lib/volt/data_stores/data_store.rb

@@ -4,7 +4,7 @@ module Volt
   class DataStore
     def self.fetch
       if Volt.config.db_driver == 'mongo'
-        return MongoDriver.fetch
+        MongoDriver.fetch
       else
         fail "#{database_name} is not a supported database"
       end

data/lib/volt/extra_core/array.rb

@@ -1,10 +1,5 @@
 class Array
   def sum
-    total = 0
-    each do |val|
-      total += val
-    end
-
-    total
+    inject(0, :+)
   end
 end

data/lib/volt/extra_core/blank.rb

@@ -70,9 +70,7 @@ class String
   #   '　'.blank?               # => true
   #   ' something here '.blank? # => false
   def blank?
-    # self !~ /[^[:space:]]/
-    # TODO: Opal fails with the previous regex
-    strip == ''
+    self !~ /\S/
   end
 end
 

data/lib/volt/extra_core/class.rb

@@ -24,4 +24,4 @@ class Class
       undef_method(method)
     end
   end
-end
+end

data/lib/volt/extra_core/extra_core.rb

@@ -4,7 +4,6 @@ require 'volt/extra_core/object'
 require 'volt/extra_core/blank'
 require 'volt/extra_core/stringify_keys'
 require 'volt/extra_core/string'
-require 'volt/extra_core/numeric'
 require 'volt/extra_core/true_false'
 require 'volt/extra_core/class'
 if RUBY_PLATFORM == 'opal'

data/lib/volt/extra_core/logger.rb

@@ -13,6 +13,83 @@ if RUBY_PLATFORM == 'opal'
       end
     end
   end
+
+  class VoltLogger < Logger
+  end
 else
   require 'logger'
-end
+
+  module Volt
+    class VoltLogger < Logger
+      def initialize(current={})
+        super(STDOUT)
+        @current = current
+        @formatter = Volt::VoltLoggerFormatter.new
+      end
+
+      def log_dispatch(class_name, method_name, run_time, args)
+        @current = {
+          args: args,
+          class_name: class_name,
+          method_name: method_name,
+          run_time: run_time
+        }
+
+        log(Logger::INFO, task_dispatch_message)
+      end
+
+      def args
+        @current[:args]
+      end
+
+      def class_name
+        colorize(@current[:class_name].to_s, :light_blue)
+      end
+
+      def method_name
+        colorize(@current[:method_name].to_s, :green)
+      end
+
+      def run_time
+        colorize(@current[:run_time].to_s + 'ms', :green)
+      end
+
+
+      private
+
+      def colorize(string, color)
+        if STDOUT.tty? && string
+          case color
+          when :cyan
+            "\e[1;34m" + string + "\e[0;37m"
+          when :green
+            "\e[0;32m" + string + "\e[0;37m"
+          when :light_blue
+            "\e[1;34m" + string + "\e[0;37m"
+          when :purple
+            "\e[1;35m" + string + "\e[0;37m"
+          when :red
+            "\e[1;31m" + string + "\e[0;37m"
+          end
+        else
+          string.to_s
+        end
+      end
+
+      def task_dispatch_message
+        msg = "task #{class_name}##{method_name} in #{run_time}\n"
+        if args.size > 0
+          arg_str = args.map {|v| v.inspect }.join(', ')
+          msg += "with args: #{arg_str}\n"
+        end
+        msg
+      end
+    end
+
+    class VoltLoggerFormatter < Logger::Formatter
+      def call(severity, time, progname, msg)
+        "\n\n[#{severity}] #{msg2str(msg)}\n"
+      end
+    end
+  end
+end

data/lib/volt/extra_core/object.rb

@@ -9,18 +9,18 @@ class Object
   # Provides the same functionality as ||, but treats a nil model as falsy
   def or(other)
     if self && !self.nil?
-      return self
+      self
     else
-      return other
+      other
     end
   end
 
   # Provides the same functionality as &&, treats a nil model as falsy
   def and(other)
     if self && !self.nil?
-      return other
+      other
     else
-      return self
+      self
     end
   end
 

data/lib/volt/models/array_model.rb

@@ -29,7 +29,7 @@ module Volt
           if @persistor.respond_to?(method_name)
             @persistor.send(method_name, *args, &block)
           else
-            raise "this model's persistance layer does not support #{method_name}, try using store"
+            fail "this model's persistance layer does not support #{method_name}, try using store"
           end
         end
       end
@@ -77,7 +77,7 @@ module Volt
 
     # Works like << except it returns a promise
     def append(model)
-      promise, model = self.send(:<<, model)
+      promise, model = send(:<<, model)
 
       # Return a promise if one doesn't exist
       promise ||= Promise.new.resolve(model)
@@ -85,7 +85,6 @@ module Volt
       promise
     end
 
-
     # Find one does a query, but only returns the first item or
     # nil if there is no match.  Unlike #find, #find_one does not
     # return another cursor that you can call .then on.

data/lib/volt/models/buffer.rb

@@ -1,6 +1,5 @@
 module Volt
   module Buffer
-
     def save!
       # Compute the erros once
       errors = self.errors
@@ -72,4 +71,4 @@ module Volt
       model
     end
   end
-end
+end

data/lib/volt/models/field_helpers.rb

@@ -1,13 +1,13 @@
 # Provides a method to setup a field on a model.
 module FieldHelpers
-  class InvalidFieldClass < RuntimeError ; end
+  class InvalidFieldClass < RuntimeError; end
 
   module ClassMethods
     # field lets you declare your fields instead of using the underscore syntax.
     # An optional class restriction can be passed in.
-    def field(name, klass=nil)
+    def field(name, klass = nil)
       if klass && ![String, Numeric].include?(klass)
-        raise FieldHelpers::InvalidFieldClass, "valid field types is currently limited to String or Numeric"
+        fail FieldHelpers::InvalidFieldClass, 'valid field types is currently limited to String or Numeric'
       end
 
       define_method(name) do
@@ -33,5 +33,4 @@ module FieldHelpers
   def self.included(base)
     base.send :extend, ClassMethods
   end
-
-end
+end