volt 0.7.23 → 0.8.0

data/lib/volt/reactive/reactive_hash.rb

@@ -0,0 +1,49 @@
+require 'volt/reactive/hash_dependency'
+
+class ReactiveHash
+  def initialize(values={})
+    @hash = values
+    @deps = HashDependency.new
+    @all_deps = Dependency.new
+  end
+
+  def ==(val)
+    @all_deps.depend
+    @hash == val
+  end
+
+  # TODO: We should finish off this class for reactivity
+  def method_missing(method_name, *args, &block)
+    @all_deps.depend
+
+    return @hash.send(method_name, *args, &block)
+  end
+
+  def [](key)
+    @deps.depend(key)
+
+    return @hash[key]
+  end
+
+  def []=(key, value)
+    @deps.changed!(key)
+    @all_deps.changed!
+
+    @hash[key] = value
+  end
+
+  def delete(key)
+    @deps.delete(key)
+    @hash.delete(key)
+  end
+
+  def clear
+    @hash.each_pair do |key,_|
+      delete(key)
+    end
+  end
+
+  def inspect
+    "#<ReactiveHash #{@hash.inspect}>"
+  end
+end

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

@@ -53,11 +53,31 @@ module AttributeScope
     end
   end
 
+  # TODO: We should use a real parser for this
+  def getter_to_setter(getter)
+    getter = getter.strip
+
+    # Convert a getter into a setter
+    if getter.index('.') || getter.index('@')
+      prefix = ''
+    else
+      prefix = 'self.'
+    end
+
+    return "#{prefix}#{getter}=(val)"
+  end
+
   # Add an attribute binding on the tag, bind directly to the getter in the binding
   def add_single_attribute(id, attribute_name, parts)
     getter = parts[0][1..-2]
 
-    save_binding(id, "lambda { |__p, __t, __c, __id| AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { #{getter} }) }")
+    # if getter.index('@')
+    #   raise "Bindings currently do not support instance variables"
+    # end
+
+    setter = getter_to_setter(getter)
+
+    save_binding(id, "lambda { |__p, __t, __c, __id| AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { #{getter} }, Proc.new { |val| #{setter} }) }")
   end
 
 
@@ -74,12 +94,12 @@ module AttributeScope
       end
     end
 
-    reactive_template_path = add_reactive_template(content)
+    string_template_renderer_path = add_string_template_renderer(content)
 
-    save_binding(id, "lambda { |__p, __t, __c, __id| AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { ReactiveTemplate.new(__p, __c, #{reactive_template_path.inspect}) }) }")
+    save_binding(id, "lambda { |__p, __t, __c, __id| AttributeBinding.new(__p, __t, __c, __id, #{attribute_name.inspect}, Proc.new { StringTemplateRender.new(__p, __c, #{string_template_renderer_path.inspect}) }) }")
   end
 
-  def add_reactive_template(content)
+  def add_string_template_renderer(content)
     path = @path + "/_rv#{@binding_number}"
     new_handler = ViewHandler.new(path, false)
     @binding_number += 1

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

@@ -1,21 +1,21 @@
 class IfViewScope < ViewScope
   def initialize(handler, path, content)
     super(handler, path)
-    
+
     @original_path = @path
-    
+
     @last_content = content
     @branches = []
-    
+
     # We haven't added the if yet
     @if_binding_number = @handler.last.binding_number
     @handler.last.binding_number += 1
-    
+
     @path_number = 0
-    
+
     new_path
   end
-  
+
   def new_path
     @path = @original_path + "/__if#{@path_number}"
     @path_number += 1
@@ -27,26 +27,26 @@ class IfViewScope < ViewScope
     close_scope(false)
 
     @last_content = content
-    
+
     # Clear existing
     @html = ''
     @bindings = {}
-    
+
     # Close scope removes us, so lets add it back.
     @handler.scope << self
-    
+
     @binding_number = 0
 
     # Generate a new template path for this section.
     new_path
   end
-  
+
   def close_scope(final=true)
-    @branches << [@last_content, path]    
+    @branches << [@last_content, path]
 
     super()
 
-    if final    
+    if final
       # Add the binding to the parent
       branches = @branches.map do |branch|
         content = branch[0]
@@ -55,16 +55,16 @@ class IfViewScope < ViewScope
         else
           content = "Proc.new { #{branch[0]} }"
         end
-      
+
         "[#{content}, #{branch[1].inspect}]"
       end.join(', ')
-    
+
       new_scope = @handler.last
 
       # variables are captured for branches, so we must prefix them so they don't conflict.
       # page, target, context, id
       new_scope.save_binding(@if_binding_number, "lambda { |__p, __t, __c, __id| IfBinding.new(__p, __t, __c, __id, [#{branches}]) }")
