card 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c446c5d4d4690dcdfd3dfec9e7ccd86eb8103d
-  data.tar.gz: 46449abad4c318e46f01f1785d37d755bbdbcac8
+  metadata.gz: e0e96aef9fe8581d7e787b0ad6ed56db1b3ec7d1
+  data.tar.gz: bbdd504c7800d1c372bd4199a293eeeb4e0ad501
 SHA512:
-  metadata.gz: ff2d853a9eb45e599c82338dc3b9b2bfae8674b38ff61129715bf2082311dc32aa323457d74cadee1ac87d0bad8d225787c403ed7bdbed94d69870b5f253af62
-  data.tar.gz: c3f805c9e1eea8148e9567ef8fa2f89281a401c9c63677e2a06c5820871be6933bc094f83e3edf4dd43ba57025e193764708331f301b98b14925aec5ebe1f544
+  metadata.gz: 2bb8bfa7d9df016796744af64b3361c5abbf5fefe1b10d17f4ae08af370e12600e1e1353da8ed00ae07bc281c484a0fbf458fe51d535e06ff0b49fd2987d58a1
+  data.tar.gz: d0f7b44c9ec0b44118f29a0fab7721402fcdfb397df4396a914243aa5477e18eeefed973fcb1434eb56eb8af6c788104a59178f23fcf10c414b17b1394d4eb38

data/VERSION

@@ -1 +1 @@
-1.18.0
+1.18.1

data/card.gemspec

@@ -1,25 +1,30 @@
 # -*- encoding : utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name          = 'card'
-  s.version       = File.open(File.expand_path('../VERSION', __FILE__)).read.chomp
-  s.authors       = ['Ethan McCutchen', 'Lewis Hoffman', 'Gerry Gleason', "Philipp Kühl"]
-  s.email         = ['info@wagn.org']
+  s.name = 'card'
+  s.version = File.open(File.expand_path('../VERSION', __FILE__)).read.chomp
+  s.authors =
+    ['Ethan McCutchen', 'Lewis Hoffman', 'Gerry Gleason', "Philipp Kühl"]
+  s.email = ['info@wagn.org']
 
   #  s.date          = '2013-12-20'
   s.summary       = 'an atomic, set-driven content engine'
-  s.description   = 'Cards are data atoms that are grouped into Sets to which Rules can apply. Cards can formatted with Views and transformed with Events.'
+  s.description   =
+    '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.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.files         = `git ls-files`.split $INPUT_RECORD_SEPARATOR
 
   # add submodule files (seed data)
-  `git submodule --quiet foreach pwd`.split($OUTPUT_RECORD_SEPARATOR).each do |submod_path|
+  morepaths = `git submodule --quiet foreach pwd`.split $OUTPUT_RECORD_SEPARATOR
+  morepaths.each do |submod_path|
     gem_root = File.expand_path File.dirname(__FILE__)
     relative_submod_path = submod_path.gsub "#{gem_root}/", ''
     Dir.chdir(submod_path) do
-      s.files += `git ls-files`.split($OUTPUT_RECORD_SEPARATOR).map do |filename|
+      morefiles = `git ls-files`.split $OUTPUT_RECORD_SEPARATOR
+      s.files += morefiles.map do |filename|
         "#{relative_submod_path}/#{filename}"
       end
     end
@@ -31,15 +36,14 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
 
   [
-
     ['smartname',                  '0.2.3'],
-
-    ['activerecord-session_store', '~> 0.1'],
     ['uuid',                       '~> 2.3'],
-    ['carrierwave',               '~> 0.10'],
+    ['carrierwave',                '~> 0.10'],
     ['htmlentities',               '~> 4.3'],
-    ['mini_magick',                '~> 4.2.10'],
+    ['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'],
@@ -47,10 +51,10 @@ Gem::Specification.new do |s|
 
     ['haml',                       '~> 4.0'],
     ['kaminari',                   '~> 0.16'],
-    ['bootstrap-kaminari-views',   '~> 0.0.5'],
-    ['diff-lcs',                   '~> 1.2']
 
+    ['bootstrap-kaminari-views',   '~> 0'],
+    ['diff-lcs',                   '~> 1.2']
   ].each do |dep|
