card 1.92.2 → 1.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eb7affc5e520af2977e43e797522c2a99f03c11
-  data.tar.gz: 9c6893c9bc9c8120e5d48a44d1a193a66c144992
+  metadata.gz: 88067b6ea8119a642268f40030a1e3c01d7a1a60
+  data.tar.gz: 5a84f93de360e62de9e2b8971d11c89cfaf64f5c
 SHA512:
-  metadata.gz: 3b1a8555c8e7141912fb373f598a628260a6d0576cad5bec459647aa70e7586624899c73f8bd92fa246b115bd1e02968b4dc4eea5519d03adbce22120f03f049
-  data.tar.gz: 6adb58dc146a46954ef77bd57562e5ac56a3b064a25703545b7654f7491f87d35099c5720560555f72f9ff86611867a5d27bf82ad99146bf7fcc6ebc9d4f2c39
+  metadata.gz: a3f2a79c05d0e2507c47cb33984889c5fd3b88dd82c1b28d3ea5fd21f042d3b0465f8a25cf9d82d9c36e0dd810b8e35b57bc5e6631661eb8ba548fc9b657e19d
+  data.tar.gz: 9482501534eeeb186d8f7bd663f8bb541af405c9de45255df0d852cad42de0c9befdbb8a36d3e697ced2891e21ba476817b24e4a2538c70013b3ac9cc24d13ef

data/README.rdoc

@@ -9,9 +9,9 @@ New folks should start here after playing with Decko but before digging into cod
 
 Yes, if:
 
