card 1.19.6 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c91002b7b0036a9412a5b3f4d24c785d6cc7cd3
-  data.tar.gz: 91b617c019d6a60441ac0b9e08d9557099094f1c
+  metadata.gz: f6f7c57e5d0fbbb3e0d01a20620dda63db140430
+  data.tar.gz: 7cc371c0a6316b66dade977c1757d9bd172c6ca4
 SHA512:
-  metadata.gz: 93ab7930c6911b7bb811c106ad2167178d9bbd79a3b7b9e0027d5204c381ceeed0d9e6ff122748b4f966c3c37ebf8eb155483526b435660bd69cd72b18f11dd5
-  data.tar.gz: 9d2e34c1d4778d25fe534384bac6fd26a5bb54bcf8bccfbde7a721b5477be596cc212f005d61691aac4e014365ab3e66b1e40a01aac6b36a13966856957de552
+  metadata.gz: 4c412b712c3d638ba1d1701473ce9294541834ecf566d937db1b92f1e520709c2a7dc9d9f991fcfcbc99ba198c8403d0e52ddfee20a318b53823aa3eb6f10ea4
+  data.tar.gz: 97ea814246b69a991fd77a29f7c3019fe827d46ed7efcac6773c6c1862ce4bd4daafe141abdfd7778f9c66f2078afbe7303aeb599699b79e5b477e0d26df8969

data/VERSION

@@ -1 +1 @@
-1.19.6
+1.20.0