-    s.add_runtime_dependency *dep
+    s.add_runtime_dependency(*dep)
   end
 end

data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb

@@ -57,7 +57,7 @@ class ImportBootstrapLayout < Card::CoreMigration
     # update layouts to have explicit views in nests
     Card.search(type_id: Card::LayoutTypeID) do |lcard|
       lcontent = Card::Content.new lcard.content, lcard
-      lcontent.find_chunks(Card::Chunk::Include).each do |nest|
+      lcontent.find_chunks(Card::Content::Chunk::Include).each do |nest|
         nest.explicit_view = (nest.options[:inc_name] == '_main' ? 'open' : 'core')
       end
       lcard.update_attributes! content: lcontent.to_s

data/db/schema.rb

@@ -11,121 +11,139 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_160_122_153_608) do
-  create_table 'card_actions', force: :cascade do |t|
-    t.integer 'card_id',         limit: 4
-    t.integer 'card_act_id',     limit: 4
-    t.integer 'super_action_id', limit: 4
-    t.integer 'action_type',     limit: 4
-    t.boolean 'draft'
-    t.text    'comment',         limit: 65_535
+ActiveRecord::Schema.define(version: 20160122153608) do
+
+  create_table "card_actions", force: :cascade do |t|
+    t.integer "card_id",         limit: 4
+    t.integer "card_act_id",     limit: 4
+    t.integer "super_action_id", limit: 4
+    t.integer "action_type",     limit: 4
+    t.boolean "draft"
+    t.text    "comment",         limit: 65535
   end
 
-  add_index 'card_actions', ['card_act_id'], name: 'card_actions_card_act_id_index', using: :btree
-  add_index 'card_actions', ['card_id'], name: 'card_actions_card_id_index', using: :btree
+  add_index "card_actions", ["card_act_id"], name: "card_actions_card_act_id_index", using: :btree
+  add_index "card_actions", ["card_id"], name: "card_actions_card_id_index", using: :btree
 
-  create_table 'card_acts', force: :cascade do |t|
-    t.integer  'card_id',    limit: 4
-    t.integer  'actor_id',   limit: 4
-    t.datetime 'acted_at'
-    t.string   'ip_address', limit: 255
+  create_table "card_acts", force: :cascade do |t|
+    t.integer  "card_id",    limit: 4
+    t.integer  "actor_id",   limit: 4
+    t.datetime "acted_at"
+    t.string   "ip_address", limit: 255
   end
 
-  add_index 'card_acts', ['acted_at'], name: 'acts_acted_at_index', using: :btree
-  add_index 'card_acts', ['actor_id'], name: 'card_acts_actor_id_index', using: :btree
-  add_index 'card_acts', ['card_id'], name: 'card_acts_card_id_index', using: :btree
+  add_index "card_acts", ["acted_at"], name: "acts_acted_at_index", using: :btree
+  add_index "card_acts", ["actor_id"], name: "card_acts_actor_id_index", using: :btree
+  add_index "card_acts", ["card_id"], name: "card_acts_card_id_index", using: :btree
 
-  create_table 'card_changes', force: :cascade do |t|
-    t.integer 'card_action_id', limit: 4
-    t.integer 'field',          limit: 4
-    t.text    'value',          limit: 16_777_215
+  create_table "card_changes", force: :cascade do |t|
+    t.integer "card_action_id", limit: 4
+    t.integer "field",          limit: 4
+    t.text    "value",          limit: 16777215
   end
 
-  add_index 'card_changes', ['card_action_id'], name: 'card_changes_card_action_id_index', using: :btree
+  add_index "card_changes", ["card_action_id"], name: "card_changes_card_action_id_index", using: :btree
 
