volt 0.8.26.beta1 → 0.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d71fdd9ba18f67e9349026c51395e553bb34143e
-  data.tar.gz: 00ac6d296fb6a2e32d7d8326740e378ea5178545
+  metadata.gz: 47aaf2be39754e3e1e663f8f30be5ca0b5185980
+  data.tar.gz: 4a3efe149301a81d2cf06ba98f354bf0accad0e4
 SHA512:
-  metadata.gz: 774f656f5a4c365d9f37106a0204efcff36b2b72871d7f4b3bd5334b75f16ec3195b82cdecc5f23781efd76f896d130ae205a5e3f0691bd01888778cc567f12a
-  data.tar.gz: c50312a4099bd67fcc60684fca2353b0929c0878cce00e61bef809257ee3613e14796369ea47f18755d24aea59d648da28de32a4974c21a6b70b064079c80cba
+  metadata.gz: b8095761ae07bc9aa0ff5619fec850defa145a926593b78bee12305de2b8d8d7db8f4c0d91d6093a5b5dd4ad3d59475c20d0ce6e73945e6bc73deca48a25d8a4
+  data.tar.gz: 327aee6d016ac99b70e8facefe3eb04795d6a8ff6c11f5145796e31711f9b712f7a04d294b5d4f260b89f2cc0105a7c3307b6ce9b5a00ea5557ec926565809d9

data/CHANGELOG.md

@@ -1,13 +1,8 @@
 # Change Log
 
-## 0.8.25 - ...
-### Added
-- Added email validator
-- each_with_index is now supported in views and the ```index``` value is no longer provided by default.
 
 
 ## 0.8.24 - 2014-12-05
-### Added
 - Fix bug with validation inheritance
 - Fixed issue with controller loading.
 

data/Rakefile

@@ -1,7 +1,8 @@
 require 'bundler'
 require 'bundler/gem_tasks'
-Bundler.require(:development)
 require 'rubocop/rake_task'
+Bundler.require(:development)
+
 require 'opal'
 
 # Add our opal/ directory to the load path

data/VERSION

@@ -1 +1 @@
-0.8.26.beta1
+0.8.26

data/app/volt/models/user.rb

@@ -12,7 +12,6 @@ module Volt
     end
 
     validate login_field, unique: true, length: 8
-    validate :email, email: true
 
     if RUBY_PLATFORM == 'opal'
       # Don't validate on the server

data/docs/GETTING_STARTED.md

@@ -0,0 +1,28 @@
+# Getting Started
+
+Volt relies on a few concepts to take make web development faster and easier.  The first of these is reactive programming.  Data on the front and back end is stored in models.  Instead of manually updating a page when the data changes, the page is coded using a templating language which automatically updates when the data changes.
+
+## Bindings and Models
+
+This automaic updating is done via bindings and models.  In Volt app's all data is stored in a model.  From your html, you can bind things like attributes and text to a value in a model.
+
+### Name Example
+
+```html
+<label>Name:</label>
+<input type="text" value="{page._name}" />
+<p>Hello {page._name}</p>
+```
+
+In the example above, our model is called page (more about page later).  Any time a user changes the value of the field, page._name will be updated to the fields value.  When page._name is changed, the fields value changes.  Also when ```page._name``` changes, the page will show the text "Hello ..." where ... is the value of page._name.  These "two-way bindings" help us eliminiate a lot of code by keeping all of our application state in our models.  Data displayed in a view is always computed live from the data in the models.
+
+### Meal Cost Splitter Example
+
+```html
+<label>Cost:</label><input type="text" value="{page._cost}" /><br />
+<label>People:</label><input type="text" value="{page._people}" /><br />
+<p>Cost Per Person: {page._cost.to_f / page._people.to_f}</p>
+```
+In this example, a user can enter a cost and a number of people.  When either changes, the Cost Per Person will update.
+
+###

data/docs/JAVASCRIPT_COMPONENTS.md

@@ -0,0 +1,2 @@
+# Integrating JavaScript
+

