volt 0.8.18 → 0.8.19

data/lib/volt/reactive/reactive_array.rb

@@ -25,6 +25,11 @@ module Volt
       @array.each(&block)
     end
 
+    def empty?
+      @size_dep.depend
+      @array.empty?
+    end
+
     def count(&block)
       if block
         count = 0
@@ -220,6 +225,8 @@ module Volt
     end
 
     def inspect
+      # TODO: should also depend on items in array
+      @size_dep.depend
       "#<#{self.class}:#{object_id} #{@array.inspect}>"
     end
 

data/lib/volt/reactive/reactive_hash.rb

@@ -35,6 +35,7 @@ module Volt
 
     def delete(key)
       @deps.delete(key)
+      @all_deps.changed!
       @hash.delete(key)
     end
 
@@ -42,9 +43,25 @@ module Volt
       @hash.each_pair do |key, _|
         delete(key)
       end
+
+      @all_deps.changed!
+    end
+
+    def replace(hash)
+      clear
+
+      hash.each_pair do |key, value|
+        self[key] = value
+      end
+    end
+
+    def to_h
+      @all_deps.depend
+      @hash
     end
 
     def inspect
+      @all_deps.depend
       "#<ReactiveHash #{@hash.inspect}>"
     end
   end

data/lib/volt/server.rb

@@ -122,7 +122,7 @@ module Volt
 
       @app.use Rack::Static,
                urls: ['/'],
