wagn 1.12.13 → 1.13.0.pre

data/features/support/env.rb

@@ -1,6 +1,9 @@
 # -*- encoding : utf-8 -*-
 ENV['RAILS_ENV'] = "cucumber"
 
+require 'simplecov'
+
+
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
 # It is recommended to regenerate this file in the future when you upgrade to a
 # newer version of cucumber-rails. Consider adding your own code to a new file

data/features/support/paths.rb

@@ -16,7 +16,7 @@ module NavigationHelpers
     # Here is an example that pulls values out of the Regexp:
     #
     #   when /^(.*)'s profile page$/i
-    #     user_profile_path(Account[ $1 ])
+    #     user_profile_path(Auth[ $1 ])
 
     when /card (.*) with (.*) layout$/
       "/#{$1.to_name.url_key}?layout=$2"
@@ -31,7 +31,7 @@ module NavigationHelpers
       "/card/new?card[name]=#{CGI.escape($1)}"
 
     when /edit (.*)$/
-   "/card/edit/#{$1.to_name.url_key}"
+   "/#{$1.to_name.url_key}?view=edit"
 
     when /new (.*)$/
       "/new/#{$1.to_name.url_key}"

data/features/support/{wag_env.rb → wagn_env.rb}

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'email_spec' # add this line if you use spork
+require 'email_spec'
 require 'email_spec/cucumber'
 
 Capybara.configure do |config|

data/features/table_of_contents.feature

@@ -4,7 +4,7 @@ Feature: Table of Contents
   I want to be able to set a minimum header number
 
   Background:
-    Given I log in as Joe Admin
+    Given I am signed in as Joe Admin
     And I create Basic card "Two Header" with content "<h1>I'm a header</h1><h1>me too</h1>"
     And I create Basic card "Three Headers" with content "<h1>I'm a header</h1><h2>Me too</h2><h1>same here</h1>"
 

data/features/update_includers.feature

@@ -6,7 +6,7 @@ Feature: Updates for Children of watched cards
 #should this be in watch?
 
   Background:
-    Given I log in as Joe User
+    Given I am signed in as Joe User
     And I create Book card "Ulysses"
     And Joe Camel is watching "Ulysses"
     And Joe Admin is watching "Book"
@@ -39,10 +39,10 @@ Feature: Updates for Children of watched cards
     Then Joe Admin should be notified that "Joe User updated \"Bros Krmzv\""
 
   Scenario: Watching a plus card on multiedit; and watching both plus card and including card on multiedit
-    Given I log in as Joe Admin
+    Given I am signed in as Joe Admin
     And I create Cardtype card "Froot"
     And I create card "Froot+*type+*structure" with content "{{+color}} {{+flavor}}"
-    And I log in as Joe User
+    And I am signed in as Joe User
     And I create Froot card "Banana" with plusses:
       |color|flavor|
       |yellow|sweet|

data/features/watch.feature

@@ -5,10 +5,10 @@ Feature: Watch interface
   I want simple watch interface on cards
 
   Background:
-    Given I log in as Joe User
+    Given I am signed in as Joe User
 
   Scenario: Anonymous User should not see watch UI
-    Given I log out
+    Given I follow "Sign out"
     When I go to the homepage
     And I hover over the main menu
     Then I should not see "follow"

data/lib/card.rb

@@ -1,15 +1,18 @@
 # -*- encoding : utf-8 -*-
 
 class Card < ActiveRecord::Base
+  require_dependency 'card/active_record_ext'
+  
+  require_dependency 'card/codename'
   require_dependency 'card/query'
-  require_dependency 'card/constant'
+  require_dependency 'card/set_pattern'  
   require_dependency 'card/set'
   require_dependency 'card/format'
   require_dependency 'card/exceptions'
+  require_dependency 'card/auth'
+  require_dependency 'card/loader'
 
-  extend Card::Set
-  extend Card::Constant
-  extend Wagn::Loader
+  extend Set
 
   has_many :revisions, :order => :id
   has_many :references_from, :class_name => :Reference, :foreign_key => :referee_id
@@ -21,10 +24,9 @@ class Card < ActiveRecord::Base
   @@set_patterns, @@error_codes = [], {}
 
   attr_writer :selected_revision_id #writer because read method is in mod (and does not override upon load)
-  attr_accessor :action,
-    :cards, :supercard,                          # rename to subcards?
-    :comment, :comment_author, :account_args,    # obviated soon
-    :update_referencers                          # wrong mechanism for this
+  attr_accessor :action, :supercard,         
+    :comment, :comment_author,    # obviated soon
+    :update_referencers           # wrong mechanism for this
 
 
   define_callbacks :approve, :store, :extend
