RubyGems - card - Versions diffs - 1.20.1 → 1.20.2 - Mend

card 1.20.1 → 1.20.2

Files changed (85) hide show

checksums.yaml +4 -4
data/VERSION +1 -1
data/card.gemspec +2 -2
data/db/migrate_core_cards/20160811115836_rename_stats_to_admin.rb +2 -2
data/db/migrate_core_cards/20170209132834_email_test_context.rb +47 -0
data/db/migrate_core_cards/data/mailer/follower_notification_email.html +1 -1
data/db/migrate_core_cards/data/mailer/follower_notification_email.txt +1 -1
data/db/migrate_core_cards/data/mailer/mail_config.json +1 -1
data/db/seed/new/card_actions.yml +699 -771
data/db/seed/new/card_acts.yml +64 -616
data/db/seed/new/card_changes.yml +9222 -25055
data/db/seed/new/card_references.yml +767 -606
data/db/seed/new/cards.yml +2125 -1829
data/db/seed/test/fixtures/card_actions.yml +1713 -1825
data/db/seed/test/fixtures/card_acts.yml +341 -893
data/db/seed/test/fixtures/card_changes.yml +20868 -36801
data/db/seed/test/fixtures/card_references.yml +1516 -1250
data/db/seed/test/fixtures/cards.yml +3194 -2898
data/db/version_core_cards.txt +1 -1
data/lib/card/env/location.rb +1 -1
data/lib/card/format/content.rb +1 -1
data/lib/card/format/nest/subformat.rb +2 -1
data/lib/card/format/render.rb +19 -1
data/lib/card/mailer.rb +5 -2
data/lib/card/model/save_helper.rb +15 -4
data/lib/card/name.rb +1 -45
data/lib/card/name/fields_and_traits.rb +10 -9
data/lib/card/name/{variants.rb → name_variants.rb} +1 -1
data/lib/card/query.rb +28 -2
data/lib/card/query/helpers.rb +1 -0
data/lib/card/query/interpretation.rb +1 -0
data/lib/card/query/relational_attributes.rb +27 -5
data/lib/card/query/sql_statement.rb +1 -1
data/lib/card/tasks/card/create.rake +177 -0
data/mod/carrierwave/set/type/file.rb +1 -1
data/mod/carrierwave/set/type/image.rb +9 -2
data/mod/core/chunk/reference.rb +1 -1
data/mod/core/set/all/assign_attributes.rb +14 -14
data/mod/core/set/all/collection.rb +1 -1
data/mod/core/set/all/fetch.rb +4 -0
data/mod/core/set/all/haml.rb +82 -3
data/mod/core/set/all/name.rb +7 -6
data/mod/core/set/all/references.rb +1 -1
data/mod/core/set/all/subcards.rb +4 -0
data/mod/core/set_pattern/07_type_plus_right.rb +1 -1
data/mod/core/spec/set/all/{tracked_attributes_spec.rb → assign_attributes_spec.rb} +1 -1
data/mod/email/set/abstract/test_context.rb +26 -0
data/mod/email/set/all/notify.rb +10 -5
data/mod/email/set/right/html_message.rb +2 -0
data/mod/email/set/right/subject.rb +1 -0
data/mod/email/set/right/text_message.rb +1 -0
data/mod/history/set/all/content_history.rb +2 -1
data/mod/machines/set/type/coffee_script.rb +1 -1
data/mod/pointer/set/abstract/01_pointer/edit.rb +10 -7
data/mod/pointer/spec/set/type/pointer_spec.rb +2 -2
data/mod/standard/set/abstract/wql_search.rb +1 -1
data/mod/standard/set/all/rich_html/form.rb +128 -169
data/mod/standard/set/all/rich_html/form_elements.rb +52 -0
data/mod/standard/set/all/rich_html/formgroup.rb +34 -0
data/mod/standard/set/type/session.rb +2 -8
data/mod/standard/set/type/toggle.rb +23 -3
data/mod/standard/spec/set/type/email_template/email_config_spec.rb +24 -13
data/mod/standard/spec/set/type/toggle_spec.rb +13 -2
data/spec/lib/card/name_spec.rb +1 -224
data/spec/lib/card/query_spec.rb +56 -1
data/spec/lib/card/stage_director_spec.rb +19 -0
data/spec/support/helper/render_helper.rb +2 -0
data/tmpsets/set/mod001-core/all/actify.rb +6 -5
data/tmpsets/set/mod001-core/all/fetch.rb +12 -14
data/tmpsets/set/mod001-core/all/name.rb +1 -1
data/tmpsets/set/mod001-core/all/permissions.rb +22 -12
data/tmpsets/set/mod001-core/all/tracked_attributes.rb +0 -76
data/tmpsets/set/mod001-core/all/utils.rb +3 -40
data/tmpsets/set/mod002-history/all/history.rb +2 -1
data/tmpsets/set/mod008-solid_cache/abstract/solid_cache.rb +1 -1
metadata +15 -17
data/tmpsets/set/mod013-carrierwave/abstract/attachment.rb +0 -282
data/tmpsets/set/mod013-carrierwave/type/file.rb +0 -155
data/tmpsets/set/mod013-carrierwave/type/image.rb +0 -96
data/tmpsets/set/mod014-admin/self/admin.rb +0 -113
data/tmpsets/set/mod014-admin/self/admin_info.rb +0 -110
data/tmpsets/set/mod014-admin/self/version.rb +0 -15
data/tmpsets/set/mod015-developer/all/event_viz.rb +0 -59
data/tmpsets/set/mod015-developer/all/view_viz.rb +0 -30
data/tmpsets/set/mod015-developer/right/debug.rb +0 -96

	@@ -1 +1 @@