-  create_table 'card_references', force: :cascade do |t|
-    t.integer 'referer_id',  limit: 4,   default: 0,  null: false
-    t.string  'referee_key', limit: 255, default: '', null: false
-    t.integer 'referee_id',  limit: 4
-    t.string  'ref_type',    limit: 1,   default: '', null: false
-    t.integer 'present',     limit: 4
+  create_table "card_references", force: :cascade do |t|
+    t.integer "referer_id",  limit: 4,   default: 0,  null: false
+    t.string  "referee_key", limit: 255, default: "", null: false
+    t.integer "referee_id",  limit: 4
+    t.string  "ref_type",    limit: 1,   default: "", null: false
+    t.integer "present",     limit: 4
   end
 
-  add_index 'card_references', ['ref_type'], name: 'card_references_ref_type_index', using: :btree
-  add_index 'card_references', ['referee_id'], name: 'card_references_referee_id_index', using: :btree
-  add_index 'card_references', ['referee_key'], name: 'card_references_referee_key_index', using: :btree
-  add_index 'card_references', ['referer_id'], name: 'card_references_referer_id_index', using: :btree
+  add_index "card_references", ["ref_type"], name: "card_references_ref_type_index", using: :btree
+  add_index "card_references", ["referee_id"], name: "card_references_referee_id_index", using: :btree
+  add_index "card_references", ["referee_key"], name: "card_references_referee_key_index", using: :btree
+  add_index "card_references", ["referer_id"], name: "card_references_referer_id_index", using: :btree
 
-  create_table 'card_revisions', force: :cascade do |t|
-    t.datetime 'created_at',               null: false
-    t.integer  'card_id',    limit: 4,     null: false
-    t.integer  'creator_id', limit: 4,     null: false
-    t.text     'content',    limit: 65_535, null: false
+  create_table "card_revisions", force: :cascade do |t|
+    t.datetime "created_at",               null: false
+    t.integer  "card_id",    limit: 4,     null: false
+    t.integer  "creator_id", limit: 4,     null: false
+    t.text     "content",    limit: 65535, null: false
   end
 
-  add_index 'card_revisions', ['card_id'], name: 'revisions_card_id_index', using: :btree
-  add_index 'card_revisions', ['creator_id'], name: 'revisions_created_by_index', using: :btree
-
-  create_table 'cards', force: :cascade do |t|
-    t.string   'name',                limit: 255,      null: false
-    t.string   'key',                 limit: 255,      null: false
-    t.string   'codename',            limit: 255
-    t.integer  'left_id',             limit: 4
-    t.integer  'right_id',            limit: 4
-    t.integer  'current_revision_id', limit: 4
-    t.datetime 'created_at',                           null: false
-    t.datetime 'updated_at',                           null: false
-    t.integer  'creator_id',          limit: 4,        null: false
-    t.integer  'updater_id',          limit: 4,        null: false
-    t.string   'read_rule_class',     limit: 255
-    t.integer  'read_rule_id',        limit: 4
-    t.integer  'references_expired',  limit: 4
-    t.boolean  'trash',                                null: false
-    t.integer  'type_id',             limit: 4,        null: false
-    t.text     'db_content',          limit: 16_777_215
+  add_index "card_revisions", ["card_id"], name: "revisions_card_id_index", using: :btree
+  add_index "card_revisions", ["creator_id"], name: "revisions_created_by_index", using: :btree
+
+  create_table "cards", force: :cascade do |t|
+    t.integer  "left_id",             limit: 4
+    t.datetime "created_at",                           null: false
+    t.datetime "updated_at",                           null: false
+    t.integer  "current_revision_id", limit: 4
+    t.string   "name",                limit: 255,      null: false
+    t.integer  "creator_id",          limit: 4,        null: false
+    t.integer  "updater_id",          limit: 4,        null: false
+    t.integer  "right_id",            limit: 4
+    t.string   "key",                 limit: 255,      null: false
+    t.boolean  "trash",                                null: false
+    t.integer  "references_expired",  limit: 4
+    t.string   "codename",            limit: 255
+    t.string   "read_rule_class",     limit: 255
+    t.integer  "read_rule_id",        limit: 4
+    t.integer  "type_id",             limit: 4,        null: false
+    t.text     "db_content",          limit: 16777215
   end
 
