wagn 1.13.0 → 1.14.0.pre1

data/lib/card/env.rb

@@ -8,9 +8,10 @@ class Card
       
         if c = args[:controller]
           self[:controller] = c
-          self[:session] = c.request.session
-          self[:params] = c.request.params
-          self[:ajax] = c.request.xhr? || c.request.params[:simulate_xhr]
+          self[:session]    = c.request.session
+          self[:params]     = c.request.params
+          self[:ip]         = c.request.remote_ip
+          self[:ajax]       = c.request.xhr? || c.request.params[:simulate_xhr]
           self[:host]       = Wagn.config.override_host     || c.request.env['HTTP_HOST']
           self[:protocol]   = Wagn.config.override_protocol || c.request.protocol
         

data/lib/card/format.rb

@@ -207,7 +207,7 @@ class Card
       when api_option == :hide                     ; false
       # default                                    
       else                                         ; default==:show
-      end        
+      end
     end
     
     def show_views args
@@ -285,15 +285,13 @@ class Card
       content = card.raw_content || '' if content.nil?
 
       obj_content = Card::Content===content ? content : Card::Content.new( content, format=self, opts.delete(:content_opts) )
-
       card.update_references( obj_content, refresh=true ) if card.references_expired  # I thik we need this generalized
-
       obj_content.process_content_object do |chunk_opts|
         prepare_nest chunk_opts.merge(opts) { yield }
       end
     end
 
-    def ok_view view, args={}    
+    def ok_view view, args={}
       return view if args.delete :skip_permissions
       approved_view = case
         when @depth >= @@max_depth      ; :too_deep                    # prevent recursion. @depth tracks subformats
@@ -435,7 +433,6 @@ class Card
       when @mode == :closed     ; !nested_card.known?  ? :closed_missing : :closed_content
       else                      ; view
       end
-    
       sub.render view, opts
       #end
     end

data/lib/card/generators/card_migration/USAGE

@@ -1,7 +1,10 @@
 
 Description:
-    Generates a migration of database content
-
+    Generates a migration of database content. 
+    
+    To import database content from a json file move your json file to db/migrate_cards/data
+    and choose as migration name import_<filename>.
+    
 Example:
     wagn generate card_migration better_commented_search_cards
 
@@ -9,4 +12,13 @@ Example:
     
         db/migrate_cards/(migration_number)_(name).rb
 
-    ...which is set up to use methods in lib/wagn/migration_helper.rb
+    ...which is set up to use methods in lib/wagn/migration.rb
+    
+    
+    wagn generate card_migration import_better_search_cards
+
+    This will create:
+    
+        db/migrate_cards/(migration_number)_(name).rb
+        
+    ...which is set up to import data from db/migrate_cards/data/better_search_cards.json

data/lib/card/generators/card_migration/card_migration_generator.rb

@@ -3,8 +3,28 @@ require 'rails/generators/active_record'
 
 class CardMigrationGenerator < ActiveRecord::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
+  
+  class_option 'core', :type => :boolean, aliases: '-c', :default => false, :group => :runtime, 
+    desc: "Create card migration for wagn core"
 
   def create_migration_file
-    migration_template "card_migration.erb", "db/migrate_cards/#{file_name}.rb"
+    root = options['core'] ? Wagn::Migration.card_migration_paths.first : Wagn::Migration.deck_card_migration_paths.first
+    set_local_assigns!
+    migration_template @migration_template, File.join( root, "#{file_name}.rb")
   end
-end
+  
+  protected
+  
+  # sets the default migration template that is being used for the generation of the migration
+  # depending on the arguments which would be sent out in the command line, the migration template 
+  # and the table name instance variables are setup.
+
+  def set_local_assigns!
+    @migration_template = "card_migration.erb"
+    case file_name
+    when /^(import)_(.*)(?:\.json)?/
+      @migration_action = $1
+      @json_filename    = "#{$2}.json"
+    end
+  end
+end

data/lib/card/generators/card_migration/templates/card_migration.erb

@@ -1,10 +1,9 @@
 # -*- encoding : utf-8 -*-
 
-class <%= migration_class_name %> < ActiveRecord::Migration
-  include Wagn::MigrationHelper
+class <%= migration_class_name %> < Wagn::Migration
   def up