data/docs/WHY.md

@@ -0,0 +1,39 @@
+# Why Volt?
+
+Volt is a new web framework.  You use Ruby for both your client and server code.  Volt helps you break your code into reusable components.  It handles managing all assets and dependencies for you.  Volt automatically updates your pages for you when your model data changes and sync's that data to the database for you.  By providing reusable structure and handling common tasks, Volt lets you build web app's really fast!
+
+# Features
+
+## Components
+
+Volt projects are broken into components.  Components are easy to create and simple to reuse.  They are easily shared and only require one line of code to insert into your project.  Volt provides many common components out of the box.
+
+## Reactive
+
+Data in volt is reactive by default.  Changes to the data is automatically updated in the DOM.
+
+
+## Data Syncing
+
+A lot of modern web development is moving data between the front-end to the back-end.  Volt eliminates all of that work.  Model's on the front-end automatically sync to the back-end, and vice versa.  Validations are run on both sides for security.  Models on the front-end are automatically updated whenever they are changed anywhere else (another browser, a background task, etc..)
+
+
+# Why Volt is Awesome
+
+- only the relevant DOM is updated.  There is no match and patch algorithm to update from strings like other frameworks, all associations are tracked through our reactive core, so we know exactly what needs to be updated without the need to generate any extra HTML.  This has a few advantages, namely that things like input fields are retained, so any properties (focus, tab position, etc...) are also retained.
+
+
+# Why Ruby
+
+Isomorphic type system with javascript
+
+In web development today, JavaScript gets to be the default language by virtue of being in the browser.  JavaScript is a very good language, but it has a lot of warts.  (See http://wtfjs.com/ for some great examples)  Some of these can introduce bugs, others are just difficult to deal with.  JavaScript was rushed to market quickly and standardized very quickly.  Ruby was used by a small community for years while most of the kinks were worked out.  Ruby also has some great concepts such as [uniform access](http://en.wikipedia.org/wiki/Uniform_access_principle), [mixin's](http://en.wikipedia.org/wiki/Mixin), [duck typing](http://en.wikipedia.org/wiki/Duck_typing), and [blocks](http://yehudakatz.com/2012/01/10/javascript-needs-blocks/) to name a few.  While many of these features can be implemented in JavaScript in userland, few are standardardized and the solutions are seldom eloquent.
+
+[5,10,1].sort()
+// [1, 10, 5]
+
+Uniform access and duck typing provides us with the ability to make reactive objects that have the exact same interface as a normal object.  This is a big win, nothing new to learn to do reactive programming.  They can also be used interchangably with regular objects.
+
+# Why Opal
+
+Opal is really an increadiable project, and the core team has done a great job.  Ruby and JavaScript are similar in a lot of ways.  This lets Opal compile to JavaScript that is very readable.  This also means that Opal's performance is great.  You'll find that in most cases Ruby code runs with no performance penality compared to the eqivilent JavaScript code.

data/lib/volt/cli.rb

@@ -32,8 +32,7 @@ module Volt
     end
 
     desc 'server', 'run the server on the project in the current directory'
-    method_option :port, type: :string, aliases: '-p', banner: 'the port the server should run on'
-    method_option :bind, type: :string, aliases: '-b', banner: 'the ip the server should bind to'
+    method_option :port, type: :string, aliases: '-p', banner: 'specify which port the server should run on'
 
     def server
       if RUBY_PLATFORM == 'java'
@@ -62,8 +61,9 @@ module Volt
         ENV['SERVER'] = 'true'
         args = ['start', '--threaded', '--max-persistent-conns', '300']
         args += ['--max-conns', '400'] unless Gem.win_platform?
-        args += ['-p', options[:port].to_s] if options[:port]
-        args += ['-b', options[:bind].to_s] if options[:bind]
+        if options[:port]
+          args += ['-p', options[:port].to_s]
+        end
 
         Thin::Runner.new(args).run!
       end

data/lib/volt/models/validations.rb

@@ -1,10 +1,8 @@
 # require 'volt/models/validations/errors'
-require 'volt/models/validators/email_validator'
 require 'volt/models/validators/length_validator'
-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/numericality_validator'
 
 module Volt
   # Include in any class to get validation logic

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

@@ -2,11 +2,10 @@ require 'volt/page/bindings/base_binding'
 
 module Volt
   class EachBinding < BaseBinding
-    def initialize(page, target, context, binding_name, getter, variable_name, index_name, template_name)
+    def initialize(page, target, context, binding_name, getter, variable_name, template_name)
       super(page, target, context, binding_name)
 
       @item_name     = variable_name
-      @index_name    = index_name
       @template_name = template_name
 
       @templates = []
@@ -29,6 +28,7 @@ module Volt
       # Since we're checking things like size, we don't want this to be re-triggered on a
       # size change, so we run without tracking.
       Computation.run_without_tracking do
+        # puts "RELOAD:-------------- #{value.inspect}"
         # Adjust to the new size
         values = current_values(value)
         @value = values
@@ -56,8 +56,9 @@ module Volt
 
     def item_removed(position)
       # Remove dependency
-      @templates[position].context.locals[:_index_dependency].remove
+      @templates[position].context.locals[:index_dependency].remove
 
+      # puts "REMOVE AT: #{position.inspect} - #{@templates[position].inspect} - #{@templates.inspect}"
       @templates[position].remove_anchors
       @templates[position].remove
       @templates.delete_at(position)
@@ -83,21 +84,17 @@ module Volt
       item_context.locals[@item_name.to_sym] = proc { @value[item_context.locals[:_index_value]]}
 
       position_dependency                    = Dependency.new
-      item_context.locals[:_index_dependency] = position_dependency
+      item_context.locals[:index_dependency] = position_dependency
 
       # Get and set index
-      item_context.locals[:_index=]           = proc do |val|
+      item_context.locals[:index=]           = proc do |val|
         position_dependency.changed!
         item_context.locals[:_index_value] = val
       end
 
-      # If the user provides an each_with_index, we can assign the lookup for the index
-      # variable here.
-      if @index_name
-        item_context.locals[@index_name.to_sym] = proc do
-          position_dependency.depend
-          item_context.locals[:_index_value]
-        end
+      item_context.locals[:index] = proc do
+        position_dependency.depend
+        item_context.locals[:_index_value]
       end
 
       item_template = TemplateRenderer.new(@page, @target, item_context, binding_name, @template_name)
@@ -112,7 +109,7 @@ module Volt
       size = @templates.size
       if size > 0
         start_index.upto(size - 1) do |index|
-          @templates[index].context.locals[:_index=].call(index)
+          @templates[index].context.locals[:index=].call(index)
         end
       end
     end

data/lib/volt/page/tasks.rb

@@ -1,6 +1,6 @@
 module Volt
   # The tasks class provides an interface to call tasks on
-  # the backend server.  This class is setup as page.task (as a singleton)
+  # the backend server.
   class Tasks
     def initialize(page)
       @page       = page
@@ -21,6 +21,7 @@ module Volt
       @promises[promise_id] = promise
 
       # TODO: Timeout on these callbacks
+
       @page.channel.send_message([promise_id, class_name, method_name, meta_data, *args])
 
       promise

data/lib/volt/server/html_parser/each_scope.rb

@@ -1,15 +1,12 @@
 module Volt
   class EachScope < ViewScope
-    def initialize(handler, path, content, with_index)
+    def initialize(handler, path, content)
       super(handler, path)
+      # @content, @variable_name = content.strip.split(/ as /)
 
-      if with_index
-        @content, @variable_name = content.split(/.each_with_index\s+do\s+\|/)
-        @variable_name, @index_name = @variable_name.gsub(/\|/, '').split(/\s*,\s*/)
-      else
-        @content, @variable_name = content.split(/.each\s+do\s+\|/)
-        @variable_name = @variable_name.gsub(/\|/, '')
-      end
+      @content, @variable_name = content.split(/.each\s+do\s+\|/)
+
+      @variable_name = @variable_name.gsub(/\|/, '')
     end
 
     def close_scope
@@ -20,7 +17,7 @@ module Volt
       super
 
       @handler.html << "<!-- $#{binding_number} --><!-- $/#{binding_number} -->"
-      @handler.scope.last.save_binding(binding_number, "lambda { |__p, __t, __c, __id| Volt::EachBinding.new(__p, __t, __c, __id, Proc.new { #{@content} }, #{@variable_name.inspect}, #{@index_name.inspect}, #{@path.inspect}) }")
+      @handler.scope.last.save_binding(binding_number, "lambda { |__p, __t, __c, __id| Volt::EachBinding.new(__p, __t, __c, __id, Proc.new { #{@content} }, #{@variable_name.inspect}, #{@path.inspect}) }")
     end
   end
 end

data/lib/volt/server/html_parser/view_scope.rb

@@ -42,9 +42,7 @@ module Volt
             add_template(args)
           else
             if content =~ /.each\s+do\s+\|/
-              add_each(content, false)
-            elsif content =~ /.each_with_index\s+do\s+\|/
-              add_each(content, true)
+              add_each(content)
             else
               add_content_binding(content)
             end
@@ -78,8 +76,8 @@ module Volt
       fail '#else can only be added inside of an if block'
     end
 
-    def add_each(content, with_index)
-      @handler.scope << EachScope.new(@handler, @path + "/__each#{@binding_number}", content, with_index)
+    def add_each(content)
+      @handler.scope << EachScope.new(@handler, @path + "/__each#{@binding_number}", content)
     end
 
     def add_template(content)

data/spec/apps/kitchen_sink/app/main/views/todos/index.html

@@ -7,9 +7,8 @@
   <div id="count">{{ completed }} of {{ _todos.size }}</div>
 
   <table id="todos-table" class="table">
-    {{ _todos.each_with_index do |todo, idx| }}
+    {{ _todos.each do |todo| }}
       <tr>
-        <td>{{ idx+1 }}.</td>
         <td><input type="checkbox" checked="{{ todo._completed }}"></td>
         <td class="name {{ if todo._completed }}complete{{ end }}">{{todo._name}}</td>
         <td><button e-click="remove_todo(todo)">X</button></td>

data/spec/models/validations_spec.rb

@@ -1,23 +1,19 @@
-require 'spec_helper'
+require 'volt/models'
 
 class TestModel < Volt::Model
-  validate :count, numericality: { min: 5, max: 10 }
-  validate :description, length: { message: 'needs to be longer', length: 50 }
-  validate :email, email: true
   validate :name, length: 4
-  validate :phone_number, phone_number: true
+  validate :description, length: { message: 'needs to be longer', length: 50 }
   validate :username, presence: true
+  validate :count, numericality: { min: 5, max: 10 }
 end
 
 describe Volt::Model do
   it 'should validate the name' do
     expect(TestModel.new.errors).to eq(
-      count: ['must be a number'],
-      description: ['needs to be longer'],
-      email: ['must be an email address'],
       name: ['must be at least 4 characters'],
-      phone_number: ['must be a phone number with area or country code'],
-      username: ['must be specified']
+      description: ['needs to be longer'],
+      username: ['must be specified'],
+      count: ['must be a number']
     )
   end
 
@@ -40,9 +36,7 @@ describe Volt::Model do
 
     model.save!
 
-    expect(model.marked_errors.keys).to eq(
-      [:count, :description, :email, :name, :phone_number, :username]
-    )
+    expect(model.marked_errors.keys).to eq([:name, :description, :username, :count])
   end
 
   describe 'length' do
@@ -87,31 +81,4 @@ describe Volt::Model do
     end
   end
 
-  describe 'email' do
-    it 'should validate email' do
-      model = TestModel.new
-
-      expect(model.marked_errors).to eq({})
-
-      model.mark_field!(:email)
-
-      expect(model.marked_errors).to eq(
-        email: ['must be an email address']
-      )
-    end
-  end
-
-  describe 'phone_number' do
-    it 'should validate phone number' do
-      model = TestModel.new
-
-      expect(model.marked_errors).to eq({})
-
-      model.mark_field!(:phone_number)
-
-      expect(model.marked_errors).to eq(
-        phone_number: ['must be a phone number with area or country code']
-      )
-    end
-  end
 end

data/spec/server/html_parser/view_parser_spec.rb

@@ -117,7 +117,7 @@ describe Volt::ViewParser do
                                    'html' => "      <div class=\"main\">\n        <!-- $0 --><!-- $/0 -->\n      </div>\n",
                                    'bindings' => {
                                      0 => [
-                                       "lambda { |__p, __t, __c, __id| Volt::EachBinding.new(__p, __t, __c, __id, Proc.new { _items }, \"item\", nil, \"main/main/main/body/__each0/__template/0\") }"
+                                       "lambda { |__p, __t, __c, __id| Volt::EachBinding.new(__p, __t, __c, __id, Proc.new { _items }, \"item\", \"main/main/main/body/__each0/__template/0\") }"
                                      ]
                                    }
                                  })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.8.26.beta1
