volt 0.9.1 → 0.9.2

data/spec/models/model_spec.rb

@@ -201,7 +201,7 @@ describe Volt::Model do
     a = Volt::Model.new
 
     count = 0
-    -> { a._blue ; count += 1 }.watch!
+    -> { a._blue; count += 1 }.watch!
 
     expect(count).to eq(1)
 
@@ -219,7 +219,7 @@ describe Volt::Model do
 
     expect(count).to eq(0)
 
-    a._todos << {label: 'Be active'}
+    a._todos << { label: 'Be active' }
     Volt::Computation.flush!
 
     expect(count).to eq(1)
@@ -233,7 +233,7 @@ describe Volt::Model do
 
     expect(last_count).to eq(0)
 
-    a._todos! << {checked: true}
+    a._todos! << { checked: true }
     Volt::Computation.flush!
 
     expect(last_count).to eq(1)
@@ -304,7 +304,7 @@ describe Volt::Model do
     # Expand first
     a._new_item!
     count = 0
-    -> do
+    lambda do
       count += 1
       a._new_item._name
     end.watch!
@@ -459,7 +459,6 @@ describe Volt::Model do
           model.send(:"_#{attr_name}")
         end.to raise_error(Volt::InvalidFieldName, "`#{attr_name}` is reserved and can not be used as a field")
       end
-
     end
 
     it 'should prevent reserved attributes from being assigned directly' do
@@ -502,7 +501,7 @@ describe Volt::Model do
     expect(model._name).to eq('Jimmy')
   end
 
-  describe "model state" do
+  describe 'model state' do
     it 'should be new when created, then false after a change' do
       a = Volt::Model.new
       expect(a.new?).to eq(true)
@@ -515,12 +514,11 @@ describe Volt::Model do
       a = Volt::Model.new
       expect(a.new?).to eq(true)
 
-      a.attributes = {first: 'Jimmy', last: 'Dean'}
+      a.attributes = { first: 'Jimmy', last: 'Dean' }
       expect(a.new?).to eq(false)
     end
   end
 
-
   if RUBY_PLATFORM != 'opal'
     it 'should update other queries on the server when a new model is created' do
       query1 = store._todos!
@@ -529,21 +527,21 @@ describe Volt::Model do
       count = 0
 
       # count the number of todos
-      query2.fetch {|v| count += v.size }
+      query2.fetch { |v| count += v.size }
 
       expect(count).to eq(0)
 
-      query1 << {label: 'One'}
+      query1 << { label: 'One' }
 
       count = 0
-      query2.fetch {|v| count += v.size }
+      query2.fetch { |v| count += v.size }
 
       expect(count).to eq(1)
     end
 
     it 'should query twice and return twice' do
-      store._items << {name: 'One'}
-      store._items << {name: 'Two'}
+      store._items << { name: 'One' }
+      store._items << { name: 'Two' }
 
       a = store._items.fetch.sync
       b = store._items.fetch.sync
@@ -554,4 +552,12 @@ describe Volt::Model do
       expect(a.to_a).to eq(b.to_a)
     end
   end
+
+  describe 'destroy' do
+    it 'fails if attempting to destroy while parentless' do
+      model = Volt::Model.new(test: "yeah")
+      expect { model.destroy }.to raise_error(RuntimeError,
+        'Model does not have a parent and cannot be deleted.')
+    end
+  end
 end

data/spec/models/model_state_spec.rb

@@ -21,4 +21,4 @@ if RUBY_PLATFORM != 'opal'
       expect(store._items.loaded_state).to eq(:dirty)
     end
   end
-end
+end

data/spec/models/permissions_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 class TestUserTodo < Volt::Model
   own_by_user
 
@@ -47,7 +46,7 @@ class ::TestUpdateReadCheck < Volt::Model
   end
 end
 
-describe "model permissions" do
+describe 'model permissions' do
   it 'should follow CRUD states when checking permissions' do
     todo = TestUserTodoWithCrudStates.new.buffer
 
