typo 5.4.4 → 5.5

data/lib/filemanager.rb

@@ -0,0 +1,53 @@
+=begin
+  filemanager.rb
+  Copyright (C) 2008  Leon Li
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+=end
+require 'uri'
+require 'fileutils'
+FM_ID = 'filemanager'
+FM_ROOT = File.join(RAILS_ROOT, 'vendor', 'plugins', FM_ID)
+FM_PATH_PUBLIC = File.join(FM_ROOT, 'public')
+
+=begin
+if $FM_OVERWRITE || ! File.exist?(FM_ROOT)
+fm_rails_path = File.dirname(File.dirname(__FILE__)) + "/#{FM_ID}"
+FileUtils.cp_r(fm_rails_path, File.join(RAILS_ROOT, 'vendor', 'plugins'))
+FileUtils.cp_r(FM_PATH_PUBLIC, RAILS_ROOT)
+FileUtils.rm_rf(FM_PATH_PUBLIC)
+end
+=end
+
+FM_CONFIG_FILE = File.join(RAILS_ROOT, 'config', 'filemanager.yml')
+unless File.exist?(FM_CONFIG_FILE)
+  FileUtils.cp(File.join(FM_ROOT, 'filemanager.yml'))
+end
+require "erb"
+require "yaml"
+$FM_PROPERTIES = YAML::load(ERB.new(IO.read(FM_CONFIG_FILE)).result)
+
+FM_IMAGE_TYPES   = $FM_PROPERTIES['image.type'].split(' ') 
+FM_FLASH_TYPES   = $FM_PROPERTIES['flash.type'].split(' ')
+FM_MOVIE_TYPES   = $FM_PROPERTIES['movie.type'].split(' ')
+FM_RM_TYPES      = $FM_PROPERTIES['rm.type'].split(' ')
+FM_OFFICE_TYPES  = $FM_PROPERTIES['office.type'].split(' ')
+FM_EXCEL_TYPES   = $FM_PROPERTIES['excel.type'].split(' ')
+FM_WORD_TYPES    = $FM_PROPERTIES['word.type'].split(' ')
+FM_PPT_TYPES     = $FM_PROPERTIES['ppt.type'].split(' ')
+FM_HELP_TYPES    = $FM_PROPERTIES['help.type'].split(' ')
+FM_PLAIN_TYPES  = $FM_PROPERTIES['plain.type'].split(' ')
+FM_NONE_TYPES    = $FM_PROPERTIES['none.type'].split(' ')
+FM_SUPPORT_TYPES = FM_IMAGE_TYPES + FM_FLASH_TYPES + FM_MOVIE_TYPES + FM_RM_TYPES + FM_OFFICE_TYPES + FM_HELP_TYPES + FM_PLAIN_TYPES
+FM_UNKNOWN_TYPE = 'unknown'
+
+FM_RESOURCES_PATH= $FM_PROPERTIES['resources.path']
+FM_LOCK_PATH     = $FM_PROPERTIES['resources.url']
+FM_ENCODING_TO   = $FM_PROPERTIES['encoding.to']
+FM_ENCODING_FROM = $FM_PROPERTIES['encoding.from'].nil? ? '' : $FM_PROPERTIES['encoding.from']
+
+FM_TEMP_DIR      = $FM_PROPERTIES['temp.dir'].nil? ? File.join(FM_ROOT, 'temp') : $FM_PROPERTIES['temp.dir']
+
+FileUtils.rm_rf(Dir.glob("#{FM_TEMP_DIR}/*"))
+

data/lib/filemanager/controller.rb

@@ -0,0 +1,217 @@
+=begin
+  controller.rb
+  Copyright (C) 2008  Leon Li
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+=end
+module Filemanager
+  module Controller
+		def set_up
+	    @lock_path = FM_LOCK_PATH
+	    @source = params[:source]
+	    @source = decode(@source) unless @source.nil?
+	    @path = (params[:path].nil? || ! params[:path].index('..').nil?) ? '' : params[:path]
+	    @path = '' if @path == '/'
+	    @path = decode(@path)
+	    @resource_path = FM_RESOURCES_PATH
+	    @current_path = @resource_path + @path
+	    @current_file = (File.directory?(@current_path) ? Dir.new(@current_path) : File.new(@current_path))
+	    @parent_path = (!@path.blank? && !@path.rindex('/').nil?) ? (@path.rindex('/') == 0 ? '/' : @path[0..(@path.rindex('/')-1)]) : nil
+	    @path_suffix = @path.index('.').nil? || @path[-1] == '.' ? '' : @path[@path.index('.')+1..-1].downcase
+	    if File.directory?(@current_path)
+	      @all_files = Dir.entries(@current_path)
+	      @directories = @all_files.map{|f| File.directory?(@current_path + File::SEPARATOR + f) ? f : nil}.compact
+	      @files = @all_files.map{|f| File.directory?(@current_path + File::SEPARATOR + f) ? nil : f}.compact
+	      @file_total_size = @files.inject(0){|size, f| size + File.size(@current_path + File::SEPARATOR + f)}
+	    end
+	  end
+	  
+	  def tear_off
+	    @current_file.close unless @current_file.nil?
+	  end
+	  
+	  def index
+	    
+	  end
+	  
+	  def view
+	    #    respond_to do |wants|
+	    #      wants.js {  render :text => File.size(@current_path) > 1000000 ? 'File too big' : File.read(@current_path) }
+	    #    end
+	  end
+	  
+	  def file_content
+	      File.size(@current_path) > 1000000 ? 'File too big' : File.read(@current_path)
+	  end
+	  
+	#  def office
+	#    render :action=>'excel' if is_excel?
+	#    render :action=>'word' if is_word?
+	#    render :action=>'ppt' if is_ppt?
+	#    render :action=>'help' if is_help?
+	#  end
+	  
+	  def rename
+	    old_name = @current_path + File::SEPARATOR + decode(params[:old_name])
+	    new_name = @current_path + File::SEPARATOR + decode(params[:new_name])
+	    File.rename(old_name, new_name)
+	    success
+	  end
+	  
+	  def remove
+	    FileUtils.rm_rf(@source.map{|s| @current_path + File::SEPARATOR + s})
+	    success
+	  end
+	  
+	  def new_file
+	    File.new(@current_path + File::SEPARATOR + decode(params[:new_name]), 'w')
+	    success
+	  end
+	  
+	  def new_folder
+	    Dir.mkdir(@current_path + File::SEPARATOR + decode(params[:new_name]))
+	    success
+	  end
+	  
+	  def copy
+	    session[:source] = @source.map{|s| @current_path + File::SEPARATOR + s}
+	    session[:remove] = false
+	    success
+	  end
+	  
+	  def cut
+	    session[:source] = @source.map{|s| @current_path + File::SEPARATOR + s}
+	    session[:remove] = true
+	    success
+	  end
+	  
+	  def paste
+	    return error if session[:remove].nil? || session[:source].nil?
+	    begin
+	      session[:remove] == true ? FileUtils.mv(session[:source], @current_path) : FileUtils.cp_r(session[:source], @current_path)
+	      session[:remove] = nil
+	      session[:source] = nil
+	      success
+	    rescue => exception
+	      result(exception)
+	    end
+	    
+	  end
+	  
+	  def download
+	    now = Time.new
+	    now = "#{now.to_i}#{now.usec}"
+	    temp_file = FM_TEMP_DIR + File::SEPARATOR + now + '.zip'
+	    FileUtils.cd(@current_path) do |dir|
+	      system "zip -r #{temp_file} #{@source.map{|s| '"' + s + '"'}.join(' ')}"
+	    end
+	    send_file(temp_file)
+	  end
+	  
+	  
+	  def upload
+	    file = params[:upload]
+	    filename = decode(file.original_filename)
+	    File.open(@current_path + File::SEPARATOR + filename, "wb") do |f|   
+	      f.write(file.read)  
+	    end
+	    to_index
+	  end
+	  
+	  
+	  
+	  #TODO
+	  def adjust_size
+	    
+	  end
+	  
+	  #TODO
+	  def rotate
+	    
+	  end
+	  
+	  #TODO
+	  def unzip
+	    filename = decode(params[:old_name])
+	    FileUtils.cd(@current_path) do |dir|
+	      system "unzip -o #{filename}"
+	    end
+	    to_index
+	  end
+	  
+	  def to_index
+	    redirect_to :action => 'index', :path => encode(@path)
+	  end
+	  
+	  def success
+	    result("SUCCESS")
+	  end
+	  
+	  def error()
+	    result("ERROR")
+	  end
+	  
+	  def result(message)
+	    respond_to do |wants|
+	      wants.js { render :text => message }
+	    end
+	  end
+	  
+	  #methods for view
+	  def method_missing(method_id, *args)
+	    method_id_s = method_id.to_s
+	    if method_id_s[0, 3] == 'is_' && method_id_s[-1, 1] == '?'
+	      instance_eval %{
+	                        def #{method_id}(*args)
+	                          FM_#{method_id_s[3..-2].upcase}_TYPES.include?(@path_suffix)
+	                        end
+	                      }
+	      send(method_id, *args)
+	    else
+	      super
+	    end
+	  end
+	  
+	  def transfer(from, to, target)
+	    if FM_ENCODING_TO.nil?
+	      target
+	    else
+	      if target.is_a?(Array)
+	        target.map{|i| to.nil? ? i : Iconv.conv(to, from, i)}
+	      else
+	        Iconv.conv(to, from, target)
+	      end
+	    end
+	  end
+	  
+	  def encode(target)
+	    transfer(FM_ENCODING_FROM, FM_ENCODING_TO, target);
+	  end
+	  
+	  def decode(target)
+	    transfer(FM_ENCODING_TO, FM_ENCODING_FROM, target);
+	  end
+	  
+    def hsize(size)
+      size = size/1024
+      if size > 1024
+        size = size/1024
+        size = format('%0.2f',(size)) + ' mb'
+      else
+        size = format('%0.2f', size) + ' kb'
+      end
+    end
+    
+    def get_file_type(file)
+      type = File.extname(file)
+      
+      unless type.blank?
+        type = type.downcase[1..-1]
+        return type if FM_SUPPORT_TYPES.include?(type)
+      end
+      FM_UNKNOWN_TYPE
+    end
+
+  end
+end

