card 1.16.1 → 1.16.2

data/mod/04_settings/set/right/delete.rb

@@ -1,4 +1,3 @@
-include Create
-format :html do include Create::HtmlFormat end
-
+include Abstract::Permission
 
+format :html do include Abstract::Permission::HtmlFormat end

data/mod/04_settings/set/right/read.rb

@@ -1,2 +1,3 @@
-include Create
-format :html do include Create::HtmlFormat end
+include Abstract::Permission
+
+format :html do include Abstract::Permission::HtmlFormat end

data/mod/04_settings/set/right/update.rb

@@ -1,2 +1,3 @@
-include Create
-format :html do include Create::HtmlFormat end
+include Abstract::Permission
+
+format :html do include Abstract::Permission::HtmlFormat end

data/mod/04_settings/set/self/recent_settings.rb

@@ -0,0 +1,3 @@
+def followable?
+  false
+end

data/mod/04_settings/set/type/setting.rb

@@ -1,5 +1,13 @@
 require_dependency 'json'
-  
+
+def self.member_names
+  @@member_names ||= begin
+    Card.search( :type_id=>SettingID, :return=>'key' ).inject({}) do |hash, card_key|
+      hash[card_key] = true
+      hash
+    end
+  end
+end
 
 view :core do |args|
 

data/mod/05_email/set/all/notify.rb

@@ -77,7 +77,8 @@ event :stash_followers, :after=>:approve, :on=>:delete do
   act_card.follower_stash ||=  FollowerStash.new
   act_card.follower_stash.add_affected_card self
 end
-event :notify_followers_after_delete, :after=>:extend, :on=>:delete, :when=>proc{ |ca| ca.notable_change? } do
+event :notify_followers_after_delete, :after=>:extend, :on=>:delete,
+    :when=>proc{ |ca| ca.notable_change? } do
   notify_followers
 end
 

data/mod/05_email/set/type/email_template.rb

@@ -8,13 +8,13 @@ def deliver args={}
     mail = format.render_mail(args)
     mail.deliver
   rescue Net::SMTPError => exception
-    errors.add :exception, exception.message 
+    errors.add :exception, exception.message
   end
 end
 
 def process_email_field field, config, args
-  config[field] = 
-    if args[field] 
+  config[field] =
+    if args[field]
       args[field]
     elsif field_card = fetch(:trait=>field)
       # configuration can be anything visible to configurer
@@ -22,7 +22,7 @@ def process_email_field field, config, args
       Auth.as( user ) do
         yield(field_card)
       end
-    else 
+    else
       ''
     end
 end
@@ -38,7 +38,7 @@ end
 def email_config args={}
   config = {}
   args[:context] ||= self
-  
+
   [:to, :from, :cc, :bcc].each do |field_name|
     process_email_field( field_name, config, args ) do |field_card|
       field_card.process_email_addresses args[:context], {:format=>'email_text'}, args
@@ -50,22 +50,22 @@ def email_config args={}
   process_message_field :subject,      config, args, 'email_text', :content_opts=>{ :chunk_list=>:inclusion_only }
   process_message_field :text_message, config, args, 'email_text'
   process_message_field :html_message, config, args, 'email_html'
