card 1.18.3 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79f534a7d9b3208b5b7143640ad679318942a002
-  data.tar.gz: 14cf3b61c892dda96b7f2ac8bf722adc852f1e87
+  metadata.gz: 4e23b9e82cf314afb35cdffb4bbbd0702ec4fd43
+  data.tar.gz: 0ec7fdb9104bd4a9a0e24477337d641deaaeb0b0
 SHA512:
-  metadata.gz: 439daf4172199571908880128f72ed6ee9beac8f4be926c3235e2802104909abc945838eac4a0268fa2fa4dcb794112dd6326f184be12009baeb3a4cb1829db5
-  data.tar.gz: 309648a222f5583ffba3c83055e20357f705fd2edc3d08d3a126609466505a6f9f12bdbc6c60f1c88f469bf17383e76049a53db3c5a95e37e84613e113f72653
+  metadata.gz: 62199dc7a8d4f352ecf7e0f6239379881200ce30b6c66968cb7509538322c82770b1dc70f6b1d6bb15b4cf5b18678fbd80d20030ae414d06f881e46101f62bcb
+  data.tar.gz: 127ba24fe1f23acb5ae669896c8255cb244245956481095846c175cd95471fbbb6e58a5cc4706e1485293959df5e177742e60fe3fb606bbe02ece2eb620a180c

data/VERSION

@@ -1 +1 @@
-1.18.3
+1.18.4

data/card.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
     'Cards are data atoms grouped into Sets to which Rules can apply. '\
     'Cards can formatted with Views and transformed with Events.'
   s.homepage      = 'http://wagn.org'
-  s.license       = 'GPL'
+  s.licenses      = ['GPL-2.0', 'GPL-3.0']
 
   s.files         = `git ls-files`.split $INPUT_RECORD_SEPARATOR
 
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
     ['mini_magick',                '~> 4.2'],
     ['recaptcha',                  '~> 0.4.0'],
     # 0.4.0 is last version that doesn't require ruby 2.0
-
     ['coderay',                    '~> 1.0'],
     ['sass',                       '~> 3.2'],
     ['coffee-script',              '~> 2.2'],
@@ -53,7 +52,10 @@ Gem::Specification.new do |s|
     ['kaminari',                   '~> 0.16'],
 
     ['bootstrap-kaminari-views',   '~> 0'],
-    ['diff-lcs',                   '~> 1.2']
+    ['diff-lcs',                   '~> 1.2'],
+    # mime-types can be removed if we drop support for ruby 1.9.3
+    # mime-types 3.0 uses mime-types-data which isn't compatible with 1.9.3
+    ['mime-types',                  '2.99.1']
   ].each do |dep|
     s.add_runtime_dependency(*dep)
   end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160122153608) do
+ActiveRecord::Schema.define(version: 20160229134221) do
 
   create_table "card_actions", force: :cascade do |t|
     t.integer "card_id",         limit: 4

data/lib/card/active_record_helper.rb

@@ -5,8 +5,9 @@ class Card
       Card.create! args
     end
 
+    # if card with same name exists move it out of the way
     def create_card! args
-      create_card args.reverse_merge(rename_if_conflict: :new)
+      create_card args.reverse_merge(rename_if_conflict: :old)
     end
 
     def update_card name, args

data/lib/card/core_ext.rb

@@ -67,6 +67,14 @@ class Hash
   end
 end
 
+class Array
+  def to_pointer_content
+    map do |item|
+      "[[#{item}]]"
+    end.join "\n"
+  end
+end
+
 class Kaminari::Helpers::Tag
   def page_url_for page
     p = params_for(page)

data/lib/card/format/nest.rb

@@ -12,6 +12,19 @@ class Card
                        mainline: @mainline, form: @form
       end
 
