wagn 1.14.5 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603db4f3309ae1bbfef9fa3d46c0ea8726d19eeb
-  data.tar.gz: bb63d11defc3f9358593f61eb91b1da1b6e7d96a
+  metadata.gz: 10504368aca16ec7391adb5e9777576dec0d7ffe
+  data.tar.gz: 6e82c4b52133d3c8341cb993d321ecbef2dadd01
 SHA512:
-  metadata.gz: 76e13643f4a56c46998d3e829e3da401f096351d657320832356e496a8cba3f988a560aed3a41da0f291c77f49e6cc9f87c4366cc68d73ff5bc4b218e8adc5f8
-  data.tar.gz: 0fbab63157b1a92a25d4b29bee7e1dd78b1e9d46a5c62f39d480d12c642d7b3f2f8481f4a53af4d5bcb18256d6befe68cc1329e08599d3be1d0d8820c007e204
+  metadata.gz: 7fde2052c74abcbb39c23ce8cf8eabfe1a585a5106ab0d478aab32a0ce92699a7041f97e37ff99e476e048731fd30037b8838ee40d7f4651458abd4de1109d6a
+  data.tar.gz: deafe3aeb7de4766adcf4c9e13485db15d973a1666e81b3b6f96fb81619553165b931193b2cfc006bb9f234f9641456987f7e3625d4a89051d280ed2e253761d

data/VERSION

@@ -1 +1 @@
-1.14.5
+1.14.6

data/app/controllers/card_controller.rb

@@ -115,6 +115,7 @@ class CardController < ActionController::Base
     if action = @card.find_action_by_params( params )
       @card.selected_action_id = action.id
     end
+    Card::Env[:main_name] = params[:main] || (card && card.name) || ''
     
     render_errors if card.errors.any?
     true

data/lib/card/env.rb

@@ -4,8 +4,8 @@ class Card
   module Env
     class << self
       def reset args={}
-        @@env = {}
-      
+        @@env = { :main_name => nil }
+        
         if c = args[:controller]
           self[:controller] = c
           self[:session]    = c.request.session

data/mod/01_core/spec/format/html_format_spec.rb

@@ -106,6 +106,8 @@ describe Card::HtmlFormat do
         end
         c = Card['*all+*layout'] and c.content = '[[tmp layout]]'
         @main_card = Card.fetch('Joe User')
+        Card::Env[:main_name] = @main_card.name
+        
         #warn "lay #{@layout_card.inspect}, #{@main_card.inspect}"
       end
 

data/mod/05_standard/set/all/error.rb

@@ -145,7 +145,7 @@ format :html do
   view :not_found do |args| #ug.  bad name.
     sign_in_or_up_links = if !Auth.signed_in?
       %{<div>
-        #{ card_link ':signin', :text=>'Sign in'    } or
+        #{ card_link :signin, :text=>'Sign in' } or
         #{ link_to 'Sign up', wagn_path('new/:signup') } to create it.
        </div>}
     end

data/mod/05_standard/set/all/links.rb

@@ -22,7 +22,7 @@ format do
       when /^\//
         href = internal_url href[1..-1]    ; 'internal-link'
       else
-        return card_link href, options
+        return card_link href, opts
       end
     add_class opts, new_class        
     link_to text, href, opts
@@ -31,6 +31,7 @@ format do
   # link to a specific card
   def card_link name, opts={}
     text = (opts.delete(:text) || name).to_name.to_show @context_names
+    name = Card[name].cardname if Symbol===name
     
     path_opts = opts.delete( :path_opts ) || {}
     path_opts[:name ] = name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.14.5
+  version: 1.14.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails