card 1.18.1 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0e96aef9fe8581d7e787b0ad6ed56db1b3ec7d1
-  data.tar.gz: bbdd504c7800d1c372bd4199a293eeeb4e0ad501
+  metadata.gz: 040ce812a1f8d7900a5c5e742871133e90225ff0
+  data.tar.gz: e03884ae6c5850eeec5b6456cdaa202c4f6da9c2
 SHA512:
-  metadata.gz: 2bb8bfa7d9df016796744af64b3361c5abbf5fefe1b10d17f4ae08af370e12600e1e1353da8ed00ae07bc281c484a0fbf458fe51d535e06ff0b49fd2987d58a1
-  data.tar.gz: d0f7b44c9ec0b44118f29a0fab7721402fcdfb397df4396a914243aa5477e18eeefed973fcb1434eb56eb8af6c788104a59178f23fcf10c414b17b1394d4eb38
+  metadata.gz: d6de0ea37ead3e1e4de679e46e2d013e9707303550e43d3c44a111c83a857d1483e0ace41ea9c31cbf92f109713391ab5f8f49518353cbd429517aeabb5de277
+  data.tar.gz: 0b923c3dd12e2ef9df97c19d5fae2c0a198dddc8b032bc70fea8a82637aba4eacecb0765e177427828976f469847512fe36b7f148b669cb521afce246acc955f

data/VERSION

@@ -1 +1 @@
-1.18.1
+1.18.2

data/db/migrate_core_cards/20150429090551_search_card_context.rb

@@ -20,7 +20,7 @@ class SearchCardContext < Card::CoreMigration
       end
       card.update_column :db_content, content
       card.actions.each do |action|