-  config[:html_message] = Card::Mailer.layout config[:html_message] if config[:html_message].present? 
-                          
-  
+  config[:html_message] = Card::Mailer.layout config[:html_message] if config[:html_message].present?
+
+
   from_name, from_email = (config[:from] =~ /(.*)\<(.*)>/) ? [$1.strip, $2] : [nil, config[:from]]
 
   if default_from=Card::Mailer.default[:from]
     config[:from] = from_email ? %["#{from_name || from_email}" <#{default_from}>] : default_from
     config[:reply_to] ||= config[:from]
-  elsif config[:from].blank? 
+  elsif config[:from].blank?
     config[:from] = Card[Card::WagnBotID].account.email
   end
   config.select {|k,v| v.present? }
 end
 
 
-format do     
+format do
   view :mail, :perms=>:none do |args|
     args = card.email_config(args)
     text_message = args.delete(:text_message)
@@ -73,7 +73,7 @@ format do
     attachment_list = args.delete(:attach)
     alternative = (text_message.present? && html_message.present?)
     mail = Card::Mailer.new_mail(args) do
-      if alternative 
+      if alternative
         if attachment_list and !attachment_list.empty?
           content_type 'multipart/mixed'
           part :content_type => 'multipart/alternative' do |copy|
@@ -83,7 +83,7 @@ format do
             copy.part :content_type => 'text/html' do |html|
               html.body = html_message
             end
-          end    
+          end
         else
           text_part { body text_message }
           html_part do
@@ -98,16 +98,16 @@ format do
         content_type 'text/plain; charset=UTF-8'
         text_part { body text_message }
       end
-      
+
       if attachment_list
         attachment_list.each_with_index do |cardname, i|
-          if c = Card[ cardname ] and c.respond_to?(:attach)
-            add_file :filename => "attachment-#{i + 1}.#{c.attach_extension}", :content => File.read( c.attach.path )
+          if c = Card[ cardname ] and c.respond_to?(:attachment)
+            add_file :filename => "attachment-#{i + 1}.#{c.attachment.extension}", :content => File.read( c.attachment.path )
           end
         end
-      end    
+      end
     end   #TODO add error handling
     mail
   end
-  
+
 end

data/mod/05_standard/lib/carrier_wave/cardmount.rb

@@ -0,0 +1,79 @@
+require 'carrierwave'
+
+module CarrierWave
+  module CardMount
+    include CarrierWave::Mount
+
+
+    def uploaders
+      Card.uploaders ||= {}
+    end
+
+    def uploader_options
+      Card.uploader_options ||= {}
+    end
+
+    def mount_uploader(column, uploader=nil, options={}, &block)
+      options[:mount_on] ||= :db_content
+      super
+
+      class_eval <<-RUBY, __FILE__, __LINE__+1
+        event :store_#{column}_event, :on=>:save, :before=>:store do
+          store_#{column}!
+        end
+        event :remove_#{column}_event, :on =>:delete, :after=>:stored do
+          remove_#{column}!
+        end
+        event :mark_remove_#{column}_false_event, :on => :update, :after=>:stored do
+          mark_remove_#{column}_false
+        end
+        event :store_previous_model_for_#{column}_event, :on=>:update, :before =>:store do
+          store_previous_model_for_#{column}
+        end
+
+        def attachment
+          #{column}
+        end
+
+        def read_uploader *args
+          read_attribute *args
+        end
+        def write_uploader *args
+          write_attribute *args
+        end
+        def #{column}=(new_file)
+          column = _mounter(:#{column}).serialization_column
+          send(:"\#{column}_will_change!")
+          super
+        end
+
+        def remote_#{column}_url=(url)
+          column = _mounter(:#{column}).serialization_column
+          send(:"\#{column}_will_change!")
+          super
+        end
+
+        def remove_#{column}!
+          super
+          _mounter(:#{column}).remove = true
+          _mounter(:#{column}).write_identifier
+        end
+
+        def serializable_hash(options=nil)
+          hash = {}
+
+          except = options && options[:except] && Array.wrap(options[:except]).map(&:to_s)
+          only   = options && options[:only]   && Array.wrap(options[:only]).map(&:to_s)
+
+          self.class.uploaders.each do |column, uploader|
+            if (!only && !except) || (only && only.include?(column.to_s)) || (!only && except && !except.include?(column.to_s))
+              hash[column.to_s] = _mounter(column).uploader.serializable_hash
+            end
+          end
+          super(options).merge(hash)
+        end
+      RUBY
+    end
+
+  end
+end

data/mod/05_standard/lib/file_uploader.rb

@@ -0,0 +1,127 @@
+=begin
+
+DATABASE_CONTENT
+if in mod:
+  :codename/modname.ext
+else
+  ~card_id/action_id.ext
+
+
+FILE SYSTEM
+if in mod
+  (mod_dir)/files/codename/type_code-variant.ext  (no colon on codename!)
+else
+  (files_dir)/id/action_id-variant.ext            (no tilde on id!)
+
+variant = icon|small|medium|large|original
+
+
+URLS
+mark.ext
+mark/revision.ext
+mark/revision-variant.ext
+
+revision = modname or action_id
+
+Examples:
+~22/33-medium.png
+:yeti_skin/05_standard-large.png
+
+=end
+
+
+module CarrierWave::Uploader::Versions
+  private
+
+  # put version at the end of the filename
+  def full_filename(for_file)
+    name = super(for_file)
+    parts = name.split '.'
+    basename = [parts.shift, version_name].compact.join('-')
+    "#{basename}.#{parts.join('.')}"
+  end
+end
+
+class FileUploader < CarrierWave::Uploader::Base
+  attr_accessor :mod
+  include Card::Format::Location
+
+  storage :file
+
+  def filename
+    if mod_file?
+      "#{model.type_code}#{extension}"
+    else
+      "#{action_id}#{extension}"
+    end
+  end
+
+  def extension
+    if file && file.extension.present?
+      ".#{file.extension}"
+    elsif original_filename
+      File.extname(original_filename)
+    else model.content
+      File.extname(model.content)
+    end.downcase
+  end
+
+  # the identifier gets stored in the card's db_content field
+  def db_content(args={})
+    basename =
+      if (args[:mod])
+        "#{args[:mod]}#{extension}"
+      else
+        filename
+      end
+    "%s/%s" % [file_dir, basename]
+  end
+
+  def url(options = {})
+    "%s/%s/%s" % [card_path(Card.config.files_web_path), file_dir, full_filename(filename)]
+  end
+
+  def file_dir
+    if (mod = mod_file?)
+      ":#{model.codename}"
+    elsif model.id
+      "~#{model.id}"
+    else
+      "#{model.key}" # FIXME what if the card has not a name yet?
+    end
+  end
+
+  def cache_dir
+    Cardio.paths['files'].existent.first + '/tmp'
+  end
+
+  # Carrierwave usually store the filename as identifier in the database
+  # and retrieve_from_store! calls store_path with the identifier from the db
+  # In our case the first part of our identifier is not part of the path
+  # but we construct the filename from db data. So we don't need the identifier.
+  # We can just call store_path always with the filename
+  def store_path(for_file=filename) #
+    super(filename)
+  end
+
+  # paperclip compatibility used in type/file.rb#core (base format)
+  def path(version=nil)
+    version ? versions[version].path : super()
+  end
+
+  def original_filename
+    @original_filename || model.selected_action.comment
+  end
+
+  def store_dir
+    model.store_dir
+  end
+
+  def mod_file?
+    @mod ||= model.mod_file?
+  end
+
+  def action_id
+    model.selected_content_action_id
+  end
+end

data/mod/05_standard/lib/image_uploader.rb

@@ -0,0 +1,35 @@
+require 'mini_magick'
+
+class ImageUploader < FileUploader
+  include CarrierWave::MiniMagick
+
+  def path(version=nil)
+    (version && version != :original) ? versions[version].path : super()
+  end
+
+  version :icon do #, :from_version=>:small do
+    process :resize_and_pad => [16,16]
+  end
+  version :small do #, :from_version=>:medium do
+    process :resize_to_fit => [75,75]
+  end
+  version :medium do
+    process :resize_to_fit => [200,200]
+  end
+  version :large do
+    process :resize_to_fit => [500,500]
+  end
+
+  # add 'original' if no version is given
+  def full_filename(for_file)
+    name = super(for_file)
+    if version_name
+      name
+    else
+      parts = name.split '.'
+      "#{parts.shift}-original.#{parts.join('.')}"
+    end
+  end
+
+
+end

data/mod/05_standard/set/abstract/attachment.rb

@@ -0,0 +1,85 @@
+require 'carrier_wave/cardmount'
+def self.included host_class
+  host_class.extend CarrierWave::CardMount
+end
+
+
+event :write_identifier, :after=>:assign_action do
+  self.content = attachment.db_content
+end
+
+event :save_original_filename, :before=>:finalize_action do
+  if @current_action
+    @current_action.update_attributes! :comment=>original_filename
+  end
+end
+
+event :move_file_to_store_dir, :after=>:store, :on=>:create do
+  if ::File.exist? tmp_store_dir
+    if ::File.exist? store_dir
+      FileUtils.rm_rf store_dir
+    end
+    FileUtils.mv tmp_store_dir, store_dir
+  end
+  if !(content =~ /^[:~]/)
+    update_column(:db_content,attachment.db_content)
+    expire
+  end
+end
+
+def item_names(args={})  # needed for flexmail attachments.  hacky.
+  [self.cardname]
+end
+
+def original_filename
+  attachment.original_filename
+end
+
+
+def assign_set_specific_attributes
+  if @set_specific && @set_specific.present?
+    self.content = nil
+  end
+  super
+end
+
+
+def symlink_to(prior_action_id) # create filesystem links to files from prior action
+  if prior_action_id != last_action_id
+    save_action_id = selected_action_id
+    links = {}
+
+    self.selected_action_id = prior_action_id
+    attachment.versions.each do |name, version|
+      links[name] = version.store_path
+    end
+    original = attachment.store_path
+
+    self.selected_action_id = last_action_id
+    attachment.versions.each do |name, version|
+      ::File.symlink links[name], version.store_path
+    end
+    ::File.symlink original, attachment.store_path
+
+    self.selected_action_id = save_action_id
+  end
+end
+
+def attachment_format(ext)
+  if ext.present? && attachment && original_ext=attachment.extension
+    if['file', original_ext].member? ext
+      original_ext
+    elsif exts = MIME::Types[attachment.content_type]
+      if exts.find {|mt| mt.extensions.member? ext }
+        ext
+      else
+        exts[0].extensions[0]
+      end
+    end
+  end
+rescue => e
+  Rails.logger.info "attachment_format issue: #{e.message}"
+  nil
+end
+
+