card 1.20.4 → 1.21.0

data/db/seed/test/seed.rb

@@ -42,8 +42,8 @@ class SharedData
     Card.create! name: "signup alert email+*to", content: "signups@wagn.org"
 
     # generic, shared attribute card
-    color = Card.create! name: "color"
-    basic = Card.create! name: "Basic Card"
+    Card.create! name: "color"
+    Card.create! name: "Basic Card"
 
     # CREATE A CARD OF EACH TYPE
     Card.create! type_id: Card::SignupID, name: "Sample Signup" # , email: "invitation@request.com"

data/db/version_core_cards.txt

@@ -1 +1 @@
-20170314175313
+20170608200649

data/lib/card.rb

@@ -59,6 +59,10 @@ class Card < ActiveRecord::Base
     :only_storage_phase           # used to save subcards
   )
 
+  def serializable_attributes
+    self.class.serializable_attributes + set_specific.keys
+  end
+
   attr_accessor :follower_stash
 
   define_callbacks(

data/lib/card/act_manager/subdirector_array.rb

@@ -15,6 +15,7 @@ class Card
       end
 
       def add card, opts={}
+        opts ||= {}
         card = card.card if card.is_a? StageDirector
         each { |dir| return dir if dir.card == card }
         dir = ActManager.fetch card, parent: @parent

data/lib/card/auth/current.rb

@@ -53,12 +53,16 @@ class Card
         { as_id: as_id, current_id: current_id }
       end
 
-      # @param auth_data [Integer|Hash] user id or a hash
+      # @param auth_data [Integer|Hash] user id, user name, 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
+        case auth_data
+        when Integer
+          auth_data = { current_id: auth_data }
+        when String
+          auth_data = { current_id: Card.fetch_id(auth_data) }
+        end
 
         tmp_current = current_id
         tmp_as_id = as_id

data/lib/card/env.rb

@@ -40,6 +40,11 @@ class Card
         self[:params] ||= {}
       end
 
+      def slot_opts
+        return {} unless params[:slot].is_a? Hash
+        params[:slot].deep_symbolize_keys
+      end
+
       def session
         self[:session] ||= {}
       end

data/lib/card/env/success.rb

@@ -25,7 +25,7 @@ class Card
       end
 
       def hard_redirect?
-        @redirect == true
+        @redirect == true || @redirect == "true"
       end
 
       # reset card object and override params with success params

data/lib/card/format/names.rb

@@ -5,10 +5,8 @@ class Card
         @initial_context_names ||=
           if @context_names
             context_names_minus_irrelevants
-          elsif params[:slot]
-            context_names_from_params
           else
-            []
+            context_names_from_params
           end
       end
 
@@ -18,8 +16,8 @@ class Card
       end
 
       def context_names_from_params
-        context_name_list = params[:slot][:name_context].to_s
-        context_name_list.split(",").map(&:to_name)
+        return [] unless (name_list = Card::Env.slot_opts[:name_context])
+        name_list.to_s.split(",").map(&:to_name)
       end
 
       def context_names_to_params
@@ -33,14 +31,6 @@ class Card
         @context_names.uniq!
       end
 
-      # def with_name_context name
-      #   old_context = @context_names
-      #   add_name_context name
-      #   result = yield
-      #   @context_names = old_context
-      #   result
-      # end
-
       def showname title=nil
         if title
           card.cardname.title title, @context_names

data/lib/card/model/save_helper.rb

@@ -9,12 +9,10 @@ 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
+      def with_user user_name
+        Card::Auth.with current_id: Card.fetch_id(user_name) do
+          yield
+        end
       end
 
       def create_card name_or_args, content_or_args=nil

data/lib/card/query.rb

@@ -61,7 +61,8 @@ class Card
                            link_to linked_to_by
                            include included_by                                ),
       conjunction:     %w(and or all any),
-      special:         %w(found_by not sort match complete extension_type),
+      special:         %w(found_by not sort match name_match complete junction_complete
+                          extension_type),
       ignore:          %w(prepend append view params vars size)
     }.each_with_object({}) do |pair, h|
       pair[1].each { |v| h[v.to_sym] = pair[0] }

data/lib/card/query/attributes.rb

@@ -1,20 +1,14 @@
-
 class Card
   class Query
     module Attributes
       def found_by val
         found_by_cards(val).compact.each do |c|
-          if c && [SearchTypeID, SetID].include?(c.type_id)
-            # FIXME: - move this check to set mods!
-
-            subquery(
-              c.wql_hash.merge(unjoined: true, context: c.name)
-            )
-          else
+          unless c && c.respond_to?(:wql_hash)
             raise Card::Error::BadQuery,
                   '"found_by" value must be valid Search, ' \
                   "but #{c.name} is a #{c.type_name}"
           end
+          subquery c.wql_hash.merge(unjoined: true, context: c.name)
         end
       end
 
@@ -28,6 +22,10 @@ class Card
         end
       end
 