+  version: 0.8.26
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -453,6 +453,9 @@ files:
 - app/volt/views/notices/index.html
 - bin/volt
 - docs/FAQ.md
+- docs/GETTING_STARTED.md
+- docs/JAVASCRIPT_COMPONENTS.md
+- docs/WHY.md
 - docs/volt-logo.jpg
 - lib/volt.rb
 - lib/volt/assets/test.rb
@@ -508,10 +511,8 @@ files:
 - lib/volt/models/persistors/store_state.rb
 - lib/volt/models/url.rb
 - lib/volt/models/validations.rb
-- lib/volt/models/validators/email_validator.rb
 - lib/volt/models/validators/length_validator.rb
 - 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/unique_validator.rb
 - lib/volt/page/bindings/attribute_binding.rb
@@ -630,8 +631,6 @@ files:
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
 - spec/models/validations_spec.rb
-- spec/models/validators/email_validator_spec.rb
-- spec/models/validators/phone_number_validator_spec.rb
 - spec/page/bindings/content_binding_spec.rb
 - spec/page/bindings/template_binding_spec.rb
 - spec/page/sub_context_spec.rb
@@ -724,9 +723,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -780,8 +779,6 @@ test_files:
 - spec/models/persistors/params_spec.rb
 - spec/models/persistors/store_spec.rb
 - spec/models/validations_spec.rb
