wagn 1.12.9 → 1.12.10

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTU0MTc4NzBhYWNkMWM0NDgwZjUwN2Y1M2RjOTkwY2MzZGY3MGJjMQ==
+  data.tar.gz: !binary |-
+    ZjMxYmFmMTAxMzI3NzE0MWM5MjAyMTU2ZjU3MTM2ZThmMDY4N2EzOQ==
+SHA512:
+  metadata.gz: !binary |-
+    YjU1N2ZkMjM2ZmZlNDhkODkwNDBjMWY0OTVkMDVlYmIxNDBmZDhkNWY5MzYy
+    YmNiNzc2NDE2ZmVhZDJkMGIxYzQ5ZTJhZTgwMTZjOTg4MmFlYjI2NTQ2ZTk0
+    MDFiMTU0YTQ1NTJiNzBlMGY4MTMwYmM5ZTIwOWFhYmEzODQxMDU=
+  data.tar.gz: !binary |-
+    ZDRkMDdkNjU3ZjZkNGIzMTEyZDU1OTA5ZWRhNDQ4NWVlNTMwYjM4ODAwODc5
+    OTgxN2M2Y2U0MTYwMGFjZWNiMzNiODRjMTE1MzA1MzlmMDJjNzhkNzMwYjZl
+    NmViMmMxZDRlYmU5OThlOWY5OWRmNWE5NzVkZjgwN2NkODc1MGM=

data/Gemfile

@@ -5,21 +5,21 @@ gemspec
 
 gem 'wagn', :path=>File.expand_path( '../', __FILE__ )
 
-gem 'dalli', :group => :memcache
+gem 'wagn-dev', :path=>File.expand_path( '../../wagn-dev', __FILE__ )
 
 group :mysql do
   gem "mysql2", "~> 0.3"
 end
 
-group :postgres do
-  gem 'pg', '~>0.12.2'
-  # if using 1.8.7 or ree and having no luck with the above, try:
-  # gem 'postgres', '~>0.7.9.2008.01.28'
+
+
+group :profile do
+  gem 'ruby-prof', '~>0.12.1'                  # profiling
+  #gem 'test-unit' #was causing errors after cucumber runs.
 end
-#gem 'sqlite3-ruby', :require => 'sqlite3', :group=>'sqlite'
 
-# These should only be needed if you're developing new JS / CSS.  It's all pre-compiled for production
-group :assets do
+group :test do
+  
   gem 'sass-rails',   "~> 3.1"                 # pretty code; compiles to CSS
   gem 'coffee-rails', "~> 3.1"                 # pretty code; compiles to JS
   gem 'uglifier'                               # makes pretty code ugly again.  compresses js/css for fast loading
@@ -31,22 +31,10 @@ group :assets do
   
   # execjs is necessary for developing coffeescript.  mac users have execjs built-in; don't need this one
   gem 'therubyrhino', :platform=>:ruby         # :ruby is MRI rubies, so if you use a mac ruby ...
-end
-
-
-
-group :profile do
-  gem 'ruby-prof', '~>0.12.1'                  # profiling
-  #gem 'test-unit' #was causing errors after cucumber runs.
-end
-
-group :test, :development do
+  
   gem 'rails-dev-tweaks', '~> 0.6'             # dramatic speeds up asset loading, among other tweaks
   gem 'rspec-rails', "~> 2.6"                  # behavior-driven-development suite
-#  gem 'jasmine-rails'
-end
-
-group :test do
+  
   gem 'cucumber-rails', '~> 1.3', :require=>false # feature-driven-development suite
   gem 'capybara', '~> 2.2.1'                     # note, selectors were breaking when we used 2.0.1
   gem 'selenium-webdriver', '~> 2.39'

data/VERSION

@@ -1 +1 @@
-1.12.9
+1.12.10

data/app/assets/javascripts/wagn.js.coffee

@@ -187,10 +187,10 @@ $(window).ready ->
     $(this).closest('form').submit()
    
   $('body').on 'click', '.renamer-updater', ->
-    $(this).closest('form').find('.update_referencers').val 'true'
+    $(this).closest('form').find('#card_update_referencers').val 'true'
         