-    
+
       new_scope.html << "<!-- $#{@if_binding_number} --><!-- $/#{@if_binding_number} -->"
     end
   end

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

@@ -77,6 +77,22 @@ class ViewScope
     @binding_number += 1
   end
 
+  # Returns ruby code to fetch the parent. (by removing the last fetch)
+  # TODO: Probably want to do this with AST transforms with the parser/unparser gems
+  def parent_fetcher(getter)
+    parent = getter.strip.gsub(/[.][^.]+$/, '')
+
+    if parent.blank? || !getter.index('.')
+      parent = 'self'
+    end
+
+    return parent
+  end
+
+  def last_method_name(getter)
+    return getter.strip[/[^.]+$/]
+  end
+
   def add_component(tag_name, attributes, unary)
     component_name = tag_name[1..-1].gsub(':', '/')
 
@@ -93,7 +109,21 @@ class ViewScope
           # Multiple bindings
         elsif parts.size == 1 && binding_count == 1
           # A single binding
-          data_hash << "#{name.inspect} => Proc.new { #{value[1..-2]} }"
+          getter = value[1..-2]
+          data_hash << "#{name.inspect} => Proc.new { #{getter} }"
+
+          setter = getter_to_setter(getter)
+          data_hash << "#{(name + "=").inspect} => Proc.new { |val| #{setter} }"
+
+          # Add an _parent fetcher.  Useful for things like volt-fields to get the parent model.
+          parent = parent_fetcher(getter)
+
+          # TODO: This adds some overhead, perhaps there is a way to compute this dynamically on the
+          # front-end.
+          data_hash << "#{(name + "_parent").inspect} => Proc.new { #{parent} }"
+
+          # Add a _last_method property.  This is useful
+          data_hash << "#{(name + "_last_method").inspect} => #{last_method_name(getter).inspect}"
         end
       else
         # String

data/spec/apps/kitchen_sink/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'volt', path: '/Users/ryanstout/Sites/volt/volt'
-
+gem 'volt', path: '../../../'
 
 # The following gem's are optional for themeing
 
@@ -12,12 +11,10 @@ gem 'volt-bootstrap'
 gem 'volt-bootstrap-jumbotron-theme'
 
 
-gem 'volt-fields', path: '/Users/ryanstout/Sites/volt/apps/volt-fields'
-
 # Server for MRI
 platform :mri do
   gem 'thin', '~> 1.6.0'
-  gem 'bson_ext'
+  gem 'bson_ext', '~> 1.9.0'
 end
 
 # Server for jruby
@@ -25,8 +22,7 @@ platform :jruby do
   gem 'jubilee'
 end
 
+
 #---------------------
 # Needed at the moment
-gem 'opal', git: 'https://github.com/opal/opal.git'
-gem 'opal-jquery', :git => 'https://github.com/opal/opal-jquery.git'
-gem 'sockjs', git: 'https://github.com/kacperk/sockjs-ruby.git', require: false, platforms: :mri
+gem 'volt-sockjs', require: false, platforms: :mri

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

@@ -0,0 +1,8 @@
+# Specify which components you wish to include when
+# the "home" component loads.
+
+# bootstrap css framework
+component 'bootstrap'
+
+# a default theme for the bootstrap framework
+component 'bootstrap-jumbotron-theme'

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

@@ -1 +1,8 @@
-get '/'
+# 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'
+
+# 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,3 +1,11 @@
 class MainController < ModelController
   model :page
+
+  private
+    # the main template contains a #template binding that shows another
+    # template.  This is the path to that template.  It may change based
+    # on the params._controller and params._action values.
+    def main_path
+      params._controller.or('main') + "/" + params._action.or('index')
+    end
 end

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

