card 1.20.2 → 1.20.3

data/db/version_core_cards.txt

@@ -1 +1 @@
-20170209132834
+20170314175313

data/lib/card/auth/current.rb

@@ -49,6 +49,27 @@ class Card
           end
       end
 
+      def serialize
+        { as_id: as_id, current_id: current_id }
+      end
+
+      # @param auth_data [Integer|Hash] user id or a hash
+      # @opts auth_data [Integer] current_id
+      # @opts auth_data [Integer] as_id
+      def with auth_data
+        auth_data = { current_id: auth_data } if auth_data.is_a?(Integer)
+        raise ArgumentError unless auth_data.is_a? Hash
+
+        tmp_current = current_id
+        tmp_as_id = as_id
+        @current_id = auth_data[:current_id]
+        @as_id = auth_data[:as_id] if auth_data[:as_id]
+        yield
+      ensure
+        @current_id = tmp_current
+        @as_id = tmp_as_id
+      end
+
       # get session object from Env
       # return [Session]
       def session

data/lib/card/env.rb

@@ -64,9 +64,14 @@ class Card
         @env.select { |k, _v| SERIALIZABLE_ATTRIBUTES.include?(k) }
       end
 
-      def deserialize! data
+      # @param serialized_env [Hash]
+      def with serialized_env
+        tmp_env = serialize if @env
         @env ||= {}
-        @env.update data
+        @env.update serialized_env
+        yield
+      ensure
+        @env.update tmp_env if tmp_env
       end
 
       private

data/lib/card/env/success.rb

@@ -43,7 +43,9 @@ class Card
       end
 
       def id= id
-        self.mark = id  # for backwards compatibility use mark here: id was often used for the card name
+        # for backwards compatibility use mark here.
+        # id was often used for the card name
+        self.mark = id
       end
 
       def type= type
@@ -63,7 +65,7 @@ class Card
         case value
         when ""                     then ""
         when "*previous", :previous then :previous
-        when /^(http|\/)/           then value
+        when %r{^(http|/)}          then value
         when /^TEXT:\s*(.+)/        then  Regexp.last_match(1)
         when /^REDIRECT:\s*(.+)/
           @redirect = true
@@ -89,7 +91,9 @@ class Card
       end
 
       def target name_context=@name_context
-        card(name_context) || (@target == :previous ? Card::Env.previous_location : @target) || Card.fetch(name_context)
+        card(name_context) ||
+          (@target == :previous ? Card::Env.previous_location : @target) ||
+          Card.fetch(name_context)
       end
 
       def []= key, value
@@ -112,6 +116,12 @@ class Card
         end
       end
 
+      def flash message=nil
+        @params[:flash] ||= []
+        @params[:flash] << message if message
+        @params[:flash]
+      end
+
       def params
         @params.marshal_dump
       end

data/lib/card/format/render.rb

@@ -113,10 +113,19 @@ class Card
       end
 
       def view_method view
-        method "_view_#{view}"
-      rescue
-        voo.unsupported_view = view
-        method "_view_unsupported_view"
+        unless supports_view? view
+          voo.unsupported_view = view
+          view = :unsupported_view
+        end
+        method view_method_name(view)
+      end
+
+      def supports_view? view
+        respond_to? view_method_name(view)
+      end
+
+      def view_method_name view
+        "_view_#{view}"
       end
 
       def current_view view

data/lib/card/migration.rb

@@ -62,12 +62,10 @@ class Card::Migration < ActiveRecord::Migration
     Card::Cache.reset_all
     Cardio.schema_mode "" do
       Card::Auth.as_bot do
-        ActiveRecord::Base.transaction do
-          begin
-            yield
-          ensure
-            Card::Cache.reset_all
-          end
+        begin
+          yield
+        ensure
+          Card::Cache.reset_all
         end
       end
     end

data/lib/card/mod/loader.rb

@@ -18,6 +18,7 @@ class Card
     module Loader
       class << self
         def load_mods
+          load_initializers
           load_set_patterns
           load_formats
           load_sets
@@ -89,6 +90,13 @@ class Card
           files.flatten
         end
 
+        def load_initializers
+          Card.config.paths["mod/config/initializers"].existent
+              .sort.each do |initializer|
+            load initializer
+          end
+        end
+
         def load_set_patterns
           generate_set_pattern_tmp_files if rewrite_tmp_files?
           load_dir Card.paths["tmp/set_pattern"].first

data/lib/card/model/save_helper.rb

@@ -9,6 +9,14 @@ class Card
     # All !-methods in this module rename existing cards
     # to resolve name conflicts)
     module SaveHelper
+      def as_user user_name
+        current = Card::Auth.current_id
+        Card::Auth.current_id = Card.fetch_id user_name
+        result = yield
+        Card::Auth.current_id = current
+        result
+      end
+
       def create_card name_or_args, content_or_args=nil
         args = standardize_args name_or_args, content_or_args
         resolve_name_conflict args