+      def field_subformat field
+        field = card.cardname.field(field) unless field.is_a?(Card)
+        subformat field
+      end
+
+      def field_nest field, opts={}
+        if field.is_a?(Card)
+          nest field, opts
+        else
+          prepare_nest opts.merge(inc_name: card.cardname.field(field))
+        end
+      end
+
       def with_nest_mode mode
         if (switch_mode = INCLUSION_MODES[mode]) && @mode != switch_mode
           old_mode = @mode
@@ -77,9 +90,7 @@ class Card
           else
             view
           end
-
         sub.optional_render view, opts
-        # end
       end
 
       def get_nest_content cardname

data/lib/card/format/render.rb

@@ -132,8 +132,14 @@ class Card
         options[:class] = [options[:class], klass].flatten.compact * ' '
       end
 
+      def id_counter
+        return @parent.id_counter if @parent
+        @id_counter ||= 0
+        @id_counter += 1
+      end
+
       def unique_id
-        "#{card.key}-#{Time.now.to_i}-#{rand(3)}"
+        "#{card.key}-#{id_counter}"
       end
     end
   end

data/lib/card/migration.rb

@@ -44,7 +44,8 @@ class Card::Migration < ActiveRecord::Migration
 
       ActiveRecord::Base.table_name_suffix = new_suffix
       ActiveRecord::SchemaMigration.reset_table_name
-      yield
+      paths = Cardio.migration_paths(type)
+      yield(paths)
       ActiveRecord::Base.table_name_suffix = original_suffix
       ActiveRecord::SchemaMigration.reset_table_name
     end

data/lib/card/set.rb

@@ -3,8 +3,10 @@
 class Card
   module Set
     include Event
+    include Trait
     mattr_accessor :modules, :traits
-    @@modules = { base: [], base_format: {}, nonbase: {}, nonbase_format: {} }
+    @@modules = { base: [], base_format: {}, nonbase: {}, nonbase_format: {},
+                  abstract: {}, abstract_format: {} }
 
     #  A 'Set' is a group of Cards to which 'Rules' may be applied.
     #  Sets can be as specific as a single card, as general as all cards, or
@@ -129,6 +131,7 @@ class Card
     def define_on_format format_name=:base, &block
       # format class name, eg. HtmlFormat
       klass = Card::Format.format_class_name format_name
+
       # called on current set module, eg Card::Set::Type::Pointer
       mod = const_get_or_set klass do
         # yielding set format module, eg Card::Set::Type::Pointer::HtmlFormat
@@ -169,22 +172,49 @@ class Card
       end
     end
 
-    #
-    # ActiveCard support: accessing plus cards as attributes
-    #
-    def card_accessor *args
-      options = args.extract_options!
-      add_traits args, options.merge(reader: true, writer: true)
+    # include a set module and all its format modules
+    # @param [Module] set
+    # @param [Hash] opts choose the formats you want to include
+    # @option opts [Symbol, Array<Symbol>] :only include only these formats
+    # @option opts [Symbol, Array<Symbol>] :except don't include these formats
+    # @example
+    # include_set Type::Basic, except: :css
+    def include_set set, opts={}
+      set_type = set.abstract_set? ? :abstract : :nonbase
+      @@modules[set_type][set.shortname].each do |set_mod|
+        include set_mod
+      end
+      include_set_formats set, opts
     end
 
-    def card_reader *args
-      options = args.extract_options!
-      add_traits args, options.merge(reader: true)
+    def each_format set
+      set_type = set.abstract_set? ? :abstract : :nonbase
+      format_type = "#{set_type}_format".to_sym
+      @@modules[format_type].each_pair do |format, set_format_mod_hash|
+        next unless (format_mods = set_format_mod_hash[set.shortname])
+        yield format, format_mods
+      end
     end
 