-- spec/models/validators/email_validator_spec.rb
-- spec/models/validators/phone_number_validator_spec.rb
 - spec/page/bindings/content_binding_spec.rb
 - spec/page/bindings/template_binding_spec.rb
 - spec/page/sub_context_spec.rb

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

@@ -1,40 +0,0 @@
-module Volt
-  class EmailValidator
-    DEFAULT_REGEX = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
-    ERROR_MESSAGE = 'must be an email address'
-
-    def self.validate(model, old_model, field_name, options)
-      new(model, field_name, options).errors
-    end
-
-    def initialize(model, field_name, options)
-      @value = model.read_attribute field_name
-
-      case options
-      when Hash, true, false
-        configure options
-      else
-        fail 'arguments can only be a Boolean or a Hash'
-      end
-    end
-
-    def valid?
-      return false unless @value.is_a? String
-
-      !!@value.match(@custom_regex || DEFAULT_REGEX)
-    end
-
-    def errors
-      valid? ? {} : { email: [ @custom_message || ERROR_MESSAGE ] }
-    end
-
-    private
-
-    def configure(options)
-      return unless options.is_a? Hash
-
-      @custom_message = options.fetch(:error_message) { nil }
-      @custom_regex = options.fetch(:with) { nil }
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-module Volt
-  class PhoneNumberValidator
-    DEFAULT_REGEX = /^(\+?\d{1,2}[\.\-\ ]?\d{3}|\(\d{3}\)|\d{3})[\.\-\ ]?\d{3,4}[\.\-\ ]?\d{4}$/
-    ERROR_MESSAGE = 'must be a phone number with area or country code'
-
-    def self.validate(model, old_model, field_name, options)
-      new(model, field_name, options).errors
-    end
-
-    def initialize(model, field_name, options)
-      @value = model.read_attribute field_name
-
-      case options
-      when Hash, true, false
-        configure options
-      else
-        fail 'arguments can only be a Boolean or a Hash'
-      end
-    end
-
-    def valid?
-      return false unless @value.is_a? String
-
-      !!@value.match(@custom_regex || DEFAULT_REGEX)
-    end
-
-    def errors
-      valid? ? {} : { phone_number: [ @custom_message || ERROR_MESSAGE ] }
-    end
-
-    private
-
-    def configure(options)
-      return unless options.is_a? Hash
-
-      @custom_message = options.fetch(:error_message) { nil }
-      @custom_regex = options.fetch(:with) { nil }
-    end
-  end
-end