-  add_index 'cards', ['created_at'], name: 'cards_created_at_index', using: :btree
-  add_index 'cards', ['key'], name: 'cards_key_index', unique: true, using: :btree
-  add_index 'cards', ['left_id'], name: 'cards_left_id_index', using: :btree
-  add_index 'cards', ['name'], name: 'cards_name_index', using: :btree
-  add_index 'cards', ['read_rule_id'], name: 'cards_read_rule_id_index', using: :btree
-  add_index 'cards', ['right_id'], name: 'cards_right_id_index', using: :btree
-  add_index 'cards', ['type_id'], name: 'cards_type_id_index', using: :btree
-  add_index 'cards', ['updated_at'], name: 'cards_updated_at_index', using: :btree
-
-  create_table 'schema_migrations_core_cards', id: false, force: :cascade do |t|
-    t.string 'version', limit: 255, null: false
+  add_index "cards", ["created_at"], name: "cards_created_at_index", using: :btree
+  add_index "cards", ["key"], name: "cards_key_index", unique: true, using: :btree
+  add_index "cards", ["left_id"], name: "cards_left_id_index", using: :btree
+  add_index "cards", ["name"], name: "cards_name_index", using: :btree
+  add_index "cards", ["read_rule_id"], name: "cards_read_rule_id_index", using: :btree
+  add_index "cards", ["right_id"], name: "cards_right_id_index", using: :btree
+  add_index "cards", ["type_id"], name: "cards_type_id_index", using: :btree
+  add_index "cards", ["updated_at"], name: "cards_updated_at_index", using: :btree
+
+  create_table "delayed_jobs", force: :cascade do |t|
+    t.integer  "priority",   limit: 4,     default: 0, null: false
+    t.integer  "attempts",   limit: 4,     default: 0, null: false
+    t.text     "handler",    limit: 65535,             null: false
+    t.text     "last_error", limit: 65535
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by",  limit: 255
+    t.string   "queue",      limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index 'schema_migrations_core_cards', ['version'], name: 'unique_schema_migrations_cards', unique: true, using: :btree
+  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
 
-  create_table 'schema_migrations_deck_cards', id: false, force: :cascade do |t|
-    t.string 'version', limit: 255, null: false
+  create_table "schema_migrations_core_cards", id: false, force: :cascade do |t|
+    t.string "version", limit: 255, null: false
   end
 
-  add_index 'schema_migrations_deck_cards', ['version'], name: 'unique_schema_migrations_deck_cards', unique: true, using: :btree
+  add_index "schema_migrations_core_cards", ["version"], name: "unique_schema_migrations_cards", unique: true, using: :btree
 
-  create_table 'sessions', force: :cascade do |t|
-    t.string   'session_id', limit: 255
-    t.text     'data',       limit: 65_535
-    t.datetime 'updated_at'
+  create_table "schema_migrations_deck_cards", id: false, force: :cascade do |t|
+    t.string "version", limit: 255, null: false
   end
 
