wagn 1.12.7 → 1.12.8

data/VERSION

@@ -1 +1 @@
-1.12.7
+1.12.8

data/app/models/account.rb

@@ -19,10 +19,12 @@ class Account
       base.ok?(:create) && trait.ok?(:create)
     end
 
-    # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
+    # Authenticates a user by their login name and unencrypted password.  
     def authenticate(email, password)
-      u = User.find_by_email(email.strip.downcase)
-      u && u.authenticated?(password.strip) ? u.card_id : nil
+      if u = User.find_by_email(email.strip.downcase) and 
+          ( Wagn.config.no_authentication or u.authenticated? password.strip )
+        u.card_id
+      end
     end
 
     # Encrypts some data with the salt.

data/db/migrate_cards/20130411191151_renaming_for_menu.rb

@@ -16,6 +16,7 @@ class RenamingForMenu < ActiveRecord::Migration
         '*editing'    => '*edited',
       }
       renames.each do |oldname, newname|
+        puts "updating: #{oldname}"
         c = Card[oldname]
         c.update_referencers = true
         c.name = newname

data/lib/card/format.rb

@@ -206,17 +206,48 @@ class Card
       render view, args
     end
 
-    def optional_render view, args, default_hidden=false
-      test = default_hidden ? :show : :hide
-      override = args[test] && args[test].split(/[\s\,]+/).member?( view.to_s )
-      return nil if default_hidden ? !override : override
-      render view, args
+    def optional_render view, args, default=:show
+      if show_view? view, args, default
+        view = args["optional_#{ canonicalize_view view }_view".to_sym] || view
+        render view, args
+      end
     end
 
-    def _optional_render view, args, default_hidden=false
+    def _optional_render view, args, default=:show
       args[:allowed] = true
-      optional_render view, args, default_hidden
+      optional_render view, args, default
+    end
+    
+    def show_view? view, args, default=:show
+      view_key = canonicalize_view view
+      api_option = args["optional_#{ view_key }".to_sym]
+      case 
+      # args remove option
+      when api_option == :always                   ; true
+      when api_option == :never                    ; false
+      # wagneer's choice                           
+      when show_views( args ).member?( view_key )  ; true
+      when hide_views( args ).member?( view_key )  ; false
+      # args override default                      
+      when api_option == :show                     ; true
+      when api_option == :hide                     ; false
+      # default                                    
+      else                                         ; default==:show
+      end        
     end
+    
+    def show_views args
+      parse_view_visibility args[:show]
+    end
+    
+    def hide_views args
+      parse_view_visibility args[:hide]
+    end
+    
+    def parse_view_visibility val
+      (val || '').split( /[\s\,]+/ ).map { |view| canonicalize_view view }
+    end
+    
 
     def send_final_render_method view, *a
       a = [{}] if a.empty?
@@ -228,7 +259,11 @@ class Card
         unsupported_view view
       end
     rescue Exception=>e
-      rescue_view e, view
+      if Rails.env.test?
+        raise e
+      else
+        rescue_view e, view
+      end
     end
 
     def rescue_view e, view

data/lib/tasks/wagn.rake

@@ -48,6 +48,8 @@ namespace :wagn do
 
   desc "migrate structure and cards"
   task :migrate =>:environment do
+    ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
+    
     stamp = ENV['STAMP_MIGRATIONS']
 
     puts 'migrating structure'
@@ -71,7 +73,8 @@ namespace :wagn do
     desc "migrate cards"
     task :cards => :environment do
       Wagn::Cache.reset_global
-      ENV['WAGN_MIGRATION'] = true
+      ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
+      ENV['WAGN_MIGRATION'] = 'true'
       Card # this is needed in production mode to insure core db structures are loaded before schema_mode is set
     
       paths = ActiveRecord::Migrator.migrations_paths = Wagn::MigrationHelper.card_migration_paths
@@ -84,7 +87,8 @@ namespace :wagn do
   
     desc 'write the version to a file (not usually called directly)' #maybe we should move this to a method? 
     task :stamp, :suffix do |t, args|
-      ENV['WAGN_MIGRATION'] = true
+      ENV['WAGN_MIGRATION'] = 'true'
+      ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
       
       stamp_file = Wagn::Version.schema_stamp_path args[:suffix]
       Wagn::MigrationHelper.schema_mode args[:suffix ] do

data/lib/wagn/application.rb

@@ -37,6 +37,7 @@ module Wagn
         config.filter_parameters    += [:password]
         config.read_only             = !!ENV['WAGN_READ_ONLY']
         config.allow_inline_styles   = false
+        config.no_authentication     = false
         config.files_web_path        = 'files'
         config.cache_store           = :file_store, 'tmp/cache'
         
@@ -70,6 +71,7 @@ module Wagn
         add_wagn_path paths, "config/routes",       :with => "config/routes.rb"
         add_wagn_path paths, "db"
         add_wagn_path paths, "db/migrate"
+        add_wagn_path paths, "db/migrate_cards"
         add_wagn_path paths, "db/seeds",            :with => "db/seeds.rb"        
         add_wagn_path paths, 'gem-mods',            :with => 'mods'
 
@@ -91,6 +93,13 @@ module Wagn
       paths[path] = Rails::Paths::Path.new(paths, wagn_path, with, options)
     end
 
+    def load_tasks(app=self)
+      super
+      unless approot_is_gemroot?
+        Rake::Task["db:schema:dump"].clear
+      end
+      self
+    end
   end
 end
 

data/lib/wagn/migration_helper.rb

@@ -2,7 +2,6 @@
 
 module Wagn::MigrationHelper
   def self.card_migration_paths
-    Wagn.paths.add 'db/migrate_cards'
     Wagn.paths['db/migrate_cards'].to_a
   end
   

data/lib/wagn/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'wagn'
+require File.expand_path( '../../wagn', __FILE__ )
 
 module Wagn
   module Version

data/mods/core/formats/html_format.rb

@@ -97,12 +97,12 @@ class Card::HtmlFormat < Card::Format
     div = %{<div id="#{card.cardname.url_key}" data-card-id="#{card.id}" data-card-name="#{h card.name}" style="#{h args[:style]}" class="#{classes*' '}" } +
       %{data-slot='#{html_escape_except_quotes slot_options( args )}'>#{yield}</div>}
 
-    if args[:no_wrap_comment]
-      div
-    else
+    if params[:debug] == 'slot' && !tagged(view, :no_wrap_comments )
       name = h card.name
       space = '  ' * @depth
       %{<!--\n\n#{ space }BEGIN SLOT: #{ name }\n\n-->#{ div }<!--\n\n#{space}END SLOT: #{ name }\n\n-->}
+    else
+      div
     end
   end
   

data/mods/core/sets/all/name.rb

@@ -129,7 +129,7 @@ event :permit_codename, :before=>:approve, :on=>:update, :changed=>:codename do
 end
 
 event :validate_unique_codename, :after=>:permit_codename do
-  if !codename.empty? and errors.empty? and Card.find_by_codename(codename).present?
+  if codename.present? and errors.empty? and Card.find_by_codename(codename).present?
     errors.add :codename, "codename #{codename} already in use" 
   end
 end

data/mods/standard/sets/all/account.rb

@@ -133,7 +133,7 @@ format :html do
   
   
   view :signin, :tags=>:unknown_ok, :perms=>:none do |args|
-    frame_args = args.merge :title=>'Sign In', :show_help=>true, :hide_menu=>true
+    frame_args = args.merge :title=>'Sign In', :show_help=>true, :optional_menu=>:never
     signin_core = wrap_frame :signin, frame_args do
       form_tag wagn_path('account/signin') do
         %{
@@ -156,7 +156,7 @@ format :html do
 
 
   view :forgot_password, :perms=>:none do |args|
-    frame_args = args.merge :title=>'Forgot Password', :show_help=>true, :hide_menu=>true
+    frame_args = args.merge :title=>'Forgot Password', :show_help=>true, :optional_menu=>:never
     wrap_frame :forgot_password, frame_args do
       form_tag wagn_path('account/forgot_password') do
         %{

data/mods/standard/sets/all/admin.rb

@@ -3,7 +3,7 @@ view :setup, :tags=>:unknown_ok do |args|
   frame_args = {
     :title=>'Welcome, Wagneer!',
     :show_help=>true,
-    :hide_menu=>true, 
+    :optional_menu=>:never, 
     :help_text=>'To get started, set up an account.'
   }
     

data/mods/standard/sets/all/base.rb

@@ -11,6 +11,7 @@ view :name,     :perms=>:none  do |args|  card.name                    end
 view :codename, :perms=>:none  do |args|  card.codename.to_s           end  
 view :key,      :perms=>:none  do |args|  card.key                     end
 view :id,       :perms=>:none  do |args|  card.id                      end
+view :type,     :perms=>:none  do |args|  card.type_name               end
 view :linkname, :perms=>:none  do |args|  card.cardname.url_key        end
 view :url,      :perms=>:none  do |args|  wagn_url _render_linkname    end
 

data/mods/standard/sets/all/follow.rb

@@ -1,7 +1,7 @@
 format :html do
   
   watch_perms = lambda { |r| Account.logged_in? && !r.card.new_card? }
-  view :watch, :tags=>:unknown_ok, :denial=>:blank, :perms=>watch_perms do |args|
+  view :watch, :tags=>[:unknown_ok, :no_wrap_comments], :denial=>:blank, :perms=>watch_perms do |args|
     
     wrap :watch, args do
       if card.watching_type?

data/mods/standard/sets/all/rich_html.rb

@@ -23,7 +23,7 @@ format :html do
 
   view :content do |args|
     wrap :content, args.merge(:slot_class=>'card-content') do
-      menu = optional_render :menu, args, default_hidden=true
+      menu = optional_render :menu, args, :hide
       %{#{ menu }#{ _render_core args }}
     end
   end
@@ -31,7 +31,7 @@ format :html do
   view :titled, :tags=>:comment do |args|
     wrap :titled, args do
       %{
-        #{ _render_header args.merge( :menu_default_hidden=>true ) }
+        #{ _render_header args.merge( :optional_menu=>:hide ) }
         #{ wrap_body( :content=>true ) { _render_core args } }
         #{ optional_render :comment_box, args }
       }
@@ -54,7 +54,7 @@ format :html do
 
   view :title do |args|
     title = fancy_title args[:title]
-    title = _optional_render( :title_link, args.merge( :title_ready=>title ), default_hidden=true ) || title
+    title = _optional_render( :title_link, args.merge( :title_ready=>title ), :hide ) || title
     add_name_context
     title
   end
@@ -64,26 +64,30 @@ format :html do
   end
 
   view :open, :tags=>:comment do |args|
-    args[:toggler] = link_to '', path( :view=>:closed ),
-      :remote => true,
-      :title  => "close #{card.name}",
-      :class  => "close-icon ui-icon ui-icon-circle-triangle-s toggler slotter nodblclick"
-      
     wrap_frame :open, args.merge(:content=>true) do
-      %{#{ _render_open_content args }#{ optional_render :comment_box, args }}
+      %{
+        #{ _render_open_content args }
+        #{ optional_render :comment_box, args }
+      }
     end
   end
 
+  view :toggle do |args|
+    verb, adjective, direction = args[:toggle] == :close ? %w{ close closed s } : %w{ open open e }
+    
+    link_to '', path( :view=>adjective ), 
+      :remote => true,
+      :title => "#{verb} #{card.name}",
+      :class => "#{verb}-icon ui-icon ui-icon-circle-triangle-#{direction} toggler slotter nodblclick"
+  end
+    
+
   view :header do |args|
     %{
       <h1 class="card-header">
-        #{ args.delete :toggler }
+        #{ _optional_render :toggle, args, :hide }
         #{ _render_title args }
-        #{
-          args[:custom_menu] or unless args[:hide_menu]                          # developer config
-            _optional_render :menu, args, (args[:menu_default_hidden] || false)  # wagneer config
-          end
-        }
+        #{ _optional_render :menu, args }
       </h1>
     }
   end
@@ -106,7 +110,7 @@ format :html do
       @menu_vars.merge!({
         :edit      => card.ok?(:update),
         :account   => card.account && card.update_account_ok?,
-        :watch     => Account.logged_in? && render_watch(args.merge :no_wrap_comment=>true),
+        :watch     => Account.logged_in? && render_watch,
         :creator   => card.creator.name,
         :updater   => card.updater.name,
         :delete    => card.ok?(:delete) && link_to( 'delete', path(:action=>:delete),
@@ -131,13 +135,7 @@ format :html do
   end
 
   view :closed do |args|
-    args[:toggler] = link_to '', path( :view=>:open ),
-      :remote => true,
-      :title => "open #{card.name}",
-      :class => "open-icon ui-icon ui-icon-circle-triangle-e toggler slotter nodblclick"
-      
-    wrap_frame :closed, args.merge(:content=>true, :body_class=>'closed-content') do
-#    wrap :closed, args do
+    wrap_frame :closed, args.merge(:content=>true, :body_class=>'closed-content', :toggle=>:close ) do
       _render_closed_content args
     end
   end
@@ -377,8 +375,8 @@ format :html do
   view :change do |args|
     wrap :change, args do
       %{
-        #{link_to_page card.name, nil, :class=>'change-card'}
-        #{ _optional_render :menu, args, default_hidden=true }
+        #{ link_to_page card.name, nil, :class=>'change-card' }
+        #{ _optional_render :menu, args, :hide }
         #{
         if rev = card.current_revision and !rev.new_record?
           # this check should be unnecessary once we fix search result bug
@@ -417,7 +415,7 @@ format :html do
        </div>}
     end
   
-    wrap_frame :notfound, args.merge(:title=>'Not Found', :hide_menu=>'true') do
+    wrap_frame :notfound, args.merge(:title=>'Not Found', :optional_menu=>:never) do
       %{
         <h2>Could not find #{card.name.present? ? "<em>#{card.name}</em>" : 'that'}.</h2>
         #{sign_in_or_up_links}

data/mods/standard/sets/type/account_request.rb

@@ -3,7 +3,7 @@
 format :html do
   view :new do |args|
     #FIXME - make more use of standard new view
-    frame_args = args.merge :title=>'Sign Up', :show_help=>true #, :hide_menu=>true
+    frame_args = args.merge :title=>'Sign Up', :show_help=>true #, :optional_menu=>:never
     frame_args[:help_text] = case
       when card.rule_card( :add_help, :fallback=>:help ) ; nil
       when Account.create_ok?                            ; 'Send us the following, and we\'ll send you a password.' 
@@ -30,7 +30,7 @@ format :html do
 
 
   view :edit do |args|
-    frame_args = { :title=>'Invite', :show_help=>true, :hide_menu=>true,
+    frame_args = { :title=>'Invite', :show_help=>true, :optional_menu=>:never,
       :help_text=>"Accept account request from: #{link_to_page card.name}"
     }
   

data/mods/standard/sets/type/set.rb

@@ -38,14 +38,17 @@ format :html do
     end
   end
   
+  view :template_closer do |args|
+    link_to_view '', :template_link, :class=>'slotter ui-icon ui-icon-closethick template-editor-close'
+  end
+  
   view :template_editor do |args|
-    custom_menu = link_to_view '', :template_link, :class=>'slotter ui-icon ui-icon-closethick template-editor-close'
     wrap :template_editor, args do
       %{
         <div class="template-editor-left">{{</div> 
         <div class="template-editor-main">
           #{
-            wrap_frame :template_editor, :no_slot=>true, :title=>card.label, :custom_menu=>custom_menu do
+            wrap_frame :template_editor, :no_slot=>true, :title=>card.label, :optional_menu_view=>:template_closer do
               _render_core args.merge(:unlabeled=>true)
             end
           }

data/mods/standard/sets/type/user.rb

@@ -7,13 +7,13 @@ attr_accessor :email
 format :html do
   #FIXME - should perms check permission to create account?
   view :new do |args|
-    wrap_frame :invite, args.merge( :title=>'Invite', :show_help=>true, :hide_menu=>true ) do
+    wrap_frame :invite, args.merge( :title=>'Invite', :show_help=>true, :optional_menu=>:never ) do
       card_form :create do |f|      
         @form = f
         %{
           #{ f.hidden_field :type_id }
           #{ _render_name_editor :help=>'usually first and last name'   }
-          #{ fieldset :email, text_field( :account, :email, :size=>60 ) }
+          #{ fieldset :email, text_field( 'card[account_args]', :email, :size=>60 ) }
           #{ _render_invitation_field                                   }
         }
       end

data/spec/lib/card/format_spec.rb

@@ -2,7 +2,7 @@
 require 'wagn/spec_helper'
 
 describe Card::Format do
-
+=begin
   describe :render do
     it "should ignore underscores in view names" do
       render_card(:not_found).should == render_card('not found')
@@ -170,4 +170,35 @@ describe Card::Format do
     end
   end
 
+=end
+  describe '#show?' do
+    before :all do
+      @format = described_class.new Card.new
+    end
+    
+    it "should respect defaults" do
+      @format.show_view?( :menu, {}, :show ).should be_true
+      @format.show_view?( :menu, {}, :hide ).should be_false
+      @format.show_view?( :menu, {}        ).should be_true
+    end
+    
+    it "should respect developer default overrides" do
+      @format.show_view?( :menu, { :optional_menu=>:show }, :hide ).should be_true
+      @format.show_view?( :menu, { :optional_menu=>:hide }, :show ).should be_false
+      @format.show_view?( :menu, { :optional_menu=>:hide }        ).should be_false
+    end
+    
+    it "should handle args from inclusions" do
+      @format.show_view?( :menu, { :show=>'menu'         }, :hide     ).should be_true
+      @format.show_view?( :menu, { :hide=>'menu, paging' }, :show     ).should be_false
+      @format.show_view?( :menu, :show=>'menu', :optional_menu=>:hide ).should be_true      
+    end
+    
+    it "should handle hard developer overrides" do
+      @format.show_view?( :menu, :optional_menu=>:always, :hide=>'menu' ).should be_true
+      @format.show_view?( :menu, :optional_menu=>:never,  :show=>'menu' ).should be_false
+    end
+    
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.12.7
+  version: 1.12.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -949,7 +949,7 @@ files:
 - script/autospec
 - script/rails
 - script/test_filter
-- script/wagn.rb
+- script/wagn
 - spec/controllers/account_controller_spec.rb
 - spec/controllers/admin_controller_spec.rb
 - spec/controllers/captcha_spec.rb