data/lib/i18n_interpolation_deprecation.rb

@@ -0,0 +1,26 @@
+# Deprecates the use of the former message interpolation syntax in activerecord
+# as in "must have %d characters". The new syntax uses explicit variable names
+# as in "{{value}} must have {{count}} characters".
+
+require 'i18n/backend/simple'
+module I18n
+  module Backend
+    class Simple
+      DEPRECATED_INTERPOLATORS = { '%d' => '{{count}}', '%s' => '{{value}}' }
+
+      protected
+        def interpolate_with_deprecated_syntax(locale, string, values = {})
+          return string unless string.is_a?(String) && !values.empty?
+
+          string = string.gsub(/%d|%s/) do |s|
+            instead = DEPRECATED_INTERPOLATORS[s]
+            ActiveSupport::Deprecation.warn "using #{s} in messages is deprecated; use #{instead} instead."
+            instead
+          end
+
+          interpolate_without_deprecated_syntax(locale, string, values)
+        end
+        alias_method_chain :interpolate, :deprecated_syntax
+    end
+  end
+end

data/lib/rails_patch/active_support.rb

@@ -0,0 +1,4 @@
+class ActiveSupport::SafeBuffer
+  def concat(*args) super end
+  alias << concat
+end

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.4.4"
+PKG_VERSION = "5.5"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'
@@ -30,16 +30,16 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY 
   s.executables = ['typo']
   
-  s.add_dependency("rails", "= 2.3.5")
+  s.add_dependency("rails", "= 2.3.8")
   s.add_dependency("rails-app-installer", ">= 0.2.0")
   s.add_dependency("ruby-debug", ">= 0.10.3")
   s.add_dependency("flexmock", ">= 0.8.3")
-  s.add_dependency("rspec-rails", "= 1.2.7.1")
+  s.add_dependency("rspec-rails", "= 1.3.2")
   s.add_dependency("bluecloth", "~> 2.0.5")
   s.add_dependency("htmlentities")
   s.add_dependency("json")
   s.add_dependency("calendar_date_select")
-  s.add_dependency("coderay", "~> 0.8")
+  s.add_dependency("coderay", "~> 0.9")
   s.add_dependency('RedCloth', "~> 4.2.2")
 end
 
@@ -49,132 +49,5 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = true
 end
 