1	- ~~20160811115836~~
1	+ 20170209132834

data/lib/card/env/location.rb CHANGED

@@ -23,7 +23,7 @@ class Card
           Rails.logger.warn "Pass only strings to card_path. "\
                             "(#{rel_path} = #{rel_path.class})"
         end
-        if rel_path =~ /^\//
+        if rel_path =~ %r{^(https?\:)?/}
           rel_path
         else
           "#{Card.config.relative_url_root}/#{rel_path}"

data/lib/card/format/content.rb CHANGED

@@ -57,7 +57,7 @@ class Card
       end
       def output *content
-        content ||= yield
+        content = yield if block_given?
         Array.wrap(content).flatten.compact.join "\n"
       end
     end

data/lib/card/format/nest/subformat.rb CHANGED

@@ -5,7 +5,8 @@ class Card
         def subformat subcard
           subcard = Card.fetch(subcard, new: {}) if subcard.is_a?(String)
           self.class.new subcard, root: @root, parent: self, depth: @depth + 1,
-                                  form: @form, mode: @mode,
+                                  form: @form,
+                                  mode: @mode,
                                   context_names: @context_names
         end

data/lib/card/format/render.rb CHANGED

@@ -42,11 +42,29 @@ class Card
         current_view(view) do
           with_nest_mode view do
             method = view_method view
-            method.arity.zero? ? method.call : method.call(args)
+            rendered = method.arity.zero? ? method.call : method.call(args)
+            add_debug_info view, method, rendered
           end
         end
       end
+      def add_debug_info view, method, rendered
+        return rendered unless show_debug_info?
+        <<-HTML
+          <view-debug view='#{card.name}##{view}' src='#{pretty_path method.source_location}' module='#{method.owner}'/>
+          #{rendered}
+        HTML
+      end
+      def show_debug_info?
+        Env.params[:debug] == "view"
+      end
+      def pretty_path source_location
+        source_location.first.gsub(%r{^.+mod\d+-([^/]+)}, '\1: ') + ':' +
+          source_location.second.to_s
+      end
       # setting (:alway, :never, :nested) designated in view definition
       def view_cache_setting view
         method = self.class.view_cache_setting_method view

data/lib/card/mailer.rb CHANGED

@@ -20,14 +20,17 @@ class Card
       end
       def layout message
-        %(
+        <<-HTML
           <!DOCTYPE html>
           <html>
+            <head>
+              <meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
+            </head>
             <body>
               #{message}
             </body>
           </html>
-        )
+         HTML
       end
     end
   end

data/lib/card/model/save_helper.rb CHANGED

@@ -96,7 +96,7 @@ class Card
         if name_or_args.is_a?(Hash)
           name_or_args
         else
-          add_name name_or_args, content_or_args
+          add_name name_or_args, content_or_args || {}
         end
       end
@@ -128,9 +128,20 @@ class Card
       end
       def ensure_attributes card, args
-        update_args = args.select { |key, value| card.send(key) != value }
-        return if update_args.empty?
-        card.update_attributes! update_args
+        args = args.with_indifferent_access
+        subcards = card.extract_subcard_args! args
+        update_args =
+          args.select do |key, value|
+            if key =~ /^\+/
+              subfields[key] = value
+              false
+            else
+              card.send(key) != value
+            end
+          end
+        return if update_args.empty? && subcards.empty?
+        # FIXME: use ensure_attributes for subcards
+        card.update_attributes! update_args.merge(subcards: subcards)
       end
       def add_style name, opts={}

