volt 0.8.27.beta3 → 0.8.27.beta4

data/spec/apps/kitchen_sink/Gemfile

@@ -11,7 +11,9 @@ gem 'volt-bootstrap'
 gem 'volt-bootstrap-jumbotron-theme'
 
 gem 'volt-fields'
-gem 'volt-user-templates'
+gem 'volt-user-templates', path: '/Users/ryanstout/Sites/volt/apps/volt-user-templates'
+
+gem 'opal'
 
 # Server for MRI
 platform :mri do

data/spec/apps/kitchen_sink/app/main/config/routes.rb

@@ -1,15 +1,16 @@
 # See https://github.com/voltrb/volt#routes for more info on routes
 
-get '/bindings/{{_route_test}}', _action: 'bindings'
-get '/bindings', _action: 'bindings'
-get '/store', _action: 'store'
-get '/cookie_test', _action: 'cookie_test'
-get '/flash', _action: 'flash'
-get '/todos', _controller: 'todos'
+get '/bindings/{{ route_test }}', action: 'bindings'
+get '/bindings', action: 'bindings'
+get '/store', action: 'store'
+get '/cookie_test', action: 'cookie_test'
+get '/flash', action: 'flash'
+get '/yield', action: 'yield'
+get '/todos', controller: 'todos'
 
 # Signup/login routes
-get '/signup', _controller: 'user-templates', _action: 'signup'
-get '/login', _controller: 'user-templates', _action: 'login'
+get '/signup', controller: 'user-templates', action: 'signup'
+get '/login', controller: 'user-templates', action: 'login'
 
 # The main route, this should be last.  It will match any params not previously matched.
 get '/', {}

data/spec/apps/kitchen_sink/app/main/controllers/main_controller.rb

@@ -1,6 +1,11 @@
 class MainController < Volt::ModelController
   model :page
 
+  def index
+    a = {}
+    a[{}] = 5
+  end
+
   def flash_notice
     flash._notices << 'A notice message'
   end
@@ -27,6 +32,10 @@ class MainController < Volt::ModelController
     self.model = page._new_cookie.buffer
   end
 
+  def content_string
+    'content'
+  end
+
   private
 
   # the main template contains a #template binding that shows another

data/spec/apps/kitchen_sink/app/main/controllers/yield_component_controller.rb

@@ -0,0 +1,5 @@
+class YieldComponentController < Volt::ModelController
+  def content_string
+    'wrong'
+  end
+end

data/spec/apps/kitchen_sink/app/main/views/main/cookie_test.html

@@ -20,6 +20,6 @@
 
   <ul>
     {{ cookies.keys.each do |key| }}
-      <li>{{ key }}: {{ cookies.read_attribute(key) }} <button class="cookieDelete" e-click="cookies.delete(key)">X</button></li>
+      <li>{{ key }}: {{ cookies.get(key) }} <button class="cookieDelete" e-click="cookies.delete(key)">X</button></li>
     {{ end }}
   </ul>

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

@@ -4,4 +4,4 @@
 <:Body>
 	<h2>Kitchen Sink</h2>
 
-  <p>The kitchen sink app both showcases many of the features of Volt and acts as an app for integration testing.</p>
+  <p>The kitchen sink app both showcases many of the features of Volt and acts as an app for integration testing.</p>

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

@@ -11,6 +11,7 @@
         <:nav href="/flash" text="Flash" />
         <:nav href="/cookie_test" text="Cookies" />
         <:nav href="/store" text="Store" />
+        <:nav href="/yield" text="Yield" />
         <:user-templates:menu />
       </ul>
       <h3 class="text-muted">Project name</h3>
@@ -21,7 +22,7 @@
     {{ template main_path, 'body', {controller_group: 'main'} }}
 
     <div class="footer">
-      <p>&copy; Company 2014</p>
+      <p>&copy; Company {{ Time.now.year }}</p>
     </div>
 
   </div>