-desc "Publish the zip/tgz"
-task :leetsoft_upload => [:package] do
-  Rake::SshFilePublisher.new("leetsoft.com", "dist/pkg", "pkg", "#{PKG_FILE_NAME}.zip").upload
-  Rake::SshFilePublisher.new("leetsoft.com", "dist/pkg", "pkg", "#{PKG_FILE_NAME}.tgz").upload
-end
-
-desc "Publish the release files to RubyForge."
-task :tag_svn do
-  system("svn cp svn://typosphere.org/typo/trunk svn://typosphere.org/typo/tags/release_#{PKG_VERSION.gsub(/\./,'_')} -m 'tag release #{PKG_VERSION}'")
-end
-
-desc "Publish the release files to RubyForge."
-task :rubyforge_upload => [:package] do
-  files = ["tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-
-  if RUBY_FORGE_PROJECT then
-    require 'net/http'
-    require 'open-uri'
-
-    project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
-    project_data = open(project_uri) { |data| data.read }
-    group_id = project_data[/[?&]group_id=(\d+)/, 1]
-    raise "Couldn't get group id" unless group_id
-
-    # This echos password to shell which is a bit sucky
-    if ENV["RUBY_FORGE_PASSWORD"]
-      password = ENV["RUBY_FORGE_PASSWORD"]
-    else
-      print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
-      password = STDIN.gets.chomp
-    end
-
-    login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-      data = [
-        "login=1",
-        "form_loginname=#{RUBY_FORGE_USER}",
-        "form_pw=#{password}"
-      ].join("&")
-      http.post("/account/login.php", data)
-    end
-
-    cookie = login_response["set-cookie"]
-    raise "Login failed" unless cookie
-    headers = { "Cookie" => cookie }
-
-    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
-    release_data = open(release_uri, headers) { |data| data.read }
-    package_id = release_data[/[?&]package_id=(\d+)/, 1]
-    raise "Couldn't get package id" unless package_id
-
-    first_file = true
-    release_id = ""
-
-    files.each do |filename|
-      basename  = File.basename(filename)
-      file_ext  = File.extname(filename)
-      file_data = File.open(filename, "rb") { |file| file.read }
-
-      puts "Releasing #{basename}..."
-
-      release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-        release_date = Time.now.strftime("%Y-%m-%d %H:%M")
-        type_map = {
-          ".zip"    => "3000",
-          ".tgz"    => "3110",
-          ".gz"     => "3110",
-          ".gem"    => "1400"
-        }; type_map.default = "9999"
-        type = type_map[file_ext]
-        boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
-
-        query_hash = if first_file then
-          {
-            "group_id" => group_id,
-            "package_id" => package_id,
-            "release_name" => RELEASE_NAME,
-            "release_date" => release_date,
-            "type_id" => type,
-            "processor_id" => "8000", # Any
-            "release_notes" => "",
-            "release_changes" => "",
-            "preformatted" => "1",
-            "submit" => "1"
-          }
-        else
-          {
-            "group_id" => group_id,
-            "release_id" => release_id,
-            "package_id" => package_id,
-            "step2" => "1",
-            "type_id" => type,
-            "processor_id" => "8000", # Any
-            "submit" => "Add This File"
-          }
-        end
-
-        query = "?" + query_hash.map do |(name, value)|
-          [name, URI.encode(value)].join("=")
-        end.join("&")
-
-        data = [
-          "--" + boundary,
-          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
-          "Content-Type: application/octet-stream",
-          "Content-Transfer-Encoding: binary",
-          "", file_data, ""
-          ].join("\x0D\x0A")
-
-        release_headers = headers.merge(
-          "Content-Type" => "multipart/form-data; boundary=#{boundary}"
-        )
-
-        target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
-        http.post(target + query, data, release_headers)
-      end
-
-      if first_file then
-        release_id = release_response.body[/release_id=(\d+)/, 1]
-        raise("Couldn't get release id") unless release_id
-      end
-
-      first_file = false
-    end
-  end
-end
-
 desc "Upload the package to leetsoft, rubyforge and tag the release in svn"
-#task :release => [:sweep_cache, :package, :leetsoft_upload, :rubyforge_upload, :tag_svn ]
 task :release => [:sweep_cache, :package ]