card 1.91 → 1.92

data/lib/card/mod/loader/set_loader.rb

@@ -0,0 +1,85 @@
+class Card
+  module Mod
+    class Loader
+      # A SetLoader object loads all set modules for a list of mods.
+      # The mods are given by a Mod::Dirs object.
+      # SetLoader can use three different strategies to load the set modules.
+      class SetLoader < Loader
+        @module_type = :set
+
+        def load_strategy_class load_strategy
+          case load_strategy
+          when :tmp_files
+            LoadStrategy::SetTmpFiles
+          when :binding_magic
+            LoadStrategy::SetBindingMagic
+          else
+            LoadStrategy::Eval
+          end
+        end
+
+        def load
+          super
+          Card::Set.process_base_modules
+          Card::Set.clean_empty_modules
+        end
+
+
+        class Template < ModuleTemplate
+          def initialize modules, content_path
+            super
+            @modules.pop if helper_module?
+          end
+
+          def to_const
+            return Object if simple_load?
+            pattern_klass = Card::Set.const_get_or_set(@pattern.camelize) { Class.new }
+
+            @modules.inject(pattern_klass) do |const, name_part|
+              const.const_get_or_set name_part do
+                Module.new
+              end
+            end
+          end
+
+          def helper_module?
+            if @is_helper_module.nil?
+              @is_helper_module = @content =~ /\A#!\s?not? set module/
+            else
+              @is_helper_module
+            end
+          end
+
+          # correct line number for error messages
+          def offset
+            # One line for the module chain and one line for the source_location method
+            # The template changes so rarely that doesn't seem worth it to count
+            # it during runtime
+            helper_module? ? -4 : -5
+          end
+
+          private
+
+          def submodule_chain
+            @modules.map { |m| "module #{m};" }.join " "
+          end
+
+          def module_chain
+            "class Card; module Set; class #{@pattern.camelize}; #{submodule_chain}"
+          end
+
+          def preamble
+            <<-RUBY.strip_heredoc
+#{"extend Card::Set" unless helper_module?}
+            def self.source_location; "#{@content_path}"; end
+            RUBY
+          end
+
+          def end_chain
+            "end;" * (@modules.size + 3)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/card/mod/loader/set_pattern_loader.rb

@@ -0,0 +1,58 @@
+class Card
+  module Mod
+    class Loader
+      class SetPatternLoader < Loader
+        @module_type = :set_pattern
+
+        def load_strategy_class load_strategy
+          case load_strategy
+          when :tmp_files
+            LoadStrategy::PatternTmpFiles
+          else :eval
+            LoadStrategy::Eval
+          end
+        end
+
+        class Template < ModuleTemplate
+          def to_const
+            return Object if simple_load?
+            Card::Set.const_get_or_set(@pattern.camelize) do
+              Class.new(Card::Set::Pattern::Abstract)
+            end
+          end
+
+          # correct line number for error messages
+          def offset
+            -6
+          end
+
+          private
+
+          def module_chain
+            klass = "Card::Set::#{@pattern.camelize}"
+            "class #{klass} < Card::Set::Pattern::Abstract"
+          end
+
+          def preamble
+            <<-RUBY
+              cattr_accessor :options
+              class << self
+            RUBY
+          end
+
+          def postamble
+            <<-RUBY
+              end
+              register "#{@pattern}".underscore.to_sym, (options || {})
+            RUBY
+          end
+
+          def end_chain
+            "end"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/card/mod/module_template.rb

@@ -0,0 +1,67 @@
+class Card
+  module Mod
+    # ModuleTemplate is an abstract class to build ruby modules out of
+    # deckos dsl for sets and set patterns.
+    # {SetModule} and {PatternTemplate} inherit from it and adapt the template
+    # to their needs.
+    class ModuleTemplate
+      def initialize modules, content_path
+        modules = Array.wrap modules
+        @pattern = modules.shift
+        @modules = modules
+        @content = ::File.read content_path
+        @content_path = content_path
+      end
+
+      # Evaluates the module in the top level namespace.
+      def build
+        eval to_s, TOPLEVEL_BINDING, @content_path, offset
+      end
+
+      # @return [String] the ruby code to build the modal
+      def to_s
+        return content_with_source_comment if simple_load?
+        wrap_with_module_def
+      end
+
+      # Just run the code of the source.
+      # Don't use the path to the file as module hierarchy.
+      def simple_load?
+        @content =~ /\A#!\s?simple load/
+      end
+
+      private
+
+      def preamble
+        ""
+      end
+
+      def postamble
+        ""
+      end
+
+      def wrap_with_module_def
+        # for unknown reasons strip_heredoc doesn't work properly
+        # and with trailing whitespace code like `=begin` fails
+        <<-RUBY.strip_heredoc
+# -*- encoding : utf-8 -*-
+#{module_chain}
+        #{preamble}
+        #{content_with_source_comment}
+        #{postamble}
+        #{end_chain}
+        RUBY
+      end
+
+      def content_with_source_comment
+        <<-RUBY.strip_heredoc
+# ~~ above autogenerated; below pulled from #{@content_path} ~~
+#{@content}
+
+# ~~ below autogenerated; above pulled from #{@content_path} ~~
+        RUBY
+      end
+    end
+  end
+end
+