-  $('body').on 'submit', '.card-name-form', ->
-    confirmer = $(this).find '.confirm-rename'
+  $('body').on 'submit', '.edit_name-view .card-form', ->
+    confirmer = $(this).find '.confirm_rename-view'
     if confirmer.is ':hidden'
       if $(this).find('#referers').val() > 0
         $(this).find('.renamer-updater').show()

data/app/controllers/account_controller.rb

@@ -4,9 +4,9 @@ class AccountController < WagnController
   def signin
     @card = Card.new
     if params[:login]
-      password_authentication params[:login], params[:password]
+      handle { password_authentication params[:login], params[:password] }
     else
-      show :signin
+      show :signin_and_forgot_password
     end
   end
 
@@ -18,23 +18,8 @@ class AccountController < WagnController
 
   def forgot_password
     @card = Card.new
-    if request.post? and email = params[:email]
-      @account = Account[ email.downcase ]
-      case
-      when @account.nil?
-        flash[:notice] = "Unrecognized email."
-        show :signin, 404
-      when !@account.active?
-        flash[:notice] = "That account is not active."
-        show :signin, 403
-      else
-        @account.send_account_info(
-          :subject => "Password Reset",
-          :message => "You have been given a new temporary password. Please update your password once you've signed in."
-        )
-        flash[:notice] = "Check your email for your new temporary password"
-        redirect_to previous_location
-      end
+    if email = params[:email]
+      handle { reset_password Account[ email.downcase ] }
     else
       show :forgot_password 
     end
@@ -42,26 +27,35 @@ class AccountController < WagnController
 
   protected
 
+  def reset_password account
+    error = case
+      when account.nil?      ;  "Unrecognized email."
+      when !account.active?  ;  "That account is not active."
+      end
+    
+    if error
+      @card.errors.add :account, error
+      false
+    else
+      account.send_account_info(
+        :subject => "Password Reset",
+        :message => "You have been given a new temporary password. Please update your password once you've signed in."
+      )
+    end
+  end
+
   def password_authentication(login, password)
     if self.current_account_id = Account.authenticate( params[:login], params[:password] )
       flash[:notice] = "Successfully signed in"
-      #warn Rails.logger.info("to prev #{previous_location}")
-      redirect_to previous_location
     else
       usr=Account[ params[:login].strip.downcase ]
-      failed_login(
-        case
+      @card.errors.add :signin, case
         when usr.nil?     ; "Unrecognized email."
         when usr.blocked? ; "Sorry, that account is blocked."
         else              ; "Wrong password"
         end
-      )
+      false
     end
   end
 
-  def failed_login(message)
-    flash[:notice] = "Oops: #{message}"
-    show :signin, 403
-  end
-
 end

data/app/controllers/admin_controller.rb

@@ -4,30 +4,29 @@ class AdminController < CardController
   
   def setup
     raise Wagn::Oops, "Already setup" unless Account.no_logins?
-    Wagn::Env[:recaptcha_on] = false
     if request.post?
-      Account.as_bot do
-        @card = Card.create params[:card]
-        set_default_request_recipient
-
-        if @card.errors.empty?
-          roles_card = card.fetch :trait=>:roles, :new=>{}
-          roles_card.content = "[[#{Card[Card::AdminID].name}]]"
-          roles_card.save
-          self.current_account_id = @card.id
-          Card.cache.delete 'no_logins'
+      Wagn::Env[:recaptcha_on] = false
+      handle do
+        Account.as_bot do
+          @card = Card.create params[:card].merge( :cards=>{
+              '+*roles'      => { :content=>"[[#{Card[:administrator].name}]]"    },
+              '*request+*to' => { :content=>params[:card][:account_args][:email]  }
+            })
+        
+          @card.errors.empty?                 and
+          self.current_account_id = @card.id  and
+          Card.cache.delete 'no_logins'       and
           flash[:notice] = "You're good to go!"
-          redirect_to Card.path_setting('/')
-        else
-          show :setup
         end
       end
     else
-      @card = Card.new( params[:card] || {} ) #should prolly skip default
+      @card = Card.new #should prolly skip default
       show :setup
     end
   end
 
+
+
   def clear_cache
     Wagn::Cache.reset_global
     render_text 'Cache cleared'
@@ -122,9 +121,4 @@ class AdminController < CardController
     raise Wagn::PermissionDenied unless Account.always_ok?
   end
 