-  add_index 'sessions', ['session_id'], name: 'sessions_session_id_index', using: :btree
-
-  create_table 'users', force: :cascade do |t|
-    t.string   'login',               limit: 40
-    t.string   'email',               limit: 100
-    t.string   'crypted_password',    limit: 40
-    t.string   'salt',                limit: 42
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
-    t.string   'password_reset_code', limit: 40
-    t.string   'status',              limit: 255, default: 'request'
-    t.integer  'invite_sender_id',    limit: 4
-    t.string   'identity_url',        limit: 255
-    t.integer  'card_id',             limit: 4,                       null: false
-    t.integer  'account_id',          limit: 4,                       null: false
+  add_index "schema_migrations_deck_cards", ["version"], name: "unique_schema_migrations_deck_cards", unique: true, using: :btree
+
+  create_table "sessions", force: :cascade do |t|
+    t.string   "session_id", limit: 255
+    t.text     "data",       limit: 65535
+    t.datetime "updated_at"
+  end
+
+  add_index "sessions", ["session_id"], name: "sessions_session_id_index", using: :btree
+
+  create_table "users", force: :cascade do |t|
+    t.string   "login",               limit: 40
+    t.string   "email",               limit: 100
+    t.string   "crypted_password",    limit: 40
+    t.string   "salt",                limit: 42
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "password_reset_code", limit: 40
+    t.string   "status",              limit: 255, default: "request"
+    t.integer  "invite_sender_id",    limit: 4
+    t.string   "identity_url",        limit: 255
+    t.integer  "card_id",             limit: 4,                       null: false
+    t.integer  "account_id",          limit: 4,                       null: false
   end
+
 end

data/lib/card.rb

@@ -35,6 +35,7 @@ class Card < ActiveRecord::Base
   require_dependency 'card/stage_director'
   require_dependency 'card/director_register'
 
+
   has_many :references_in,  class_name: :Reference, foreign_key: :referee_id
   has_many :references_out, class_name: :Reference, foreign_key: :referer_id
   has_many :acts, -> { order :id }

data/lib/card/content.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
-# TODO: move Card::Chunk to Card::Content::Chunk...
-require_dependency 'card/chunk'
+require_dependency 'card/content/chunk'
+require_dependency 'card/content/parser'
 
 class Card
   class Content < SimpleDelegator
@@ -16,8 +16,8 @@ class Card
         end
       @opts = opts || {}
 
-      content = parse_content content unless content.is_a?(Array)
-      super content
+      @chunks = Parser.new(chunk_list).parse(content, self)
+      super(@chunks.any? ? @chunks : content)
     end
 
     def card
@@ -62,75 +62,6 @@ class Card
       self
     end
 