-    def card_writer *args
-      options = args.extract_options!
-      add_traits args, options.merge(writer: true)
+    # include a format modules of a set
+    # @param [Module] set
+    # @param [Hash] opts choose the formats you want to include
+    # @option opts [Symbol, Array<Symbol>] :only include only these formats
+    # @option opts [Symbol, Array<Symbol>] :except don't include these formats
+    # @example
+    # include_set Type::Basic, except: :css
+    def include_set_formats set, opts={}
+      each_format set do |format, format_mods|
+        match = format.to_s.match(/::(?<format>[^:]+)Format/)
+        format_sym = match ? match[:format] : :base
+        next if opts[:except] && Array(opts[:except]).include?(format_sym)
+        next if opts[:only] && !Array(opts[:only]).include?(format_sym)
+        format_mods.each do |format_mod|
+          define_on_format format_sym do
+            include format_mod
+          end
+        end
+      end
     end
 
     def ensure_set &block
@@ -220,15 +250,14 @@ class Card
 
       # make the set available for use
       def register_set set_module
-        return if set_module.abstract_set?  # noop; only used by explicit
-        # inclusion in other set modules
         if set_module.all_set?
           # automatically included in Card class
           modules[:base] << set_module
         else
+          set_type = set_module.abstract_set? ? :abstract : :nonbase
           # made ready for dynamic loading via #include_set_modules
-          modules[:nonbase][set_module.shortname] ||= []
-          modules[:nonbase][set_module.shortname] << set_module
+          modules[set_type][set_module.shortname] ||= []
+          modules[set_type][set_module.shortname] << set_module
         end
       end
 
@@ -290,16 +319,14 @@ EOF
     end
 
     def register_set_format format_class, mod
-      return if abstract_set? # noop; only used by explicit inclusion in
-      # other set modules
-
       if all_set?
         # ready to include in base format classes
         modules[:base_format][format_class] ||= []
         modules[:base_format][format_class] << mod
       else
+        format_type = abstract_set? ? :abstract_format : :nonbase_format
         # ready to include dynamically in set members' format singletons
-        format_hash = modules[:nonbase_format][format_class] ||= {}
+        format_hash = modules[format_type][format_class] ||= {}
         format_hash[shortname] ||= []
         format_hash[shortname] << mod
       end
@@ -308,9 +335,13 @@ EOF
     def shortname
       parts = name.split '::'
       first = 2 # shortname eliminates Card::Set
-      set_class = Card::SetPattern.find parts[first].underscore
-
-      last = first + set_class.anchor_parts_count
+      pattern_name = parts[first].underscore
+      last = if pattern_name == 'abstract'
+               first + 1
+             else
+               set_class = Card::SetPattern.find pattern_name
+               first + set_class.anchor_parts_count
+             end
       parts[first..last].join '::'
     end
 
@@ -324,52 +355,6 @@ EOF
 
     private
 
-    def get_traits mod
-      Card::Set.traits ||= {}
-      Card::Set.traits[mod] || Card::Set.traits[mod] = {}
-    end
-
-    def add_traits args, options
-      mod = self
-      # raise "Can't define card traits on all set" if mod == Card
-      mod_traits = get_traits mod
-
-      new_opts = options[:type] ? { type: options[:type] } : {}
-      new_opts[:default_content] = options[:default] if options[:default]
-
-      args.each do |trait|
-        define_trait_card trait, new_opts
-        define_trait_reader trait if options[:reader]
-        define_trait_writer trait if options[:writer]
-
-        mod_traits[trait.to_sym] = options
-      end
-    end
-
-    def define_trait_card trait, opts
-      define_method "#{trait}_card" do
-        trait_var "@#{trait}_card" do
-          fetch trait: trait.to_sym, new: opts.clone
-        end
-      end
-    end
-
-    def define_trait_reader trait
-      define_method trait do
-        trait_var "@#{trait}" do
-          send("#{trait}_card").content
-        end
-      end
-    end
-
-    def define_trait_writer trait
-      define_method "#{trait}=" do |value|
-        card = send "#{trait}_card"
-        subcards.add name: card.name, type_id: card.type_id, content: value
-        instance_variable_set "@#{trait}", value
-      end
-    end
-
     def set_specific_attributes *args
       Card.set_specific_attributes ||= []
       Card.set_specific_attributes += args.map(&:to_s)

