card 1.96.8 → 1.97.0

data/lib/card/query.rb

@@ -46,21 +46,21 @@ class Card
       # (These are referred to as "properties" in WQL documentation. Need to
       # reconcile #EFM)
       basic:           %i[id name key type_id content left_id right_id
-                          creator_id updater_id codename read_rule_id],
+                creator_id updater_id codename read_rule_id],
       # "Relational" values can involve tying multiple queries together
       relational:      %i[type
-                          part left right
-                          editor_of edited_by last_editor_of last_edited_by
-                          creator_of created_by
-                          updater_of updated_by
-                          link_to linked_to_by
-                          include included_by
+                     part left right
+                     editor_of edited_by last_editor_of last_edited_by
+                     creator_of created_by
+                     updater_of updated_by
+                     link_to linked_to_by
+                     include included_by
 
-                          refer_to referred_to_by
-                          member_of member
+                     refer_to referred_to_by
+                     member_of member
 
-                          found_by not sort match name_match complete
-                          extension_type],
+                     found_by not sort match name_match complete
+                     extension_type],
 
       plus_relational: %i[plus left_plus right_plus],
       conjunction:     %i[and or all any],
@@ -75,7 +75,7 @@ class Card
                 .each_with_object({}) { |v, h| h[v] = nil }
 
     OPERATORS =