@@ -33,8 +35,8 @@ class Card < ActiveRecord::Base
   around_save :store
   after_save :extend
 
-  load_mods
-
+  Loader.load_mods if count > 0
+    
   tracks :content # we can phase this out and just use "dirty" handling once current content is stored in the cards table
 
 end

data/lib/{active_record/quoting_and_matching.rb → card/active_record_ext.rb}

@@ -1,15 +1,8 @@
 # -*- encoding : utf-8 -*-
 module ActiveRecord
-  module QuotingAndMatching
-    # dummy module to trigger loading code below
-  end
 
   module ConnectionAdapters
     class AbstractAdapter
-      def quote_interval(string)
-        raise "quote_interval not implemented"
-      end
-
       def match(string)
         raise "match not implemented"
       end
@@ -24,20 +17,12 @@ module ActiveRecord
     end
 
     class PostgreSQLAdapter
-      def quote_interval(string)
-        "interval '#{string}'"
-      end
-
       def match(string)
         "~* #{string}"
       end
     end
 
     module MysqlCommon
-      def quote_interval(string)
-        "interval #{string}"
-      end
-
       def match(string)
         "REGEXP #{string}"
       end
@@ -60,13 +45,33 @@ module ActiveRecord
     end
 
     class SQLiteAdapter
-      def quote_interval(string)
-        "interval #{string}"
-      end
-
       def match(string)
         "REGEXP #{string}"
       end
     end
   end
-end
+  
+  module Transactions
+    #FIXME!!
+    # the following code is already in Rails 4 (see https://github.com/rails/rails/commit/c8792c7b2ea4f5fe7a5610225433ea8dd8d0f83e)
+    # it allows manual rollbacks in after_save (eg store events) to reset the object correctly
+    #  hopefully we can soon get rid of this code!
+    
+    def with_transaction_returning_status
+      status = nil
+      self.class.transaction do
+        add_to_transaction
+        begin
+          status = yield
+        rescue ActiveRecord::Rollback
+          @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1
+          status = nil
+        end
+
+        raise ActiveRecord::Rollback unless status
+      end
+      status
+    end
+  end
+  
+end

data/lib/card/auth.rb