data/lib/card/model/save_helper.rb

@@ -16,9 +16,7 @@ class Card
       end
 
       def create_card name_or_args, content_or_args=nil
-        args = standardize_args name_or_args, content_or_args
-        resolve_name_conflict args
-        Card.create! args
+        Card.create! create_args(name_or_args, content_or_args)
       end
 
       def update_card name, content_or_args
@@ -152,6 +150,12 @@ class Card
         end
       end
 
+      def create_args name_or_args, content_or_args=nil
+        args = standardize_args name_or_args, content_or_args
+        resolve_name_conflict args
+        args
+      end
+
       def name_from_args name_or_args
         name_or_args.is_a?(Hash) ? name_or_args[:name] : name_or_args
       end
@@ -171,7 +175,7 @@ class Card
       end
 
       def ensure_attributes card, args
-        args = args.with_indifferent_access
+        args = args.to_h.with_indifferent_access
         subcards = card.extract_subcard_args! args
         update_args =
           args.select do |key, value|
@@ -224,6 +228,25 @@ class Card
       alias_method :ensure, :ensure_card
       alias_method :ensure!, :ensure_card!
       alias_method :delete, :delete_card
+
+
+      def method_missing method, *args
+        return super unless (cardtype_card = extract_cardtype_from_method_name method)
+        Card.create! create_args(*args).merge(type_id: cardtype_card.id)
+      end
+
+      def respond_to_missing? method, _include_private=false
+        extract_cardtype_from_method_name(method) || super
+      end
+
+      def extract_cardtype_from_method_name method
+        return unless method =~ /^create_(?<type>.+)$/
+        cardtype_card = Card[Regexp.last_match[:type]] ||
+                        Card[Regexp.last_match[:type].to_sym]
+        return unless cardtype_card&.type_id == Card::CardtypeID ||
+                      cardtype_card.id == Card::SetID
+        cardtype_card
+      end
     end
   end
 end

data/lib/card/name.rb

@@ -1,20 +1,19 @@
 # -*- encoding : utf-8 -*-
 require_dependency "card/env"
 
-require "smart_name"
+require "cardname"
 
 class Card
-  # The SmartName class provides generalized of Card naming patterns
+  # The Cardname class provides generalized of Card naming patterns
   # (compound names, key-based variants, etc)
   #
   # Card::Name adds support for deeper card integration
-  class Name < SmartName
+  class Name < Cardname
     include FieldsAndTraits
     include ::Card::Name::NameVariants
 
     self.params  = Card::Env # yuck!
-    self.session = proc { Card::Auth.current.name }
-    self.banned_array = ["/"]
+    self.session = proc { Card::Auth.current.name } # also_yuck
 
     class << self
       def cardish mark
@@ -25,6 +24,10 @@ class Card
         end
       end
 
+      def compose parts
+        parts.flatten.map { |part| cardish part }.join joint
+      end
+
       def url_key_to_standard key
         key.to_s.tr "_", " "
       end
@@ -49,10 +52,5 @@ class Card
     def set?
       Set::Pattern.card_keys[tag_name.key]
     end
-
-    # processes contextual title argument used in nests like "title: _left"
-    def title title_directive, context_names
-      title_directive.to_name.to_absolute_name(self).to_show(*context_names)
-    end
   end
 end

data/lib/card/name/fields_and_traits.rb

@@ -24,18 +24,20 @@ class Card
 
       # @return [True/False]
       def field_of? context
+        return false unless junction?
         if context.present?
-          child_of?(context) && relative_name(context).length == 2
-          # junction? &&
-          #  absolute_name(context).left_name.key == context.to_name.key
-          # @child_of?(context_name) && relative_name(context_name).length == 2
+          absolute_name(context).left_name.key == context.to_name.key
         else
           s.match(/^\s*\+[^+]+$/).present?
         end
       end
 