-    def parse_content content
-      @chunks = []
-
-      if content.is_a? String
-        position = last_position = 0
-        prefix_regexp = Chunk.get_prefix_regexp chunk_list
-        interval_string = ''
-
-        while (prefix_match = content[position..-1].match(prefix_regexp))
-          prefix = prefix_match[0]
-          # prefix of matched chunk
-          chunk_start = prefix_match.begin(0) + position
-          # content index of beginning of chunk
-          if prefix_match.begin(0) > 0
-            # if matched chunk is not beginning of test string
-            interval_string += content[position..chunk_start - 1]
-            # hold onto the non-chunk part of the string
-          end
-
-          chunk_class = Chunk.find_class_by_prefix prefix
-          # get the chunk class from the prefix
-          match, offset =
-            chunk_class.full_match content[chunk_start..-1], prefix
-          # see whether the full chunk actually matches
-          # (as opposed to bogus prefix)
-          context_ok = chunk_class.context_ok? content, chunk_start
-          # make sure there aren't contextual reasons for ignoring this chunk
-          position = chunk_start
-          # move scanning position up to beginning of chunk
-
-          if match
-            # we have a chunk match
-            position += (match.end(0) - offset.to_i)
-            # move scanning position up to end of chunk
-            if context_ok
-              @chunks << interval_string unless interval_string.empty?
-              # add the nonchunk string to the chunk list
-              @chunks << chunk_class.new(match, self)
-              # add the chunk to the chunk list
-              interval_string = ''
-              # reset interval string for next go-round
-              last_position = position
-              # note that the end of the chunk was the last place where a
-              # chunk was found (so far)
-            end
-          else
-            position += 1
-            # no match.  look at the next character
-          end
-
-          next unless !match || !context_ok
-          interval_string += content[chunk_start..position - 1]
-          # moving beyond the alleged chunk.
-          # append failed string to "nonchunk" string
-        end
-      end
-
-      if chunks.any?
-        if last_position < content.size
-          remainder = content[last_position..-1]
-          # handle any leftover nonchunk string at the end of content
-          @chunks << remainder
-        end
-        chunks
-      else
-        content
-      end
-    end
-
     ALLOWED_TAGS = {}
     %w(
       br i b pre cite caption strong em ins sup sub del ol hr ul li p

data/lib/card/content/chunk.rb

@@ -0,0 +1,119 @@
+# -*- encoding : utf-8 -*-
+
+require 'uri/common'
+
+class Card #::Content
+  class Content < SimpleDelegator
+    # A chunk is a pattern of text that can be protected
+    # and interrogated by a format. Each Chunk class has a
+    # +pattern+ that states what sort of text it matches.
+    # Chunks are initalized by passing in the result of a
+    # match by its pattern.
+    module Chunk
+      mattr_accessor :raw_list, :prefix_regexp_by_list, :prefix_map
+      @@raw_list = {}
+      @@prefix_regexp_by_list = {}
+      @@prefix_map = {}
+
+      class << self
+        def register_class klass, hash
+          klass.config = hash.merge class: klass
+          prefix_index = hash[:idx_char] || :default
+          # ^ this is gross and needs to be moved out.
+          prefix_map[prefix_index] = klass.config
+        end
+
+        def register_list key, list
+          raw_list[key] = list
+        end
+
+        def find_class_by_prefix prefix
+          config = prefix_map[prefix[0, 1]] ||
+                   prefix_map[prefix[-1, 1]] ||
+                   prefix_map[:default]
+          # prefix identified by first character, last character, or default.
+          # a little ugly...
+          config[:class]
+        end
+
+        def get_prefix_regexp chunk_list_key
+          prefix_regexp_by_list[chunk_list_key] ||= begin
+            prefix_res = raw_list[chunk_list_key].map do |chunkname|
+              chunk_class = const_get chunkname
+              chunk_class.config[:prefix_re]
+            end
+            /(?:#{ prefix_res * '|' })/m
+          end
+        end
+      end
+
+      # not sure whether this is best place.  Could really happen almost anywhere
+      # (even before chunk classes are loaded).
+      register_list :default, [
+        :URI, :HostURI, :EmailURI, :EscapedLiteral, :Include, :Link
+      ]
+      register_list :references,  [:EscapedLiteral, :Include, :Link]
+      register_list :nest_only, [:Include]
+      register_list :query, [:QueryReference]
+
+      class Abstract
+        class_attribute :config
+        attr_reader :text, :process_chunk
+
+        class << self
+          # if the prefix regex matched check that chunk against the full regex
+          def full_match content, prefix=nil
+            content.match full_re(prefix)
+          end
+
+          def full_re _prefix
+            config[:full_re]
+          end
+
+          def context_ok? _content, _chunk_start
+            true
+          end
+        end
+
+        def reference_code
+          'I'
+        end
+
+        def initialize match, content
+          @text = match[0]
+          @processed = nil
+          @content = content
+          interpret match, content
+          self
+        end
+
+        def interpret _match_string, _content, _params
+          Rails.logger.info 'no #interpret method found for chunk class: ' \
+                            "#{self.class}"
+        end
+
+        def format
+          @content.format
+        end
+
+        def card
+          @content.card
+        end
+
+        def to_s
+          @process_chunk || @processed || @text
+        end
+
+        def inspect
+          "<##{self.class}##{self}>"
+        end
+
+        def as_json _options={}
+          @process_chunk || @processed ||
+            "not rendered #{self.class}, #{card && card.name}"
+        end
+      end
+    end
+  end
+  Card::Loader.load_chunks
+end