volt 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2390fa6b2d27296a6a761e1bbf575bd07cebc42d
-  data.tar.gz: a9520a04804d30eca3619a436918e81987eb7b41
+  metadata.gz: 7b8a76f2d758ccc809b63fb8cb7433b1b6e11c54
+  data.tar.gz: 9ecc4f6a3333af52c492ac2079372beece3c773f
 SHA512:
-  metadata.gz: 66c6eea2b57285e84f61480db89912df81dbcc82f204e36df68e1bd512a0d716249ee89bda9fab91900909d76e6d48daa4e218c47c77b93b43b3b987b47d6a6a
-  data.tar.gz: c59669709786b49c15976d09f9895d1d8952c08bfd6d7b3604fd6f364493ecea0ea5aa0bcf7ee270470c6424584785c122f050d2dd7e373f3c733b6a6396dfc1
+  metadata.gz: f82aa5ff02d08404d6c9ad387bbd60785190aa7aa5741f6e63ee5a5fd5e3b459def0928976db7b2a6ba24425b0b696848a06e0b788679efa5e9ff24123c61ce8
+  data.tar.gz: 82012fceb2f955f0a0627f16b1d96353fd2e55a7a8f2ccf577a63e407b476d85d42f0783994108cadb6d63bb45d2661d2736fe9ade7ad651e8415e798e46730e

data/Readme.md

@@ -668,3 +668,7 @@ Controllers provide a .channel method, that you can use to get the status of the
 | retry_count | the number of reconnection attempts that have been made without a successful connection |
 | reconnect_interval | the time until the next reconnection attempt (in seconds) |
 
+
+## Accessing DOM section in a controller
+
+TODO

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.6

data/app/volt/assets/css/notices.css.scss

@@ -5,4 +5,5 @@
   margin-left: -300px;
   left: 50%;
   z-index: 1000;
+  cursor: pointer;
 }

data/app/volt/views/notices/index.html