-  def set_default_request_recipient
-    to_card = Card.fetch '*request+*to', :new=>{}
-    to_card.content=params[:card][:account_args][:email]
-    to_card.save
-  end
 end

data/app/controllers/card_controller.rb

@@ -53,6 +53,7 @@ class CardController < WagnController
     watchers.send((params[:toggle]=='on' ? :add_item : :drop_item), myname)
     watchers.save!
     ajax? ? show(:watch) : read
+    
   end
 
 
@@ -60,9 +61,6 @@ class CardController < WagnController
 
   private
   
-  def handle
-    yield ? success : render_errors
-  end
   
   #-------( FILTERS )
 
@@ -123,41 +121,5 @@ class CardController < WagnController
 
   #------- REDIRECTION 
 
-  def success
-    redirect, new_params = !ajax?, {}
-
-    target = case params[:success]
-      when Hash
-        new_params = params[:success]
-        redirect ||= !!(new_params.delete :redirect)
-        new_params.delete :id
-      when /^REDIRECT:\s*(.+)/
-        redirect=true
-        $1
-      when nil  ;  '_self'
-      else      ;   params[:success]
-      end
-        
-    target = case target
-      when '*previous'     ;  previous_location #could do as *previous
-      when '_self  '       ;  card #could do as _self
-      when /^(http|\/)/    ;  target
-      when /^TEXT:\s*(.+)/ ;  $1
-      else                 ;  Card.fetch target.to_name.to_absolute(card.cardname), :new=>{}
-      end
-
-    case
-    when redirect
-      target = page_path target.cardname, new_params if Card === target
-      wagn_redirect target
-    when String===target
-      render :text => target
-    else
-      @card = target
-      self.params = self.params.merge new_params #need tests.  insure we get slot, main...
-      show
-    end
-  end
-
 end
 

data/app/controllers/wagn_controller.rb

@@ -47,6 +47,47 @@ class WagnController < ActionController::Base
     end
   end
 
+  def handle
+    yield ? success : render_errors
+  end
+  
+  
+  def success
+    redirect, new_params = !ajax?, {}
+
+    target = case params[:success]
+      when Hash
+        new_params = params[:success]
+        redirect ||= !!(new_params.delete :redirect)
+        new_params.delete :id
+      when /^REDIRECT:\s*(.+)/
+        redirect=true
+        $1
+      when nil  ;  '_self'
+      else      ;   params[:success]
+      end
+        
+    target = case target
+      when '*previous'     ;  previous_location #could do as *previous
+      when '_self  '       ;  card #could do as _self
+      when /^(http|\/)/    ;  target
+      when /^TEXT:\s*(.+)/ ;  $1
+      else                 ;  Card.fetch target.to_name.to_absolute(card.cardname), :new=>{}
+      end
+
+    case
+    when redirect
+      target = page_path target.cardname, new_params if Card === target
+      wagn_redirect target
+    when String===target
+      render :text => target
+    else
+      @card = target
+      self.params = self.params.merge new_params #need tests.  insure we get slot, main...
+      show
+    end
+  end
+
 
   def render_errors
     #fixme - should prioritize certain error classes
@@ -68,7 +109,7 @@ class WagnController < ActionController::Base
     opts[:view] = view || params[:view]      
 
     formatter = Card::Format.new card, :controller=>self, :format=>format, :inclusion_opts=>opts[:items]
-    result = formatter.render_show opts
+    result = formatter.show opts
     status = formatter.error_status || status
     
     if format==:file && status==200
@@ -83,7 +124,6 @@ class WagnController < ActionController::Base
   end
   
 
-
   rescue_from Exception do |exception|
     Rails.logger.info "exception = #{exception.class}: #{exception.message}"
     
@@ -109,7 +149,7 @@ class WagnController < ActionController::Base
 
         if ActiveRecord::RecordInvalid === exception
           :errors
-        elsif ENV['WAGN_MIGRATION'] or Rails.logger.level == 0 # could also just check non-production mode...
+        elsif Rails.logger.level == 0 # could also just check non-production mode...
           raise exception
         else
           :server_error
@@ -118,6 +158,9 @@ class WagnController < ActionController::Base
 
     show view
   end
+  
+
+  
 end
 
 