-* <b>you're a Ruby developer</b>, or at least someone who does not fear ruby code. <b>Not a techie? {Try Decko.org}[http://decko.org]</b>
-* <b>you've experimented with Decko</b> enough to know the basics (cards, types, rules, etc.) <b>No idea what a card is? {Try Decko.org}[http://decko.org]</b>.
-* <b>you're looking at this page from a docs site</b> (ie, NOT GitHub) so you can use our links to navigate code. <b>Links look funny? {Try rubydocs.info}[http://rubydoc.info/gems/card].</b>
+* <b>You're a Ruby developer</b>, or at least someone who does not fear ruby code. <b>Not a techie? {Try Decko.org}[http://decko.org]</b>
+* <b>You've experimented with Decko</b> enough to know the basics ({cards}[docs/Card], types, rules, etc.) <b>No idea what a card is? {Try Decko.org}[http://decko.org]</b>.
+* <b>You're looking at this page from a docs site</b> (ie, NOT GitHub) so you can use our links to navigate code. <b>Links look funny? {Try rubydocs.info}[http://rubydoc.info/gems/card].</b>
 
 
 ===Decko: an _application_ or a <i>development framework</i>?

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/card.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.2.2"
+  s.required_ruby_version = ">= 2.3"
 
   [
     ["cardname",                   version],

data/config/initializers/01_core_extensions/array.rb

@@ -7,7 +7,7 @@ module CoreExtensions
     end
 
     def to_name
-      Card.compose_mark self
+      Card::Name.compose self
     end
   end
 end

data/config/initializers/01_core_extensions/object.rb

@@ -30,6 +30,15 @@ module CoreExtensions
       Card::Name.new self
     end
 
+    def name?
+      # Although we want to check for instances of class Card::Name we can't use that
+      # class because it is renewed with every request
+      # (at least in development mode) but the name cache is persistent.
+      # Hence the name objects in the cache are objects of a different instance of the
+      # Card::Name class and is_a?(Card::Name) will return false
+      self.is_a? Cardname
+    end
+
     def to_viewname
       Card::Name::ViewName.new self
     end

data/config/initializers/01_core_extensions/persistent_identifiers.rb

@@ -6,7 +6,7 @@ module CoreExtensions
     end
 
     def cardname
-      Card.quick_fetch(self).cardname
+      Card.quick_fetch(self).name
     end
   end
 end

data/config/initializers/02_patches/action_dispatch.rb

@@ -14,3 +14,4 @@ module Patches
   end
 end
 
+#

data/config/initializers/02_patches/active_record.rb

@@ -62,5 +62,47 @@ module Patches
         end
       end
     end
+
+    module ConnectionAdapters
+      module AbstractAdapter
+        def match _string
+          raise I18n.t(:exception_not_implemented, scope: "lib.card.active_record_ext")
+        end
+
+        def cast_types
+          native_database_types.merge custom_cast_types
+        end
+
+        def custom_cast_types
+          {}
+        end
+      end
+
+      module PostgreSQLAdapter
+        def match string
+          "~* #{string}"
+        end
+      end
+
+      module Mysql2Adapter
+        def match string
+          "REGEXP #{string}"
+        end
+
+        def custom_cast_types
+          { string: { name: "char" },
+            integer: { name: "signed" },
+            text: { name: "char" },
+            float: { name: "decimal" },
+            binary: { name: "binary" } }
+        end
+      end
+
+      module SQLiteAdapter
+        def match string
+          "REGEXP #{string}"
+        end
+      end
+    end
   end
 end

data/config/initializers/02_patches/active_support.rb

@@ -0,0 +1,13 @@
+module Patches
+  module ActiveSupport
+    module Callbacks
+      # Add applies? method to rails' callback api.
+      # Used for events.
+      module Callback
+        def applies? object
+          conditions_lambdas.all? { |c| c.call(object, nil) }
+        end
+      end
+    end
+  end
+end

data/config/initializers/deck_config.rb

@@ -0,0 +1,3 @@
+if File.exist? 'config/deck.yml'
+  Decko.application.config.x = OpenStruct.new(Decko.application.config_for(:deck))
+end

data/config/initializers/patches.rb

@@ -1,4 +1,4 @@
-module Kaminari
+module Kaminari #:nodoc: all
   module Helpers
     class Tag
       include Patches::Kaminari::Helpers::Tag
@@ -7,25 +7,56 @@ module Kaminari
 end
 
 if defined? BetterErrors
-  module BetterErrors
+  module BetterErrors #:nodoc: all
     class StackFrame
       suppress_warnings { include Patches::BetterErrors::StackFrame::TmpPath }
     end
   end
 end
 
-class ActiveRecord::Relation
-  include Patches::ActiveRecord::Relation
+module ActiveRecord #:nodoc: all
+  class Relation
+    include Patches::ActiveRecord::Relation
+  end
+
+  module ConnectionAdapters
+    class AbstractAdapter
+      prepend Patches::ActiveRecord::ConnectionAdapters::AbstractAdapter
+    end
+
+    class PostgreSQLAdapter < AbstractAdapter
+      prepend Patches::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+    end
+
+    class AbstractMysqlAdapter < AbstractAdapter
+    end
+
+    class Mysql2Adapter < AbstractMysqlAdapter
+      include Patches::ActiveRecord::ConnectionAdapters::Mysql2Adapter
+    end
+
+    class SQLiteAdapter < AbstractAdapter
+      include Patches::ActiveRecord::ConnectionAdapters::SQLiteAdapter
+    end
+  end
 end
 
-module ActiveJob::Arguments
+module ActiveJob::Arguments #:nodoc: all
   class << self
     prepend Patches::ActiveJob::Arguments
   end
 end
 
-module ActionDispatch
+module ActionDispatch #:nodoc: all
   class Reloader
     extend Patches::ActionDispatch::Reloader
   end
 end
+
+module ActiveSupport #:nodoc: all
+  module Callbacks
+    class Callback
+      prepend Patches::ActiveSupport::Callbacks::Callback
+    end
+  end
+end

data/config/locales/de.yml

@@ -34,7 +34,7 @@ de:
       active_record_ext:
         exception_not_implemented: "%{func} nicht implementiert"
       codename:
-        exception_missing_codename: nicht vorhanden %{codename} %{code} (%{const})
+        exception_unknown_codename: "unbekannter %{codename}"
       error:
         exception_for_card: "für Karte %{cardname}: %{message}"
       format:
@@ -44,8 +44,6 @@ de:
           no_cardname: unbekannte Karte
           error_rendering: "Render-Fehler: %{cardname} (%{view} view)"
         exception_init_without_card: Format ohne Karte initialisiert
-      name:
-        exception_unknown_codename: "unbekannter %{codename}: %{tag_code}"
       query:
         attributes:
           exception_bad_query: '"%{found_by}" value must be valid Search, aber %{name} ist ein %{type}' # TODO

data/config/locales/en.yml

@@ -44,7 +44,7 @@ en:
       active_record_ext:
         exception_not_implemented: "%{func} not implemented"
       codename:
-        exception_missing_codename: Missing codename %{code} (%{const})
+        exception_unknown_codename: "unknown codename: %{codename}"
       error:
         exception_for_card: "for card %{cardname}: %{message}"
       format:
@@ -54,8 +54,6 @@ en:
           no_cardname: unknown card
           error_rendering: "Error rendering: %{cardname} (%{view} view)"
         exception_init_without_card: format initialized without card
-      name:
-        exception_unknown_codename: "unknown %{codename}: %{tag_code}"
       query:
         attributes:
           exception_bad_query: '"%{found_by}" value must be valid Search, but %{name} is a %{type}'

data/db/migrate_core_cards/20120611203506_rails_inflection_updates.rb

@@ -13,7 +13,7 @@ class RailsInflectionUpdates < Card::Migration::Core
   end
 
   def unless_name_collision card
-    if (twin = Card.find_by_key(card.cardname.key)) && twin.id != card.id
+    if (twin = Card.find_by_key(card.name.key)) && twin.id != card.id
       if twin.trash
         twin.destroy
         yield
@@ -65,12 +65,12 @@ class RailsInflectionUpdates < Card::Migration::Core
 
     cards_with_css = Card.search type: %w(in html css scss)
     cards_with_css.each do |card|
-      new_content = card.content
+      new_content = card.db_content
       content_changed = false
 
       apply_to_content.each do |i|
         plural, wrong_sing, correct_sing = corrections[i]
-        if card.content =~ wrong_sing
+        if card.db_content =~ wrong_sing
           content_changed = true
           new_content = new_content.gsub(wrong_sing, correct_sing)
         end

data/db/migrate_core_cards/20130823192433_add_style_cards.rb

@@ -76,7 +76,7 @@ class AddStyleCards < Card::Migration::Core
     # (this auto-generates cached file)
 
     default_skin =
-      if old_css.content =~ /\S/
+      if old_css.db_content =~ /\S/
         name = "customized classic skin"
         Card.create! name: name, type: "Skin",
                      content: "[[classic skin]]\n[[*css]]"

data/db/migrate_core_cards/20130920214038_jsonize_tinymce.rb

@@ -3,7 +3,7 @@
 class JsonizeTinymce < Card::Migration::Core
   def up
     card = Card[:tiny_mce]
-    cleaned_rows = card.content.strip.split(/\s*\,\s+/).map do |row|
+    cleaned_rows = card.db_content.strip.split(/\s*\,\s+/).map do |row|
       key, val = row.split(/\s*\:\s*/)
       val.gsub!(/\"\s*\+\s*\"/, "")
       val.gsub! "'", '"‚'

data/db/migrate_core_cards/20140629222005_add_email_cards.rb

@@ -68,8 +68,8 @@ class AddEmailCards < Card::Migration::Core
     )
     if request_card = Card[:request]
       [:to, :from].each do |field|
-        if old_card = request_card.fetch(trait: field) && !old_card.content.blank?
-          Card.create! name: "signup alert email+#{Card[field].name}", content: old_card.content
+        if old_card = request_card.fetch(trait: field) && !old_card.db_content.blank?
+          Card.create! name: "signup alert email+#{Card[field].name}", content: old_card.db_content
         end
       end
       request_card.codename = nil
@@ -79,7 +79,7 @@ class AddEmailCards < Card::Migration::Core
     # update *from settings
 
     signup_alert_from = Card["signup alert email"].fetch(trait: :from, new: {})
-    if signup_alert_from.content.blank?
+    if signup_alert_from.db_content.blank?
       signup_alert_from.content = "_user"
       signup_alert_from.save!
     end
@@ -103,7 +103,7 @@ class AddEmailCards < Card::Migration::Core
         right: "email_config",
         referred_to_by: { right: { codename: "send" } }
       ).each do |card|