@@ -0,0 +1,205 @@
+# -*- encoding : utf-8 -*-
+
+class Card
+  module Auth
+    @@as_card = @@as_id = @@current_id = @@current = @@simulating_setup_need = nil
+
+    NON_CREATEABLE_TYPES = %w{ signup setting set } # NEED API
+    NEED_SETUP_KEY = 'NEED_SETUP'
+
+    #after_save :reset_instance_cache
+
+    class << self
+
+      # Authenticates a user by their login name and unencrypted password.  
+      def authenticate email, password
+        accounted = Auth[ email ]
+        if accounted and account = accounted.account and account.active?
+          if Wagn.config.no_authentication or password_authenticated?( account, password.strip )
+            accounted.id
+          end
+        end
+      end
+
+      def password_authenticated? account, password
+        account.password == encrypt( password, account.salt )
+      end
+
+      def authenticate_by_token token
+        token_card = find_token_card(token) or return :token_not_found
+        
+        token_card.updated_at >
+          Wagn.config.token_expiry.ago      or return :token_expired  # > means "after"
+
+        account = token_card.left and
+        account.right_id==Card::AccountID   or return :bad_account
+
+        accounted = account.left and
+        accounted.accountable?              or return :illegal_account  #(overkill?)
+        
+        as_bot { token_card.delete! }
+        accounted.id
+      end
+
+      def find_token_card token
+        Auth.as_bot do
+          Card.search(
+            :right_id=>Card::TokenID, 
+            :content=>token
+          ).first
+        end          
+      end
+    
+      # Encrypts some data with the salt.
+      def encrypt password, salt
+        Digest::SHA1.hexdigest "#{salt}--#{password}--"
+      end
+
+      # find accounted by email
+      def [] email
+        Auth.as_bot do
+          Card.search( :right_plus=>[
+            {:id=>Card::AccountID},
+            {:right_plus=>[{:id=>Card::EmailID},{ :content=>email.strip.downcase }]}
+          ]).first
+        end
+      end
+        
+      def signin signin_id
+        self.current_id = signin_id
+        session[:user] = signin_id if session
+      end
+
+      def session
+        Card::Env[:session]
+      end
+
+      def set_current_from_session
+        self.current_id = 
+          if session
+            if card_id=session[:user] and Card.exists? card_id
+              card_id
+            else
+              session[:user] = nil
+            end
+          end
+        current_id
+      end
+
+      def current_id
+        @@current_id ||= Card::AnonymousID
+      end
+
+      def current
+        if @@current && @@current.id == current_id
+          @@current
+        else
+          @@current = Card[current_id]
+        end
+      end
+
+      def current_id= card_id
+        @@current = @@as_id = @@as_card = nil
+        @@current_id = card_id
+      end
+
+      def get_user_id user
+        case user
+        when NilClass;   nil
+        when Card    ;   user.id
+        when Integer ;   user
+        else
+          user = user.to_s
+          Card::Codename[user] or (cd=Card[user] and cd.id)
+        end
+      end
+
+      def as given_user
+        tmp_id, tmp_card = @@as_id, @@as_card
+        @@as_id, @@as_card = get_user_id( given_user ), nil  # we could go ahead and set as_card if given a card...
+
+        @@current_id = @@as_id if @@current_id.nil?
+
+        if block_given?
+          value = yield
+          @@as_id, @@as_card = tmp_id, tmp_card
+          return value
+        else
+          #fail "BLOCK REQUIRED with Card#as"
+        end
+      end
+
+      def as_bot &block
+        as Card::WagnBotID, &block
+      end
+
+      def among? authzed
+        as_card.among? authzed
+      end
+
+      def as_id
+        @@as_id || current_id
+      end
+
+      def as_card
+        if @@as_card and @@as_card.id == as_id
+          @@as_card
+        else
+          @@as_card = Card[as_id]
+        end
+      end
+
+      def signed_in?
+        current_id != Card::AnonymousID
+      end
+
+      def needs_setup?
+        test = Card.cache.read NEED_SETUP_KEY
+        !test.nil? ? test : begin
+          @@simulating_setup_need or Card.cache.write( NEED_SETUP_KEY, (account_count < 3) ) # 3, because
+        end
+      end
+    
+      def simulate_setup_need! mode=true
+        @@simulating_setup_need = mode
+        Card.cache.write NEED_SETUP_KEY, nil
+      end
+    
+
+      def always_ok?
+        #warn Rails.logger.warn("aok? #{as_id}, #{as_id&&Card[as_id].id}")
+        return false unless usr_id = as_id
+        return true if usr_id == Card::WagnBotID #cannot disable
+
+        always = Card.cache.read('ALWAYS') || {}
+        #warn(Rails.logger.warn "Auth.always_ok? #{usr_id}")
+        if always[usr_id].nil?
+          always = always.dup if always.frozen?
+          always[usr_id] = !!Card[usr_id].all_roles.detect{|r|r==Card::AdministratorID}
+          #warn(Rails.logger.warn "update always hash #{always[usr_id]}, #{always.inspect}")
+          Card.cache.write 'ALWAYS', always
+        end
+        #warn Rails.logger.warn("aok? #{usr_id}, #{always[usr_id]}")
+        always[usr_id]
+      end
+      # PERMISSIONS
+
+
+      def createable_types
+        type_names = Auth.as_bot do
+          Card.search :type=>Card::CardtypeID, :return=>:name, :not => { :codename => ['in'] + NON_CREATEABLE_TYPES }
+        end
+        type_names.reject do |name|
+          !Card.new( :type=>name ).ok? :create
+        end.sort
+      end
+
+      private
+  
+      def account_count
+        as_bot { Card.count_by_wql :right=>Card[:account].name }
+      end
+
+    end
+  end
+end

data/lib/card/chunk.rb

@@ -8,96 +8,97 @@ require 'uri/common'
 # Chunks are initalized by passing in the result of a
 # match by its pattern.
 
-module Card::Chunk
-  mattr_accessor :raw_list, :prefix_regexp_by_list, :prefix_map
-  @@raw_list, @@prefix_regexp_by_list, @@prefix_map = {}, {}, {}
+class Card
+  module Chunk
+    mattr_accessor :raw_list, :prefix_regexp_by_list, :prefix_map
+    @@raw_list, @@prefix_regexp_by_list, @@prefix_map = {}, {}, {}
   
-  class << self
-    def register_class klass, hash
-      klass.config = hash.merge :class => klass
-      prefix_index = hash[:idx_char] || :default  # this is gross and needs to be moved out.  
-      prefix_map[prefix_index] = klass.config
-    end
+    class << self
+      def register_class klass, hash
+        klass.config = hash.merge :class => klass
+        prefix_index = hash[:idx_char] || :default  # this is gross and needs to be moved out.  
+        prefix_map[prefix_index] = klass.config
+      end
     
