card 1.93.6 → 1.93.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0adcfab0f64530119b1670a194d67fde9845ad6
-  data.tar.gz: 3febe6d143c9de76acff582cbddd9ec8fded0104
+  metadata.gz: c81d66467e56b3af782e751bba26e6827dd6d9a0
+  data.tar.gz: b16da38bf76b952dfa8ee0886a83a32676feaf80
 SHA512:
-  metadata.gz: a9f35f827cce3f73f984671c7a09f0d6adeff29523503f6b46b64bcfdee09c71449dcae5ab2356084f81788a9122a24821dc07a02b0036c9ee79f28ee2f699ae
-  data.tar.gz: f843c07e3dd51ae50d2cae972cdfd307706b7e8ae1b0057cd83dd2d0256b9336de707b5b9e9e49353881aaf526331559d1dcf3f4bd05da2e1a1fb73c61d1ca8d
+  metadata.gz: 9c8a5450fb09bbfd53a6598eb0037ac5efebde683da6fd419ef069709c4e0848754896a5622c97c79baa41e0cfc4769b18e822f98af95f18f6a6e1fa21d2fac7
+  data.tar.gz: 5f635635cefc576134b1f806b2ca8b9b10d1310fa6d4317ce5f92d739dc78bf463d16f43893de4ef741029f092ad931cf1f5cbc043eb87c11967e8077af1692d

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/config/initializers/02_patches/active_record.rb

@@ -104,5 +104,18 @@ module Patches
         end
       end
     end
+
+    module Migration
+      module ClassMethods
+        def check_pending! connection=::ActiveRecord::Base.connection
+          %i[structure core_cards deck deck_cards].each do |migration_type|
+            Cardio.schema_mode(migration_type) do |paths|
+              ::ActiveRecord::Migrator.migrations_paths = paths
+              super
+            end
+          end
+        end
+      end
+    end
   end
 end

data/config/initializers/patches.rb

@@ -19,6 +19,12 @@ module ActiveRecord #:nodoc: all
     include Patches::ActiveRecord::Relation
   end
 
+  class Migration
+    class << self
+      prepend Patches::ActiveRecord::Migration::ClassMethods
+    end
+  end
+
   module ConnectionAdapters
     class AbstractAdapter
       prepend Patches::ActiveRecord::ConnectionAdapters::AbstractAdapter

data/config/initializers/recaptcha.rb

@@ -5,8 +5,8 @@ def load_recaptcha_config setting
   setting = "recaptcha_#{setting}".to_sym
   Cardio.config.send(
     "#{setting}=", load_recaptcha_card_config(setting) || # card content
-                   Cardio.config.send(setting) || # application.rb
-                   default_setting(setting)
+    Cardio.config.send(setting) || # application.rb
+    default_setting(setting)
   )
 end
 
@@ -26,18 +26,20 @@ def load_recaptcha_card_config setting
   card && card.db_content.present? && card.db_content
 end
 
-Recaptcha.configure do |config|
-  # the seed task runs initializers so we have to check
-  # if the cards table is ready before we use it here
-  CONFIG_OPTIONS =
-    {
-      public_key: :site_key,
-      private_key: :secret_key,
-      proxy: :proxy
-    }
-  if card_table_ready?
-    CONFIG_OPTIONS.each do |codename, setting|
-      config.send "#{setting}=", load_recaptcha_config(codename)
+ActiveSupport.on_load :after_card do
+  Recaptcha.configure do |config|
+    # the seed task runs initializers so we have to check
+    # if the cards table is ready before we use it here
+    CONFIG_OPTIONS =
+      {
+        public_key: :site_key,
+        private_key: :secret_key,
+        proxy: :proxy
+      }
+    if card_table_ready?
+      CONFIG_OPTIONS.each do |codename, setting|
+        config.send "#{setting}=", load_recaptcha_config(codename)
+      end
     end
   end
 end

data/lib/card.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
-require "carrierwave"
 
 Object.const_remove_if_defined :Card
+ActiveSupport.run_load_hooks(:before_card, self)
 # ActiveSupport::Dependencies.loaded.clear
 
 # Cards are wiki-inspired building blocks.