data/lib/card/set/trait.rb

@@ -0,0 +1,70 @@
+class Card
+  module Set
+    #
+    # ActiveCard support: accessing plus cards as attributes
+    module Trait
+      def card_accessor *args
+        options = args.extract_options!
+        add_traits args, options.merge(reader: true, writer: true)
+      end
+
+      def card_reader *args
+        options = args.extract_options!
+        add_traits args, options.merge(reader: true)
+      end
+
+      def card_writer *args
+        options = args.extract_options!
+        add_traits args, options.merge(writer: true)
+      end
+
+      private
+
+      def get_traits mod
+        Card::Set.traits ||= {}
+        Card::Set.traits[mod] || Card::Set.traits[mod] = {}
+      end
+
+      def add_traits args, options
+        mod = self
+        # raise "Can't define card traits on all set" if mod == Card
+        mod_traits = get_traits mod
+
+        new_opts = options[:type] ? { type: options[:type] } : {}
+        new_opts[:default_content] = options[:default] if options[:default]
+
+        args.each do |trait|
+          define_trait_card trait, new_opts
+          define_trait_reader trait if options[:reader]
+          define_trait_writer trait if options[:writer]
+
+          mod_traits[trait.to_sym] = options
+        end
+      end
+
+      def define_trait_card trait, opts
+        define_method "#{trait}_card" do
+          trait_var "@#{trait}_card" do
+            fetch trait: trait.to_sym, new: opts.clone
+          end
+        end
+      end
+
+      def define_trait_reader trait
+        define_method trait do
+          trait_var "@#{trait}" do
+            send("#{trait}_card").content
+          end
+        end
+      end
+
+      def define_trait_writer trait
+        define_method "#{trait}=" do |value|
+          card = send "#{trait}_card"
+          subcards.add name: card.name, type_id: card.type_id, content: value
+          instance_variable_set "@#{trait}", value
+        end
+      end
+    end
+  end
+end

data/lib/card/stage.rb

@@ -3,18 +3,43 @@ class Card
   # 8 stages that are grouped in 3 phases.
   #
   # 'validation phase'
-  #   * initialize stage
-  #   * prepare_to_validate stage
-  #   * validate stage
+  #   * initialize stage (I)
+  #   * prepare_to_validate stage (P2V)
+  #   * validate stage (V)
   #
   # 'storage phase'
-  #   * prepare_to_store stage
-  #   * store stage
-  #   * finalize stage
+  #   * prepare_to_store stage (P2S)
+  #   * store stage (S)
+  #   * finalize stage (F)
   #
   # 'integration phase'
-  #   * integrate stage
-  #   * integrate_with_delay stage
+  #   * integrate stage (IG)
+  #   * integrate_with_delay stage (IGwD)
+  #
+  #
+  # Explanation:
+  #  yes!  the recommended stage to do that
+  #  yes   ok to do it here if necessary
+  #  no    not recommended; chance to mess things up
+  #        but if something forces you to do it here you can try
+  #  no!   never do it here. it won't work or will break things
+  #
+  # if there is only a single entry in a phase column it counts for all stages
+  # of that phase
+  #
+  #                               validation    |    storage    | integrate
+  #                              I    P2V  V    |  P2S  S    F  | IG   IGwD
+  #----------------------------------------------------------------------
+  # add subcard                  yes! yes! yes  | yes  yes  yes |    yes
+  # remove subcard               yes! yes! yes  | yes  no   no! |    no!
+  # validate                     yes  yes  yes! |      no       |    no
+  # unsecure change              yes  yes! no   |      no!      |    no!
+  # secure change                     yes       | yes! no!  no! |    no!
+  # abort                             yes!      |      yes      |    yes?
+  # fail
+  # create other cards
+  # has id                            no        | no   no?  yes |    yes
+  # dirty attributes                  yes       |      yes      |    no
   #
   #
   module Stage