@@ -9,7 +9,7 @@
   </div>
 {/}
 {#if !flash.empty?}
-  <div class="notices alert alert-info">
+  <div class="notices alert alert-info" e-click="flash.clear">
     {#each flash._notices as notice}
       <p>{notice}</p>
     {/}

data/lib/volt/models/model.rb

@@ -2,6 +2,7 @@ require 'volt/models/model_wrapper'
 require 'volt/models/array_model'
 require 'volt/models/model_helpers'
 require 'volt/reactive/object_tracking'
+require 'volt/models/model_hash_behaviour'
 
 class NilMethodCall < NoMethodError
   def true?
@@ -18,22 +19,11 @@ class Model
   include ModelWrapper
   include ObjectTracking
   include ModelHelpers
+  include ModelHashBehaviour
   
   attr_accessor :attributes
   attr_reader :parent, :path, :persistor, :options
   
-  def nil?
-    attributes.nil?
-  end
-  
-  def false?
-    attributes.false?
-  end
-  
-  def true?
-    attributes.true?
-  end
-  
   def initialize(attributes={}, options={})
     @options = options
     @parent = options[:parent]
@@ -72,32 +62,6 @@ class Model
     @persistor.event_removed(event, no_more_events) if @persistor
   end
   
-  
-  tag_method(:delete) do
-    destructive!
-  end
-  def delete(*args)
-    __clear_element(args[0])
-    attributes.delete(*args)
-    trigger_by_attribute!('changed', args[0])
-    
-    @persistor.removed(args[0]) if @persistor
-  end
-  
-  tag_method(:clear) do
-    destructive!
-  end
-  def clear
-    attributes.each_pair do |key,value|
-      __clear_element(key)      
-    end
-
-    attributes.clear
-    trigger!('changed')
-    
-    @persistor.removed(nil) if @persistor
-  end
-  
   tag_all_methods do
     pass_reactive! do |method_name|
       method_name[0] == '_' && method_name[-1] == '='
@@ -235,27 +199,12 @@ class Model
     # Add the new item
     result << value
     
-    return result
+    return nil
   end
   
   def inspect
     "<#{self.class.to_s} #{attributes.inspect}>"
-  end
-  
-  def [](val)
-    raise "Models do not support hash style lookup.  Hashes inserted into other models are converted to models, see https://github.com/voltrb/volt#automatic-model-conversion"
-  end
-  
-  # Convert the model to a hash all of the way down.
-  def to_h
-    hash = {}
-    attributes.each_pair do |key, value|
-      hash[key] = deep_unwrap(value)
-    end
-    
-    return hash
-  end
-  
+  end  
   
   private
     # Clear the previous value and assign a new one

data/lib/volt/models/model_hash_behaviour.rb

@@ -0,0 +1,66 @@
+# Contains all of the methods on a model that make it behave like a hash.
+# Moving this into a module cleans up the main Model class for things that
+# make it behave like a model.
+module ModelHashBehaviour
+  def self.included(base)
+    # In modules, since we need to tag on the main class, we setup the
+    # tags with included.
+    base.tag_method(:delete) do
+      destructive!
+    end
+    
+    base.tag_method(:clear) do
+      destructive!
+    end
+  end
+  
+  
+  def nil?
+    attributes.nil?
+  end
+  
+  def false?
+    attributes.false?
+  end
+  
+  def true?
+    attributes.true?
+  end
+  
+  def delete(*args)
+    __clear_element(args[0])
+    attributes.delete(*args)
+    trigger_by_attribute!('changed', args[0])
+    
+    @persistor.removed(args[0]) if @persistor
+  end
+  
+
+  def clear
+    attributes.each_pair do |key,value|
+      __clear_element(key)      
+    end
+
+    attributes.clear
+    trigger!('changed')
+    
+    @persistor.removed(nil) if @persistor
+  end
+  
+  
+  # Convert the model to a hash all of the way down.
+  def to_h
+    hash = {}
+    attributes.each_pair do |key, value|
+      hash[key] = deep_unwrap(value)
+    end
+    
+    return hash
+  end
+  
+  
+  def [](val)
+    raise "Models do not support hash style lookup.  Hashes inserted into other models are converted to models, see https://github.com/voltrb/volt#automatic-model-conversion"
+  end
+  
+end

data/lib/volt/models/url.rb

@@ -17,6 +17,7 @@ class URL
     destructive!
   end
   def parse(url)
+    puts "PARSE: #{url}"
     matcher = url.match(/^(https?)[:]\/\/([^\/]+)(.*)$/)
     @scheme = matcher[1]
     @host, @port = matcher[2].split(':')

data/lib/volt/page/page.rb

@@ -32,7 +32,7 @@ require 'volt/page/draw_cycle'
 require 'volt/page/tasks'
 
 class Page
-  attr_reader :url, :params, :page, :store, :flash, :templates, :routes, :draw_cycle
+  attr_reader :url, :params, :page, :store, :flash, :templates, :routes, :draw_cycle, :events
 
   def initialize
 
@@ -80,10 +80,10 @@ class Page
     return if url.blank?
 
     # Normalize url
-    Benchmark.bm(1) do
+    # Benchmark.bm(1) do
       host = `document.location.host`
       @url.parse("http://#{host}" + url)
-    end
+    # end
     
     # Clear the flash
     flash.clear

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

@@ -64,6 +64,12 @@ class DomSection < BaseSection
     }
   end
   
+  # Returns the nearest DOM node that contains all of the section.
+  def container_node
+    range = self.range()
+    return `range.commonAncestorContainer`
+  end
+  
 	# Takes in our html and bindings, and rezero's the comment names, and the
 	# bindings.  Returns an updated bindings hash
 	def set_content_and_rezero_bindings(html, bindings)
@@ -133,21 +139,19 @@ class DomSection < BaseSection
 		return new_bindings
 	end
   
-  private
-  
-    def range
-      return @range if @range
+  def range
+    return @range if @range
 
-  		range = nil
-  		%x{
-  		  range = document.createRange();
-  		  range.setStartAfter(this.start_node);
-  		  range.setEndBefore(this.end_node);
-  		}
+		range = nil
+		%x{
+		  range = document.createRange();
+		  range.setStartAfter(this.start_node);
+		  range.setEndBefore(this.end_node);
+		}
 
-      @range = range
+    @range = range
 
-  		return range
-    end
+		return range
+  end
 
 end

data/lib/volt/page/template_renderer.rb

@@ -26,6 +26,10 @@ class TemplateRenderer < BaseBinding
       end
     end
     
+    if @context.respond_to?(:section=)
+      @context.section = self.section
+    end
+    
     if @context.respond_to?(:dom_ready)
       @context.dom_ready
     end

data/lib/volt/reactive/reactive_array.rb

@@ -17,6 +17,14 @@ class ReactiveArray# < Array
     @array.==(*args)
   end
   
+  tag_method(:each) do
+    destructive!
+  end
+  # At the moment, each just passes through.
+  def each(&block)
+    @array.each(&block)
+  end
+  
   tag_method(:[]=) do
     pass_reactive!
   end
@@ -209,7 +217,7 @@ class ReactiveArray# < Array
       
       result
     end
-  end
+  end  
   
   def inspect
     "#<#{self.class.to_s} #{@array.inspect}>"

data/lib/volt/reactive/reactive_value.rb

@@ -92,7 +92,6 @@ class ReactiveValue < BasicObject
       return current_obj.__send__(method_name, *pass_args, &block)
     end
     
-    @block_reactives = []
     result = @reactive_manager.with_and_options(args) do |val, in_args|
       # Unwrap arguments if the method doesn't want reactive values
       # TODO: Should cache the lookup on pass_reactive

data/lib/volt/router/routes.rb

@@ -89,7 +89,7 @@ class Routes
   # TODO: Slow, need dfa
   def params_for_path(path)
     routes.each do |route|
-      puts "ROUTE: #{route.inspect} -- #{path.inspect}"
+      # TODO: Finish nested routes
       if false && route[0].class == Proc
         # puts route[0].call(params).inspect
         

data/spec/models/model_spec.rb

@@ -450,8 +450,8 @@ describe Model do
     all_items = a._items.to_a.cur
     
     a = [
-      {:_name=>"Test1", :_other=>{:_time=>"Now"}},
-      {:_name=>"Test2", :_other=>{:_time=>"Later"}}
+      {:_name => "Test1", :_other => {:_time => "Now"}},
+      {:_name => "Test2", :_other => {:_time => "Later"}}
     ]
     expect(all_items).to eq(a)
   end

data/templates/newgem/app/newgem/controllers/index_controller.rb.tt

@@ -1,5 +1,7 @@
 module <%=config[:name].gsub(/^volt[-]/, '').gsub('-', '_').split("_").map {|s| s.capitalize }.join("") %>
-  class IndexController
+  class IndexController < ModelController
+    model :page
+    
     attr_accessor :data
     
     def initialize(data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -354,6 +354,7 @@ files:
 - lib/volt/models.rb
 - lib/volt/models/array_model.rb
 - lib/volt/models/model.rb
+- lib/volt/models/model_hash_behaviour.rb
 - lib/volt/models/model_helpers.rb
 - lib/volt/models/model_wrapper.rb
 - lib/volt/models/persistors/array_store.rb