@@ -59,26 +58,23 @@ describe "model permissions" do
       todo._name = 'Jimmy'
 
       todo.save!.then do
-        spec_err = "should not have saved"
+        spec_err = 'should not have saved'
       end.fail do |err|
-        expect(err).to eq({:name=>["can not be changed"]})
+        expect(err).to eq(name: ['can not be changed'])
       end
     end.fail do |err|
       spec_err = "Did not save because: #{err.inspect}"
     end
 
-    if spec_err
-      fail spec_err
-    end
+    fail spec_err if spec_err
   end
 
   # it 'should deny an insert/create if a deny without fields' do
   #   store._todos << {name: 'Ryan'}
   # end
 
-
   if RUBY_PLATFORM != 'opal'
-    describe "read permissions" do
+    describe 'read permissions' do
       it 'should deny read on a field' do
         model = store._test_deny_read_names!.buffer
         model._name = 'Jimmy'
@@ -113,7 +109,7 @@ describe "model permissions" do
     end
 
     it 'should not check the read permissions when updating (so that all fields are present for the permissions check)' do
-      model = store._test_update_read_checks!.append({name: 'Ryan'}).sync
+      model = store._test_update_read_checks!.append(name: 'Ryan').sync
 
       expect(model.create_check).to eq(true)
       expect(model.read_check).to eq(nil)
@@ -146,7 +142,7 @@ describe "model permissions" do
     end
 
     it 'should not check read on delete, so all fields are available to the permissions block' do
-      model = store._test_update_read_checks!.append({name: 'Ryan'}).sync
+      model = store._test_update_read_checks!.append(name: 'Ryan').sync
 
       expect(model.read_check).to eq(nil)
 
@@ -155,4 +151,4 @@ describe "model permissions" do
       expect(model.read_check).to eq(nil)
     end
   end
-end
+end

data/spec/models/url_spec.rb

@@ -20,7 +20,7 @@ describe Volt::URL do
   subject { described_class.new fake_router }
 
   describe '#parse' do
-    let(:fake_router) { double('Router', url_to_params: {foo: 'bar'}) }
+    let(:fake_router) { double('Router', url_to_params: { foo: 'bar' }) }
     context 'with a valid url' do
       it 'returns "http" for scheme' do
         expect(subject.scheme).to eq 'http'

data/spec/models/user_spec.rb

@@ -2,9 +2,17 @@ require 'spec_helper'
 require 'volt/models/user'
 
 class FakeConfig
-  def public; self; end
-  def auth; self; end
-  def use_username; true; end
+  def public
+    self
+  end
+
+  def auth
+    self
+  end
+
+  def use_username
+    true
+  end
 end
 
 describe Volt::User do
@@ -16,13 +24,13 @@ describe Volt::User do
         allow(Volt).to receive(:config).and_return FakeConfig.new
       end
 
-      it "returns :username" do
+      it 'returns :username' do
         expect(subject).to eq :username
       end
     end
 
     describe 'when use_username is not set' do
-      it "returns :email" do
+      it 'returns :email' do
         expect(subject).to eq :email
       end
     end
@@ -36,11 +44,11 @@ describe Volt::User do
     if RUBY_PLATFORM != 'opal'
       describe 'when it is a Volt server' do
         before do
-          allow(BCrypt::Password).to receive(:create).with('test').
-            and_return 'hashed-password'
+          allow(BCrypt::Password).to receive(:create).with('test')
+            .and_return 'hashed-password'
         end
 
-        it "encrypts password" do
+        it 'encrypts password' do
           subject
 
           expect(BCrypt::Password).to have_received :create
@@ -49,7 +57,7 @@ describe Volt::User do
         it 'sets _hashed_password to passed value' do
           subject
 
-          expect(user._hashed_password).to eq "hashed-password"
+          expect(user._hashed_password).to eq 'hashed-password'
         end
       end
     end
@@ -61,7 +69,6 @@ describe Volt::User do
 
       subject { user.password = 'a valid test password' }
 
-
       it 'sets _password to passed value' do
         subject
 

data/spec/models/user_validation_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-
 describe Volt::UserValidatorHelpers do