-        next unless (content_change = action.change_for(:db_content).first)
+        next unless (content_change = action.change :db_content)
         content = content_change.value
         replace.each do |key, val|
           content.gsub!(/(#{sep})_(#{key})(?=#{sep})/, "\\1_#{val}")

data/db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb

@@ -2,11 +2,17 @@
 
 class AddRecentSettingSessionCard < Card::CoreMigration
   def up
-    Card.create! name: '*recent settings', codename: 'recent_settings', type_code: :pointer, subcards: {
-      '+*self+*options' => { type_code: :search_type, content: '{"type":"setting"}' },
-      '+*self+*update'  => { content: '[[Anyone]]' },
-      '+*self**create'  => { content: '[[Anyone]]' },
-      '+*self**read'    => { content: '[[Anyone]]' }
-    }
+    Card.create!(
+      name: '*recent settings',
+      codename: 'recent_settings',
+      type_code: :pointer,
+      subcards: {
+        '+*self+*options' => { type_code: :search_type,
+                               content: '{"type":"setting"}' },
+        '+*self+*update'  => { content: '[[Anyone]]' },
+        '+*self**create'  => { content: '[[Anyone]]' },
+        '+*self**read'    => { content: '[[Anyone]]' }
+      }
+    )
   end
 end

data/db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb

@@ -26,7 +26,7 @@ class UpdateFileAndImageCards < Card::CoreMigration
     Card::Cache.reset_all
     Card.search(type: [:in, 'file', 'image']).each do |card|
       card.actions.each do |action|
-        if (content_change = action.change_for(:db_content).first)
+        if (content_change = action.change :db_content)
           original_filename = content_change.value.split("\n").first
           action.update_attributes! comment: original_filename
         end

data/db/migrate_core_cards/20150824135418_update_file_history.rb

@@ -4,7 +4,7 @@ class UpdateFileHistory < Card::CoreMigration
   def up
     Card.search(type: [:in, 'file', 'image']).each do |card|
       card.actions.each do |action|
-        next unless (content_change = action.change_for(:db_content).first)
+        next unless (content_change = action.change :db_content)
         original_filename, file_type, action_id, mod = content_change.value.split("\n")
         next unless file_type.present? && action_id.present?
         value =

data/lib/card/cache.rb

@@ -1,17 +1,6 @@
 # -*- encoding : utf-8 -*-
 
 class Card
-  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
-
   class Cache
     TEST_ENVS         = %w(test cucumber).freeze
     @@prepopulating   = TEST_ENVS.include? Rails.env
@@ -28,22 +17,14 @@ class Card
                                       store: cache_type
       end
 
+      # establish clean context;
+      # clear the temporary caches and ensure we're using the latest stamp
+      # on the persistent caches.
       def renew
-        cache_by_class.keys do |klass|
-          raise "renewing nil cache: #{klass}" unless klass.cache
-          cache_by_class[klass].system_prefix = system_prefix(klass)
+        cache_by_class.each do |_klass, cache|
+          cache.soft.reset
+          cache.hard.renew if cache.hard
         end
-        reset_soft
-      end
-
-      def database_name
-        @database_name ||= (cfg = Cardio.config) &&
-                           (dbcfg = cfg.database_configuration) &&
-                           dbcfg[Rails.env]['database']
-      end
-
-      def system_prefix klass
-        "#{database_name}/#{klass}"
       end
 
       def restore
@@ -51,16 +32,18 @@ class Card
         prepopulate
       end
 
-      def reset_global # deprecated
-        reset_all
+      def reset_global
+        cache_by_class.each do |_klass, cache|
+          cache.soft.reset
+          cache.hard.annihilate if cache.hard
+        end
+        reset_other
       end
 
       def reset_all
         reset_hard
         reset_soft
-
-        Card::Codename.reset_cache
-        Cardio.delete_tmp_files
+        reset_other
       end
 
       def reset_hard
@@ -75,6 +58,11 @@ class Card
         end
       end
 
+      def reset_other
+        Card::Codename.reset_cache
+        Cardio.delete_tmp_files
+      end
+
       def obj_to_key obj
         case obj
         when Hash
@@ -161,3 +149,14 @@ class Card
     end
   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

@@ -1,33 +1,68 @@
 # -*- encoding : utf-8 -*-
 
 class Card::Cache::Persistent
-  attr_reader :prefix
+  attr_accessor :prefix
+
+  class << self
+    def database_name
+      @database_name ||= (cfg = Cardio.config) &&
+                         (dbcfg = cfg.database_configuration) &&
+                         dbcfg[Rails.env]['database']
+    end
+  end
 
   def initialize opts
     @store = opts[:store]
-    self.system_prefix =
-      opts[:prefix] || Card::Cache.system_prefix(opts[:class])
+    @klass = opts[:class]
+    @class_key = @klass.to_s.to_name.key
+    @database = opts[:database] || self.class.database_name
   end
 
-  def system_prefix= system_prefix
-    @system_prefix = system_prefix
-    @prefix = "#{system_prefix}/"
+  def renew
+    @stamp = nil
+    @prefix = nil
+  end
+
+  def reset
+    @stamp = new_stamp
+    @prefix = nil
+    Cardio.cache.write stamp_key, @stamp
+  end
+
+  def stamp
+    @stamp ||= Cardio.cache.fetch stamp_key { new_stamp }
+  end
+
+  def stamp_key
+    "#{@database}/#{@class_key}/stamp"
+  end
+
+  def new_stamp
+    Time.now.to_i.to_s 32
+  end
+
+  def prefix
+    @prefix ||= "#{@database}/#{@class_key}/#{stamp}"
+  end
+
+  def full_key key
+    "#{prefix}/#{key}"
   end
 
   def read key
-    @store.read(full_key(key))
+    @store.read full_key(key)
   end
 
   def write_variable key, variable, value
-    if @store && (object = @store.read key)
+    if @store && (object = read key)
       object.instance_variable_set "@#{variable}", value
-      @store.write key, object
+      write key, object
     end
     value
   end
 
   def write key, value
-    @store.write(full_key(key), value)
+    @store.write full_key(key), value
   end
 
   def fetch key, &block
@@ -38,17 +73,11 @@ class Card::Cache::Persistent
     @store.delete full_key(key)
   end
 
-  def reset
+  def annihilate
     @store.clear
-  rescue => e
-    Rails.logger.debug "Problem clearing cache: #{e.message}"
   end
 
   def exist? key
     @store.exist? full_key(key)
   end
-
-  def full_key key
-    @prefix + key
-  end
 end

data/lib/card/query/sql_statement.rb

@@ -1,9 +1,9 @@
 class Card
   class Query
     class SqlStatement
-      def initialize query
+      def initialize query=nil
         @query = query
-        @mods = query.mods
+        @mods = query && query.mods
       end
 
       def build
@@ -146,18 +146,19 @@ class Card
       end
 
       def standard_conditions query
-        [trash_condition(query), permission_conditions(query)].compact * ' AND '
+        table = query.table_alias
+        [trash_condition(table), permission_conditions(table)].compact * ' AND '
       end
 
-      def trash_condition query
-        "#{query.table_alias}.trash is false"
+      def trash_condition table
+        "#{table}.trash is false"
       end
 
-      def permission_conditions query
+      def permission_conditions table
         return if Auth.always_ok?
         read_rules = Auth.as_card.read_rules
         read_rule_list = read_rules.present? ? read_rules.join(',') : 1
-        "#{query.table_alias}.read_rule_id IN (#{read_rule_list})"
+        "#{table}.read_rule_id IN (#{read_rule_list})"
       end
 
       def group
@@ -205,7 +206,7 @@ class Card
           when 'id'             then "#{table}.id"
           when 'update'         then "#{table}.updated_at"
           when 'create'         then "#{table}.created_at"
-          when /^(name|alpha)$/ then "LOWER( #{table}.key )"
+          when /^(name|alpha)$/ then "#{table}.key"
           when 'content'        then "#{table}.db_content"
           when 'relevance'      then "#{table}.updated_at" # deprecated
           else

data/lib/cardio.rb

@@ -29,7 +29,6 @@ module Cardio
         recaptcha_private_key:  nil,
         recaptcha_proxy:        nil,
 
-        cache_store:            [:file_store, 'tmp/cache'],
         override_host:          nil,
         override_protocol:      nil,
 
@@ -41,7 +40,7 @@ module Cardio
         email_defaults:         nil,
 
         token_expiry:           2.days,
-        revisions_per_page:     10,
+        acts_per_page:          10,
         space_last_in_multispace: true,
         closed_search_limit:    50,
 

data/mod/01_core/spec/set/all/content_spec.rb

@@ -9,7 +9,7 @@ describe Card::Set::All::Content do
       @card.save_content_draft('booboo')
       @card.reload
       expect(@card.drafts.length).to eq 1
-      expect(@card.drafts[0].new_values[:content]).to eq 'booboo'
+      expect(@card.drafts[0].value(:db_content)).to eq 'booboo'
     end
   end
 end

data/mod/01_history/lib/card/act.rb

@@ -9,13 +9,20 @@ class Card
              class_name: 'Card::Action'
 
     belongs_to :actor, class_name: 'Card'
-    belongs_to :card
+
+    def card
+      Card.fetch card_id, look_in_trash: true, skip_modules: true
+    end
 
     class << self
+      def delete_cardless
+        left_join = 'LEFT JOIN cards ON card_acts.card_id = cards.id'
+        joins(left_join).where('cards.id IS NULL').delete_all
+      end
+
       def delete_actionless
         joins(
-          'LEFT JOIN card_actions '\
-          'ON card_acts.id = card_actions.card_act_id'
+          'LEFT JOIN card_actions ON card_acts.id = card_act_id'
         ).where(
           'card_actions.id is null'
         ).delete_all
@@ -27,6 +34,19 @@ class Card
         vars = { card_ids: card_ids, current_user_id: Card::Auth.current_id }
         joins(:actions).where(sql, vars).uniq.order(:id).reverse_order
       end
+
+      def all_viewable
+        joins = 'JOIN card_actions ON card_acts.id = card_act_id ' \
+                'JOIN cards ON cards.id = card_actions.card_id'
+        where = [
+          'card_actions.id is not null', # data check. should not be needed
+          'cards.id is not null',    # ditto
+          'draft is not true',
+          Card::Query::SqlStatement.new.permission_conditions('cards')
+        ].compact.join ' AND '
+
+        joins(joins).where(where).uniq
+      end
     end
 
     def set_actor
@@ -54,8 +74,8 @@ class Card
 
     def relevant_actions_for card
       actions.select do |action|
-        card.included_card_ids.include?(action.card_id) ||
-          (card.id == action.card_id)
+        (card.id == action.card_id) ||
+          card.included_card_ids.include?(action.card_id)
       end
     end
 

data/mod/01_history/lib/card/action.rb

@@ -2,7 +2,6 @@
 
 class Card
   class Action < ActiveRecord::Base
-    belongs_to :card
     belongs_to :act,  foreign_key: :card_act_id, inverse_of: :actions
     has_many :card_changes, foreign_key: :card_action_id, inverse_of: :action,
                             dependent: :delete_all, class_name: 'Card::Change'
@@ -29,14 +28,23 @@ class Card
       end
 
       def fetch id
-        cache.read(id.to_s) || begin
-          cache.write id.to_s, Action.find(id.to_i)
+        cache.fetch id.to_s do
+          find id.to_i
         end
       end
 
       def delete_cardless
         left_join = 'LEFT JOIN cards ON card_actions.card_id = cards.id'
-        Card::Action.joins(left_join).where('cards.id IS NULL').delete_all
+        joins(left_join).where('cards.id IS NULL').delete_all
+      end
+
+      def delete_changeless
+        joins(
+          'LEFT JOIN card_changes '\
+          'ON card_changes.card_action_id = card_actions.id'
+        ).where(
+          'card_changes.id IS NULL'
+        ).delete_all
       end
 
       def delete_old
@@ -61,76 +69,44 @@ class Card
     # writing here (disabled history), we still have to generate change stream
     # events in another way.
 
-    def changed_fields obj, changed_fields
-      changed_fields.each do |f|
-        Card::Change.create field: f, value: obj[f], card_action_id: id
-      end
-    end
-
-    def edit_info
-      @edit_info ||= {
-        action_type:  "#{action_type}d",
-        new_content:  new_values[:content],
-        new_name:     new_values[:name],
-        new_cardtype: new_values[:cardtype],
-        old_content:  old_values[:content],
-        old_name:     old_values[:name],
-        old_cardtype: old_values[:cardtype]
-      }
-    end
-
-    def new_values
-      @new_values ||=
-        {
-          content:  new_value_for(:db_content),
-          name:     new_value_for(:name),
-          cardtype: ((typecard = Card[new_value_for(:type_id).to_i]) &&
-                     typecard.name.capitalize)
-        }
-    end
-
-    def old_values
-      @old_values ||= {
-        content:  last_value_for(:db_content),
-        name:     last_value_for(:name),
-        cardtype: ((value = last_value_for(:type_id)) &&
-                   (typecard = Card.find(value)) &&
-                   typecard.name.capitalize)
-      }
-    end
+    # def changed_fields obj, changed_fields
+    #   changed_fields.each do |f|
+    #     Card::Change.create field: f, value: obj[f], card_action_id: id
+    #   end
+    # end
 
-    def last_value_for field
-      ch = card.last_change_on(field, before: self)
-      ch && ch.value
+    def value field
+      return unless (change = change field)
+      interpret_value field, change.value
     end
 
-    def field_index field
-      if field.is_a? Integer
-        field
-      else
-        Card::TRACKED_FIELDS.index(field.to_s)
-      end
+    def change field
+      changes[interpret_field field]
     end
 
-    def new_value_for field
-      ch = card_changes.find_by(field: field_index(field))
-      ch && ch.value
+    def changes
+      @changes ||=
+        card_changes.each_with_object({}) do |change, hash|
+          hash[change.field.to_sym] = change
+        end
     end
 
-    def change_for field
-      card_changes.where 'card_changes.field = ?', field_index(field)
+    def previous_value field
+      return if action_type == :create
+      return unless (previous_change = previous_change field)
+      interpret_value field, previous_change.value
     end
 
     def new_type?
-      new_value_for :type_id
+      value :type_id
     end
 
     def new_content?
-      new_value_for :db_content
+      value :db_content
     end
 
     def new_name?
-      new_value_for :name
+      value :name
     end
 
     def action_type= value
@@ -141,10 +117,6 @@ class Card
       TYPE[read_attribute(:action_type)]
     end
 
-    def set_act
-      self.set_act ||= acts.last
-    end
-
     def revision_nr
       card.actions.index_of self
     end
@@ -157,18 +129,14 @@ class Card
       content_diff_object.green?
     end
 
-    # def diff
-    #   @diff ||= { cardtype: type_diff, content: content_diff, name: name_diff}
-    # end
-
     def name_diff opts={}
       return unless new_name?
-      Card::Diff.complete old_values[:name], new_values[:name], opts
+      Card::Diff.complete previous_value(:name), value(:name), opts
     end
 
     def cardtype_diff opts={}
       return unless new_type?
-      Card::Diff.complete old_values[:cardtype], new_values[:cardtype], opts
+      Card::Diff.complete previous_value(:cardtype), value(:cardtype), opts
     end
 
     def content_diff diff_type=:expanded, opts=nil
@@ -180,15 +148,46 @@ class Card
       end
     end
 
+    def card
+      Card.fetch card_id, look_in_trash: true, skip_modules: true
+    end
+
+    private
+
     def content_diff_object opts=nil
       @diff ||= begin
         diff_args = opts || card.include_set_modules.diff_args
-        Card::Diff.new old_values[:content], new_values[:content], diff_args
+        Card::Diff.new previous_value(:content), value(:content), diff_args
       end
     end
 
-    def card
-      Card.fetch card_id, look_in_trash: true
+    def previous_change field
+      field = interpret_field field
+      if @previous_changes && @previous_changes.key?(field)
+        @previous_changes[field]
+      else
+        @previous_changes ||= {}
+        @previous_changes[field] = card.last_change_on field, before: self
+      end
+    end
+
+    def interpret_field field
+      case field
+      when :content then :db_content
+      when :cardtype then :type_id
+      else field.to_sym
+      end
+    end
+
+    def interpret_value field, value
+      case field.to_sym
+      when :type_id
+        value && value.to_i
+      when :cardtype
+        type_card = value && Card.quick_fetch(value.to_i)
+        type_card && type_card.name.capitalize
+      else value
+      end
     end
   end
 end