-        set_name = card.cardname.left
+        set_name = card.name.left
         card.name = "#{set_name.tr('*', '').tr('+', '_')}_email_template"
         card.type = "Email Template"
         card.save!

data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb

@@ -65,7 +65,7 @@ class ImportBootstrapLayout < Card::Migration::Core
 
     # update layouts to have explicit views in nests
     Card.search(type_id: Card::LayoutTypeID) do |lcard|
-      lcontent = Card::Content.new lcard.content, lcard
+      lcontent = Card::Content.new lcard.db_content, lcard
       lcontent.find_chunks(Card::Content::Chunk::Nest).each do |nest|
         nest.explicit_view =
           nest.options[:nest_name] == "_main" ? "open" : "core"

data/db/migrate_core_cards/20150220134731_following_to_follow_rule.rb

@@ -3,7 +3,7 @@
 class FollowingToFollowRule < Card::Migration::Core
   def up
     Card.search(right: { codename: "following" }, left: { type: "user" }).each do |following_card|
-      user_name = following_card.cardname.left
+      user_name = following_card.name.left
       following_card.item_names.each do |followed_set_name|
         set_card = Card.fetch(followed_set_name, new: {})
         if set_card.type_code != :set

data/db/migrate_core_cards/20150317162412_bootstrap_themes.rb

@@ -30,7 +30,7 @@ class BootstrapThemes < Card::Migration::Core
     import_json "skin_images.json"
 
     if sidebar_card = Card["*sidebar"]