-  context "with user" do
+  context 'with user' do
     before do
       allow(Volt).to receive(:current_user_id) { 294 }
     end
@@ -21,4 +20,4 @@ describe Volt::UserValidatorHelpers do
       expect(todo._user_id).to eq(294)
     end
   end
-end
+end

data/spec/models/validations_spec.rb

@@ -19,10 +19,9 @@ describe Volt::Model do
     Class.new(Volt::Model) do
       attr_accessor :ran_promise
       validate do
-
         Promise.new.then do
           self.ran_promise = true
-          {name: 'Invalid'}
+          { name: 'Invalid' }
         end
       end
     end
@@ -54,7 +53,7 @@ describe Volt::Model do
     model = test_model_with_promises.new
 
     model.validate!.then do |errs|
-      expect(errs).to eq({name: 'Invalid'})
+      expect(errs).to eq(name: 'Invalid')
       expect(model.ran_promise).to eq(true)
     end
   end
@@ -64,7 +63,7 @@ describe Volt::Model do
       specify do
         expect { model.mark_field! field }
           .to change { model.marked_errors }
-          .from({}).to({ field => [message ] })
+          .from({}).to(field => [message])
       end
     end
 
@@ -112,7 +111,7 @@ describe Volt::Model do
       Class.new(Volt::Model) do
         validate :special_field, format: [
           { with: /regex/, message: 'regex failed' },
-          { with: ->(x) {x == false}, message: 'proc failed' }
+          { with: ->(x) { x == false }, message: 'proc failed' }
         ]
       end
     end
@@ -121,9 +120,7 @@ describe Volt::Model do
       before { model._special_field = 'nope' }
 
       it 'returns an array of errors' do
-        expect(model.errors).to eq({
-          special_field: [ regex_message, proc_message ]
-        })
+        expect(model.errors).to eq(special_field: [regex_message, proc_message])
       end
     end
 
@@ -135,7 +132,7 @@ describe Volt::Model do
       end
 
       it 'returns an array with a single error' do
-        expect(model.errors.to_h).to eq({ special_field: [ proc_message ] })
+        expect(model.errors.to_h).to eq(special_field: [proc_message])
       end
     end
   end
@@ -167,4 +164,4 @@ describe Volt::Model do
     model._name = 'ok' # fails again
     expect(model._name).to eq('Jimmy')
   end
-end
+end

data/spec/models/validators/email_validator_spec.rb

@@ -41,7 +41,7 @@ describe Volt::Model do
       specify do
         expect { model.mark_field! field }
           .to change { model.marked_errors }
-          .from({}).to({ field => [message ] })
+          .from({}).to(field => [message])
       end
     end
 
@@ -89,7 +89,7 @@ describe Volt::Model do
       Class.new(Volt::Model) do
         validate :special_field, format: [
           { with: /regex/, message: 'regex failed' },
-          { with: ->(x) {x == false}, message: 'proc failed' }
+          { with: ->(x) { x == false }, message: 'proc failed' }
         ]
       end
     end
@@ -98,9 +98,7 @@ describe Volt::Model do
       before { model._special_field = 'nope' }
 
       it 'returns an array of errors' do
-        expect(model.errors).to eq({
-          special_field: [ regex_message, proc_message ]
-        })
+        expect(model.errors).to eq(special_field: [regex_message, proc_message])
       end
     end
 
@@ -112,7 +110,7 @@ describe Volt::Model do
       end
 
       it 'returns an array with a single error' do
-        expect(model.errors.to_h).to eq({ special_field: [ proc_message ] })
+        expect(model.errors.to_h).to eq(special_field: [proc_message])
       end
     end
   end
@@ -144,4 +142,4 @@ describe Volt::Model do
     model._name = 'ok' # fails again
     expect(model._name).to eq('Jimmy')
   end
-end
+end

data/spec/models/validators/format_validator_spec.rb

@@ -1,11 +1,19 @@
 require 'spec_helper'
 require 'models/validators/shared_examples_for_validators'
 