-    def register_list key, list
-      raw_list[key] = list
-    end
+      def register_list key, list
+        raw_list[key] = list
+      end
     
-    def find_class_by_prefix prefix
-      config = prefix_map[ prefix[0,1] ] || prefix_map[ prefix[-1,1] ] || prefix_map[:default]
-      #prefix identified by first character, last character, or default.  a little ugly...
-      config[:class]
-    end
+      def find_class_by_prefix prefix
+        config = prefix_map[ prefix[0,1] ] || prefix_map[ prefix[-1,1] ] || prefix_map[:default]
+        #prefix identified by first character, last character, or default.  a little ugly...
+        config[:class]
+      end
     
-    def get_prefix_regexp chunk_list_key
-      prefix_regexp_by_list[chunk_list_key] ||= begin
-        chunk_types = raw_list[chunk_list_key].map { |chunkname| const_get chunkname }
-        prefix_res = chunk_types.map do |chunk_class|
-          chunk_class.config[:prefix_re]
+      def get_prefix_regexp chunk_list_key
+        prefix_regexp_by_list[chunk_list_key] ||= begin
+          chunk_types = raw_list[chunk_list_key].map { |chunkname| const_get chunkname }
+          prefix_res = chunk_types.map do |chunk_class|
+            chunk_class.config[:prefix_re]
+          end
+          /(?:#{ prefix_res * '|' })/m
         end
-        /(?:#{ prefix_res * '|' })/m
       end
-    end
 
-  end
+    end
   
   
-  #not sure whether this is best place.  Could really happen almost anywhere (even before chunk classes are loaded).
-  register_list :default, [ :URI, :HostURI, :EmailURI, :EscapedLiteral, :Include, :Link ]
-  register_list :references,                         [ :EscapedLiteral, :Include, :Link ]
-
+    #not sure whether this is best place.  Could really happen almost anywhere (even before chunk classes are loaded).
+    register_list :default, [ :URI, :HostURI, :EmailURI, :EscapedLiteral, :Include, :Link ]
+    register_list :references,                         [ :EscapedLiteral, :Include, :Link ]
+    register_list :inclusion_only,                     [  :Include ]
   
-  class Abstract
-    class_attribute :config
-    attr_reader :text, :process_chunk
+    class Abstract
+      class_attribute :config
+      attr_reader :text, :process_chunk
     
-    class << self
-      def full_match content, prefix=nil
-#        warn "attempting full match on #{content}.  class = #{self}"
-        content.match full_re( prefix )
-      end
+      class << self
+        def full_match content, prefix=nil
+  #        warn "attempting full match on #{content}.  class = #{self}"
+          content.match full_re( prefix )
+        end
 
-      def full_re prefix
-        config[:full_re]
-      end
+        def full_re prefix
+          config[:full_re]
+        end
       
-      def context_ok? content, chunk_start
-        true
+        def context_ok? content, chunk_start
+          true
+        end
       end
-    end
 
-    def initialize match, content
-      @text = match[0]
-      @processed = nil
-      @content = content
-      interpret match, content
-      self
-    end
+      def initialize match, content
+        @text = match[0]
+        @processed = nil
+        @content = content
+        interpret match, content
+        self
+      end
     
-    def interpret match_string, content, params
-      Rails.logger.info "no #interpret method found for chunk class: #{self.class}"
-    end
+      def interpret match_string, content, params
+        Rails.logger.info "no #interpret method found for chunk class: #{self.class}"
+      end
     
-    def format
-      @content.format
-    end
+      def format
+        @content.format
+      end
     
-    def card
-      @content.card
-    end
+      def card
+        @content.card
+      end
 
-    def to_s
-      @process_chunk || @processed || @text
-    end
+      def to_s
+        @process_chunk || @processed || @text
+      end
 
-    def inspect
-      "<##{self.class}##{to_s}>"
-    end
+      def inspect
+        "<##{self.class}##{to_s}>"
+      end
 
-    def as_json(options={})
-      @process_chunk || @processed|| "not rendered #{self.class}, #{card and card.name}"
+      def as_json(options={})
+        @process_chunk || @processed|| "not rendered #{self.class}, #{card and card.name}"
+      end
     end
   end
-  
-  Card.load_chunks
+  Loader.load_chunks
 end