volt 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d606022e96b3c66c338e68f58355728f8b801f4
-  data.tar.gz: 6377f71a5054e00a7da776cc05b216cabdb3bab1
+  metadata.gz: e1b91323e2f7568714d8806c4a6a19ca652bcd42
+  data.tar.gz: 7b101bb67b83e2bd1e17e51deaba445c6e1b71d1
 SHA512:
-  metadata.gz: cb4f2b5751bdbd886987fb7ddefe6a9b455ba61f7fd951a5538435d11e154880dcb63949ccb0cc8e98c1174aeb77c76fbb821f3cbbd50f72d57ab9f451f5ff9b
-  data.tar.gz: a36b1aa6e6b47f0e5b1ee8086ecda80ce6bd9de5970ad143830aff2afeb2ac3710480c7114cd5bd5057a44aafe6354f3f68c2e1c92df59cb8f443fe34da81ee0
+  metadata.gz: 79cd2a471f41f67827221272bba712810fe0e2f3451407c62bff270e35cc1ce21618bc1411614537e5a90c9636cdcfcc99c093d5ef76204b5f87efc4996fcfe1
+  data.tar.gz: df8606499fcdfc4aebfcf7e7ee1d49efd15f4a45b2e7def66a822f31ff035addd62a63f60f07ba40111d17705a07c37ba0a54554aa55edfa34031537f287b7f1

data/Readme.md

@@ -616,6 +616,10 @@ The above would search the following:
 | blog        | comments       | index.html   | :body     |
 | gems/blog   | comments       | index.html   | :body     |
 
+# Context in Controls
+
+Controls that render without a provided controller can access the context they were inserted in with the ```.parent``` method.  Most of the time you want to pass in any data that will be used.  But for things like calling methods on the parent controller, using ```.parent.some_method``` can be useful.
+
 
 # Routes
 

data/VERSION

@@ -1 +1 @@
-0.5.10
+0.5.11

data/lib/volt/models/url.rb

@@ -17,17 +17,29 @@ class URL
     destructive!
   end
   def parse(url)
-    puts "PARSE: #{url}"
-    matcher = url.match(/^(https?)[:]\/\/([^\/]+)(.*)$/)
-    @scheme = matcher[1]
-    @host, @port = matcher[2].split(':')
-    @port ||= 80
+    if url[0] == '#'
+      # url only updates fragment
+      @fragment = url[1..-1]
+    else
+      # Add the host for localized names
+      if url[0..3] != 'http'
+        host = `document.location.host`
+        url = "http://#{host}" + url
+      end
+      
+      matcher = url.match(/^(https?)[:]\/\/([^\/]+)(.*)$/)
+      @scheme = matcher[1]
+      @host, @port = matcher[2].split(':')
+      @port ||= 80
     
-    @path = matcher[3]
-    @path, @fragment = @path.split('#', 2)
-    @path, @query = @path.split('?', 2)
+      @path = matcher[3]
+      @path, @fragment = @path.split('#', 2)
+      @path, @query = @path.split('?', 2)
 
-    assign_query_hash_to_params
+      assign_query_hash_to_params
+    end
+    
+    scroll
   end
 
   # Full url rebuilds the url from it's constituent parts
@@ -55,6 +67,8 @@ class URL
       new_url += query_parts.join('&')
     end
     
+    new_url += '#' + @fragment if @fragment
+    
     return new_url
   end
   
@@ -62,10 +76,29 @@ class URL
   # browser should be updated
   # Called when an attribute changes to update the url
   def update!
-    new_url = full_url()
+    if Volt.client?
+      new_url = full_url()
     
-    if `(document.location.href != new_url)`
-      `history.pushState(null, null, new_url)`
+      if `(document.location.href != new_url)`
+        `history.pushState(null, null, new_url)`
+      end
+    end
+  end
+  
+  def scroll
+    if Volt.client?
+      if @fragment
+        # Scroll to anchor
+        %x{
+          var anchor = $('a[name="' + this.fragment + '"]');
+          if (anchor) {
+            $(document.body).scrollTop(anchor.offset().top);
+          }
+        }
+      else
+        # Scroll to the top by default
+        `$(document.body).scrollTop(0);`
+      end
     end
   end
   
@@ -85,8 +118,6 @@ class URL
       # Loop through the .params we already have assigned.
       assign_from_old(@params, query_hash)
       assign_new(@params, query_hash)
-      
-      puts @params.inspect + '---'
     end
     
     # Loop through the old params, and overwrite any existing values,

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

@@ -3,7 +3,7 @@ require 'volt/page/template_renderer'
 
 class TemplateBinding < BaseBinding
   def initialize(target, context, binding_name, binding_in_path, getter)
-    # puts "New template binding: #{context.inspect} - #{binding_name.inspect} - #{getter.inspect}"
+    # puts "New template binding: #{context.inspect} - #{binding_name.inspect}"
     super(target, context, binding_name)
     
     # Binding in path is the path for the template this binding is in
@@ -108,6 +108,7 @@ class TemplateBinding < BaseBinding
 
   def update
     full_path, controller_name = path_for_template(@path.cur, @section.cur)
+    puts "Update: #{full_path} - #{controller_name.inspect}"
 
     @current_template.remove if @current_template
         
@@ -140,7 +141,20 @@ class TemplateBinding < BaseBinding
       current_context = @context
     end
 
-    @current_template = TemplateRenderer.new(@target, current_context, @binding_name, full_path)    
+    @current_template = TemplateRenderer.new(@target, current_context, @binding_name, full_path)   
+    
+    if controller
+      if current_context.respond_to?(:section=)
+        current_context.section = @current_template.section
+      end
+    
+      if current_context.respond_to?(:dom_ready)
+        current_context.dom_ready
+      end
+
+      @controller = controller
+    end
+     
   end
 
   def remove
@@ -161,6 +175,15 @@ class TemplateBinding < BaseBinding
     end
 
     super
+    
+    if @controller
+      # Let the controller know we removed
+      if @controller.respond_to?(:dom_removed)
+        @controller.dom_removed
+      end
+      
+      @controller = nil
+    end
   end
   
   private

data/lib/volt/page/page.rb

@@ -75,14 +75,13 @@ class Page
     @tasks ||= Tasks.new(self)
   end
   
-  def link_clicked(url)
+  def link_clicked(url='')
     # Skip when href == ''
     return if url.blank?
 
     # Normalize url
     # Benchmark.bm(1) do
-      host = `document.location.host`
-      @url.parse("http://#{host}" + url)
+      @url.parse(url)
     # end
     
     # Clear the flash
@@ -161,7 +160,6 @@ class Page
         page_obj_str = nil
         
         `page_obj_str = sessionStorage.getItem('___page');`
-        `console.log(page_obj_str);`
         `if (page_obj_str) {`
           `sessionStorage.removeItem('___page');`
 

data/lib/volt/page/template_renderer.rb

@@ -25,15 +25,6 @@ class TemplateRenderer < BaseBinding
         @sub_bindings << binding.call(target, context, id)
       end
     end
-    
-    if @context.respond_to?(:section=)
-      @context.section = self.section
-    end
-    
-    if @context.respond_to?(:dom_ready)
-      @context.dom_ready
-    end
-
   end
 
   def remove
@@ -51,12 +42,6 @@ class TemplateRenderer < BaseBinding
     @sub_bindings = []
     
     super
-
-    # Let the controller know we removed
-    if @context.respond_to?(:dom_removed)
-      @context.dom_removed
-    end
-    
   end
   
   def remove_anchors

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor