wagn 1.12.13 → 1.13.0.pre

data/mods/standard/sets/right/create.rb

@@ -3,9 +3,9 @@ format do
   view :editor do |args|
     set_name = card.cardname.trunk_name
     set_card = Card.fetch(set_name)
-    not_set = set_card && set_card.type_id != Card::SetID
+    not_set = set_card && set_card.type_id != SetID
 
-    group_options = Account.as_bot { Card.search(:type=>Card::RoleID, :sort=>'name') }
+    group_options = Auth.as_bot { Card.search(:type_id=>RoleID, :sort=>'name') }
 
     inheritable = not_set ? false : set_card.inheritable?
     inheriting = inheritable && card.content=='_left'
@@ -59,6 +59,7 @@ format do
     card.content=='_left' ? core_inherit_content(args) : _final_pointer_type_closed_content(args)
   end
 
+
   private
 
   def core_inherit_content args={}
@@ -80,3 +81,8 @@ format do
     %{<span class="inherit-perm">#{text}</span>}
   end
 end
+
+
+def standardize_items
+  # noop to override default behavior, which wouldn't let '_left' through and would therefore break
+end

data/mods/standard/sets/right/delete.rb

@@ -1,3 +1,5 @@
+include Right::Create
+
 view :core,           :right=>:create
 view :editor,         :right=>:create
 view :closed_content, :right=>:create

data/mods/standard/sets/right/email.rb

@@ -1,5 +1,53 @@
+#event :
+include All::Permissions::Accounts
+
 view :raw do |args|
-  account = Account[ card.left.id ]
-  account ? account.send('email') : ''
+  
+  case
+  when card.real?          ; card.content
+  when card.left.account   ; card.left.account.email #this supports legacy behavior (should be moved to User+*email+*type plus right)
+  else ''
+  end
 end
+
 view :core, :raw
+
+event :validate_email, :after=>:approve, :on=>:save do
+  if content.present? && content !~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+    errors.add :content, 'must be valid address'
+  end
+end
+
+event :validate_unique_email, :after=>:validate_email, :on=>:save do
+  if content.present?
+    Auth.as_bot do
+      wql = { :right_id=>Card::EmailID, :eq=>content }
+      wql[:not] = { :id => id } if id
+      if Card.search( wql ).first
+        errors.add :content, 'must be unique'
+      end
+    end
+  end
+end
+
+event :downcase_email, :before=>:approve, :on=>:save do
+  if content and content != content.downcase
+    self.content = content.downcase
+  end
+end
+
+def email_required?
+  !built_in?
+end
+
+def ok_to_read
+  if is_own_account? or Auth.always_ok?
+    true
+  else
+    deny_because "viewing email is restricted to administrators and account holders"
+  end
+end
+
+def is_own_account?
+  cardname.parts[0].to_name.key == Auth.as_card.cardname.key
+end

data/mods/standard/sets/right/machine_output.rb

@@ -0,0 +1,12 @@
+
+format do
+  view :not_found do |args|
+    if card.left.kind_of? Machine
+      card.left.update_machine_output
+      self.error_status = 302
+      wagn_path card.left.machine_output_card.attach.url(:default, :timestamp => false)  # to get rid of additional number in url
+    else
+      _final_not_found args
+    end
+  end
+end

data/mods/standard/sets/right/password.rb

@@ -0,0 +1,39 @@
+
+include All::Permissions::Accounts
+
+view :editor do |args|
+  card.content = ''
+  autocomplete = (@parent && @parent.card.name=='*signin+*account') ? 'on' : 'off' #hack
+  form.password_field :content, :class=>'card-content', :autocomplete=>autocomplete
+end
+
+view :raw do |args|
+  '<em>encrypted</em>'
+end
+
+event :encrypt_password, :on=>:save, :after=>:process_subcards do
+  salt = (left && left.salt)
+  unless salt.present? or salt = Card::Env[:salt] # hack - fix with better ORM handling
+    #errors.add :password, 'need a valid salt'
+    # turns out we have a lot of existing account without a salt.  not sure when that broke??
+  end
+  if updates.for :content
+    unless Card::Env[:no_password_encryptions] # hack for import - fix with api for ignoring events
+      self.content = Auth.encrypt content, salt
+    end
+  end
+end
+
+event :validate_password, :on=>:save, :before=>:approve do
+  unless content.length > 3
+    errors.add :password, 'must be at least 4 characters'
+  end
+end
+
+event :validate_password_present, :on=>:update, :before=>:approve do
+  abort :success if content.blank?
+end
+
+def ok_to_read
+  is_own_account? ? true : super
+end

data/mods/standard/sets/right/read.rb

@@ -1,3 +1,5 @@
+include Right::Create
+
 view :core,           :right=>:create
 view :editor,         :right=>:create
 view :closed_content, :right=>:create

data/mods/standard/sets/right/salt.rb

@@ -1,4 +1,5 @@
+include All::Permissions::Accounts
+
 view :raw do |args|
   "Private data"
 end
-view :core, :raw

data/mods/standard/sets/right/script.rb

@@ -0,0 +1,10 @@
+include Machine
+
+store_machine_output :filetype => "js"
+
+
+view :javascript_include_tag do |args|
+  %{
+    <script src="#{card.machine_output_url}" type="text/javascript"></script>
+  }
+end

data/mods/standard/sets/right/stats.rb

@@ -0,0 +1,35 @@
+
+view :core do |args|
+  if subject = card.left
+  
+    frame args do
+      cache_card = Card.fetch(subject.key)
+      db_card    = Card.find_by_key(subject.key)
+    
+      table = if cache_card && db_card
+        %{<table class="show-cache">
+            <tr><th>Field</th><th>Cache Val</th><th>Database Val</th></tr>
+            #{
+              [ :name, :updated_at, :updater_id, :current_revision_id, :content ].map do |field|
+                %{<tr>#{ [ field, cache_card.send(field), db_card.send(field) ].map() { |cell| "<td>#{cell}</td>"}.join }</tr>}
+              end.join
+            }
+          </table>
+        }
+      end
+  
+      %{
+        <h1>Cache/DB Comparison</h1>
+        #{ table }
+      
+        <h1>Cached Card Inspect</h1>
+        #{ h cache_card.inspect }
+
+        <h1>Database Card Inspect</h1>
+        #{ h db_card.inspect }
+       }
+    end
+    
+  end
+end
+

data/mods/standard/sets/right/status.rb

@@ -0,0 +1,9 @@
+include All::Permissions::Accounts
+
+def ok_to_update
+  if is_own_account? && !Auth.always_ok?
+    deny_because you_cant('change the status of your own account')
+  else
+    super
+  end 
+end

data/mods/standard/sets/right/style.rb

@@ -1,49 +1,13 @@
-# -*- encoding : utf-8 -*-
+require 'sass'
+include Machine
 
+store_machine_output :filetype => "css"
 
-def self.delete_style_files
-  Account.as_bot do
-    Card.search( :right=>{:codename=>'style'}, :return=>'id' ).each do |style_file_id|
-      Card.delete_tmp_files style_file_id
-    end
-  end
-end
-
-#FIXME - the following could be unified with type/file.rb considerably
-
-# note that this was formerly accomplished as a separate File card (eg *all+*style+file).  The issue was that the permanent
-# file regularly caused problems with non-root wagns, and requiring users to re-save the *all+*style rule upon updates
-# to CSS, SCSS, and Skin cards was not popular.
-
-def style_file
-  Wagn.paths['files'].existent.first + "/tmp/#{id}/#{current_revision_id}.css"
-end
-
-def style_path
-  "#{ Wagn.config.files_web_path }/#{ name.to_name.url_key }-#{ current_revision_id }.css"
-end
-
-
-format do
-  # FIXME - this should be a read event (when we have read events)
-  view :not_found do |args|
-    if card.real?
-      compressed_css = card.compress_stylesheets
-      filename = card.style_file 
-      FileUtils.mkdir_p File.dirname(filename)  
-      File.open filename, 'w' do |f|
-        f.write compressed_css
-      end
-      self.error_status = 302
-      wagn_path card.style_path
-    else
-      _final_not_found args
-    end
-  end
-  
+def chunk_list  #turn off autodetection of uri's 
+                #TODO with the new format pattern this should be handled in the js format
+    :inclusion_only
 end
-
-
+    
 format :file do
   view :core do |args|
     if params[:explicit_file] and r = controller.response
@@ -55,13 +19,3 @@ format :file do
   end
 end
 
-
-def compress_stylesheets
-  Account.as_bot do
-    format = Card::CssFormat.new self
-    Sass.compile format._render_core, :style=>:compressed
-  end
-rescue Exception=>e
-  raise Card::Oops, "Stylesheet Error:\n#{ e.message }"
-end
-

data/mods/standard/sets/right/{crypted_password.rb → token.rb}

@@ -1,4 +1,5 @@
+include All::Permissions::Accounts
+
 view :raw do |args|
   "Private data"
 end
-view :core, :raw

data/mods/standard/sets/right/update.rb

@@ -1,3 +1,5 @@
+include Right::Create
+
 view :core,           :right=>:create
 view :editor,         :right=>:create
 view :closed_content, :right=>:create

data/mods/standard/sets/rstar/rules.rb

@@ -53,7 +53,7 @@ format :html do
       set_selected = card_args[:name].to_name.left_name.to_s
     end
 
-    edit_mode = !params[:item] && card.ok?( ( card.new_card? ? :create : :update ) )
+    edit_mode = !params[:success] && card.ok?( ( card.new_card? ? :create : :update ) )
     
     opts = {
       :open_rule    => card,
@@ -214,7 +214,11 @@ format :html do
 
 end
 
-# I doubt that the following are actually included at present.
+# 
+
+=begin
+
+These are commented because they are not currently included (see notes in lib/card/set.rb re anchorless sets)
 
 def repair_set
   @set_repair_attempted = true
@@ -232,4 +236,4 @@ def method_missing method_id, *args
     super
   end
 end
-
+=end

data/mods/standard/sets/self/account_links.rb

@@ -1,30 +1,23 @@
-# -*- encoding : utf-8 -*-
+
 format :html do
 
   view :raw do |args|
     #ENGLISH
-    prefix = "#{ Wagn.config.relative_url_root }/account"
-    %{<span id="logging">#{
-      if Account.logged_in?
-        ucard = Account.current
-        %{
-          #{ link_to ucard.name, "#{ Wagn.config.relative_url_root }/#{ucard.cardname.url_key}", :id=>'my-card-link' }
-          #{
-            if Account.create_ok?
-              link_to 'Invite a Friend', "#{prefix}/invite", :id=>'invite-a-friend-link'
-            end
-          }
-          #{ link_to 'Sign out', "#{prefix}/signout",                                      :id=>'signout-link' }
-        }
-      else
-        %{
-          #{ if Card.new(:type_code=>'account_request').ok? :create
-               link_to 'Sign up', "#{prefix}/signup", :id=>'signup-link'
-             end }
-          #{ link_to 'Sign in', "#{prefix}/signin", :id=>'signin-link' }
-        }
-      end }
-    </span>}
+    links = []
+    if Auth.signed_in?
+      links << link_to_page( Auth.current.name, nil, :id=>'my-card-link' )
+      links << link_to( 'Sign out', wagn_path('delete/:signin'), :id=>'signout-link' )
+      #  if Card.new(:type_id=>Card.default_accounted_type_id).ok? :create
+      #    link_to 'Invite a Friend', "#{prefix}/invite", :id=>'invite-a-friend-link'
+      #  end
+    else
+      if Card.new(:type_id=>Card::SignupID).ok? :create
+        links << link_to( 'Sign up', wagn_path('account/signup'), :id=>'signup-link' )
+      end
+      links << link_to( 'Sign in', wagn_path(':signin'), :id=>'signin-link' )
+    end
+    
+    %{<span id="logging">#{ links.join ' ' }</span>}
   end
 
 end

data/mods/standard/sets/self/alerts.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 
 view :raw do |args|
   '<!-- *alerts is deprecated. please remove from layout -->'

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

@@ -0,0 +1,21 @@
+
+event :admin_tasks, :on=>:update, :before=>:approve do
+  if task = Env.params[:task]
+    if Auth.always_ok?
+      case task.to_sym
+      when :clear_cache           ;  Wagn::Cache.reset_global
+      when :repair_references     ;  Card::Reference.repair_all
+      when :empty_trash           ;  Card.empty_trash
+      when :delete_old_revisions  ;  Card::Revision.delete_old
+      when :delete_old_sessions
+        if months = Env.params[:months].to_i and months > 0
+          ActiveRecord::SessionStore::Session.delete_all ["updated_at < ?", months.months.ago]
+        end
+      end
+      Env.params[:success] = Card[:stats].name
+      abort :success
+    else
+      raise Card::PermissionDenied.new(self)
+    end
+  end
+end

data/mods/standard/sets/self/foot.rb

@@ -1,4 +1,3 @@
-  # -*- encoding : utf-8 -*-
 
 format :html do
   view :raw do |args|

data/mods/standard/sets/self/head.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 
 format :html do
 
@@ -12,12 +11,12 @@ format :html do
       #{ head_javascript }      
     )
   end