data/spec/models/validators/email_validator_spec.rb

@@ -1,120 +0,0 @@
-require 'spec_helper'
-
-describe Volt::EmailValidator do
-  subject { Volt::EmailValidator.new(*params) }
-  let(:params) { [ model, field_name, options ] }
-
-  let(:model) { Volt::Model.new email: email }
-  let(:field_name) { :email }
-  let(:options) { true }
-
-  let(:valid_email) { 'test@example.com' }
-  let(:invalid_email) { 'test@example-com' }
-  let(:email) { valid_email }
-
-  describe '.validate' do
-    let(:result) { described_class.validate(*params.dup.insert(1, nil)) }
-
-    before do
-      allow(described_class).to receive(:new).and_return subject
-      allow(subject).to receive(:errors).and_call_original
-
-      result
-    end
-
-    it 'initializes an email validator with the provided arguments' do
-      expect(described_class).to have_received(:new).with(*params)
-    end
-
-    it 'calls errors on the email validator' do
-      expect(subject).to have_received :errors
-    end
-
-    it 'returns the result of calling errors on the validator' do
-      expect(subject.errors).to eq result
-    end
-  end
-
-  describe '#valid?' do
-    context 'when using the default regex' do
-      let(:options) { true }
-
-      context 'when the email is valid' do
-        let(:email) { valid_email }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'when the email is missing a TLD' do
-        let(:email) { 'test@example' }
-
-        specify { expect(subject.valid?).to eq false }
-      end
-
-      context 'when the email TLD is only one character' do
-        let(:email) { 'test@example.c' }
-
-        specify { expect(subject.valid?).to eq false }
-      end
-
-      context 'when the email is missing an username' do
-        let(:email) { '@example.com' }
-
-        specify { expect(subject.valid?).to eq false }
-      end
-
-      context 'when the email is missing the @ symbol' do
-        let(:email) { 'test.example.com' }
-
-        specify { expect(subject.valid?).to eq false }
-      end
-    end
-
-    context 'when using a custom regex' do
-      let(:options) { { with: /.+\@.+/ } }
-
-      context 'and the email qualifies' do
-        let(:email) { 'test@example' }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'and the email does not qualify' do
-        let(:email) { 'test$example' }
-
-        specify { expect(subject.valid?).to eq false }
-      end
-    end
-  end
-
-  describe '#errors' do
-    context 'when the model has a valid email' do
-      let(:email) { valid_email }
-
-      it 'returns an empty error hash' do
-        expect(subject.errors).to eq({})
-      end
-    end
-
-    context 'when the model has an invalid email' do
-      let(:email) { invalid_email }
-
-      it 'returns an array of errors for email' do
-        expect(subject.errors).to eq(email: ['must be an email address'])
-      end
-    end
-
-    context 'when provided a custom error message' do
-      let(:options) { { error_message: custom_message } }
-      let(:custom_message) { 'this is a custom message' }
-
-      context 'and the email is invalid' do
-        let(:email) { invalid_email }
-
-        it 'returns errors with the custom message' do
-          expect(subject.errors).to eq(email: [ custom_message ])
-        end
-      end
-    end
-  end
-end