+      # Implements the match attribute that matches always against content and name.
+      # That's different from the match operator that can be restricted to names or
+      # content.
+      # Example: { match: "name or content" } vs. { name: ["match", "a name"] }
       def match val
         cxn, val = match_prep val
         val.gsub!(/[^#{Card::Name::OK4KEY_RE}]+/, " ")
@@ -40,20 +38,24 @@ class Card
           ].map do |field|
             %(#{field} #{cxn.match quote("[[:<:]]#{v}[[:>:]]")})
           end
-          "(#{name_or_content.join ' OR '})"
+          or_join name_or_content
         end
-        add_condition "(#{val_list.join ' AND '})"
+        add_condition and_join(val_list)
+      end
+
+      def name_match val
+        name_like "%#{val}%"
       end
 
       def complete val
         no_plus_card = (val =~ /\+/ ? "" : "and right_id is null")
         # FIXME: -- this should really be more nuanced --
         # it breaks down after one plus
+        name_like "#{val}%", no_plus_card
+      end
 
-        add_condition(
-          " lower(#{table_alias}.name) LIKE" \
-          " lower(#{quote(val.to_s + '%')}) #{no_plus_card}"
-        )
+      def junction_complete val
+        name_like ["#{val}%", "%+#{val}%"]
       end
 
       def extension_type _val
@@ -61,6 +63,24 @@ class Card
         Rails.logger.info "using DEPRECATED extension_type in WQL"
         interpret right_plus: AccountID
       end
+
+      private
+
+      def name_like patterns, extra_cond=""
+        likes =
+          Array(patterns).map do |pat|
+            "lower(#{table_alias}.name) LIKE lower(#{quote pat})"
+          end
+        add_condition "#{or_join(likes)} #{extra_cond}"
+      end
+
+      def or_join conditions
+        "(#{Array(conditions).join ' OR '})"
+      end
+
+      def and_join conditions
+        "(#{Array(conditions).join ' AND '})"
+      end
     end
   end
 end

data/lib/card/query/value.rb

@@ -20,11 +20,10 @@ class Card
       end
 
       def canonicalize_operator
-        if target = OPERATORS[@operator.to_s]
-          @operator = target
-        else
+        unless (target = OPERATORS[@operator.to_s])
           raise Card::Error::BadQuery, "Invalid Operator #{@operator}"
         end
+        @operator = target
       end
 
       def sqlize v
@@ -47,7 +46,7 @@ class Card
                      ["#{table}.db_content", v]
                    else
                      ["#{table}.#{safe_sql field}", v]
-          end
+                   end
 
         v = v[0] if Array === v && v.length == 1 && op != "in"
         if op == "~"

data/lib/card/set/format.rb

@@ -81,14 +81,35 @@ class Card
         include Set::Format::HamlViews
 
         mattr_accessor :views
-        self.views = {}
+        self.views = Hash.new { |h, k| h[k] = {} }
 
         def view view, *args, &block
           view = view.to_viewname.key.to_sym
-          views[self] ||= {}
           interpret_view_opts view, args[0] if block_given?
-          view_block = views[self][view] = view_block view, args, &block
-          define_method "_view_#{view}", view_block
+          view_method_block = view_block(view, args, &block)
+          if async_view? args
+            # This case makes only sense for HtmlFormat
+            # but I don't see an easy way to override class methods for a specific
+            # format. All formats are extended with this general module. So
+            # a HtmlFormat.view method would be overridden by AbstractFormat.view
+            # We need something like AbstractHtmlFormat for that.
+            define_async_view_method view, &view_method_block
+          else
+            define_standard_view_method view, &view_method_block
+          end
+        end
+
+        def define_standard_view_method view, &block
+          views[self][view] = block
+          define_method "_view_#{view}", &block
+        end
+
+        def define_async_view_method view, &block
+          view_content = "#{view}_async_content"
+          define_standard_view_method view_content, &block
+          define_standard_view_method view do
+            "<card-view-placeholder data-url=#{path view: view_content}/>"
+          end
         end
 
         def interpret_view_opts view, opts
@@ -112,6 +133,10 @@ class Card
           args.first.is_a?(Hash) && args.first[:template] == :haml
         end
 
+        def async_view? args
+          args.first.is_a?(Hash) && args.first[:async]
+        end
+
         def lookup_alias_block view, args
           opts = args[0].is_a?(Hash) ? args.shift : { view: args.shift }
           opts[:mod] ||= self

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

@@ -22,24 +22,26 @@ class Card
       #   > render :with_instance_variables  # => "Hello haml"
       module HamlViews
         def haml_view_block view, &block
-          template = ::File.read haml_template_path view
+          template_path = haml_template_path view
           if block_given?
-            haml_temlate_render_block_with_locals view, template, &block
+            haml_template_render_block_with_locals view, template_path, &block
           else
-            haml_template_render_block view, template
+            haml_template_render_block view, template_path
           end
         end
 
-        def haml_template_render_block view, template
+        def haml_template_render_block view, template_path
+          template = ::File.read template_path
           proc do |view_args|
             voo = View.new(self, view, view_args, @voo)
             with_voo voo do
-              haml_to_html template, view_args
+              haml_to_html template, view_args, nil, path: template_path
             end
           end
         end
 
-        def haml_template_render_block_with_locals view, template
+        def haml_template_render_block_with_locals view, template_path, &block
+          template = ::File.read template_path
           proc do |view_args|
             instance_exec view_args, &block
             locals = instance_variables.each_with_object({}) do |var, h|
@@ -47,30 +49,40 @@ class Card
             end
             voo = View.new(self, view, view_args, @voo)
             with_voo voo do
-              haml_to_html template, locals
+              haml_to_html template, locals, nil, path: template_path
             end
           end
         end
 
-        def haml_template_path view
-          source = source_location
+        def haml_template_path view, source=nil
+          source ||= source_location
           basename = ::File.basename(source, ".rb")
+          source_dir = ::File.dirname(source)
           ["./#{basename}", "."].each do |template_dir|
-            path = try_haml_template_path(template_dir, view, source)
+            path = try_haml_template_path(template_dir, view, source_dir)
             return path if path
           end
           raise(Card::Error, "can't find haml template for #{view}")
         end
 
-        def try_haml_template_path template_path, view, source_path, ext="haml"
-          path = ::File.expand_path("#{template_path}/#{view}.#{ext}", source_path)
+        def try_haml_template_path template_path, view, source_dir, ext="haml"
+          path = ::File.expand_path("#{template_path}/#{view}.#{ext}", source_dir)
                        .sub(%r{(/mod/[^/]+)/set/}, "\\1/#{TEMPLATE_DIR}/")
           ::File.exist?(path) && path
         end
 
-        def haml_to_html haml, locals, a_binding=nil
+        def haml_to_html haml, locals, a_binding=nil, debug_info={}
           a_binding ||= binding
           ::Haml::Engine.new(haml).render a_binding, locals || {}
+        rescue Haml::SyntaxError => e
+          raise Card::Error,
+                "haml syntax error #{template_location(debug_info)}: #{e.message}"
+        end
+
+        def template_location debug_info
+          return "" unless debug_info[:path]
+          Pathname.new(debug_info[:path])
+                  .relative_path_from(Pathname.new(Dir.pwd))
         end
       end
     end

data/lib/card/set/trait.rb

@@ -22,6 +22,7 @@ class Card
       def add_attributes *args
         Card.set_specific_attributes ||= []
         Card.set_specific_attributes += args.map(&:to_s)
+        Card.set_specific_attributes.uniq!
       end
 
       def get_traits mod

data/lib/card/set_pattern.rb

@@ -99,6 +99,7 @@ EOF
             @module_key
           else
             @module_key = begin
+              # binding.pry if to_s == "*input+*right+*options+*self"
               if self.class.anchorless?
                 self.class.pattern_code.camelize
               elsif anchor_codenames
@@ -124,12 +125,27 @@ EOF
         end
 
         def anchor_codenames
-          @anchor_name.parts.map do |part|
+          anchor_parts.map do |part|
             part_id = Card.fetch_id part
             part_id && Card::Codename[part_id.to_i] || (return nil)
           end
         end
 
+        def anchor_parts
+          return [@anchor_name] unless anchor_parts_count > 1
+          parts = @anchor_name.parts
+          if parts.size <= anchor_parts_count
+            parts
+          else
+            # handles cases where anchor is a compound card, eg A+B+*self
+            [@anchor_name[0..-anchor_parts_count]] + parts[(-anchor_parts_count + 1)..-1]
+          end
+        end
+
+        def anchor_parts_count
+          self.class.anchor_parts_count
+        end
+
         def pattern
           @pattern ||= self.class.pattern
         end

data/lib/card/subcards.rb

@@ -182,6 +182,7 @@ class Card
         when Card
           val.name = absolutize_subcard_name key
           new_by_card val
+        when nil then next
         else new_by_attributes key, val
         end
       end
@@ -246,6 +247,7 @@ class Card
     end
 
     def new_by_attributes name, attributes={}
+      attributes ||= {}
       absolute_name = absolutize_subcard_name name
       if absolute_name.field_of?(@context_card.name) &&
          (absolute_name.parts.size - @context_card.cardname.parts.size) > 2
@@ -255,8 +257,7 @@ class Card
       else
         subcard_args = extract_subcard_args! attributes
         t_i_s = attributes.delete(:transact_in_stage)
-        card = Card.assign_or_initialize_by absolute_name.s, attributes,
-                                            local_only: true
+        card = Card.assign_or_initialize_by absolute_name.s, attributes, local_only: true
         subcard = new_by_card card, transact_in_stage: t_i_s
         card.subcards.add subcard_args
         subcard