@@ -0,0 +1,73 @@
+<:Title>
+  Bindings
+
+<:Body>
+  <h1>Bindings</h1>
+
+
+  <h2>Text</h2>
+  <table class="table">
+    <tr>
+      <td>Page</td>
+      <td><input type="text" id="pageName1" value="{page._name}"></td>
+      <td><input type="text" id="pageName2" value="{page._name}"></td>
+      <td id="pageName3">{page._name}</td>
+    </tr>
+    <tr>
+      <td>Params</td>
+      <td><input type="text" id="paramsName1" value="{params._name}"></td>
+      <td><input type="text" id="paramsName2" value="{params._name}"></td>
+      <td id="paramsName3">{params._name}</td>
+    </tr>
+    <tr>
+      <td>Routes</td>
+      <td><input type="text" id="routesName1" value="{params._route_test}"></td>
+      <td><input type="text" id="routesName2" value="{params._route_test}"></td>
+      <td id="routesName3">{params._route_test}</td>
+    </tr>
+  </table>
+
+  <h2>Checkbox</h2>
+
+  <table class="table">
+    <tr>
+      <td>Page</td>
+      <td><input type="checkbox" id="pageCheck1" checked="{page._check}" /></td>
+      <td><input type="checkbox" id="pageCheck2" checked="{page._check}" /></td>
+      <td id="pageCheck3">{page._check}</td>
+    </tr>
+    <tr>
+      <td>Params</td>
+      <td><input type="checkbox" id="paramsCheck1" checked="{params._check}" /></td>
+      <td><input type="checkbox" id="paramsCheck2" checked="{params._check}" /></td>
+      <td id="paramsCheck3">{params._check}</td>
+    </tr>
+  </table>
+
+  <h2>Radio</h2>
+
+  <table class="table">
+    <tr>
+      <td>Page</td>
+      <td><input type="radio" id="pageRadio1" checked="{page._radio}" value="one" /></td>
+      <td><input type="radio" id="pageRadio2" checked="{page._radio}" value="two" /></td>
+      <td id="pageRadio3">{page._radio}</td>
+    </tr>
+    <tr>
+      <td></td>
+      <td><input type="radio" checked="{page._radio}" value="one" /></td>
+      <td><input type="radio" checked="{page._radio}" value="two" /></td>
+      <td></td>
+    </tr>
+  </table>
+
+  <h2>Textarea</h2>
+  <table class="table">
+    <tr>
+      <td>Page</td>
+      <td><textarea id="textareaName1">{page._textarea_name}</textarea></td>
+      <td><textarea id="textareaName2">{page._textarea_name}</textarea></td>
+      <td id="textareaName3">{page._textarea_name}</td>
+    </tr>
+  </table>
+

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

@@ -1,2 +1,7 @@
+<:Title>
+  KitchenSink
+
 <:Body>
-	<h2>Index Template</h2>
+	<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>

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

@@ -1,9 +1,29 @@
 <:Title>
-  Home
+  {#template main_path, "title", {controller_group: 'main'}} - KitchenSink
 
 <:Body>
-  <h1>Home</h1>
-	
-  {#template "index"}
-  
-  <p>After template</p>
+  <div class="container">
+    <div class="header">
+      <ul class="nav nav-pills pull-right">
+        <:nav href="/" text="Home" />
+        <:nav href="/bindings" text="Bindings" />
+        <:nav href="/store" text="Store" />
+      </ul>
+      <h3 class="text-muted">Project name</h3>
+    </div>
+
+    <:volt:notices />
+
+    {#template main_path, 'body', {controller_group: 'main'}}
+
+    <div class="footer">
+      <p>&copy; Company 2014</p>
+    </div>
+
+  </div>
+
+<:Nav>
+  <li class="{#if url.path.split('/')[1] == attrs.href.split('/')[1]}active{/}">
+    <a href="{attrs.href}">{attrs.text}</a>
+  </li>
+

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

@@ -0,0 +1,6 @@
+<:Title>
+  Store
+
+<:Body>
+  <h1>Store</h1>
+

data/spec/controllers/reactive_accessors_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'volt/controllers/reactive_accessors'
+require 'volt/reactive/reactive_accessors'
 
 class TestReactiveAccessors
   include ReactiveAccessors
@@ -8,12 +8,6 @@ class TestReactiveAccessors
 end
 
 describe ReactiveAccessors do
-  it "should return the same reactive value after each read" do
-    inst = TestReactiveAccessors.new
-
-    expect(inst._name.reactive_manager.object_id).to eq(inst._name.reactive_manager.object_id)
-  end
-
   it "should assign a reactive value" do
     inst = TestReactiveAccessors.new
 
@@ -24,19 +18,23 @@ describe ReactiveAccessors do
   it "should start nil" do
     inst = TestReactiveAccessors.new
 
-    expect(inst._name.cur).to eq(nil)
+    expect(inst._name).to eq(nil)
   end
 
-  it "should keep the same reactive value when reassigning" do
+  it 'should trigger changed when assigning a new value' do
     inst = TestReactiveAccessors.new
+    values = []
 
-    inst._name = 'Ryan'
-    rv1_id = inst._name.reactive_manager.object_id
+    -> { values << inst._name }.watch!
 
-    inst._name = 'Jim'
-    rv2_id = inst._name.reactive_manager.object_id
+    expect(values).to eq([nil])
 
-    expect(rv1_id).to eq(rv2_id)
-  end
+    inst._name = 'Ryan'
+    Computation.flush!
+    expect(values).to eq([nil,'Ryan'])
 
+    inst._name = 'Stout'
+    Computation.flush!
+    expect(values).to eq([nil,'Ryan','Stout'])
+  end
 end