data/lib/card/name.rb CHANGED

@@ -10,9 +10,7 @@ class Card
   # Card::Name adds support for deeper card integration
   class Name < SmartName
     include FieldsAndTraits
-    include Variants
-    RELATIVE_REGEXP = /\b_(left|right|whole|self|user|main|\d+|L*R?)\b/
+    include ::Card::Name::NameVariants
     self.params  = Card::Env # yuck!
     self.session = proc { Card::Auth.current.name }
@@ -44,24 +42,6 @@ class Card
       Card::Codename[Card.fetch_id self]
     end
-    def relative_name context_name
-      to_show(*context_name.to_name.parts).to_name
-    end
-    def absolute_name context_name
-      to_absolute_name(context_name)
-    end
-    def child_of? context_name
-      if context_name.present?
-        # Do I still equal myself after I've been relativised in the context
-        # of context_name?
-        relative_name(context_name).key != absolute_name(context_name).key
-      else
-        s.match(/^\s*\+/)
-      end
-    end
     def setting?
       Set::Type::Setting.member_names[key]
     end
@@ -70,30 +50,6 @@ class Card
       Set::Pattern.card_keys[tag_name.key]
     end
-    def relative?
-      s =~ RELATIVE_REGEXP || starts_with_joint?
-    end
-    def simple_relative?
-      relative? && stripped.to_name.starts_with_joint?
-    end
-    def absolute?
-      !relative?
-    end
-    def stripped
-      s.gsub RELATIVE_REGEXP, ""
-    end
-    def starts_with_joint?
-      s =~ /^\+/
-    end
-    def to_sym
-      s.to_sym
-    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)

data/lib/card/name/fields_and_traits.rb CHANGED

@@ -23,9 +23,12 @@ class Card
       end
       # @return [True/False]
-      def field_of? context_name
-        if context_name.present?
-          child_of?(context_name) && relative_name(context_name).length == 2
+      def field_of? context
+        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
         else
           s.match(/^\s*\+[^+]+$/).present?
         end
@@ -38,13 +41,14 @@ class Card
       # @return [String]
       def trait tag_code
         name = trait_name tag_code
-        raise Card::Error::NotFound, "unknown codename: #{tag_code}" unless name
         name.s
       end
       # @return [Card::Name]
       def trait_name tag_code
-        return unless (card_id = Card::Codename[tag_code])
+        card_id = Card::Codename[tag_code]
+        raise Card::Error::NotFound, "unknown codename: #{tag_code}" unless card_id
         [self, Card.quick_fetch(card_id).name].to_name
       end
@@ -59,9 +63,6 @@ class Card
           end.present?
         end
       end
     end
   end
-end
+end

data/lib/card/name/{variants.rb → name_variants.rb} RENAMED

@@ -1,6 +1,6 @@
 class Card
   class Name