-
-  view :core, :raw
   
-  view :content do |args|
-    wrap args.merge(:slot_class=>'card-content') do
-      CGI.escapeHTML render_raw
+  view :core do |args|
+    case
+    when focal?    ; CGI.escapeHTML _render_raw(args)
+    when @mainline ; "(*head)"
+    else           ; _render_raw(args)
     end
   end
   
@@ -31,7 +30,7 @@ format :html do
   def head_buttons
     bits = []
     [:favicon, :logo].each do |name|
-      if c = Card[name] and c.type_id == Card::ImageID and !c.content.blank?
+      if c = Card[name] and c.type_id == ImageID and !c.content.blank?
         bits << %{<link rel="shortcut icon" href="#{ subformat(c)._render_source :size=>:icon }" />}
         break
       end
@@ -44,11 +43,10 @@ format :html do
       end
 
       # RSS # move to mods!
-      if root.card.type_id == Card::SearchTypeID
+      if root.card.type_id == SearchTypeID
         opts = { :format => :rss }
-        root.search_params[:vars].each { |key, val| opts["_#{key}"] = val }
-        rss_href = page_path root.card.name, opts
-        bits << %{<link rel="alternate" type="application/rss+xml" title="RSS" href=#{wagn_path rss_href} />}
+        search_params[:vars].each { |key, val| opts["_#{key}"] = val }
+        bits << %{<link rel="alternate" type="application/rss+xml" title="RSS" href=#{page_path root.card.name, opts} />}
       end
     end
     bits.join "\n      "
@@ -56,18 +54,15 @@ format :html do
   
   def head_stylesheets
     manual_style = params[:style]
-    debug        = params[:debug] == 'style'
-    style_rule   = card.rule_card :style
+    style_card   = Card[manual_style] if manual_style
+    style_card ||= card.rule_card :style
     
-    if manual_style or debug   
-      path_args = { :format=>:css }
-      path_args[:item] = :import if debug
-      style_cardname = manual_style || (style_rule && style_rule.name)
-      @css_path = page_path style_cardname, path_args
-    elsif style_rule
-      @css_path = wagn_path style_rule.style_path
+    @css_path = if params[:debug] == 'style'
+      page_path( style_card.name, :item => :import, :format => :css) 
+    elsif style_card
+      wagn_path style_card.machine_output_url
     end 
-
+    
     if @css_path
       %{<link href="#{@css_path}" media="all" rel="stylesheet" type="text/css" />}
     end
@@ -78,13 +73,15 @@ format :html do
       "window.wagn={rootPath:'#{ Wagn.config.relative_url_root }'}",
       "window.tinyMCEPreInit={base:\"#{wagn_path 'assets/tinymce'}\",query:'3.5.9',suffix:''}" # tinyMCE doesn't load on non-root wagns w/o preinit line
     ]
-    Wagn::Env[:recaptcha_on]                        and varvals << "wagn.recaptchaKey='#{Wagn.config.recaptcha_public_key}'"
+    Env.recaptcha_on?                               and varvals << "wagn.recaptchaKey='#{Wagn.config.recaptcha_public_key}'"
     c=Card[:double_click] and !Card.toggle c.content and varvals << 'wagn.noDoubleClick=true'
     @css_path                                        and varvals << "wagn.cssPath='#{@css_path}'"
     
+    script_card = card.rule_card :script
+    ie9_card    = Card[:script_html5shiv_printshiv]
     %(#{ javascript_tag do varvals * ';' end  }      
-      #{ javascript_include_tag 'application' }
-      <!--[if lt IE 9]>#{ javascript_include_tag 'html5shiv-printshiv' }<![endif]-->
+      #{ javascript_include_tag script_card.machine_output_url if script_card }
+      <!--[if lt IE 9]>#{ javascript_include_tag ie9_card.machine_output_url if ie9_card }<![endif]-->
       #{ javascript_tag { "wagn.setTinyMCEConfig('#{ escape_javascript Card.setting(:tiny_mce).to_s }')" } }
       #{ google_analytics_head_javascript })
   end