data/spec/apps/kitchen_sink/app/main/views/main/yield.html

@@ -0,0 +1,18 @@
+<:Title>
+  Yield Binding
+
+<:Body>
+  <:yield-test>My yielded content {{ @i ||= 0 ; @i += 1 }}</:yield-test>
+
+  <:yield-component>This is my {{ content_string }}</:yield-component>
+
+<:Yield-test>
+  <h1>Yield Section</h1>
+
+  <p>{{ yield }}</p>
+  <p>{{ yield }}</p>
+
+
+  {{ if Volt.user }}
+    Email: {{ Volt.user._email }}
+  {{ end }}

data/spec/apps/kitchen_sink/app/main/views/yield-component/index.html

@@ -0,0 +1,4 @@
+<:Body>
+  <h1>Yield Component</h1>
+
+  {{ yield }}

data/spec/extra_core/logger_spec.rb

@@ -25,7 +25,9 @@ if RUBY_PLATFORM != 'opal'
       expect(logger_with_opts.args).to eq([5, :arg2])
     end
 
-    context 'when STDOUT is a TTY' do
+    describe 'when STDOUT is a TTY' do
+      before { allow(STDOUT).to receive(:tty?).and_return(true) }
+      
       it 'should return a blue class name' do
         expect(logger_with_opts.class_name).to eq("\e[1;34m#{class_name}\e[0;37m")
       end
@@ -39,7 +41,7 @@ if RUBY_PLATFORM != 'opal'
       end
     end
 
-    context 'when STDOUT is not a TTY' do
+    describe 'when STDOUT is not a TTY' do
       before { allow(STDOUT).to receive(:tty?).and_return(false) }
 
       it 'should not add any terminal color codes' do

data/spec/integration/user_spec.rb

@@ -33,48 +33,48 @@ if ENV['BROWSER']
 
       expect(page).to have_content('Test Account 9550')
     end
-
-    it 'should login and logout' do
-      visit '/'
-
-      # Add the user
-      $page.store._users << { email: 'test@test.com', password: 'awes0mesEcRet', name: 'Test Account 9550' }
-
-      click_link 'Login'
-
-      fields = all(:css, 'form .form-control')
-      fields[0].set('test@test.com')
-      fields[1].set('awes0mesEcRet')
-      click_button 'Login'
-
-      expect(page).to have_content('Test Account 9550')
-
-      # Click the logout link
-      click_link 'Test Account 9550'
-      click_link 'Logout'
-
-      expect(page).to_not have_content('Test Account 9550')
-    end
-
-    it 'should fail to create an account without a valid email and password' do
-      visit '/'
-
-      click_link 'Login'
-      click_link 'Signup here'
-
-      expect(page).to_not have_content('must be at least 8 characters')
-
-      fields = all(:css, 'form .form-control')
-
-      fields[0].set('test')
-      fields[1].set('awe')
-      fields[2].set('Tes')
-
-      # some capybara drivers don't trigger blur correctly
-      page.execute_script("$('.form-control').blur()")
-
-      expect(page).to have_content('must be at least 8 characters')
-    end
+    #
+    # it 'should login and logout' do
+    #   visit '/'
+    #
+    #   # Add the user
+    #   $page.store._users << { email: 'test@test.com', password: 'awes0mesEcRet', name: 'Test Account 9550' }
+    #
+    #   click_link 'Login'
+    #
+    #   fields = all(:css, 'form .form-control')
+    #   fields[0].set('test@test.com')
+    #   fields[1].set('awes0mesEcRet')
+    #   click_button 'Login'
+    #
+    #   expect(page).to have_content('Test Account 9550')
+    #
+    #   # Click the logout link
+    #   click_link 'Test Account 9550'
+    #   click_link 'Logout'
+    #
+    #   expect(page).to_not have_content('Test Account 9550')
+    # end
+    #
+    # it 'should fail to create an account without a valid email and password' do
+    #   visit '/'
+    #
+    #   click_link 'Login'
+    #   click_link 'Signup here'
+    #
+    #   expect(page).to_not have_content('must be at least 8 characters')
+    #
+    #   fields = all(:css, 'form .form-control')
+    #
+    #   fields[0].set('test')
+    #   fields[1].set('awe')
+    #   fields[2].set('Tes')
+    #
+    #   # some capybara drivers don't trigger blur correctly
+    #   page.execute_script("$('.form-control').blur()")
+    #
+    #   expect(page).to have_content('must be at least 8 characters')
+    # end
   end
 
 end