@@ -75,6 +83,43 @@ class Card
         end
       end
 
+
+      # Creates or updates a trait card with codename and right rules.
+      # Content for rules that are pointer cards by default
+      # is converted to pointer format.
+      # @example
+      #   ensure_trait "*a_or_b", :a_or_b,
+      #                default: { type_id: Card::PointerID },
+      #                options: ["A", "B"],
+      #                input: "radio"
+      def ensure_trait name, codename, args={}
+        ensure_card name, codename: codename
+        args.each do |setting, value|
+          ensure_trait_rule name, setting, value
+        end
+      end
+
+      def ensure_trait_rule trait, setting, value
+        validate_setting setting
+        card_args = normalize_trait_rule_args setting, value
+        ensure_card [trait, :right, setting], card_args
+      end
+
+      def validate_setting setting
+        unless Card::Codename[setting] &&
+               Card.fetch_type_id(setting) == SettingID
+          raise ArgumentError, "not a valid setting: #{setting}"
+        end
+      end
+
+      def normalize_trait_rule_args setting, value
+        return value if value.is_a? Hash
+        if Card.fetch_type_id([setting, :right, :default]) == PointerID
+          value = Array(value).to_pointer_content
+        end
+        { content: value }
+      end
+
       # if card with same name exists move it out of the way
       def create_card! name_or_args, content_or_args=nil
         args = standardize_args name_or_args, content_or_args

data/lib/card/name/view_name.rb

@@ -12,7 +12,7 @@ class Card
         def new obj
           return obj if self.class === obj
           str = Array === obj ? obj * joint : obj.to_s
-          if known_name = @@name2viewnameobject[str]
+          if (known_name = @@name2viewnameobject[str])
             known_name
           else
             super str.strip
@@ -23,13 +23,14 @@ class Card
       def initialize str
         @s = str.to_s.strip
         @s = @s.encode("UTF-8") if RUBYENCODING
