volt 0.7.13 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b0050f5ac129588d9ec24b02a9b8aaa19ff2003
-  data.tar.gz: 05b63b91265dc30256fa8db98114542aad699987
+  metadata.gz: 1fc433aea390d72ea67bc96a667a68184162990c
+  data.tar.gz: d75d3644a9633f81c9ccb20da751586f67463c73
 SHA512:
-  metadata.gz: 354f2e09f8e0827a693171b73fbfcd08e66dece3725a788047d40e72a71890f046030e0bf8240f6270755c7f36b8e668fbf257d20346849feb93c19147b0923f
-  data.tar.gz: a33eb668641e8a7d2c6ab1176f025719486e4dc3fd9c1d4c26dcd4ff8e1c1e3e7c837178c7f1d2f8ccf651e84542102668d1e6b89f7be27d0615e07b9c3a7b7d
+  metadata.gz: 6a9a01e11d069071794c7d279a49bbbafb54b16a9a9f7a4f4d1210291914390c26383908884428d79ff5fa139608d1df270d8e83a742d15ec10e5e0de3db4487
+  data.tar.gz: a72b58ada2bda7c71d5be6ba48328b8c7390052f6a4ba479c948f1c1923d07bf7f7cea60736f97b7e4964652108187b19de9fd065b3db6fe96149ecdbf85b0dd

data/Readme.md

@@ -14,7 +14,15 @@ Instead of syncing data between the client and server via HTTP, volt uses a pers
 
 Pages HTML is written in a handlebars like template language.  Volt uses data flow/reactive programming to automatically and intelligently propagate changes to the DOM (or anything other code wanting to know when a value updates)  When something in the DOM changes, Volt intelligently updates only the nodes that need to be changed.
 