data/card.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |s|
     ["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.summary       = "a surprisingly simple content nesting engine"
   s.description   =
-    "Cards are data atoms grouped into Sets to which Rules can apply. "\
-    "Cards can formatted with Views and transformed with Events."
+    "Cards are wiki-inspired data atoms." \
+    '"Cardists" use links, nests, types, patterned names, queries, views, ' \
+    "events, and rules to create rich structures."
   s.homepage      = "http://wagn.org"
   s.licenses      = ["GPL-2.0", "GPL-3.0"]
 
@@ -33,12 +33,12 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.0"
 
   [
-    ["smartname",                  "0.3.1"],
+    ["smartname",                  "0.4"],
     ["uuid",                       "~> 2.3"],
-    ["carrierwave",                "1.0.0.beta"],
+    ["carrierwave",                "1.0.0.rc"],
     ["htmlentities",               "~> 4.3"],
     ["mini_magick",                "~> 4.2"],
     # recaptcha 0.4.0 is last version that doesn't require ruby 2.0
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
     ["sass",                       "~> 3.2"],
     ["coffee-script",              "~> 2.2"],
     ["uglifier",                   "~> 3.0"],
+    ["nokogiri",                   "~> 1.6.8"],
     ["haml",                       "~> 4.0"],
     ["kaminari",                   "~> 0.16"],
     ["bootstrap-kaminari-views",   "~> 0"],

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

@@ -5,5 +5,9 @@ module CoreExtensions
         "[[#{item}]]"
       end.join "\n"
     end
+
+    def to_name
+      Card.compose_mark self
+    end
   end
 end

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

@@ -0,0 +1,12 @@
+module CoreExtensions
+  # methods for codenames and numerical ids
+  module PersistentIdentifier
+    def card
+      Card[self]
+    end
+
+    def cardname
+      Card.quick_fetch(self).cardname
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Patches
+  module BetterErrors
+    class StackFrame
+      # correct links to tmp files so that they point
+      # to the original file and line
+      module TmpPath
+        @map = {} # cache tmp path mapping
+
+        class << self
+          def included klass
+            klass.class_eval do
+              remove_method :initialize
+            end
+          end
+
+          def corrections filename
+            @map[filename] ||= real_filename_and_line_offset filename
+            yield(*@map[filename])
+          end
+
+          def real_filename_and_line_offset filename
+            File.open(filename) do |file|
+              file.each_line.with_index do |line, i|
+                if line =~ /pulled from ([\S]+) ~~/
+                  return Regexp.last_match(1), i + 1
+                end
+              end
+            end
+            [filename, 0]
+          end
+        end
+
+        def initialize filename, line, name, frame_binding=nil
+          @filename = filename
+          @line = line
+          @name = name
+          @frame_binding = frame_binding
+
+          correct_tmp_file if tmp_file?
+          set_pretty_method_name if frame_binding
+        end
+
+        def tmp_file?
+          @filename.include? "/tmp/"
+        end
+
+        def correct_tmp_file
+          TmpPath.corrections(@filename) do |real_path, line_offset|
+            @filename = real_path
+            @line -= line_offset
+          end
+        end
+      end
+    end
+  end
+end

data/config/initializers/core_extensions.rb

@@ -1,24 +1,19 @@
 # -*- encoding : utf-8 -*-
 
-# include is private in ruby 1.9.3
-# Object.include CoreExtensions::Object
-# Module.include CoreExtensions::Module
-# Hash.include CoreExtensions::Hash::Merging
-# Array.include CoreExtensions::Array
-class Object
-  include CoreExtensions::Object
-end
-
-class Module
-  include CoreExtensions::Module
-end
+# extend core Ruby object classes
 
-class Hash
-  include CoreExtensions::Hash::Merging
+class Class
+  def include_extension extension
+    include extension
+  end
 end
 
-class Array
-  include CoreExtensions::Array
+module CoreExtensions
+  ::Object.include_extension Object
+  ::Module.include_extension Module
+  ::Array.include_extension Array
+  ::Hash.include_extension Hash::Merging
+  ::Symbol.include_extension PersistentIdentifier
+  ::Integer.include_extension PersistentIdentifier
+  ::Hash.extend Hash::ClassMethods::Nesting
 end
-
-Hash.extend CoreExtensions::Hash::ClassMethods::Nesting

data/config/initializers/patches.rb

@@ -5,3 +5,11 @@ module Kaminari
     end
   end
 end
+
+if defined? BetterErrors
+  module BetterErrors
+    class StackFrame
+      include Patches::BetterErrors::StackFrame::TmpPath
+    end
+  end
+end

data/config/locales/de.yml

@@ -406,8 +406,6 @@ de:
             delete_old: delete old
             references: Verweise
             repair_all: alle reparieren
-            view_cache: view cache
-            clear_view_cache: clear view cache
             memory_now: memory now
             clear_cache: clear cache
             # memory previous

data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb

@@ -10,8 +10,7 @@ class ImportBootstrapLayout < Card::Migration::Core
     end
 
     import_json "bootstrap_layout.json" # , pristine: true, output_file: nil
-    if layout && layout.pristine? &&
-       all = Card[:all]
+    if layout && layout.pristine? && (all = Card[:all])
       layout_rule_card = all.fetch trait: :layout
       style_rule_card  = all.fetch trait: :style
       if layout_rule_card.pristine? && style_rule_card.pristine?
@@ -19,9 +18,13 @@ class ImportBootstrapLayout < Card::Migration::Core
         if style_rule_card.item_names.first == "customized classic skin"
           Card.create! name: "customized bootstrap skin", type: "Skin",
                        content: "[[classic bootstrap skin]]\n[[*css]]"
-          style_rule_card.update_attributes! content: "[[customized bootstrap skin]]"
+          style_rule_card.update_attributes!(
+            content: "[[customized bootstrap skin]]"
+          )
         else
-          style_rule_card.update_attributes! content: "[[classic bootstrap skin]]"
+          style_rule_card.update_attributes!(
+            content: "[[classic bootstrap skin]]"
+          )
         end
       end
     end
@@ -40,15 +43,21 @@ class ImportBootstrapLayout < Card::Migration::Core
     old_stand.delete!
 
     # these are hard-coded
-    Card.create! name: "theme: bootstrap_default", type_code: :css, codename: "theme_bootstrap_default"
-    Card.create! name: "style: bootstrap",         type_code: :css, codename: "bootstrap_css"
-    Card.create! name: "style: bootstrap cards",   type_code: :css, codename: "bootstrap_cards"
+    Card.create! name: "theme: bootstrap_default", type_code: :css,
+                 codename: "theme_bootstrap_default"
+    Card.create! name: "style: bootstrap", type_code: :css,
+                 codename: "bootstrap_css"
+    Card.create! name: "style: bootstrap cards", type_code: :css,
+                 codename: "bootstrap_cards"
 
-    Card.create! name: "style: bootstrap compatible", type_code: :scss, codename: "style_bootstrap_compatible"
-    Card.create! name: "script: bootstrap", type_code: :js, codename: "bootstrap_js"
+    Card.create! name: "style: bootstrap compatible", type_code: :scss,
+                 codename: "style_bootstrap_compatible"
+    Card.create! name: "script: bootstrap", type_code: :js,
+                 codename: "bootstrap_js"
 
     # add new setting: *default html view
-    Card.create! name: "*default html view", type_code: :setting, codename: "default_html_view"
+    Card.create! name: "*default html view", type_code: :setting,
+                 codename: "default_html_view"
     Card.create! name: "*default html view+*right+*default", type_code: :phrase
 
     # retain old behavior (default view was content, now titled)
@@ -57,8 +66,9 @@ 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.find_chunks(Card::Content::Chunk::Include).each do |nest|
-        nest.explicit_view = (nest.options[:inc_name] == "_main" ? "open" : "core")
+      lcontent.find_chunks(Card::Content::Chunk::Nest).each do |nest|
+        nest.explicit_view =
+          nest.options[:nest_name] == "_main" ? "open" : "core"
       end
       lcard.update_attributes! content: lcontent.to_s
     end

data/db/migrate_core_cards/20161102202156_tweak_recaptcha_setting_cards.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+
+class TweakRecaptchaSettingCards < Card::Migration::Core
+  def up
+    ensure_card name: "*recaptcha settings", type_id: Card::BasicID
+    ensure_card name: "*recaptcha settings+*self+*structure",
+                content: <<-STRING
+{{+public key}}
+{{+private key}}
+{{+proxy}}
+    STRING
+    %w(public_key private_key proxy).each do |name|
+      ensure_card name: "#{Card[:recaptcha_settings].name}+#{name.tr('_', ' ')}",
+                  type_id: Card::PhraseID
+    end
+  end
+end

data/db/migrate_core_cards/20161103154836_update_keys.rb

@@ -0,0 +1,46 @@
+# -*- encoding : utf-8 -*-
+
+class UpdateKeys < Card::Migration::Core
+  def up
+    Card.pluck(:id, :name, :key).each do |id, name, key|
+      new_key = name.to_name.key
+      next if new_key == key
+      update_key id, key, new_key
+    end
+  end
+
+  def update_key id, key, new_key
+    Card.where(id: id).update_all(key: new_key)
+    Card::Reference.where(referee_id: id).update_all(referee_key: new_key)
+    puts "updated key '#{key}' to '#{new_key}'"
+  rescue ActiveRecord::RecordNotUnique => e
+    resolve_conflict id, key, new_key
+  end
+
+  def resolve_conflict id, key, new_key
+    if walking_dead? key
+      Card.where(id: id).delete_all
+      # card wasn't reachable anyway
+      # (due to rails inflection update or smartname update)
+    else
+      # example:
+      # "Matthias Taxes" can be in the database with two keys:
+      # "matthia_taxis" and "matthia_tax".
+      # Their keys will both be updated to "matthias_tax".
+      # "matthia_taxis" is a walking dead since the last rails inflection
+      # update (it's in the db but you can only get to via its id; all requests via
+      # name find the other one). If we update the walking dead
+      # "matthia_taxis" first to "matthias_tax" we want to replace it with
+      # the living "matthia_tax".
+      # The living card is the one that has been updated more recently.
+      longer_untouched = [Card.find(id), Card.find_by_key(new_key)]
+                           .min { |a, b| a.updated_at <=> b.updated_at}
+      Card.where(id: longer_untouched).delete_all
+      update_key id, key, new_key if longer_untouched != id
+    end
+  end
+
+  def walking_dead? key
+    key.include?("taxis") || key[0] == " " || key[-1] == " "
+  end
+end

data/lib/card.rb

@@ -1,13 +1,6 @@
 # -*- encoding : utf-8 -*-
 require "carrierwave"
 
-# if Cardio.file_buckets.present?
-#   require "carrierwave/storage/fog"
-#   Cardio.file_buckets.each do |bucket, config|
-#     require config["provider"]
-#   end
-# end
-
 Object.const_remove_if_defined :Card
 
 # Cards are wiki-inspired building blocks.
@@ -39,7 +32,7 @@ class Card < ActiveRecord::Base
   require_dependency "card/change"
   require_dependency "card/reference"
   require_dependency "card/subcards"
-  require_dependency "card/cache/view_cache"
+  require_dependency "card/view"
   require_dependency "card/act_manager"
   require_dependency "card/act_manager/stage_director"
 

data/lib/card/act_manager.rb

@@ -99,6 +99,10 @@ class Card
         directors[card] = new_director card, opts
       end
 
+      def include? name
+        directors.keys.any? { |card| card.key == name.to_name.key }
+      end
+
       def new_director card, opts={}
         if opts[:parent]
           StageSubdirector.new card, opts

data/lib/card/auth/permissions.rb

@@ -51,9 +51,11 @@ class Card
       # @param user_id [Integer]
       # @return [true/false]
       def admin? user_id
-        !Card[user_id].all_roles.find do |r|
-          r == Card::AdministratorID
-        end.nil?
+        has_role? user_id, Card::AdministratorID
+      end
+
+      def has_role? user_id, role_id
+        Card[user_id].all_roles.include? role_id
       end
     end
   end

data/lib/card/cache.rb

@@ -22,18 +22,9 @@ class Card
     end
 
     def expire name
-      # note: calling instance method breaks on dirty names
       key = name.to_name.key
       return unless (card = Card.cache.read key)
-      Card.cache.delete key
-      Card.cache.delete "~#{card.id}" if card.id
-    end
-
-    def expire_hard name
-      return unless Card.cache.hard
-      key = name.to_name.key
-      Card.cache.hard.delete key
-      Card.cache.hard.delete "~#{card.id}" if card.id
+      card.expire
     end
   end
 
@@ -190,13 +181,3 @@ class Card
   end
 end
 
-# ActiveSupport::Cache::FileStore.class_eval do
-#   # escape special symbols \*"<>| additionaly to :?.
-#   # All of them not allowed to use in ms windows file system
-#   def real_file_path name
-#     name = name.gsub("%", "%25").gsub("?", "%3F").gsub(":", "%3A")
-#     name = name.gsub('\\', "%5C").gsub("*", "%2A").gsub('"', "%22")
-#     name = name.gsub("<", "%3C").gsub(">", "%3E").gsub("|", "%7C")
-#     "%s/%s.cache" % [@cache_path, name]
-#   end
-# end

data/lib/card/cache/persistent.rb

@@ -101,6 +101,12 @@ class Card
           write key, object
         end
         value
+      rescue
+        # FIXME: somehow read is finding Card objects with set_modules_loaded
+        # That shouldn't be possible (#fetch is designed to prevent it), and
+        # it immediately breaks write.  Best guess is that #read is somehow
+        # shortcutting and returning current object.  need to research!
+        Rails.logger.info "failed to write attribute: #{attribute}"
       end
 
       def write key, value

data/lib/card/content/chunk.rb

@@ -68,11 +68,12 @@ class Card
       # Could really happen almost anywhere
       # (even before chunk classes are loaded).
       register_list :default, [
-        :URI, :HostURI, :EmailURI, :EscapedLiteral, :Include, :Link
+        :URI, :HostURI, :EmailURI, :EscapedLiteral, :Nest, :Link
       ]
-      register_list :references,  [:EscapedLiteral, :Include, :Link]
-      register_list :nest_only, [:Include]
+      register_list :references,  [:EscapedLiteral, :Nest, :Link]
+      register_list :nest_only, [:Nest]
       register_list :query, [:QueryReference]
+      register_list :stub, [:ViewStub]
 
       class Abstract
         class_attribute :config

data/lib/card/content/diff.rb

@@ -22,7 +22,7 @@ class Card
       end
 
       attr_reader :result
-      delegate :summary, :complete, to: :result
+      delegate :summary, :complete, :summary_omits_content?, to: :result
 
       # diff options
       # :format  => :html|:text|:pointer|:raw
@@ -59,7 +59,7 @@ class Card
           opts[:reject] =  /^</
           opts[:postprocess] = proc { |word| word.gsub("\n", "<br>") }
         when :pointer
-          opts[:preprocess] = proc { |word| word.gsub("[[", "").gsub("]]", "") }
+          opts[:preprocess] = proc { |word| word.gsub("[[", "").gsub("]]", "<br>") }
         else # :raw
           opts[:preprocess] = proc { |word| CGI.escapeHTML(word) }
         end