-    contentedly do
-      
-    end
+    <% if @migration_action == 'import' -%>
+      import_json "<%= @json_filename %>"
+    <% end -%>
   end
 end

data/lib/card/generators/format/USAGE

@@ -5,5 +5,5 @@ Example:
     rails generate format backup
 
     This will create:
-        mods/standard/formats/backup_format.rb
-        spec/mods/standard/formats/backup_format_spec.rb
+        mods/05_standard/formats/backup_format.rb
+        spec/mods/05_standard/formats/backup_format_spec.rb

data/lib/card/generators/format/format_generator.rb

@@ -2,7 +2,7 @@ class FormatGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('../templates', __FILE__)
   
   def create_files
-    template 'format_template.erb',           "mod/standard/format/#{file_name}_format.rb"
-    template 'format_spec_template.erb', "spec/mod/standard/format/#{file_name}_format_spec.rb"
+    template 'format_template.erb',           "mod/05_standard/format/#{file_name}_format.rb"
+    template 'format_spec_template.erb', "spec/mod/05_standard/format/#{file_name}_format_spec.rb"
   end
 end

data/lib/card/generators/set/USAGE

@@ -5,5 +5,5 @@ Example:
     wagn generate set standard type tshirt
 
     This will create:
-        mods/standard/sets/type/tshirt.rb
-        spec/mods/standard/sets/type/tshirt_spec.rb
+        mods/05_standard/sets/type/tshirt.rb
+        spec/mods/05_standard/sets/type/tshirt_spec.rb

data/lib/card/mailer.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'open-uri'
 
+
 class Card
   class Mailer < ActionMailer::Base
     
@@ -11,108 +12,28 @@ class Card
     default @@defaults
 
     include Wagn::Location
-
-
-    def confirmation_email account
-      @site = Card.setting :title
-      @token = account.token
-      @link = wagn_url "/update/#{ account.left.cardname.url_key }?token=#{ @token }"
-      @expiry = Wagn.config.token_expiry
-
-      confirm_from = token_emails_from(account)
-      mail_from( { :to=>account.email, :subject=>"verification link for #{@site}" }, confirm_from )
-    end
-  
-    def password_reset account
-      @site = Card.setting :title
-      @link = wagn_url "/update/#{account.cardname.url_key}?reset_token=#{account.token_card.refresh(true).content}"
-      @expiry = Wagn.config.token_expiry
-    
-      reset_from = token_emails_from(account)
-      mail_from( { :to=>account.email, :subject=>"verification link for #{@site}" }, reset_from )    
-    end
-
-    def signup_alert invite_request
-      @site = Card.setting :title
-      @card = invite_request
-      @email= invite_request.account.email
-      @name = invite_request.name
-      @content = invite_request.content
-      @request_url  = wagn_url invite_request
-      @requests_url = wagn_url Card[:signup]
-
-      args = {
-        :to           => Card.setting('*request+*to'),
-        :subject      => "#{invite_request.name} signed up for #{@site}",
-        :content_type => 'text/html',
-      }
-      mail_from args, Card.setting('*request+*from') || "#{@name} <#{@email}>"
-    end
-
-
-    def change_notice cd_with_acct, card, action, watched, subedits=[], updated_card=nil
-      cd_with_acct = Card[cd_with_acct] unless Card===cd_with_acct
-      email = cd_with_acct.account.email
-      #warn "change_notice( #{cd_with_acct}, #{email}, #{card.inspect}, #{action.inspect}, #{watched.inspect} Uc:#{updated_card.inspect}...)"
-
-      updated_card ||= card
-      @card = card
-      @updater = updated_card.updater.name
-      @action = action
-      @subedits = subedits
-      @card_url = wagn_url card
-      @change_url  = wagn_url "card/changes/#{card.cardname.url_key}"
-      @unwatch_url = wagn_url "card/watch/#{watched.to_name.url_key}?toggle=off"
-      @udpater_url = wagn_url card.updater
-      @watched = (watched == card.cardname ? "#{watched}" : "#{watched} cards")
-
-      args = {
-        :to           => email,
-        :subject      => "[#{Card.setting :title} notice] #{@updater} #{action} \"#{card.name}\"" ,
-        :content_type => 'text/html',
-      }
-      mail_from args, Card[Card::WagnBotID].account.email
-    end
-
-    def flexmail config
-      @message = config.delete(:message)
-
-      if attachment_list = config.delete(:attach) and !attachment_list.empty?
-        attachment_list.each_with_index do |cardname, i|
-          if c = Card[ cardname ] and c.respond_to?(:attach)
-            attachments["attachment-#{i + 1}.#{c.attach_extension}"] = File.read( c.attach.path )
-          end
-        end
+        
+    class << self
+      def new_mail(*args, &block)
+        mail = Mail.new(args, &block)
+        method = Card::Mailer.delivery_method
+        mail.delivery_method(method, Card::Mailer.send(:"#{method}_settings"))
+        mail.perform_deliveries    = Card::Mailer.perform_deliveries
+        mail.raise_delivery_errors = Card::Mailer.raise_delivery_errors
+        mail
       end