+# test fake used for edge cases where default_options are not Hash types.
+# Feel free to append stub methods to this class as needed for testing.
+class SpecValidator < Volt::FormatValidator
+  def default_options
+    "No hash here, no sir!"
+  end
+end
+
 describe Volt::FormatValidator do
   subject { described_class.new(*init_params) }
 
-  let(:init_params) { [ model, field_name ] }
-  let(:validate_params) { [ model, field_name, options ] }
+  let(:init_params) { [model, field_name] }
+  let(:validate_params) { [model, field_name, options] }
 
   let(:model) { Volt::Model.new field: field_content }
   let(:field_name) { :field }
@@ -38,4 +46,14 @@ describe Volt::FormatValidator do
 
     specify { expect(subject).to be_valid }
   end
-end
+
+  context 'when default_options is not a Hash' do
+    it 'returns the options hash instead of default_options' do
+      user = Volt::Model.new(email: "rick@nolematad.io")
+      validator = SpecValidator.new(user, 'email')
+      options = { with: /.+@.+/, message: 'must include an @ symbol' }
+      results = validator.apply(options).errors
+      expect(results.empty?).to be_truthy
+    end
+  end
+end

data/spec/models/validators/length_validator_spec.rb

@@ -6,23 +6,21 @@ describe Volt::LengthValidator do
 
   let(:model) { Volt::Model.new name: name }
   let(:field_name) { :name }
-  let(:name) { "John Doe" }
+  let(:name) { 'John Doe' }
 
   describe '.validate' do
     describe 'when options is a Fixnum' do
       let(:options) { 5 }
 
       describe 'when name is "John Doe"' do
-        let(:name) { "John Doe" }
+        let(:name) { 'John Doe' }
         it { expect(subject).to eq({}) }
       end
 
       describe 'when name is "John"' do
-        let(:name) { "John" }
+        let(:name) { 'John' }
         it do
-          expect(subject).to eq({
-            name: ["must be at least 5 characters"]
-          })
+          expect(subject).to eq(name: ['must be at least 5 characters'])
         end
       end
     end
@@ -33,36 +31,28 @@ describe Volt::LengthValidator do
       end
 
       describe 'when name is "John Doe"' do
-        let(:name) { "John Doe" }
+        let(:name) { 'John Doe' }
         it { expect(subject).to eq({}) }
       end
 
       describe 'when name is "John"' do
-        let(:name) { "John" }
+        let(:name) { 'John' }
         it do
           if RUBY_PLATFORM == 'opal'
-            expect(subject).to eq({
-              name: ["must be at least {\"length\"=>5, \"maximum\"=>10} characters"]
-            })
+            expect(subject).to eq(name: ["must be at least {\"length\"=>5, \"maximum\"=>10} characters"])
           else
-            expect(subject).to eq({
-              name: ["must be at least {:length=>5, :maximum=>10} characters"]
-            })
+            expect(subject).to eq(name: ['must be at least {:length=>5, :maximum=>10} characters'])
           end
         end
       end
 
       describe 'when name is "Zach Galifianakis"' do
-        let(:name) { "Zach Galifianakis" }
+        let(:name) { 'Zach Galifianakis' }
         it do
           if RUBY_PLATFORM == 'opal'
-            expect(subject).to eq({
-             name: ["must be less than {\"length\"=>5, \"maximum\"=>10} characters"]
-            })
+            expect(subject).to eq(name: ["must be less than {\"length\"=>5, \"maximum\"=>10} characters"])
           else
-            expect(subject).to eq({
-             name: ["must be less than {:length=>5, :maximum=>10} characters"]
-            })
+            expect(subject).to eq(name: ['must be less than {:length=>5, :maximum=>10} characters'])
           end
         end
       end
@@ -71,7 +61,7 @@ describe Volt::LengthValidator do
     describe 'when options not a Fixnum or a Hash' do
       let(:options) { 'string' }
 
-      it "raises an exception" do
+      it 'raises an exception' do
         expect { subject }.to raise_error(
           RuntimeError,
           'The arguments to length must be a number or a hash'