-    module Variants
+    module NameVariants
       @@variant_methods = [:capitalize, :singularize, :pluralize, :titleize,
                            :downcase, :upcase, :swapcase, :reverse, :succ]
       @@variant_aliases = { capitalized: :capitalize, singular: :singularize,

data/lib/card/query.rb CHANGED

@@ -54,7 +54,8 @@ class Card
                            creator_id updater_id codename read_rule_id        ),
       relational:      %w( type part left right
                            editor_of edited_by last_editor_of last_edited_by
-                           creator_of created_by member_of member             ),
+                           creator_of created_by member_of member
+                           updater_of updated_by),
       plus_relational: %w(plus left_plus right_plus),
       ref_relational:  %w( refer_to referred_to_by
                            link_to linked_to_by
@@ -134,7 +135,12 @@ class Card
     # @return Integer for :count, otherwise Array of Strings or Integers
     def get_results retrn
       rows = run_sql
-      if retrn == "name" && (statement[:prepend] || statement[:append])
+      if retrn =~ /_\w+/
+        name_processor = contextual_name_processor retrn
+        rows.map do |row|
+          name_processor.call row["name"]
+        end
+      elsif retrn == "name" && (statement[:prepend] || statement[:append])
         rows.map do |row|
           [statement[:prepend], row["name"], statement[:append]].compact * "+"
         end
@@ -158,6 +164,26 @@ class Card
       @sql ||= SqlStatement.new(self).build.to_s
     end
+    def contextual_name_processor pattern
+      case pattern.downcase
+      when "_left", "_l"
+        ->(name) { name.to_name.left_name.to_s }
+      when "_right", "_r"
+        ->(name) { name.to_name.right_name.to_s }
+      else
+        chain = "name.to_name"
+        pattern.each_char do |ch|
+          case ch
+          when "l", "L"
+            chain += ".left_name"
+          when "r", "R"
+            chain += ".right_name"
+          end
+        end
+        eval "lambda { |name| #{chain}.to_s }"
+      end
+    end
     # Query Hierarchy
     # @root, @subqueries, and @superquery are used to track a hierarchy of
     # query objects.  This nesting allows to find, for example, cards that

data/lib/card/query/helpers.rb CHANGED

@@ -45,6 +45,7 @@ class Card
         end
       end
+      # generates an id used to identify a table variable in the sql statement
       def table_id force=false
         if force
           tick_table_seq!

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

@@ -42,6 +42,7 @@ class Card
         clause = clause_to_hash clause
         clause.symbolize_keys!
         clause.each do |key, val|
+          next if key.to_sym == :return
           clause[key] = normalize_value val
         end
         clause

data/lib/card/query/relational_attributes.rb CHANGED

@@ -1,7 +1,6 @@
 class Card
   class Query
     module RelationalAttributes
       def type val
         restrict :type_id, val
       end
@@ -19,7 +18,10 @@ class Card
         restrict :right_id, val
       end
-      def editor_of val
+      # action_table_id and action_condition are needed to reuse that method
+      # for `updater_of`
+      def editor_of val, action_table_id=nil, action_condition=nil
+        action_table_id ||= table_id true
         act_join = Join.new(
           from: self,
           to: ["card_acts", "a#{table_id true}", "actor_id"]
@@ -27,17 +29,25 @@ class Card
         joins << act_join
         action_join = Join.new(
           from: act_join,
-          to: ["card_actions", "an#{table_id true}", "card_act_id"],
+          to: ["card_actions", "an#{action_table_id}", "card_act_id"],
           superjoin: act_join
         )
+        # Join.new resets @conditions, so we have to set it after
+        # initialization
+        action_join.conditions << action_condition if action_condition
         join_cards val, from: action_join, from_field: "card_id"
       end
-      def edited_by val
+      # action_table_id and action_condition are needed to reuse that method
+      # for `updated_by`
+      def edited_by val, action_table_id=nil, action_condition=nil
+        action_table_id ||= table_id true
         action_join = Join.new(
           from: self,
-          to: ["card_actions", "an#{table_id true}", "card_id"]
+          to: ["card_actions", "an#{action_table_id}", "card_id"],
         )
+        action_join.conditions << action_condition if action_condition
         joins << action_join
         act_join = Join.new(
           from: action_join,
@@ -47,6 +57,18 @@ class Card
         join_cards val, from: act_join, from_field: "actor_id"
       end
+      # edited but not created
+      def updated_by val
+        action_table_id = table_id true
+        edited_by val, action_table_id, "an#{action_table_id}.action_type = 1"
+      end
+      # editor but not creator
+      def updater_of val
+        action_table_id = table_id true
+        editor_of val, action_table_id, "an#{action_table_id}.action_type = 1"
+      end
       def last_editor_of val
         join_cards val, to_field: "updater_id"
       end

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

@@ -40,7 +40,7 @@ class Card
       def fields
         table = @query.table_alias
-        field = @mods[:return]
+        field = @mods[:return] unless @mods[:return] =~ /_\w+/
         field = field.blank? ? :card : field.to_sym
         field = full_field(table, field)
         [field, @mods[:sort_join_field]].compact * ", "

data/lib/card/tasks/card/create.rake ADDED

@@ -0,0 +1,177 @@
+require "colorize"
+namespace :card do
+  namespace :create do
+    DEFAULT_RULE = { style: "*all+*style",
+                     script: "*all+*script" }.freeze
+    # 1. Creates a js/coffee/css/scss file with the appropriate path in
+    #    the given mod.
+    #    If a card with the given name exists it copies the content to that
+    #    file.
+    # 2. Creates a self set file that loads the code file as content
+    # 3. Creates a card migration that adds the code card to the script/style
+    #    rule defined by DEFAULT_RULE. Override the rule_card_name
+    #    method to change it.
+    # @parem mod [String] the name of the mod where the files are created
+    # @param name [String] the card name
+    #   A "script: " or "style: " prefix is added if missing.
+    #   Whitespaces are translated to underscores for the codename.
+    # @param type supported options are js, coffee, css, scss
+    desc "create folders and files for scripts or styles"
+    task codefile: :environment do
+      with_params(:mod, :name, :type) do |mod, name, category, type, type_codename|
+        create_content_file mod, name, type
+        create_rb_file mod, name
+        create_migration_file name, category, type_codename
+      end
+    end
+    # shortcut for create:codefile type=scss
+    desc "create folders and files for stylesheet"
+    task style: :environment do
+      ENV["type"] ||= "scss"
+      Rake::Task["card:create:codefile"].invoke
+    end
+    # shortcut for create:codefile type=coffee
+    desc "create folders and files for script"
+    task script: :environment do
+      ENV["type"] ||= "coffee"
+      Rake::Task["card:create:codefile"].invoke
+    end
+    def create_content_file mod, name, type
+      write_to_mod(mod, content_dir(type), content_filename(name, type)) do |f|
+        content = (card = Card.fetch(name)) ? card.content : ""
+        f.puts content
+      end
+    end
+    def create_rb_file mod, name
+      self_dir = File.join "set", "self"
+      self_file = name + ".rb"
+      write_to_mod(mod, self_dir, self_file) do |f|
+        f.puts("include_set Abstract::CodeFile")
+      end
+    end
+    def create_migration_file name, category, type_codename
+      puts "creating migration file...".yellow
+      migration_out = `bundle exec wagn generate card:migration #{name}`
+      migration_file = migration_out[/db.*/]
+      content = migration_content name, category, type_codename
+      write_at migration_file, 5, content # 5 is line no.
+    end
+    def with_params *keys
+      return unless parameters_present?(*keys)
+      values = keys.map { |k| ENV[k.to_s] }
+      mod, name, type = values
+      name = remove_prefix name
+      typecode = type_codename(type)
+      yield mod, name, category(typecode), type, typecode
+    end
+    def remove_prefix name
+      name.sub(/^(?:script|style):?_?\s*/, "")
+    end
+    def category typecode
+      case typecode
+      when :java_script, :coffee_script then
+        :script
+      when :css, :scss then
+        :style
+      end
+    end
+    def parameters_present? *env_keys
+      missing = env_keys.select { |k| !ENV[k.to_s] }
+      return true if missing.empty?
+      missing.each do |key|
+        color_puts "missing parameter:", :red, key
+      end
+      false
+    end
+    def color_puts colored_text, color, text=""
+      puts "#{colored_text.send(color.to_s)} #{text}"
+    end
+    def write_at fname, at_line, sdat
+      open(fname, "r+") do |f|
+        (at_line - 1).times do # read up to the line you want to write after
+          f.readline
+        end
+        pos = f.pos # save your position in the file
+        rest = f.read # save the rest of the file
+        f.seek pos # go back to the old position
+        f.puts sdat # write new data & rest of file
+        f.puts rest
+        color_puts "created", :green, fname
+      end
+    end
+    def write_to_mod mod, relative_dir, filename
+      mod_dir = File.join "mod", mod
+      dir = File.join mod_dir, relative_dir
+      path = File.join dir, filename
+      Dir.mkdir(dir) unless Dir.exist?(dir)
+      if File.exist?(path)
+        color_puts "file exists", :yellow, path
+      else
+        File.open(path, "w") do |opened_file|
+          yield(opened_file)
+          color_puts "created", :green, path
+        end
+      end
+    end
+    def type_codename type
+      case type
+      when "js" then
+        :java_script
+      when "coffee" then
+        :coffee_script
+      when "css", "scss" then
+        type.to_sym
+      else
+        color_puts "'#{type}' is not a valid type. "\
+                 "Please choose between js, coffee, css and scss.", :red
+        exit
+      end
+    end
+    def migration_content name, category, type_codename
+      <<-RUBY
+    add_#{category} "#{name}",
+                type_id: #{type_id type_codename},
+                to: "#{rule_card_name category}"
+      RUBY
+    end
+    def content_dir type
+      dir = case type
+      when "js", "coffee" then
+        "javascript"
+      when "css", "scss" then
+        "stylesheets"
+      end
+      File.join "lib", dir
+    end
+    def content_filename name, type
+      file_ext = type == "coffee" ? ".js.coffee" : "." + type
+      name + file_ext
+    end
+    def type_id type_codename
+      "Card::#{type_codename.to_s.camelcase}ID"
+    end
+    def rule_card_name category
+      DEFAULT_RULE[category]
+    end
+  end
+end