-See a quick demo video here: [https://www.youtube.com/watch?v=6ZIvs0oKnYs](https://www.youtube.com/watch?v=6ZIvs0oKnYs) and [https://www.youtube.com/watch?v=c478sMlhx1o](https://www.youtube.com/watch?v=c478sMlhx1o)
+See some demo videos here:
+ - [https://www.youtube.com/watch?v=6ZIvs0oKnYs](https://www.youtube.com/watch?v=6ZIvs0oKnYs)
+ - [https://www.youtube.com/watch?v=c478sMlhx1o](https://www.youtube.com/watch?v=c478sMlhx1o)
+ - [https://www.youtube.com/watch?v=yZIQ-2irY-Q](https://www.youtube.com/watch?v=yZIQ-2irY-Q)
+
+Check out demo apps:
+ - https://github.com/voltrb/todos
+ - https://github.com/voltrb/blog
+ - https://github.com/voltrb/contactsdemo
 
 
 ## Goals
@@ -544,6 +552,18 @@ Controllers in the app/home component do not need to be namespaced, all other co
 
 Here "auth" would be the component name.
 
+## Reactive Accessors
+
+The default ModelController proxies any missing methods to its model.  Since models are wrapped in ReactiveValue's, they return ReactiveValue's by default.  Sometimes you need to store additional data reactively in the controller outside of the model.  (Though often you may want to condier doing another control/controller)  In this case, you can add a ```reactive_accessor```.  These behave just like ```attr_accessor``` except the values assigned and returned are wrapped in a ReactiveValue.  Updates update the existing ReactiveValue.
+
+```ruby
+  class Contacts < ModelController
+    reactive_accessor :_query
+  end
+```
+
+Now from the view we can bind to _query while also changing in and out the model.  You can also use ```reactive_reader``` and ```reactive_writer```
+
 # Components
 
 Apps are made up of Components.  Each folder under app/ is a component.  When you visit a route, it loads all of the files in the component on the front end, so new pages within the component can be rendered without a new http request.  If a URL is visited that routes to a different component, the request will be loaded as a normal page load and all of that components files will be loaded.  You can think of components as the "reload boundary" between sections of your app.

data/VERSION

@@ -1 +1 @@
-0.7.13
+0.7.14

data/lib/volt/controllers/model_controller.rb

@@ -1,4 +1,8 @@
+require 'volt/controllers/reactive_accessors'
+
 class ModelController
+  include ReactiveAccessors
+
   def self.model(val)
     @default_model = val
   end

data/lib/volt/controllers/reactive_accessors.rb

@@ -0,0 +1,48 @@
+module ReactiveAccessors
+
+  module ClassMethods
+    # Create a method to read a reactive value from an instance value.  If it
+    # is not setup, create it so it can be updated through the reactive value
+    # at a later point.
+    def reactive_reader(*names)
+      names.each do |name|
+        var_name = :"@#{name}"
+        define_method(name.to_sym) do
+          value = instance_variable_get(var_name)
+
+          unless value
+            value = ReactiveValue.new(nil)
+
+            instance_variable_set(var_name, value)
+          end
+
+          value
+        end
+      end
+    end
+
+    def reactive_writer(*names)
+      names.each do |name|
+        var_name = :"@#{name}"
+        define_method(:"#{name}=") do |new_value|
+          value = instance_variable_get(var_name)
+
+          if value
+            value.cur = new_value
+          else
+            instance_variable_set(var_name, ReactiveValue.new(value))
+          end
+        end
+      end
+    end
+
+    def reactive_accessor(*names)
+      reactive_reader(*names)
+      reactive_writer(*names)
+    end
+  end
+
+  def self.included(base)
+    base.send :extend, ClassMethods
+  end
+end

data/lib/volt/models/url.rb

@@ -130,7 +130,13 @@ class URL
       query_hash = self.query_hash
 
       # Get the params that are in the route
-      query_hash.merge!(@router.url_to_params(@path))
+      new_params = @router.url_to_params(@path)
+
+      if new_params == false
+        raise "no routes match path: #{@path}"
+      end
+
+      query_hash.merge!(new_params)
 
       # Loop through the .params we already have assigned.
       assign_from_old(@params, query_hash)

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

@@ -20,21 +20,21 @@ class BaseBinding
     @@binding_number ||= 10000
   end
 
-  def section
-    @section ||= target.section(@binding_name)
+  def dom_section
+    @dom_section ||= target.dom_section(@binding_name)
   end
 
   def remove
-    section.remove if @section
+    @dom_section.remove if @dom_section
 
     # Clear any references
     @target = nil
     @context = nil
-    @section = nil
+    @dom_section = nil
   end
 
   def remove_anchors
-    section.remove_anchors
+    @dom_section.remove_anchors if @dom_section
   end
 
   def queue_update

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

@@ -17,13 +17,16 @@ class ContentBinding < BaseBinding
 
   def update
     value = @value.cur.or('')
+    if value.reactive?
+      puts "GOT CUR: #{value.inspect}"
+    end
 
     # Exception values display the exception as a string
     value = value.to_s
 
     # Update the html in this section
     # TODO: Move the formatter into another class.
-    section.html = value.gsub("\n", "<br />\n")
+    dom_section.html = value.gsub("\n", "<br />\n")
   end
 
   def remove

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

@@ -56,10 +56,10 @@ class EachBinding < BaseBinding
 
     if position >= @templates.size
       # Setup new bindings in the spot we want to insert the item
-      section.insert_anchor_before_end(binding_name)
+      dom_section.insert_anchor_before_end(binding_name)
     else
       # Insert the item before an existing item
-      section.insert_anchor_before(binding_name, @templates[position].binding_name)
+      dom_section.insert_anchor_before(binding_name, @templates[position].binding_name)
     end
 
     index = ReactiveValue.new(position)

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

@@ -174,7 +174,7 @@ class TemplateBinding < BaseBinding
       # Set the current section on the controller if it wants so it can manipulate
       # the dom if needed
       if @controller.respond_to?(:section=)
-        @controller.section = @current_template.section
+        @controller.section = @current_template.dom_section
       end
 
       if @controller.respond_to?(:dom_ready)

data/lib/volt/page/targets/attribute_target.rb

@@ -8,7 +8,7 @@ require 'volt/page/targets/binding_document/html_node'
 
 class AttributeTarget < ComponentNode
 
-  def section(*args)
+  def dom_section(*args)
     return AttributeSection.new(self, *args)
   end
 end

data/lib/volt/page/targets/dom_target.rb

@@ -5,7 +5,7 @@ require 'volt/page/targets/dom_section'
 # the dom.  Currently only one "dom" is supported, but multiple
 # may be allowed in the future (iframes?)
 class DomTarget < BaseSection
-  def section(*args)
+  def dom_section(*args)
     return DomSection.new(*args)
   end
 end

data/lib/volt/page/template_renderer.rb

@@ -7,7 +7,7 @@ class TemplateRenderer < BaseBinding
 
     @sub_bindings = []
 
-    bindings = self.section.set_content_to_template(page, template_name)
+    bindings = self.dom_section.set_content_to_template(page, template_name)
 
     bindings.each_pair do |id,bindings_for_id|
       bindings_for_id.each do |binding|

data/lib/volt/reactive/reactive_count.rb

@@ -17,6 +17,8 @@ class ReactiveCount
   # After events are bound, we keep a cache of each cell's count
   # value, and base the results
   def cached_count
+    @cached_results = []
+
 
   end
 
@@ -24,7 +26,7 @@ class ReactiveCount
   # run the count on the source object.
   def direct_count
     count = 0
-    @source.size.cur.times do |index|
+    @source.cur.size.times do |index|
       val = @source[index]
       result = @block.call(val).cur
       if result == true
@@ -37,16 +39,17 @@ class ReactiveCount
 
   def setup_listeners
     @cell_trackers = []
+    @setup = false
     @added_tracker = @source.on('added') do |_, index|
       change_cell_count(@source.size.cur)
-      trigger!('changed')
     end
 
     @removed_tracker = @source.on('removed') do |_, index|
       change_cell_count(@source.size.cur)
-      trigger!('changed')
     end
 
+    @setup = true
+
     # Initial cell tracking
     change_cell_count(@source.size.cur)
   end
@@ -54,6 +57,7 @@ class ReactiveCount
   # We need to make sure we're listening on the result from each cell,
   # that way we can trigger when the value changes.
   def change_cell_count(size)
+    # puts "CHANGE SIZE: #{size}"
     current_size = @cell_trackers.size
 
     if current_size < size
@@ -66,6 +70,7 @@ class ReactiveCount
         result = @block.call(val)
 
         @cell_trackers << result.on('changed') do
+          # puts "RESULT CHANGED: #{index}"
           trigger!('changed')
         end
       end

data/lib/volt/reactive/reactive_value.rb

@@ -239,21 +239,23 @@ class ReactiveManager
 
   # Fetch the current value
   def cur(shallow=false, ignore_cache=false)
-    # Return from cache if it is cached
+    # Use cache if it is cached
     if @cur_cache && !shallow && !ignore_cache
-      return @cur_cache
-    end
-
-    if @getter.class == ::Proc
-      # Get the current value, capture any errors
-      begin
-        result = @getter.call
-      rescue => e
-        result = e
-      end
+      # We might be caching another reactive value, so we just set
+      # it as the result and let it get unwrapped.
+      result = @cur_cache
     else
-      # getter is just an object, return it
-      result = @getter
+      if @getter.class == ::Proc
+        # Get the current value, capture any errors
+        begin
+          result = @getter.call
+        rescue => e
+          result = e
+        end
+      else
+        # getter is just an object, return it
+        result = @getter
+      end
     end
 
     if !shallow && result.reactive?
@@ -268,7 +270,7 @@ class ReactiveManager
   def update_followers
     return if @setting_up
     if has_listeners?
-      current_obj = cur(false, true)
+      current_obj = cur(true, true)
       should_attach = current_obj.respond_to?(:on)
 
       if should_attach

data/spec/controllers/reactive_accessors_spec.rb

@@ -0,0 +1,41 @@
+require 'volt/controllers/reactive_accessors'
+
+class TestReactiveAccessors
+  include ReactiveAccessors
+
+  reactive_accessor :_name
+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
+
+    inst._name = 'Ryan'
+    expect(inst._name).to eq('Ryan')
+  end
+
+  it "should start nil" do
+    inst = TestReactiveAccessors.new
+
+    expect(inst._name.cur).to eq(nil)
+  end
+
+  it "should keep the same reactive value when reassigning" do
+    inst = TestReactiveAccessors.new
+
+    inst._name = 'Ryan'
+    rv1_id = inst._name.reactive_manager.object_id
+
+    inst._name = 'Jim'
+    rv2_id = inst._name.reactive_manager.object_id
+
+    expect(rv1_id).to eq(rv2_id)
+  end
+
+end

data/spec/models/reactive_count_spec.rb

@@ -0,0 +1,13 @@
+require 'volt/models'
+
+describe ReactiveCount do
+  it "should call cur through the reactive count to the number" do
+    model = ReactiveValue.new(Model.new)
+
+    model._items << {_name: 'ok'}
+
+    count = model._items.count {|m| m._name == 'ok' }
+
+    expect(count.cur).to eq(1)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.7.14
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -361,6 +361,7 @@ files:
 - lib/volt/cli/new_gem.rb
 - lib/volt/console.rb
 - lib/volt/controllers/model_controller.rb
+- lib/volt/controllers/reactive_accessors.rb
 - lib/volt/extra_core/array.rb
 - lib/volt/extra_core/blank.rb
 - lib/volt/extra_core/extra_core.rb
@@ -485,6 +486,7 @@ files:
 - spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/public/index.html
+- spec/controllers/reactive_accessors_spec.rb
 - spec/extra_core/inflector_spec.rb
 - spec/integration/test_integration_spec.rb
 - spec/models/event_chain_spec.rb
@@ -495,6 +497,7 @@ files:
 - spec/models/persistors/store_spec.rb
 - spec/models/reactive_array_spec.rb
 - spec/models/reactive_call_times_spec.rb
+- spec/models/reactive_count_spec.rb
 - spec/models/reactive_generator_spec.rb
 - spec/models/reactive_tags_spec.rb
 - spec/models/reactive_value_spec.rb
@@ -596,6 +599,7 @@ test_files:
 - spec/apps/kitchen_sink/app/main/views/main/main.html
 - spec/apps/kitchen_sink/config.ru
 - spec/apps/kitchen_sink/public/index.html
+- spec/controllers/reactive_accessors_spec.rb
 - spec/extra_core/inflector_spec.rb
 - spec/integration/test_integration_spec.rb
 - spec/models/event_chain_spec.rb
@@ -606,6 +610,7 @@ test_files:
 - spec/models/persistors/store_spec.rb
 - spec/models/reactive_array_spec.rb
 - spec/models/reactive_call_times_spec.rb
+- spec/models/reactive_count_spec.rb
 - spec/models/reactive_generator_spec.rb
 - spec/models/reactive_tags_spec.rb
 - spec/models/reactive_value_spec.rb