-      new_content = sidebar_card.content.gsub(/(\*(logo|credit))\|content/, '\1|content_panel')
+      new_content = sidebar_card.db_content.gsub(/(\*(logo|credit))\|content/, '\1|content_panel')
       sidebar_card.update_attributes! content: new_content
     end
   end

data/db/migrate_core_cards/20150429090551_search_card_context.rb

@@ -13,8 +13,8 @@ class SearchCardContext < Card::Migration::Core
       ["",       "left"]
     ]
     Card.search(type_id: ["in", Card::SearchTypeID, Card::SetID]).each do |card|
-      next unless card.cardname.junction? && card.real?
-      content = card.content
+      next unless card.name.junction? && card.real?
+      content = card.db_content
       replace.each do |key, val|
         content.gsub!(/(#{sep})_(#{key})(?=#{sep})/, "\\1_#{val}")
       end

data/db/migrate_core_cards/20150501010515_responsive_sidebar.rb

@@ -4,7 +4,7 @@ class ResponsiveSidebar < Card::Migration::Core
   def up
     if (layout = Card.fetch "Default Layout") &&
        layout.updater.id == Card::WagnBotID
-      new_content = layout.content.gsub "<body>", '<body class="right-sidebar">'
+      new_content = layout.db_content.gsub "<body>", '<body class="right-sidebar">'
       layout.update_attributes! content: new_content
     end
   end

data/db/migrate_core_cards/20150610180019_add_recaptcha_key_and_admin_info_cards.rb

@@ -27,8 +27,8 @@ class AddRecaptchaKeyAndAdminInfoCards < Card::Migration::Core
   end
 
   def add_admin_info_to_home_card
-    return unless (home = Card[Card[:home].content])
-    new_content = home.content.prepend "{{*admin info|content}}\n"
+    return unless (home = Card[Card[:home].db_content])
+    new_content = home.db_content.prepend "{{*admin info|content}}\n"
     home.update_attributes! content: new_content
   end
 

data/db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb

@@ -14,14 +14,14 @@ class UpdateFileAndImageCards < Card::Migration::Core
   def update_cards_with_attachment
     Card.search(type: [:in, "file", "image"]).each do |card|
       update_history card
-      next unless card.content.present?
+      next unless card.db_content.present?
       update_db_content card
       update_filenames card
     end
   end
 
   def update_db_content card
-    attach_array = card.content.split "\n"
+    attach_array = card.db_content.split "\n"
     attach_array[0].match(/\.(?<ext>.+)$/) do |match|
       basename =
         if attach_array.size > 3 # mod file

data/db/migrate_core_cards/20160811115836_rename_stats_to_admin.rb

@@ -2,7 +2,7 @@
 
 class RenameStatsToAdmin < Card::Migration::Core
   def up
-    return if Card::Codename[:admin] || !Card::Codename[:stats]
+    return if Card::Codename.exist?(:admin) || !Card::Codename.exist?(:stats)
     Card[:stats].update_attributes! name: "*admin", codename: "admin"
   end
 end

data/db/migrate_core_cards/20160914132636_fix_mod_files.rb

@@ -4,9 +4,9 @@ class FixModFiles < Card::Migration::Core
   def up
     Card.search(type: "image").each do |card|
       next unless card.coded?
-      next unless card.content.include?("05_standard") ||
-                  card.content.include?("06_bootstrap")
-      new_content = card.content.sub("05_standard", "standard")
+      next unless card.db_content.include?("05_standard") ||
+                  card.db_content.include?("06_bootstrap")
+      new_content = card.db_content.sub("05_standard", "standard")
                         .sub("06_bootstrap", "bootstrap")
       card.update_column :db_content, new_content
 

data/db/migrate_core_cards/20170830210517_correct_signup_success_message.rb

@@ -2,8 +2,8 @@
 
 class CorrectSignupSuccessMessage < Card::Migration::Core
   def up
-    if (card = Card["signup success"]) && card.content.include?("{{*title}}")
-      new_content = card.content.gsub "{{*title}}", "{{*title|core}}"
+    if (card = Card["signup success"]) && card.db_content.include?("{{*title}}")
+      new_content = card.db_content.gsub "{{*title}}", "{{*title|core}}"
       card.update_attributes! content: new_content
     end
   end

data/db/migrate_core_cards/data/cards.yml

@@ -3,9 +3,9 @@
 - :name: "*header"
   :type: HTML
   :key: "*header"
-  :merged: 2017-08-30 14:11:51 UTC
+  :merged: 2017-07-22 23:21:37 UTC
 - :name: "*main menu"
   :type: HTML
   :key: "*main_menu"
-  :merged: 2017-08-30 14:11:51 UTC
+  :merged: 2017-07-22 23:21:37 UTC
 :remotes: {}