data/spec/integration/yield_spec.rb

@@ -0,0 +1,18 @@
+if ENV['BROWSER']
+  require 'spec_helper'
+
+  describe 'yield binding', type: :feature, sauce: true do
+    before do
+      visit '/yield'
+    end
+
+    it 'should render the yielded content multiple times' do
+      expect(page).to have_content("My yielded content 1")
+      expect(page).to have_content("My yielded content 2")
+    end
+
+    it 'should render the content from the tag\'s controller when yielding' do
+      expect(page).to have_content('This is my content')
+    end
+  end
+end

data/spec/models/associations_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+class ::Person < Volt::Model
+  has_many :addresses
+end
+
+class ::Address < Volt::Model
+  belongs_to :person
+end
+
+describe Volt::Associations do
+  if RUBY_PLATFORM != 'opal'
+    before do
+      # DataStore.new.drop_database
+      # $page.instance_variable_set('@store', nil)
+
+      store._people << {name: 'Jimmy'}
+      @person = store._people[0]
+      @person._addresses << {city: 'Bozeman'}
+      @person._addresses << {city: 'Portland'}
+    end
+
+    it 'should associate via belongs_to' do
+      address = store._addresses.fetch_first.sync
+
+      expect(address.person.sync._id).to eq(@person._id)
+    end
+
+    it 'should associate via has_many' do
+      person = store._people.fetch_first.sync
+
+      addresses = person.addresses.fetch.sync
+      expect(addresses.size).to eq(2)
+      expect(addresses[0]._city).to eq('Bozeman')
+    end
+  end
+end

data/spec/models/dirty_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+describe "Volt::Dirty" do
+  let(:model) do
+    model = Volt::Model.new
+
+    # Run changed on the model will revert changes after each sync
+    allow(model).to receive(:run_changed)
+
+    model
+  end
+
+  it 'should track changed attributes' do
+    model._name = 'Bob'
+    expect(model.name_was).to eq(nil)
+
+    model._name = 'Jimmy'
+    expect(model.name_was).to eq(nil)
+    expect(model.name_changes).to eq([nil, 'Bob'])
+
+    model._name = 'Martin'
+    expect(model.name_was).to eq(nil)
+    expect(model.name_changes).to eq([nil, 'Bob', 'Jimmy'])
+
+    model._name = nil
+    expect(model.name_was).to eq(nil)
+    expect(model.name_changes).to eq([nil, 'Bob', 'Jimmy', 'Martin'])
+
+    model._name = 'Ryan'
+    expect(model.name_was).to eq(nil)
+    expect(model.name_changes).to eq([nil, 'Bob', 'Jimmy', 'Martin', nil])
+
+    expect(model.changed_attributes).to eq({:name=>[nil, "Bob", "Jimmy", "Martin", nil]})
+  end
+
+  it 'should say models are changed' do
+    expect(model.changed?(:name)).to eq(false)
+    model._name = 'Bob'
+
+    expect(model.changed?(:name)).to eq(true)
+    model._name = 'Jimmy'
+
+    expect(model.changed?(:name)).to eq(true)
+
+    model.clear_tracked_changes!
+
+    expect(model.changed?(:name)).to eq(false)
+  end
+
+  it 'should reset changes' do
+    expect(model.changed?(:name)).to eq(false)
+    model._name = 'Bob'
+    expect(model.changed?(:name)).to eq(true)
+    model._name = 'Jimmy'
+    expect(model.changed?(:name)).to eq(true)
+
+    expect(model.name_was).to eq(nil)
+    expect(model.name_changes).to eq([nil, 'Bob'])
+
+    model.clear_tracked_changes!
+
+    expect(model.name_was).to eq(nil)
+  end
+
+  it 'should not track when assigning the same value' do
+    expect(model.changed?(:name)).to eq(false)
+    model._name = nil
+    expect(model.changed?(:name)).to eq(false)
+
+    model._name = 'bob'
+    expect(model.changed?(:name)).to eq(true)
+    expect(model.name_changes).to eq([nil])
+
+    model._name = 'bob'
+    expect(model.name_changes).to eq([nil])
+  end
+
+  it 'should revert changes' do
+    expect(model.attributes).to eq({})
+    model.attributes = {first: 'Bob', last: 'Smith'}
+    expect(model.attributes).to eq({first: 'Bob', last: 'Smith'})
+
+    model.revert_changes!
+    expect(model.attributes).to eq({first: nil, last: nil})
+  end
+
+  it 'should revert changes after a clear_tracked_changed!' do
+    expect(model.attributes).to eq({})
+    model.attributes = {first: 'Bob', last: 'Smith'}
+    expect(model.attributes).to eq({first: 'Bob', last: 'Smith'})
+
+    model.clear_tracked_changes!
+    expect(model.changed_attributes).to eq({})
+
+    model._first = 'Jimmy'
+    model._last = 'Dean'
+    expect(model.attributes).to eq({first: 'Jimmy', last: 'Dean'})
+
+    model.revert_changes!
+    expect(model.attributes).to eq({first: 'Bob', last: 'Smith'})
+  end
+end