-      %w(!= = =~ < > in ~).each_with_object({}) { |v, h| h[v] = v }.merge(
+      %w[!= = =~ < > in ~].each_with_object({}) { |v, h| h[v] = v }.merge(
         {
           eq: "=", gt: ">", lt: "<", match: "~", ne: "!=", "not in": "not in"
         }.stringify_keys
@@ -95,6 +95,13 @@ class Card
       def class_for type
         const_get "#{type.capitalize}Query"
       end
+
+      def safe_sql txt
+        txt = txt.to_s
+        raise "WQL contains disallowed characters: #{txt}" if txt.match?(/[^\w\s*().,]/)
+
+        txt
+      end
     end
   end
 end

data/lib/card/query/abstract_query/query_helper.rb

@@ -11,6 +11,7 @@ class Card
           list = []
           subqueries.each do |s|
             next unless Array.wrap(fasten).include? s.fasten
+
             list << s
             list += s.subqueries_with_fasten s.fasten
           end
@@ -29,6 +30,7 @@ class Card
 
         def next_table_suffix
           return root.next_table_suffix unless root?
+
           @table_suffix = (@table_suffix || -1) + 1
         end
 

data/lib/card/query/card_query.rb

@@ -38,6 +38,7 @@ class Card
 
       def default_comment
         return if @superquery || !Card.config.sql_comments
+
         statement.to_s
       end
 

data/lib/card/query/card_query/conjunctions.rb

@@ -26,6 +26,7 @@ class Card
 
         def conjunction val
           return unless [String, Symbol].member? val.class
+
           CONJUNCTIONS[val.to_sym]
         end
 
@@ -38,6 +39,7 @@ class Card
 
         def conjoinable_val val
           return val if val.is_a? Array
+
           clause_to_hash(val).map { |key, value| { key => value } }
         end
       end

data/lib/card/query/card_query/interpretation.rb

@@ -47,16 +47,11 @@ class Card
           attribute = ATTRIBUTES[key]
           if (method = INTERPRET_METHOD[attribute])
             send method, key, val
-          else
-            non_standard_attribute attribute
+          elsif attribute != :ignore
+            bad_attribute! key
           end
         end
 
-        def non_standard_attribute attribute
-          return if attribute == :ignore
-          bad_attribute! attribute
-        end
-
         def bad_attribute! attribute
           raise Error::BadQuery, "Invalid attribute: #{attribute}"
         end

data/lib/card/query/card_query/match_attributes.rb

@@ -11,6 +11,7 @@ class Card
         def match val
           val.gsub!(/[^#{Card::Name::OK4KEY_RE}]+/, " ")
           return nil if val.strip.empty?
+
           val.gsub!("*", '\\\\\\\\*')
           val_list = val.split(/\s+/).map do |v|
             name_or_content_match v

data/lib/card/query/card_query/reference_attributes.rb

@@ -13,16 +13,16 @@ class Card
 
         {
           refer_to: %w[L I],
-          link_to:  "L",
-          include:  "I"
+          link_to: "L",
+          include: "I"
         }.each do |methodname, reftype|
           define_reference_method methodname, reftype, :referee, :referer_id
         end
 
         {
           referred_to_by: %w[L I],
-          linked_to_by:   "L",
-          included_by:    "I"
+          linked_to_by: "L",
+          included_by: "I"
         }.each do |methodname, reftype|
           define_reference_method methodname, reftype, :referer, :referee_id
         end

data/lib/card/query/card_query/run.rb

@@ -83,6 +83,7 @@ class Card
         def process_name name, pattern
           name = pattern.to_name.absolute(name) if pattern =~ /_\w+/
           return name unless alter_results?
+
           alter_result name
         end
 

data/lib/card/query/card_query/sorting.rb

@@ -15,6 +15,7 @@ class Card
 
         def sort val
           return nil unless full?
+
           sort_field = val[:return] || "db_content"
           val = val.clone
           item = val.delete(:item) || "left"

data/lib/card/query/clause.rb

@@ -1,17 +1,19 @@
+class Card
+  module Query
+    module Clause
+      #    attr_accessor :clause
 
-module Card::Query::Clause
-  #    attr_accessor :clause
+      def safe_sql text
+        Query.safe_sql text
+      end
 
-  def safe_sql txt
-    txt = txt.to_s
-    txt =~ /[^\w\*\(\)\s\.\,]/ ? raise("WQL contains disallowed characters: #{txt}") : txt
-  end
-
-  def quote v
-    connection.quote(v)
-  end
+      def quote v
+        connection.quote(v)
+      end
 
-  def connection
-    @connection ||= ActiveRecord::Base.connection
+      def connection
+        @connection ||= ActiveRecord::Base.connection
+      end
+    end
   end
 end

data/lib/card/query/join.rb

@@ -47,7 +47,7 @@ class Card
         if !@side.nil?
           @side.to_s.upcase
         else
-          in_or = from && from.is_a?(Card::Query) && from.mods[:conj] == "or"
+          in_or = from&.is_a?(Card::Query) && from.mods[:conj] == "or"
           @side = in_or ? "LEFT" : nil
         end
       end
@@ -68,7 +68,7 @@ class Card
       #
       # In all cases, if the field is not specified, it is assumed to be :id
       def interpret_from_and_to opts
-        [:from, :to].each do |side|
+        %i[from to].each do |side|
           directional_hash_for_object(side, opts[side]).map do |key, value|
             opts[:"#{side}_#{key}"] ||= value
           end
@@ -98,6 +98,7 @@ class Card
 
       def dir_hash_for_join side, object
         raise "to: cannot be Join" if side == :to
+
         dir_hash object.to_table, object.to_alias
       end
 
@@ -113,6 +114,7 @@ class Card
 
       def register_superjoin
         return unless @from.is_a? Join
+
         @superjoin = @from
         @superjoin.subjoins << self
       end

data/lib/card/query/reference_query.rb

@@ -43,6 +43,7 @@ class Card
 
       def add_reftype_condition reftype
         return unless reftype.present?
+
         reftype = Array.wrap reftype
         operator = (reftype.size == 1 ? "=" : "IN")
         quoted_letters = reftype.map { |letter| "'#{letter}'" } * ", "

data/lib/card/query/sql_statement.rb

@@ -17,7 +17,7 @@ class Card
 
       def initialize query=nil
         @query = query
-        @mods = query && query.mods
+        @mods = query&.mods
       end
 
       def build
@@ -51,6 +51,7 @@ class Card
 
       def comment
         return nil unless Card.config.sql_comments && @query.comment
+
         "/* #{@query.comment} */\n"
       end
 
@@ -91,7 +92,7 @@ class Card
         full_syntax do
           limit = @mods[:limit]
           offset = @mods[:offset]
-          if limit.to_i > 0
+          if limit.to_i.positive?
             string =  "LIMIT  #{limit.to_i} "
             string += "OFFSET #{offset.to_i} " if offset.present?
             string
@@ -104,12 +105,7 @@ class Card
       end
 
       def safe_sql txt
-        txt = txt.to_s
-        if txt =~ /[^\w\*\(\)\s\.\,]/
-          raise "WQL contains disallowed characters: #{txt}"
-        else
-          txt
-        end
+        Query.safe_sql txt
       end
 
       def cast_type type

data/lib/card/query/sql_statement/joins.rb

@@ -32,6 +32,7 @@ class Card
 
         def subjoins join
           return unless join.to.is_a? AbstractQuery
+
           joins join.to
         end
 

data/lib/card/query/sql_statement/order.rb

@@ -5,12 +5,12 @@ class Card
     # @mods[:dir]
     class SqlStatement
       ORDER_MAP = {
-        "id"        => "id",
-        "update"    => "updated_at",
-        "create"    => "created_at",
-        "name"      => "key",
-        "content"   => "db_content",
-        "alpha"     => "key",       # DEPRECATED
+        "id" => "id",
+        "update" => "updated_at",
+        "create" => "created_at",
+        "name" => "key",
+        "content" => "db_content",
+        "alpha" => "key",       # DEPRECATED
         "relevance" => "updated_at" # DEPRECATED
       }.freeze
 
@@ -47,6 +47,7 @@ class Card
         def order_as
           field = yield
           return field unless (as = @mods[:sort_as])
+
           "CAST(#{field} AS #{cast_type(safe_sql(as))})"
         end
 

data/lib/card/query/sql_statement/where.rb

@@ -1,4 +1,3 @@
-
 class Card
   module Query
     class SqlStatement
@@ -23,6 +22,7 @@ class Card
         def conditions_from subqueries
           subqueries.map do |query|
             next if query.conditions_on_join
+
             case query.fasten
             when :exist     then exist_condition query
             when :in        then in_condition query
@@ -67,6 +67,7 @@ class Card
         # only applies to card queries
         def implicit_conditions query
           return unless query.is_a?(CardQuery)
+
           table = query.table_alias
           [trash_condition(table), permission_conditions(table)].compact * " AND "
         end
@@ -77,6 +78,7 @@ class Card
 
         def permission_conditions table
           return if Auth.always_ok?
+
           read_rules = Auth.as_card.read_rules
           read_rule_list = read_rules.present? ? read_rules.join(",") : 1
           "#{table}.read_rule_id IN (#{read_rule_list})"

data/lib/card/query/value.rb

@@ -30,6 +30,7 @@ class Card
         unless (target = OPERATORS[@operator.to_s])
           raise Error::BadQuery, "Invalid operator: #{@operator}"
         end
+
         @operator = target
       end
 

data/lib/card/reference.rb

@@ -9,6 +9,7 @@ class Card
       # array takes form [ [referer_id, referee_id, referee_key, ref_type], ...]
       def mass_insert array
         return if array.empty?
+
         value_statements = array.map { |values| "\n(#{values.join ', '})" }
         sql = "INSERT into card_references "\
               "(referer_id, referee_id, referee_key, ref_type) "\

data/lib/card/set/advanced_api.rb

@@ -32,9 +32,9 @@ class Card
           define_method method do |*args|
             if (error = wrong_stage(opts) || wrong_action(opts[:on]))
               raise Card::Error, error
-            else
-              send "_#{method}", *args
             end
+
+            send "_#{method}", *args
           end
         end
       end

data/lib/card/set/code_nest.rb

@@ -0,0 +1,15 @@
+# TODO: work in progress
+class Card
+  module Set
+    # ActiveCard support: accessing plus cards as attributes
+    module CodeNest
+      def nest *args
+        args.each do |arg|
+          add_nest arg
+        end
+      end
+
+      def add_nest args; end
+    end
+  end
+end

data/lib/card/set/event.rb

@@ -23,12 +23,13 @@ class Card
       CONDITION_OPTIONS = {
         on: %i[create update delete save read],
         changed: %i[name content db_content type type_id codename key],
+        changing: %i[name content db_content type type_id codename key],
         skip: :allowed,
-        trigger: :required,  # the event is only executed if triggered explicitly with
-                             # trigger: [event_name]
+        trigger: :required  # the event is only executed if triggered explicitly with
+        # trigger: [event_name]
       }.freeze
 
-      CONDITIONS = ::Set.new(%i[on changed when skip trigger]).freeze
+      CONDITIONS = ::Set.new(%i[on changed changing when skip trigger]).freeze
 
       include DelayedEvent
       include Options

data/lib/card/set/event/callbacks.rb

@@ -5,6 +5,7 @@ class Card
         def set_event_callbacks
           %i[before after around].each do |kind|
             next unless (object_method = @opts.delete kind)
+
             set_event_callback object_method, kind
           end
         end

data/lib/card/set/event/delayed_event.rb

@@ -2,8 +2,8 @@ class Card
   module Set
     class Event
       module DelayedEvent
-        DELAY_STAGES = ::Set.new([:integrate_with_delay_stage,
-                                  :integrate_with_delay_final_stage]).freeze
+        DELAY_STAGES = ::Set.new(%i[integrate_with_delay_stage
+                                    integrate_with_delay_final_stage]).freeze
 
         private
 
@@ -26,8 +26,9 @@ class Card
           @set_module.class_exec(self) do |event|
             define_method(event.delaying_method_name, proc do
               IntegrateWithDelayJob.set(queue: event.name).perform_later(
-                Card::ActManager.act&.id, self, serialize_for_active_job, Card::Env.serialize,
-                Card::Auth.serialize, event.simple_method_name
+                Card::ActManager.act&.id, self, serialize_for_active_job,
+                Card::Env.serialize, Card::Auth.serialize,
+                event.simple_method_name
               )
             end)
           end
@@ -67,7 +68,7 @@ class Card
     when Time
       { value: value.to_s, type: "time" }
     when Hash
-      { value: serialize_hash_value(value), type: "hash"}
+      { value: serialize_hash_value(value), type: "hash" }
     when ActionController::Parameters
       serialize_value value.to_unsafe_h
     else
@@ -75,7 +76,7 @@ class Card
     end
   end
 
-  def serialize_hash_value
+  def serialize_hash_value value
     value.each_with_object({}) { |(k, v), h| h[k] = serialize_value(v) }
   end