+      def field_only?
+        relative? && stripped.to_name.parts.reject(&:blank?).first == parts.last
+      end
+
       def relative_field_name tag_name
-        field_name(tag_name).relative_name self
+        field_name(tag_name).name_from self
       end
 
       # @return [String]

data/lib/card/name/view_name.rb

@@ -1,19 +1,19 @@
 # -*- encoding : utf-8 -*-
 require_dependency "card/env"
 
-require "smart_name"
+require "cardname"
 
 class Card
   class Name
-    class ViewName < SmartName
+    class ViewName < Cardname
       @@name2viewnameobject = {}
 
       class << self
         def new obj
           return obj if self.class === obj
           str = Array === obj ? obj * joint : obj.to_s
-          if (known_name = @@name2viewnameobject[str])
-            known_name
+          if (cached_name = @@name2viewnameobject[str])
+            cached_name
           else
             super str.strip
           end

data/lib/card/query.rb

@@ -82,9 +82,9 @@ class Card
 
     DEFAULT_ORDER_DIRS = { update: "desc", relevance: "desc" }.freeze
 
-    attr_reader :statement, :mods, :conditions, :comment,
-                :subqueries, :superquery, :vars
-    attr_accessor :joins, :table_seq, :unjoined, :conditions_on_join
+    attr_reader :statement, :mods, :conditions, :comment, :vars,
+                :subqueries, :superquery, :unjoined
+    attr_accessor :joins, :conditions_on_join, :table_seq
 
     # Query Execution
 
@@ -106,8 +106,7 @@ class Card
       @context    = @statement.delete(:context) || nil
       @unjoined   = @statement.delete(:unjoined) || nil
       @superquery = @statement.delete(:superquery) || nil
-      @vars       = @statement.delete(:vars) || {}
-      @vars.symbolize_keys!
+      @vars       = initialize_vars
 
       @comment = comment || default_comment
 
@@ -115,6 +114,13 @@ class Card
       self
     end
 
+    def initialize_vars
+      if (v = @statement.delete :vars) then v.symbolize_keys
+      elsif @superquery                then @superquery.vars
+      else                                  {}
+      end
+    end
+
     def default_comment
       return if @superquery || !Card.config.sql_comments
       statement.to_s

data/lib/card/query/attributes.rb

@@ -17,7 +17,7 @@ class Card
           Query.run val
         else
           Array.wrap(val).map do |v|
-            Card.fetch v.to_name.to_absolute(context), new: {}
+            Card.fetch v.to_name.absolute(context), new: {}
           end
         end
       end

data/lib/card/query/interpretation.rb

@@ -51,7 +51,7 @@ class Card
       def clause_to_hash clause
         case clause
         when Hash              then clause
-        when String, SmartName then { key: clause.to_name.key }
+        when String, Cardname then { key: clause.to_name.key }
         when Integer           then { id: clause }
         else raise Card::Error::BadQuery, "Invalid query args #{clause.inspect}"
         end
@@ -60,7 +60,7 @@ class Card
       def normalize_value val
         case val
         when Integer, Float, Symbol, Hash then val
-        when String, SmartName            then normalize_string_value val
+        when String, Cardname            then normalize_string_value val
         when Array                        then val.map { |v| normalize_value v }
         else raise Card::Error::BadQuery, "unknown WQL value type: #{val.class}"
         end
@@ -71,7 +71,7 @@ class Card
         when /^\$(\w+)$/                       # replace from @vars
           @vars[Regexp.last_match[1].to_sym].to_s.strip
         when /\b_/                             # absolutize based on @context
-          val.to_name.to_absolute(context)
+          val.to_name.absolute(context)
         else
           val
         end

data/lib/card/reference.rb

@@ -3,7 +3,7 @@
 class Card
   # a Reference is a directional relationship from one card (the referer)
   # to another (the referee).
-  class Reference < ActiveRecord::Base
+  class Reference < ApplicationRecord
     class << self
       # bulk insert improves performance considerably
       # array takes form [ [referer_id, referee_id, referee_key, ref_type], ...]
@@ -49,7 +49,7 @@ class Card
       end
 
       # repair references one by one (delete, create, delete, create...)
-      # slower, but better than #repair_all for use on running sites
+      # slower, but better than #recreate_all for use on running sites
       def repair_all
         delete_if_referer_missing
         Card.where(trash: false).find_each do |card|