-
-      mail_from config, config[:from]
-    end
-
-    private
-
-    def token_emails_from account
-      Card.setting( '*invite+*from' ) || begin
-        from_card_id = Auth.current_id
-        from_card_id = WagnBotID if [ AnonymousID, account.left_id ].member? from_card_id
-        from_card = Card[from_card_id]
-        "#{from_card.name} <#{from_card.account.email}>"
-      end
-    end
-
-    def mail_from args, from
-      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
+          
+      def layout message
+        %{
+          <!DOCTYPE html>
+          <html>
+            <body>
+              #{message}
+            </body>
+          </html>
+        }
       end
-      
-      args[:template_path] = 'mailer'
-      mail args
     end
-
   end
-  
 end
+

data/lib/card/name.rb

@@ -1,11 +1,11 @@
-# -*- encoding : utf-8 -*-
+  # -*- encoding : utf-8 -*-
 require 'smart_name'
 
 class Card
   class Name < SmartName
 
     self.params  = Card::Env # yuck!
-    self.session = proc { Auth.current.name }
+    self.session = proc { Card::Auth.current.name }
     self.banned_array = ['/']
 
     def star?
@@ -32,7 +32,8 @@ class Card
     end
 
     def trait tag_code
-      trait_name( tag_code ).s
+      name = trait_name( tag_code )
+      name ? name.s : ( raise Wagn::NotFound, "unknown codename: #{tag_code}" )
     end
   end
 end

data/lib/card/query.rb

@@ -58,10 +58,10 @@ class Card::Query
 
 
   class SqlStatement
-    attr_accessor :fields, :relevance_fields, :tables, :joins, :conditions, :group, :order, :limit, :offset
+    attr_accessor :fields, :tables, :joins, :conditions, :group, :order, :limit, :offset
 
     def initialize
-      @fields, @relevance_fields, @joins, @conditions = [],[],[],[]
+      @fields, @joins, @conditions = [],[],[],[]
       @tables, @group, @order, @limit, @offset = "","","","",""
     end
 

data/lib/card/query/card_spec.rb