-               root: 'public',
+               root: 'config/base',
                index: '',
                header_rules: [
                  [:all, { 'Cache-Control' => 'public, max-age=86400' }]

data/lib/volt/server/component_templates.rb

@@ -4,10 +4,11 @@ require 'volt/server/html_parser/view_parser'
 # setup code (for controllers, models, views, and routes)
 module Volt
   class ComponentTemplates
+    # client is if we are generating for the client or backend
     def initialize(component_path, component_name, client = true)
       @component_path = component_path
       @component_name = component_name
-      @client         = true
+      @client         = client
     end
 
     def code
@@ -21,11 +22,7 @@ module Volt
     end
 
     def page_reference
-      if @client
-        '$page'
-      else
-        'page'
-      end
+      '$page'
     end
 
     def generate_view_code

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

@@ -107,7 +107,7 @@ module Volt
     end
 
     def add_component(tag_name, attributes, unary)
-      component_name = tag_name[1..-1].gsub(':', '/')
+      component_name = tag_name[1..-1].tr(':', '/')
 
       @handler.html << "<!-- $#{@binding_number} --><!-- $/#{@binding_number} -->"
 

data/lib/volt/server/rack/component_code.rb

@@ -12,12 +12,13 @@ module Volt
       @client          = client
     end
 
-    def code
+    # The client argument is for if this code is being generated for the client
+    def code(client=true)
       code = ''
 
       asset_files = AssetFiles.new(@component_name, @component_paths)
       asset_files.component_paths.each do |component_path, component_name|
-        code << ComponentTemplates.new(component_path, component_name, @client).code
+        code << ComponentTemplates.new(component_path, component_name, client).code
         code << "\n\n"
       end
 

data/lib/volt/server/rack/component_paths.rb

@@ -1,4 +1,6 @@
 # ComponentPaths gives an array of every folder where you find a component.
+require 'volt/server/rack/component_code'
+
 module Volt
   class ComponentPaths
     def initialize(root = nil)
@@ -73,6 +75,19 @@ module Volt
             end
           end
         end
+
+        # component_names = []
+        # app_folders do |app_folder|
+        #   Dir["#{app_folder}/*"].map {|cp| cp[/[^\/]+$/] }.each do |component_name|
+        #     component_names << component_name
+        #   end
+        # end
+        #
+        # # Load in all views
+        # component_names.uniq.each do |component_name|
+        #   code = Volt::ComponentCode.new(component_name, self).code
+        #   eval(code)
+        # end
       end
     end
 

data/lib/volt/server/rack/index_files.rb

@@ -34,7 +34,7 @@ module Volt
     end
 
     def html
-      index_path = File.expand_path(File.join(Volt.root, 'public/index.html'))
+      index_path = File.expand_path(File.join(Volt.root, 'config/base/index.html'))
       html       = File.read(index_path)
 
       ERB.new(html).result(binding)

data/lib/volt/tasks/dispatcher.rb

@@ -2,34 +2,48 @@ module Volt
   # The task dispatcher is responsible for taking incoming messages
   # from the socket channel and dispatching them to the proper handler.
   class Dispatcher
+
+    # Dispatch takes an incoming Task from the client and runs it on the
+    # server, returning the result to the client.
+    # Tasks returning a promise will wait to return.
     def dispatch(channel, message)
-      callback_id, class_name, method_name, *args = message
+      callback_id, class_name, method_name, meta_data, *args = message
       method_name = method_name.to_sym
 
       # Get the class
       klass = Object.send(:const_get, class_name)
 
-      result = nil
-      error = nil
+      promise = Promise.new
 
+      # Check that we are calling on a TaskHandler class and a method provide at
+      # TaskHandler or above in the ancestor chain.
       if safe_method?(klass, method_name)
+        promise.resolve(nil)
+
         # Init and send the method
-        begin
+        promise = promise.then do
+          Thread.current['meta'] = meta_data
+
           result = klass.new(channel, self).send(method_name, *args)
-        rescue => e
-          # TODO: Log these errors better
-          puts e.inspect
-          puts e.backtrace
-          error = e
+
+          Thread.current['meta'] = nil
+
+          result
         end
+
       else
         # Unsafe method
-        error = RuntimeError.new("unsafe method: #{method_name}")
+        promise.reject(RuntimeError.new("unsafe method: #{method_name}"))
       end
 
       if callback_id
-        # Callback with result
-        channel.send_message('response', callback_id, result, error)
+        # Run the promise and pass the return value/error back to the client
+        promise.then do |result|
+          channel.send_message('response', callback_id, result, nil)
+        end.fail do |error|
+          channel.send_message('response', callback_id, nil, error)
+          Volt.logger.error(error)
+        end
       end
     end
 

data/lib/volt/tasks/task_handler.rb

@@ -4,7 +4,16 @@ module Volt
       # On the front-end we setup a proxy class to the backend that returns
       # promises for all calls.
       def self.method_missing(name, *args, &block)
-        $page.tasks.call(self.name, name, *args, &block)
+        # Meta data is passed from the browser to the server so the server can know
+        # things like who's logged in.
+        meta_data = {}
+
+        user_id = $page.cookies._user_id
+        unless user_id.nil?
+          meta_data['user_id'] = user_id
+        end
+
+        $page.tasks.call(self.name, name, meta_data, *args, &block)
       end
     else
       def initialize(channel = nil, dispatcher = nil)
@@ -22,21 +31,14 @@ module Volt
       end
 
       # On the backend, we proxy all class methods like we would
-      # on the front-end.  This returns promises.
+      # on the front-end.  This returns a promise, even if the
+      # original code did not.
       def self.method_missing(name, *args, &block)
-        promise = Promise.new
-
-        begin
-          result = new(nil, nil).send(name, *args, &block)
-
-          promise.resolve(result)
-        rescue => e
-          puts "Task Error: #{e.inspect}"
-          puts e.backtrace
-          promise.reject(e)
-        end
-
-        promise
+        # TODO: optimize: this could run the inside first to see if it
+        # returns a promise, so we don't have to wrap it.
+        return Promise.new.then do
+          new(nil, nil).send(name, *args, &block)
+        end.resolve(nil)
       end
 
       # Provide access to the store collection

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

@@ -3,7 +3,10 @@
 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 '/users_test', _controller: 'users_test'
 
 # 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,32 @@
 class MainController < Volt::ModelController
   model :page
 
+  def flash_notice
+    flash._notices << 'A notice message'
+  end
+
+  def flash_success
+    flash._successes << 'A success message'
+  end
+
+  def flash_warning
+    flash._warnings << 'A warning message'
+  end
+
+  def flash_error
+    flash._errors << 'An error message'
+  end
+
+  def cookie_test
+    self.model = page._new_cookie.buffer
+  end
+
+  def add_cookie
+    cookies.send(:"_#{_name.to_s}=", _value)
+
+    self.model = page._new_cookie.buffer
+  end
+
   private
 
   # the main template contains a #template binding that shows another

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

@@ -0,0 +1,27 @@
+class UsersTestController < Volt::ModelController
+  def index
+    self.model = store._users.buffer
+  end
+
+  def signup
+    puts "Signup"
+    model.save!.then do |a|
+      puts "Saved"
+    end.fail do |err|
+      puts "Fail with: #{err.inspect}"
+    end
+  end
+
+  def login
+    puts "USER LOGIN"
+    User.login('ryanstout@gmail.com', 'temppass').then do |result|
+      puts "Login Success"
+    end.fail do |err|
+      puts "ERR: #{err.inspect}"
+    end
+  end
+
+  def logout
+    User.logout
+  end
+end

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

@@ -0,0 +1,25 @@
+<:Title>
+  Cookies
+
+<:Body>
+  <h1>Add Cookies</h1>
+
+  <form e-submit="add_cookie">
+    <div class="form-group">
+       <label>Name</label>
+       <input class="form-control" id="cookieName" type="text" value="{{ _name }}" />
+    </div>
+    <div class="form-group">
+       <label>Value</label>
+       <input class="form-control" id="cookieValue" type="text" value="{{ _value }}" />
+    </div>
+    <button>Add Cookie</button>
+  </form>
+
+  <h2>Cookies</h2>
+
+  <ul>
+    {{ cookies.keys.each do |key| }}
+      <li>{{ key }}: {{ cookies.read_attribute(key) }} <button class="cookieDelete" e-click="cookies.delete(key)">X</button></li>
+    {{ end }}
+  </ul>

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

@@ -0,0 +1,13 @@
+<:Title>
+  Flash Messages
+
+<:Body>
+  <h1>Flash Messages</h1>
+
+  <p>
+    <a e-click="flash_notice">Flash Notice</a><br />
+    <a e-click="flash_success">Flash Success</a><br />
+    <a e-click="flash_warning">Flash Warning</a><br />
+    <a e-click="flash_error">Flash Error</a><br />
+  </p>
+

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

@@ -8,7 +8,10 @@
         <:nav href="/" text="Home" />
         <:nav href="/bindings" text="Bindings" />
         <:nav href="/todos" text="Todos" />
+        <:nav href="/flash" text="Flash" />
+        <:nav href="/cookie_test" text="Cookies" />
         <:nav href="/store" text="Store" />
+        <:nav href="/users_test" text="Users" />
       </ul>
       <h3 class="text-muted">Project name</h3>
     </div>

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

@@ -0,0 +1,22 @@
+<:Title>
+  Users Test
+
+<:Body>
+  <h1>Users Test</h1>
+
+  <form e-submit="signup">
+    {{ errors.html_inspect }}<br />
+    <input value="{{ _username }}" /><br />
+    <input type="password" value="{{ _password }}" /><br />
+
+    <button>Signup</button>
+  </form>
+
+  <hr />
+
+  <button e-click="login">Login</button><button e-click="logout">Logout</button>
+
+  {{ if Volt.user }}
+    {{ Volt.user._username }}<br />
+    {{ Volt.user._name }}
+  {{ end }}

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

@@ -0,0 +1,3 @@
+Volt.setup do |config|
+  config.app_secret = 'vFYUzMiPIdMw1Iox0ggDpBYorLm_d55YtRPc0eGrdCpoN4h9E5FcWySIT_D8JIEOllU'
+end

data/spec/integration/bindings_spec.rb

@@ -188,7 +188,7 @@ if ENV['BROWSER']
         expect(find('#paramsCheck3')).to have_content('')
 
         if ENV['BROWSER'] != 'phantom'
-          expect(current_url).to match(/\/bindings$/)
+          expect(current_url).to match(/\/bindings[?]check[=]false$/)
         end
       end
     end

data/spec/integration/cookies_spec.rb

@@ -0,0 +1,48 @@
+if ENV['BROWSER']
+  require 'spec_helper'
+
+  describe 'cookies collection', type: :feature do
+    if ENV['BROWSER'] != 'phantom'
+      # TODO: fails in phantom for some reason
+      it 'should add' do
+        visit '/'
+
+        click_link 'Cookies'
+
+        fill_in('cookieName', with: 'one')
+        fill_in('cookieValue', with: 'one')
+        click_button 'Add Cookie'
+
+        expect(page).to have_content('one: one')
+
+        # Reload the page
+        page.evaluate_script('document.location.reload()')
+
+        # Check again
+        expect(page).to have_content('one: one')
+      end
+    end
+
+    it 'should delete cookies' do
+      visit '/'
+
+      click_link 'Cookies'
+
+      fill_in('cookieName', with: 'two')
+      fill_in('cookieValue', with: 'two')
+      click_button 'Add Cookie'
+
+      expect(page).to have_content('two: two')
+
+      find('.cookieDelete').click
+
+      expect(page).to_not have_content('two: two')
+
+      # Reload the page
+      page.evaluate_script('document.location.reload()')
+
+      expect(page).to_not have_content('two: two')
+
+    end
+  end
+end