@@ -136,7 +136,7 @@ class Card < ApplicationRecord
     :update_referers,             # wrong mechanism for this
     :update_all_users,            # if the above is wrong then this one too
     :silent_change,               # and this probably too
-    :remove_rule_stash,
+    # :remove_rule_stash,
     :last_action_id_before_edit,
     :only_storage_phase,           # used to save subcards
     :changed_attributes
@@ -174,6 +174,7 @@ class Card < ApplicationRecord
   after_commit :integration_phase, unless: -> { only_storage_phase? }
 #  after_rollback :clean_up, unless: -> { only_storage_phase? }
 
-  extend CarrierWave::Mount
   ActiveSupport.run_load_hooks(:card, self)
 end
+
+ActiveSupport.run_load_hooks(:after_card, self)

data/lib/card/format/nest/fetch.rb

@@ -49,9 +49,7 @@ class Card
         end
 
         def nest_content_from_subcard_params nest_name
-          return unless (subcard_params = params["subcards"])
-          return unless (nestcard_params = subcard_params[nest_name])
-          nestcard_params["content"]
+          params.dig "subcards", nest_name, "content"
         end
       end
     end

data/lib/card/migration/deck_structure.rb

@@ -0,0 +1,18 @@
+# -*- encoding : utf-8 -*-
+require "card/migration"
+
+class Card
+  class Migration
+    # Inherit from this migration class to make database table changes
+    # in your deck
+    class DeckStructure < Migration
+      @type = :deck
+
+      def contentedly
+        Cardio.schema_mode :deck do
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/card/query/attributes.rb

@@ -27,7 +27,7 @@ class Card
       # content.
       # Example: { match: "name or content" } vs. { name: ["match", "a name"] }
       def match val