-        @key = if @s.index(self.class.joint)
-                 @parts = @s.split(/\s*#{JOINT_RE}\s*/)
+        @key =
+          if @s.index(self.class.joint)
+            @parts = @s.split(/\s*#{JOINT_RE}\s*/)
             @parts << "" if @s[-1, 1] == self.class.joint
             @simple = false
             @parts.map { |p| p.to_name.key } * self.class.joint
-               else
-                 @parts = [str]
+          else
+            @parts = [str]
             @simple = true
             str.empty? ? "" : simple_key
           end
@@ -37,7 +38,8 @@ class Card
       end
 
       def simple_key
-        decoded.underscore.gsub(/[^#{OK4KEY_RE}]+/, "_").split(/_+/).reject(&:empty?) * "_"
+        decoded.underscore.gsub(/[^#{OK4KEY_RE}]+/, "_")
+               .split(/_+/).reject(&:empty?) * "_"
       end
 
       def to_viewname

data/lib/card/query/join.rb

@@ -8,6 +8,7 @@ class Card
                     :from_field, :to_field,
                     :superjoin, :subjoins
 
+      # documentation??? -pk
       def initialize opts={}
         from_and_to opts
         opts.each do |key, value|
@@ -15,8 +16,9 @@ class Card
         end
         @from_field ||= :id
         @to_field   ||= :id
-        @conditions = []
-        @subjoins = []
+
+        @conditions = Array @conditions
+        @subjoins = Array @subjoins
         if @from.is_a? Join
           @superjoin = @from
           @superjoin.subjoins << self

data/lib/card/query/sorting.rb

@@ -22,30 +22,34 @@ class Card
 
       # EXPERIMENTAL!
       def sort_by_count val, item
-        if item == "referred_to"
-          @mods[:sort] = "coalesce(count,0)" # needed for postgres
-          cs = Query.new(
-            return: "coalesce(count(*), 0) as count",
-            group: "sort_join_field",
-            superquery: self
-          )
-          subselect = Query.new val.merge(return: "id", superquery: self)
-          cs.add_condition "referer_id in (#{subselect.sql})"
-          # FIXME: - SQL generated before SQL phase
-          cs.joins << Join.new(
-            from: cs,
-            to: %w(card_references wr referee_id)
-          )
-          cs.mods[:sort_join_field] = "#{cs.table_alias}.id as sort_join_field"
-          # HACK!
-
-          joins << Join.new(
-            from: self,
-            to: [cs, "srtbl", "sort_join_field"]
-          )
-        else
+        method_name = "sort_by_count_#{item}"
+        unless respond_to?(method_name)
           raise Card::Error::BadQuery, "count with item: #{item} not yet implemented"
         end
+        send method_name, val
+      end
+
+      def sort_by_count_referred_to val
+        @mods[:sort] = "coalesce(count,0)" # needed for postgres
+        cs = Query.new(
+          return: "coalesce(count(*), 0) as count",
+          group: "sort_join_field",
+          superquery: self
+        )
+        subselect = Query.new val.merge(return: "id", superquery: self)
+        cs.add_condition "referer_id in (#{subselect.sql})"
+        # FIXME: - SQL generated before SQL phase
+        cs.joins << Join.new(
+          from: cs,
+          to: %w(card_references wr referee_id)
+        )
+        cs.mods[:sort_join_field] = "#{cs.table_alias}.id as sort_join_field"
+        # HACK!
+
+        joins << Join.new(
+          from: self,
+          to: [cs, "srtbl", "sort_join_field"]
+        )
       end
     end
   end

data/lib/card/reference.rb

@@ -41,10 +41,10 @@ class Card
           "LEFT JOIN cards ON card_references.referer_id = cards.id"
         ).where(
           "cards.id IS NULL"
-        ).find_in_batches do |group|
+        ).pluck_in_batches(:id) do |group_ids|
           # used to be .delete_all here, but that was failing on large dbs
           puts "deleting batch of references"
-          where("id in (#{group.map(&:id).join ','})").delete_all
+          where("id in (#{group_ids.join ','})").delete_all
         end
       end
 

data/lib/card/set/advanced_api.rb

@@ -4,14 +4,11 @@ class Card
     module AdvancedApi
       def ensure_set &block
         set_module = yield
+        set_module = card_set_module_const_get(set_module) unless set_module.is_a?(Module)
+        set_module
       rescue NameError => e
         if e.message =~ /uninitialized constant (?:Card::Set::)?(.+)$/
-          constant_pieces = Regexp.last_match(1).split("::")
-          constant_pieces.inject(Card::Set) do |set_mod, module_name|
-            set_mod.const_get_or_set module_name do
-              Module.new
-            end
-          end
+          define_set Regexp.last_match(1)
         end
         # try again - there might be another submodule that doesn't exist
         ensure_set(&block)
@@ -40,6 +37,34 @@ class Card
           end
         end
       end
+
+      private
+
+      # @param set_name [String] name of the constant to be defined
+      def define_set set_name
+        constant_pieces = set_name.split("::")
+        constant_pieces.inject(Card::Set) do |set_mod, module_name|
+          set_mod.const_get_or_set module_name do
+            Module.new
+          end
+        end
+      end
+
+      # "set" is the noun not the verb
+      def card_set_module_const_get const
+        Card::Set.const_get normalize_const(const)
+      end
+
+      def normalize_const const
+        case const
+        when Array
+          const.map { |piece| piece.to_s.camelcase }.join("::")
+        when Symbol
+          const.to_s.camelcase
+        else
+          const
+        end
+      end
     end
   end
 end

data/lib/card/set/event.rb

@@ -1,5 +1,5 @@
 class Card
-  def deserialize_for_active_job! attr, env, current_id
+  def deserialize_for_active_job! attr
     attr.each do |attname, args|
       # symbols are not allowed so all symbols arrive here as strings
       # convert strings that were symbols before back to symbols
@@ -7,15 +7,21 @@ class Card
       instance_variable_set("@#{attname}", value)
     end
     include_set_modules
+  end
+
+  def with_env_and_auth env, auth
     # If active jobs (and hence the integrate_with_delay events) don't run
     # in a background process then Card::Env.deserialize! decouples the
     # controller's params hash and the Card::Env's params hash with the
     # effect that params changes in the CardController get lost
     # (a crucial example are success params that are processed in
     # CardController#update_params_for_success)
-    return if Wagn.config.active_job.queue_adapter == :inline
-    Card::Env.deserialize! env
-    Card::Auth.current_id = current_id
+    return yield if Wagn.config.active_job.queue_adapter == :inline
+    Card::Auth.with auth do
+      Card::Env.with env do
+        yield
+      end
+    end
   end
 
   def serialize_for_active_job
@@ -115,16 +121,18 @@ class Card
           define_method(method_name, proc do
             IntegrateWithDelayJob.set(queue: event).perform_later(
               self, serialize_for_active_job, Card::Env.serialize,
-              Card::Auth.current_id, final_method_name
+              Card::Auth.serialize, final_method_name
             )
           end)
         end
       end
 
       class IntegrateWithDelayJob < ActiveJob::Base
-        def perform card, card_attribs, env, current_id, method_name
-          card.deserialize_for_active_job! card_attribs, env, current_id
-          card.send method_name
+        def perform card, card_attribs, env, auth, method_name
+          card.deserialize_for_active_job! card_attribs
+          card.with_env_and_auth env, auth do
+            card.send method_name
+          end
         end
       end