data/spec/models/validators/phone_number_validator_spec.rb

@@ -1,146 +0,0 @@
-require 'spec_helper'
-
-describe Volt::PhoneNumberValidator do
-  subject { Volt::PhoneNumberValidator.new(*params) }
-  let(:params) { [ model, field_name, options ] }
-
-  let(:model) { Volt::Model.new phone_number: phone_number }
-  let(:field_name) { :phone_number }
-  let(:options) { true }
-
-  let(:valid_us_number) { '(123)-123-1234' }
-  let(:valid_intl_number) { '+12 123 123 1234' }
-  let(:invalid_number) { '1234-123-123456' }
-  let(:phone_number) { valid_us_number }
-
-  describe '.validate' do
-    let(:result) { described_class.validate(*params.dup.insert(1, nil)) }
-
-    before do
-      allow(described_class).to receive(:new).and_return subject
-      allow(subject).to receive(:errors).and_call_original
-
-      result
-    end
-
-    it 'initializes a phone number validator with the provided arguments' do
-      expect(described_class).to have_received(:new).with(*params)
-    end
-
-    it 'calls errors on the phone number validator' do
-      expect(subject).to have_received :errors
-    end
-
-    it 'returns the result of calling errors on the validator' do
-      expect(subject.errors).to eq result
-    end
-  end
-
-  describe '#valid?' do
-    context 'when using the default regex' do
-      let(:options) { true }
-
-      context 'when the phone number is a valid US number' do
-        let(:phone_number) { valid_us_number }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'when the phone number is a valid international number' do
-        let(:phone_number) { valid_intl_number }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'when the phone number uses dashes' do
-        let(:phone_number) { '123-123-1234' }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'when the phone number uses periods' do
-        let(:phone_number) { '123.123.1234' }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'when the phone number uses spaces' do
-        let(:phone_number) { '123 123 1234' }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'when the phone number uses parentheses and a space' do
-        let(:phone_number) { '(123) 123.1234' }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'when an international number uses a plus' do
-        let(:phone_number) { '+12 123 123 1234' }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'when an international number does not use a plus' do
-        let(:phone_number) { '12 123 123 1234' }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'when an international number is from the UK' do
-        let(:phone_number) { '+12 123 1234 1234' }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-    end
-
-    context 'when using a custom regex' do
-      let(:options) { { with: /\d{10}/ } }
-
-      context 'and the phone number qualifies' do
-        let(:phone_number) { '1231231234' }
-
-        specify { expect(subject.valid?).to eq true }
-      end
-
-      context 'and the phone number does not qualify' do
-        let(:phone_number) { '123-123-1234' }
-
-        specify { expect(subject.valid?).to eq false }
-      end
-    end
-  end
-
-  describe '#errors' do
-    context 'when the model has a valid phone number' do
-      let(:phone_number) { valid_us_number }
-
-      it 'returns an empty error hash' do
-        expect(subject.errors).to eq({})
-      end
-    end
-
-    context 'when the model has an invalid phone number' do
-      let(:phone_number) { invalid_number }
-
-      it 'returns an array of errors for phone number' do
-        expect(subject.errors).to eq(
-          phone_number: ['must be a phone number with area or country code'])
-      end
-    end
-
-    context 'when provided a custom error message' do
-      let(:options) { { error_message: custom_message } }
-      let(:custom_message) { 'this is a custom message' }
-
-      context 'and the phone number is invalid' do
-        let(:phone_number) { invalid_number }
-
-        it 'returns errors with the custom message' do
-          expect(subject.errors).to eq(phone_number: [ custom_message ])
-        end
-      end
-    end
-  end
-end