-        cxn, val = match_prep val
+        cxn = connection
         val.gsub!(/[^#{Card::Name::OK4KEY_RE}]+/, " ")
         return nil if val.strip.empty?
 

data/lib/card/query/clause.rb

@@ -7,12 +7,11 @@ module Card::Query::Clause
     txt =~ /[^\w\*\(\)\s\.\,]/ ? raise("WQL contains disallowed characters: #{txt}") : txt
   end
 
-    def quote v
-      ActiveRecord::Base.connection.quote(v)
-    end
+  def quote v
+    connection.quote(v)
+  end
 
-    def match_prep v
-      cxn ||= ActiveRecord::Base.connection
-      [cxn, v]
-    end
+  def connection
+    @connection ||= ActiveRecord::Base.connection
+  end
 end

data/lib/card/query/interpretation.rb

@@ -61,11 +61,15 @@ class Card
         case val
         when Integer, Float, Symbol, Hash then val
         when String                       then normalize_string_value val
-        when Array                        then val.map { |v| normalize_value v }
+        when Array                        then normalize_array_value val
         else raise Card::Error::BadQuery, "unknown WQL value type: #{val.class}"
         end
       end
 
+      def normalize_array_value val
+        val.map { |v| normalize_value v }
+      end
+
       def normalize_string_value val
         case val.to_s
         when /^\$(\w+)$/                       # replace from @vars

data/lib/card/query/value.rb

@@ -2,6 +2,7 @@ class Card
   class Query
     class Value
       include Clause
+      SQL_FIELD = { name: "key", content: "db_content" }.freeze
 
       attr_reader :query, :operator, :value
 
@@ -14,11 +15,16 @@ class Card
       def parse_value rawvalue
         case rawvalue
         when String, Integer then ["=", rawvalue]
-        when Array           then [rawvalue[0], rawvalue[1..-1]]
+        when Array           then parse_array_value rawvalue
         else raise("Invalid Condition Clause #{rawvalue}.inspect}")
         end
       end
 
+      def parse_array_value array
+        operator = operator?(array.first) ? array.shift : :in
+        [operator, array]
+      end
+
       def canonicalize_operator
         unless (target = OPERATORS[@operator.to_s])
           raise Card::Error::BadQuery, "Invalid Operator #{@operator}"
@@ -26,6 +32,10 @@ class Card
         @operator = target
       end
 
+      def operator? key
+        OPERATORS.key? key.to_s
+      end
+
       def sqlize v
         case v
         when Query then  v.to_sql
@@ -35,27 +45,27 @@ class Card
       end
 
       def to_sql field
-        op = @operator
-        v = @value
-        table = @query.table_alias
-
-        field, v = case field.to_s
-                   when "name"
-                     ["#{table}.key", [v].flatten.map(&:to_name).map(&:key)]
-                   when "content"
-                     ["#{table}.db_content", v]
-                   else
-                     ["#{table}.#{safe_sql field}", v]
-                   end
-
-        v = v[0] if Array === v && v.length == 1 && op != "in"
-        if op == "~"
-          cxn, v = match_prep(v)
-          %(#{field} #{cxn.match(sqlize(v))})
+        value = value_sql field, @value
+        "#{field_sql field} #{operational_sql value}"
+      end
+
+      def operational_sql value
+        if @operator == "~"
+          connection.match value
         else
-          "#{field} #{op} #{sqlize(v)}"
+          "#{@operator} #{value}"
         end
       end
+
+      def field_sql field
+        db_field = SQL_FIELD[field.to_sym] || safe_sql(field.to_s)
+        "#{@query.table_alias}.#{db_field}"
+      end
+
+      def value_sql field, value
+        value = [value].flatten.map(&:to_name).map(&:key) if field.to_sym == :name
+        sqlize value
+      end
     end
   end
 end

data/lib/card/set/event.rb

@@ -12,13 +12,7 @@ class Card
       include DelayedEvent
 
       def event event, stage_or_opts={}, opts={}, &final
-        if stage_or_opts.is_a? Symbol
-          opts[:in] = stage_or_opts
-        else
-          opts = stage_or_opts
-        end
-        process_stage_opts opts
-
+        opts = event_opts stage_or_opts, opts
         Card.define_callbacks event
         define_event event, opts, &final
         set_event_callbacks event, opts
@@ -26,27 +20,34 @@ class Card
 
       private
 
-      def define_event event, opts, &final
-        final_method_name = "#{event}_without_callbacks" # should be private?
-        class_eval do
-          define_method final_method_name, &final
-        end
+      # EVENT OPTS
 
-        if with_delay? opts
-          define_delayed_event_method event, final_method_name
+      def event_opts stage_or_opts, opts
+        opts = normalize_opts stage_or_opts, opts
+        process_stage_opts opts
+        process_action_opts opts
+        opts
+      end
+
+      def normalize_opts stage_or_opts, opts
+        if stage_or_opts.is_a? Symbol
+          opts[:in] = stage_or_opts
         else
-          define_event_method event, final_method_name
+          opts = stage_or_opts
         end
+        opts
+      end
+
+      def process_action_opts opts
+        opts[:on] = [:create, :update] if opts[:on] == :save
       end
 
       def process_stage_opts opts
         if opts[:after] || opts[:before]
           # ignore :in options
-        elsif opts[:in]
-          opts[:after] =
-            callback_name opts.delete(:in), opts.delete(:after_subcards)
+        elsif (in_opt = opts.delete :in)
+          opts[:after] = callback_name in_opt, opts.delete(:after_subcards)
         end
-        opts[:on] = [:create, :update] if opts[:on] == :save
       end
 
       def callback_name stage, after_subcards=false
@@ -54,27 +55,50 @@ class Card
         name.to_sym
       end
 
-      def define_event_method event, call_method
+      # EVENT DEFINITION
+
+      def define_event event, opts, &final
+        simple_method_name = "#{event}_without_callbacks"
+        define_simple_method event, simple_method_name, &final
+        define_event_method event, simple_method_name, opts
+      end
+
+      def define_simple_method _event, method_name, &method
+        class_eval do
+          define_method method_name, &method
+        end
+      end
+
+      def define_event_method event, method_name, opts
+        event_type = with_delay?(opts) ? :delayed : :standard
+        send "define_#{event_type}_event_method", event, method_name
+      end
+
+      def define_standard_event_method event, method_name
         class_eval do
           define_method event do
             log_event_call event
             run_callbacks event do
-              send call_method
+              send method_name
             end
           end
         end
       end
 
+      # EVENT CALLBACKS
+
       def set_event_callbacks event, opts
         opts[:set] ||= self
         [:before, :after, :around].each do |kind|
-          next unless (object_method = opts.delete(kind))
-          Card.class_eval do
-            set_callback(
-              object_method, kind, event,
-              prepend: true, if: proc { |c| c.event_applies?(opts) }
-            )
-          end
+          next unless (object_method = opts.delete kind)
+          set_event_callback object_method, kind, event, opts
+        end
+      end
+
+      def set_event_callback object_method, kind, event, opts
+        Card.class_eval do
+          set_callback object_method, kind, event,
+                       prepend: true, if: proc { |c| c.event_applies?(opts) }
         end
       end
     end

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

@@ -11,10 +11,10 @@ class Card
           DELAY_STAGES.include?(opts[:after]) || DELAY_STAGES.include?(opts[:before])
         end
 
-        def define_delayed_event_method event, final_method_name
+        def define_delayed_event_method event, simple_method_name
           delaying_method = "#{event}_with_delay"
-          define_event_delaying_method event, delaying_method, final_method_name
-          define_event_method event, delaying_method
+          define_event_delaying_method event, delaying_method, simple_method_name
+          define_standard_event_method event, delaying_method
         end
 
         # creates an ActiveJob.

data/lib/card/set/format/haml_views.rb

@@ -44,7 +44,7 @@ class Card
           end
         end
 
-        def  haml_template_path view=nil, source=nil
+        def haml_template_path view=nil, source=nil
           each_template_path(source) do |template_dir, source_dir|
             path = try_haml_template_path template_dir, view, source_dir
             return path if path

data/lib/card/tasks/card.rake

@@ -78,6 +78,13 @@ namespace :card do
       Rake::Task["card:migrate:stamp"].invoke :core_cards
     end
 
+    puts "migrating deck structure"
+    Rake::Task["card:migrate:deck_structure"].execute
+    if stamp
+      Rake::Task["card:migrate:stamp"].reenable
+      Rake::Task["card:migrate:stamp"].invoke :core_cards
+    end
+
     puts "migrating deck cards"
     # not invoke because we don't want to reload environment
     Rake::Task["card:migrate:deck_cards"].execute

data/lib/card/tasks/card/migrate.rake

@@ -19,6 +19,18 @@ def prepare_migration
   # structures are loaded before schema_mode is set
 end
 
+# @param mod [Boolean] if true reset column information for models defined in
+#   in mods in the deck
+def reset_column_information mod=false
+  Rails.application.eager_load!
+  load_mod_lib if mod
+  ApplicationRecord.descendants.each(&:reset_column_information)
+end
+
+def load_mod_lib
+  Dir.glob(Cardio.root.join("mod/*/lib/*.rb")).each { |x| require_dependency x }
+end
+
 namespace :card do
   namespace :migrate do
     desc "migrate cards"
@@ -32,6 +44,7 @@ namespace :card do
         ActiveRecord::Migrator.migrate paths, version
         Rake::Task["db:_dump"].invoke # write schema.rb
       end
+      reset_column_information
     end
 
     desc "migrate core cards"
@@ -40,6 +53,22 @@ namespace :card do
       run_card_migration :core_cards
     end
 
+    desc "migrate deck structure"
+    task deck_structure: :environment do
+      migrate_deck_structure
+    end
+
+    def migrate_deck_structure
+      require "card/migration/deck_structure"
+      ENV["SCHEMA"] = "#{Cardio.root}/db/schema.rb"
+      Cardio.schema_mode(:deck) do |paths|
+        ActiveRecord::Migrator.migrations_paths = paths
+        ActiveRecord::Migrator.migrate paths, version
+        Rake::Task["db:_dump"].invoke # write schema.rb
+      end
+      reset_column_information true
+    end
+
     desc "migrate deck cards"
     task deck_cards: :environment do
       require "card/migration"