data/spec/models/model_spec.rb

@@ -7,6 +7,12 @@ end
 class Item < Volt::Model
 end
 
+class TestAssignsMethod < Volt::Model
+  def name=(val)
+    self._name = val
+  end
+end
+
 describe Volt::Model do
   it 'should allow _ methods to be used to store values without predefining them' do
     a = Volt::Model.new
@@ -196,22 +202,22 @@ describe Volt::Model do
     a = Volt::Model.new
 
     count = 0
-    -> { a._blue && a._blue.respond_to?(:green) && a._blue._green; count += 1 }.watch!
+    -> { a._blue && a._blue.respond_to?(:_green) && a._blue._green; count += 1 }.watch!
     expect(count).to eq(1)
 
     a._blue._green = 5
     Volt::Computation.flush!
 
-    expect(count).to eq(1)
+    expect(count).to eq(2)
 
     a._blue = 22
     Volt::Computation.flush!
-    expect(count).to eq(2)
+    expect(count).to eq(3)
 
     a._blue = { green: 50 }
     expect(a._blue._green).to eq(50)
     Volt::Computation.flush!
-    expect(count).to eq(3)
+    expect(count).to eq(4)
   end
 
   it 'should trigger changed when a value is deleted' do
@@ -381,13 +387,13 @@ describe Volt::Model do
     end
 
     it 'should set the model path for a sub array' do
-      @model._items << { _name: 'Bob' }
+      @model._items << { name: 'Bob' }
       expect(@model._items.path).to eq([:items])
       expect(@model._items[0].path).to eq([:items, :[]])
     end
 
     it 'should set the model path for sub sub arrays' do
-      @model._lists << { _name: 'List 1', _items: [] }
+      @model._lists << { name: 'List 1', items: [] }
       expect(@model._lists[0]._items.path).to eq([:lists, :[], :items])
     end
 
@@ -431,8 +437,6 @@ describe Volt::Model do
   if RUBY_PLATFORM != 'opal'
     describe 'class loading' do
       it 'should load classes for models' do
-        $page.add_model('Item')
-
         @model = Volt::Model.new
 
         # Should return a buffer of the right type
@@ -444,4 +448,56 @@ describe Volt::Model do
       end
     end
   end