data/app/mailers/mailer.rb

@@ -89,16 +89,17 @@ class Mailer < ActionMailer::Base
   private
 
   def mail_from args, from
-    #puts "unprocessed mail args: #{args}"
-    unless ENV['WAGN_MIGRATION']
-      from_name, from_email = (from =~ /(.*)\<(.*)>/) ? [$1.strip, $2] : [nil, from]
-      if default_from=@@defaults[:from]
-        args[:from] = !from_email ? default_from : "#{from_name || from_email} <#{default_from}>"
-        args[:reply_to] ||= from
-      else
-        args[:from] = from
-      end
-      #puts "mail args: #{args}"
+    from_name, from_email = (from =~ /(.*)\<(.*)>/) ? [$1.strip, $2] : [nil, from]
+    if default_from=@@defaults[:from]
+      args[:from] = !from_email ? default_from : "#{from_name || from_email} <#{default_from}>"
+      args[:reply_to] ||= from
+    else
+      args[:from] = from
+    end
+    
+    if config.send_emails == false
+      Rails.logger.debug "Email is off; NOT mailing the following: #{args}"
+    else
       mail args
     end
   end

data/config/environments/development.rb

@@ -46,6 +46,7 @@ Wagn.application.class.configure do
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   config.active_record.auto_explain_threshold_in_seconds = 0.5
+  
 
   #  if File.exists?(File.join(Rails.root,'tmp', 'debug.txt'))
 #    require 'ruby-debug'
@@ -53,6 +54,8 @@ Wagn.application.class.configure do
 #    Debugger.start_remote
 #    File.delete(File.join(Rails.root,'tmp', 'debug.txt'))
 #  end
+
+  config.send_emails = false
 end
 
 

data/lib/card/content.rb

@@ -131,9 +131,9 @@ class Card
     ALLOWED_TAGS.each_key {|k|
       ALLOWED_TAGS[k] << 'class'
       ALLOWED_TAGS[k] << 'style' if Wagn.config.allow_inline_styles
-      ALLOWED_TAGS[k].freeze
+      ALLOWED_TAGS[k]
     }
-    ALLOWED_TAGS.freeze
+    ALLOWED_TAGS
 
     ATTR_VALUE_RE = [ /(?<=^')[^']+(?=')/, /(?<=^")[^"]+(?=")/, /\S+/ ]
 

data/lib/card/format.rb

@@ -72,6 +72,8 @@ class Card
       end
       
 
+      
+
       def new card, opts={}
         klass = self != Format ? self : get_format( (opts[:format] || :html).to_sym )
         new_format = klass.allocate
@@ -190,6 +192,8 @@ class Card
     #
     # ---------- Rendering ------------
     #
+    
+    
 
     def render view, args={}
       prefix = args.delete(:allowed) ? '_' : ''
@@ -250,22 +254,40 @@ class Card
     
 
     def send_final_render_method view, *a
-      a = [{}] if a.empty?
+      @current_view = view
+      args = default_render_args view, *a
       if final_method = view_method(view)
         with_inclusion_mode view do
-          send final_method, *a
+          send final_method, args
         end
       else
         unsupported_view view
       end
     rescue Exception=>e
-      if Rails.env.test?
+      if Rails.env =~ /^cucumber|test$/
         raise e
       else
         rescue_view e, view
       end
     end
 
+    def default_render_args view, a=nil
+      args = case a
+      when nil   ; {}
+      when Hash  ; a.clone
+      when Array ; a[0].merge a[1]
+      else       ; raise Wagn::Error, "bad render args: #{a}"
+      end
+      
+      view_key = canonicalize_view view
+      default_method = "default_#{ view }_args"
+      if respond_to? default_method
+        send default_method, args
+      end
+      args
+    end
+    
+
     def rescue_view e, view
       controller.send :notify_airbrake, e if Airbrake.configuration.api_key
       Rails.logger.info "\nError rendering #{error_cardname} / #{view}: #{e.class} : #{e.message}"
@@ -492,7 +514,6 @@ class Card
       args
     end
     
-    
     def default_item_view
       :name
     end
@@ -570,7 +591,7 @@ class Card
       @context_names += name.to_name.part_names
       @context_names.uniq!
     end
-  end
 
+  end
 end