@@ -4,7 +4,7 @@ class Card
     class CardSpec < Spec
     
       ATTRIBUTES = {
-        :basic           => %w{ name type_id content id key updater_id left_id right_id creator_id updater_id codename },
+        :basic           => %w{ name type_id content id key updater_id left_id right_id creator_id updater_id codename }, 
         :relational      => %w{ type part left right editor_of edited_by last_editor_of last_edited_by creator_of created_by member_of member },
         :plus_relational => %w{ plus left_plus right_plus },
         :ref_relational  => %w{ refer_to referred_to_by link_to linked_to_by include included_by },
@@ -200,15 +200,15 @@ class Card
       def right val
         merge field(:right_id) => id_or_subspec(val)
       end
-
+      
       def editor_of val
-        revision_spec :creator_id, :card_id, val
+        action_spec :actor_id, "card_actions.card_id", val
       end
 
       def edited_by val
-        revision_spec :card_id, :creator_id, val
+        action_spec "card_actions.card_id", :actor_id, val
       end
-  
+      
       def last_editor_of val
         merge field(:id) => subspec(val, :return=>'updater_id')
       end
@@ -291,7 +291,7 @@ class Card
 
       def sort val
         return nil if @parent
-        val[:return] = val[:return] ? safe_sql(val[:return]) : 'content'
+        val[:return] = val[:return] ? safe_sql(val[:return]) : 'db_content'
         @mods[:sort] =  "t_sort.#{val[:return]}"
         item = val.delete(:item) || 'left'
 
@@ -326,10 +326,8 @@ class Card
     
 
         cond = begin
-          join_alias = add_revision_join
-          # FIXME: OMFG this is ugly
           val_list = val.split(/\s+/).map do |v|
-            name_or_content = ["replace(#{self.table_alias}.name,'+',' ')","#{join_alias}.content"].map do |field|
+            name_or_content = ["replace(#{self.table_alias}.name,'+',' ')","#{self.table_alias}.db_content"].map do |field| 
               %{#{field} #{ cxn.match quote("[[:<:]]#{v}[[:>:]]") }}
             end
             "(#{name_or_content.join ' OR '})"
@@ -374,10 +372,6 @@ class Card
         join_alias
       end
 
-      def add_revision_join
-        add_join(:rev, :card_revisions, :current_revision_id, :id)
-      end
-
       def field name
         @fields ||= {}
         @fields[name] ||= 0
@@ -394,13 +388,19 @@ class Card
         cardspec = CardSpec.build( args )
         merge field(:cond) => cardspec.merge(val)
         self.joins.merge! cardspec.joins
-        self.sql.relevance_fields += cardspec.sql.relevance_fields
       end
 
-
-      def revision_spec(field, linkfield, val)
+      # def revision_spec(field, linkfield, val)
+#         card_select = CardSpec.build(:_parent=>self, :return=>'id').merge(val).to_sql
+#         add_join :ed, "(select distinct #{field} from card_revisions where #{linkfield} in #{card_select})", :id, field
+#       end
+      
+      
+      def action_spec(field, linkfield, val)
         card_select = CardSpec.build(:_parent=>self, :return=>'id').merge(val).to_sql
-        add_join :ed, "(select distinct #{field} from card_revisions where #{linkfield} in #{card_select})", :id, field
+        sql =  "(SELECT DISTINCT #{field} AS join_card_id FROM card_acts INNER JOIN card_actions ON card_acts.id = card_act_id "
+        sql += " WHERE #{linkfield} IN #{card_select} AND (draft=0 OR draft IS NULL))"
+        add_join :ac, sql, :id, :join_card_id
       end
 
 
@@ -472,9 +472,7 @@ class Card
         when :raw;  "#{table_alias}.*"
         when :card; "#{table_alias}.name"
         when :count; "coalesce(count(*),0) as count"
-        when :content
-          join_alias = add_revision_join
-          "#{join_alias}.content"
+        when :content; "#{table_alias}.db_content"
         else
           ATTRIBUTES[field.to_sym]==:basic ? "#{table_alias}.#{field}" : safe_sql(field)
         end
@@ -500,16 +498,8 @@ class Card
           when "update";          "#{table_alias}.updated_at"
           when "create";          "#{table_alias}.created_at"
           when /^(name|alpha)$/;  "LOWER( #{table_alias}.key )"
-          when 'content'
-            join_alias = add_revision_join
-            "lower(#{join_alias}.content)"
-          when "relevance"
-            if !sql.relevance_fields.empty?
-              sql.fields << sql.relevance_fields
-              "name_rank desc, content_rank"
-            else
-              "#{table_alias}.updated_at"
-            end
+          when 'content';         "#{table_alias}.db_content"
+          when "relevance";       "#{table_alias}.updated_at" #deprecated            
           else
             safe_sql(key)
           end

data/lib/card/query/value_spec.rb

@@ -49,12 +49,11 @@ class Card::Query
       field, v = case field
         when "cond";     return "(#{sqlize(v)})"
         when "name";     ["#{table}.key",      [v].flatten.map(&:to_name).map(&:key)]
-        when "content";   join_alias = @cardspec.add_revision_join
-                         ["#{join_alias}.content", v]
+        when "content";  ["#{table}.db_content", v]
         else;            ["#{table}.#{safe_sql(field)}", v]
         end
 
-      v = v[0] if Array===v && v.length==1
+      v = v[0] if Array===v && v.length==1 && op != 'in'
       if op=='~'
         cxn, v = match_prep(v,@cardspec)
         %{#{field} #{cxn.match(sqlize(v))}}