+
+  it 'should have assignments optionally go through a method' do
+    model = TestAssignsMethod.new
+
+    model._name = 'Jimmy'
+
+    expect(model._name).to eq('Jimmy')
+  end
+
+  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)
+
+      a._name = 'Ryan'
+      expect(a.new?).to eq(false)
+    end
+
+    it 'should allow multiple assignments with attributes, changing new? to false after' do
+      a = Volt::Model.new
+      expect(a.new?).to eq(true)
+
+      a.attributes = {first: 'Jimmy', last: 'Dean'}
+      expect(a.new?).to eq(false)
+    end
+
+    it 'should load store models ' do
+
+    end
+  end
+
+
+  if RUBY_PLATFORM != 'opal'
+    it 'should update other queries on the server when a new model is created' do
+      query1 = store._todos
+      query2 = store._todos.limit(1)
+
+      count = 0
+
+      # count the number of todos
+      query2.fetch {|v| count += v.size }
+
+      expect(count).to eq(0)
+
+      query1 << {label: 'One'}
+
+      count = 0
+      query2.fetch {|v| count += v.size }
+
+      expect(count).to eq(1)
+    end
+  end
 end

data/spec/models/model_state_spec.rb

@@ -0,0 +1,24 @@
+# Models automatically unload if no dependencies are listening and they have not been .keep (kept)
+
+if RUBY_PLATFORM != 'opal'
+  require 'spec_helper'
+
+  describe Volt::Model do
+    it 'should stay loaded while a computaiton is watching some data' do
+      expect(store._items.loaded_state).to eq(:not_loaded)
+
+      comp = -> { store._items.size }.watch!
+
+      # On the server models do a blocking load
+      expect(store._items.loaded_state).to eq(:loaded)
+
+      comp.stop
+
+      Volt::Timers.flush_next_tick_timers!
+
+      # Computation stopped listening, so the collection should unload and be set to
+      # a dirty state
+      expect(store._items.loaded_state).to eq(:dirty)
+    end
+  end
+end

data/spec/models/permissions_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+
+class TestUserTodo < Volt::Model
+  own_by_user
+
+  permissions(:update) do
+    deny :user_id
+  end
+end
+
+class TestUserTodoWithCrudStates < Volt::Model
+  permissions(:create, :update) do |state|
+    # Name is set on create, then can not be changed
+    deny unless state == :create
+  end
+end
+
+class ::TestDenyDelete < Volt::Model
+  permissions(:delete) do
+    deny
+  end
+end
+
+class ::TestDenyReadName < Volt::Model
+  permissions(:read) do
+    deny :name
+  end
+end
+
+describe "model permissions" do
+  it 'should follow CRUD states when checking permissions' do
+    todo = TestUserTodoWithCrudStates.new.buffer
+
+    spec_err = nil
+
+    todo._name = 'Test Todo'
+    todo.save!.then do
+      # Don't allow it to change
+      todo._name = 'Jimmy'
+
+      todo.save!.then do
+        spec_err = "should not have saved"
+      end.fail do |err|
+        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
+  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
+      it 'should deny read on a field' do
+        model = store._test_deny_read_names.buffer
+        model._name = 'Jimmy'
+        model._other = 'should be visible'
+
+        model.save!.sync
+
+        # Clear the identity map, so we can load up a fresh copy
+        model.save_to.persistor.clear_identity_map
+
+        reloaded = store._test_deny_read_names.fetch_first.sync
+
+        expect(reloaded._name).to eq(nil)
+        expect(reloaded._other).to eq('should be visible')
+      end
+    end
+
+    it 'should prevent delete if denied' do
+      model = store._test_deny_deletes.buffer
+
+      model.save!.then do
+        # Saved
+        count = 0
+
+        store._test_deny_deletes.delete(model).then do
+          # deleted
+          count += 1
+        end
+
+        expect(count).to eq(1)
+      end
+    end
+  end
+end