openskip-skip_embedded 0.9.4 → 0.9.5

data/ChangeLog

@@ -1,3 +1,6 @@
+== 0.9.5  / 2009-05-27
+* [port] SKIP's upload file validations.
+
 == 0.9.4  / 2009-05-22
 * [new] update flash showing mechanism.
 

data/generators/skip_embedded/skip_embedded_generator.rb

@@ -10,7 +10,7 @@ class SkipEmbeddedGenerator < Rails::Generator::Base
         public/blank.html
         public/javascripts/dropdown_navigation.js
         public/javascripts/labeled_text_field.js
-        public/javascripts/skip_fckeditor_config.js
+        public/javascripts/skip/skip_fckeditor_config.js
         public/javascripts/flash_message.js
       ]
 

data/generators/skip_embedded/templates/public/javascripts/labeled_text_field.js

@@ -16,6 +16,11 @@
           target.removeClass(focusClass).val(message);
         };
       });
+    target.parents("form").submit(function(){
+        if(target.val() == message){ target.val("") };
+        return true;
+      });
+    return target;
   };
 })(jQuery);
 

data/generators/skip_embedded/templates/public/javascripts/{skip_fckeditor_config.js → skip/skip_fckeditor_config.js}

@@ -1,5 +1,4 @@
-
-FCKConfig.EditorAreaCSS = FCKConfig.BasePath + '../../../stylesheets/application.css' ;
+FCKConfig.EditorAreaCSS = FCKConfig.BasePath + '../../../../stylesheets/editor_area.css' ;
 
 FCKConfig.Plugins.Add( 'autogrow' ) ;
 FCKConfig.Plugins.Add( 'dragresizetable' );

data/generators/skip_embedded_stylesheets/skip_embedded_stylesheets_generator.rb

@@ -6,10 +6,12 @@ class SkipEmbeddedStylesheetsGenerator < Rails::Generator::Base
         public/stylesheets/skip_embedded.css
         public/stylesheets/skip_footer.css
         public/stylesheets/skip_header.css
+        public/stylesheets/editor_area.css
         public/stylesheets/sass/skip_base.sass
         public/stylesheets/sass/skip_embedded.sass
         public/stylesheets/sass/skip_footer.sass
         public/stylesheets/sass/skip_header.sass
+        public/stylesheets/sass/editor_area.sass
         public/stylesheets/sprites/sprites.css
         public/stylesheets/sprites/sprites.png
       ]

data/generators/skip_embedded_stylesheets/templates/public/stylesheets/editor_area.css

@@ -0,0 +1,72 @@
+.hiki_style p, .rich_style p {
+  color: #555555;
+  font-size: 12px;
+  font-family: Verdana, Arial, sans-serif;
+  margin: 10px 0;
+  line-height: 1.2; }
+.hiki_style hr, .rich_style hr {
+  margin: 3px; }
+.hiki_style h1, .rich_style h1 {
+  border: 1px solid silver;
+  background-color: #f0f0f0;
+  margin-top: 0.8em; }
+.hiki_style h2, .rich_style h2 {
+  border-left: 10px solid silver;
+  border-bottom: 1px solid silver;
+  margin-top: 0.8em;
+  padding-left: 3px; }
+.hiki_style h3, .rich_style h3 {
+  border-left: 5px solid silver;
+  border-bottom: 1px dashed silver;
+  margin-top: 0.8em;
+  padding-left: 3px; }
+.hiki_style h4, .rich_style h4 {
+  border-left: 2px solid silver;
+  border-bottom: 1px dotted silver;
+  margin-top: 0.8em;
+  padding-left: 3px; }
+.hiki_style h5, .rich_style h5 {
+  border-bottom: 1px dotted silver;
+  margin-top: 0.8em; }
+.hiki_style ul, .rich_style ul {
+  list-style-type: disc;
+  padding-left: 25px; }
+.hiki_style ol, .rich_style ol {
+  list-style-type: decimal;
+  padding-left: 25px; }
+.hiki_style pre, .rich_style pre {
+  white-space: -moz-pre-wrap;
+  white-space: -pre-wrap;
+  white-space: -o-pre-wrap;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  background-color: #f7f7ff;
+  margin-left: 5px;
+  border: 1px dashed silver;
+  padding: 5px; }
+.hiki_style blockquote, .rich_style blockquote {
+  background-color: #fff7f7;
+  margin: 2px 2px 2px 10px;
+  border: 1px dashed silver;
+  padding: 2px 2px 2px 5px; }
+.hiki_style big, .rich_style big {
+  font-size: 30px;
+  font-weight: bold; }
+
+.rich_style {
+  background-color: #FFFFFF;
+  color: #555555;
+  width: 98%; }
+  .rich_style td {
+    font-family: Arial, Verdana, sans-serif;
+    font-size: 12px;
+    color: #555555; }
+  .rich_style a[href] {
+    color: -moz-hyperlinktext !important;
+    text-decoration: -moz-anchor-decoration; }
+  .rich_style div {
+    color: #555555;
+    font-size: 12px;
+    font-family: Verdana, Arial, sans-serif;
+    margin: 10px 0;
+    line-height: 1.2; }

data/generators/skip_embedded_stylesheets/templates/public/stylesheets/sass/editor_area.sass

@@ -0,0 +1,96 @@
+.hiki_style, .rich_style
+  p
+    :color #555555
+    :font-size 12px
+    :font-family Verdana, Arial, sans-serif
+    :margin 10px 0
+    :line-height 1.2
+
+  hr
+    :margin 3px
+
+  h1
+    :border 1px solid silver
+    :background-color #f0f0f0
+    :margin-top 0.8em
+
+  h2
+    :border-left 10px solid silver
+    :border-bottom 1px solid silver
+    :margin-top 0.8em
+    :padding-left 3px
+
+  h3
+    :border-left 5px solid silver
+    :border-bottom 1px dashed silver
+    :margin-top 0.8em
+    :padding-left 3px
+
+  h4
+    :border-left 2px solid silver
+    :border-bottom 1px dotted silver
+    :margin-top 0.8em
+    :padding-left 3px
+
+  h5
+    :border-bottom 1px dotted silver
+    :margin-top 0.8em
+
+  ul
+    :list-style-type disc
+    :padding-left 25px
+
+    li
+  ol
+    :list-style-type decimal
+    :padding-left 25px
+
+  pre
+    // Mozilla
+    :white-space -moz-pre-wrap
+    // Opera 4-6
+    :white-space -pre-wrap
+    // Opera 7
+    :white-space -o-pre-wrap
+    // CSS3
+    :white-space pre-wrap
+    // IE 5.5+
+    :word-wrap break-word
+    :background-color #f7f7ff
+    :margin-left 5px
+    :border 1px dashed silver
+    :padding 5px
+
+  blockquote
+    :background-color #fff7f7
+    :margin 2px 2px 2px 10px
+    :border 1px dashed silver
+    :padding 2px 2px 2px 5px
+
+  big
+    :font-size 30px
+    :font-weight bold
+
+.rich_style
+  :background-color #FFFFFF
+  :color #555555
+  :width 98%
+
+  td
+    :font-family Arial, Verdana, sans-serif
+    :font-size 12px
+    :color #555555
+
+  a[href]
+    // For Firefox... mark as important, otherwise it becomes black
+    :color -moz-hyperlinktext !important
+    // For Firefox 3, otherwise no underline will be used
+    :text-decoration -moz-anchor-decoration
+
+  // TODO 以下のdivは必要なければ消す。(元のCSSに記述があったので入れてあるだけ
+  div
+    :color #555555
+    :font-size 12px
+    :font-family Verdana, Arial, sans-serif
+    :margin 10px 0
+    :line-height 1.2

data/lib/skip_embedded.rb

@@ -1,6 +1,6 @@
 # SkipEmbedded
 module SkipEmbedded
-  Version = "0.9.4"
+  Version = "0.9.5"
 
   Dependencies = {:jquery => "jquery-1.3.2.min.js"}
 end

data/lib/skip_embedded/helpers/ui.rb

@@ -3,7 +3,7 @@ module SkipEmbedded
     module Ui
 
       def sanitize_richtext(content)
-        allowed_tags = HTML::WhiteListSanitizer.allowed_tags.dup << "table" << "tbody" << "tr" << "th" << "td" << "caption" << "strike"
+        allowed_tags = HTML::WhiteListSanitizer.allowed_tags.dup << "table" << "tbody" << "tr" << "th" << "td" << "caption" << "strike" << "u"
         allowed_attributes = HTML::WhiteListSanitizer.allowed_attributes.dup << "style" << "cellspacing" << "cellpadding" << "border" << "align" << "summary"
         sanitize(content, :tags => allowed_tags, :attributes => allowed_attributes)
       end

data/lib/skip_embedded/types/content_type.rb

@@ -0,0 +1,28 @@
+# SKIP(Social Knowledge & Innovation Platform)
+# Copyright (C) 2008-2009 TIS Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module SkipEmbedded
+  module Types::ContentType
+    CONTENT_TYPE_IMAGES = {
+      :jpg  => 'image/jpg,image/jpeg,image/pjpeg',
+      :jpeg => 'image/jpg,image/jpeg,image/pjpeg',
+      :png  => 'image/png,image/x-png',
+      :gif  => 'image/gif',
+      :bmp  => 'image/bmp'
+    }.freeze
+
+    DEFAULT_CONTENT_TYPE = "application/octet-stream"
+  end
+end

data/lib/skip_embedded/validations_file.rb

@@ -0,0 +1,94 @@
+# SKIP(Social Knowledge & Innovation Platform)
+# Copyright (C) 2008-2009 TIS Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module SkipEmbedded
+  module ValidationsFile
+    include Types::ContentType
+    def valid_presence_of_file(file)
+      unless file.is_a?(ActionController::UploadedFile)
+        errors.add_to_base "ファイルが指定されていません。"
+        return false
+      end
+      true
+    end
+
+    def valid_extension_of_file(file)
+      unless verify_extension? file.original_filename, file.content_type
+        errors.add_to_base "この形式のファイルは、アップロードできません。"
+      end
+    end
+
+    def valid_content_type_of_file(file)
+      extension = file.original_filename.split('.').last
+      if(content_types = CONTENT_TYPE_IMAGES[extension.to_sym])
+        unless content_types.split(',').include?(file.content_type)
+          errors.add_to_base "この形式のファイルは、アップロードできません。"
+          return false;
+        end
+      end
+      true
+    end
+
+    def valid_size_of_file(file)
+      if file.size == 0
+        errors.add_to_base "存在しないもしくはサイズ０のファイルはアップロードできません。"
+      elsif file.size > SkipEmbedded::InitialSettings['max_share_file_size'].to_i
+        errors.add_to_base "#{SkipEmbedded::InitialSettings['max_share_file_size'].to_i/1.megabyte}Mバイト以上のファイルはアップロードできません。"
+      end
+    end
+
+    def valid_max_size_per_owner_of_file(file, owner_symbol)
+      if (FileSizeCounter.per_owner(owner_symbol) + file.size) > SkipEmbedded::InitialSettings['max_share_file_size_per_owner'].to_i
+        errors.add_to_base "共有ファイル保存領域の利用容量が最大値を越えてしまうためアップロードできません。"
+      end
+    end
+
+    def valid_max_size_of_system_of_file(file)
+      if (FileSizeCounter.per_system + file.size) > SkipEmbedded::InitialSettings['max_share_file_size_of_system'].to_i
+        errors.add_to_base "システム全体における共有ファイル保存領域の利用容量が最大値を越えてしまうためアップロードできません。"
+      end
+    end
+
+    class FileSizeCounter
+      def self.per_owner owner_symbol
+        sum = 0
+        sum += ShareFile.total_share_file_size(owner_symbol)
+        sum
+      end
+      def self.per_system
+        sum = 0
+        Dir.glob("#{SkipEmbedded::InitialSettings['share_file_path']}/**/*").each do |f|
+          sum += File.stat(f).size
+        end
+        sum
+      end
+    end
+
+    private
+    def verify_extension? file_name, content_type
+      !disallow_extensions.any?{|extension| extension == file_name.split('.').last } &&
+        !disallow_content_types.any?{|content| content == content_type }
+    end
+
+    def disallow_content_types
+      ['text/html', 'application/x-javascript', 'image/bmp']
+    end
+
+    def disallow_extensions
+      ['html', 'htm', 'js', 'bmp']
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: openskip-skip_embedded
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - MAEDA Naoki
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 -07:00
+date: 2009-05-28 00:00:00 -07:00
 default_executable: skip-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,9 @@ files:
 - lib/skip_embedded/rp_service/http_connection.rb
 - lib/skip_embedded/rp_service/oauth_proxy.rb
 - lib/skip_embedded/rp_service/util.rb
+- lib/skip_embedded/types
+- lib/skip_embedded/types/content_type.rb
+- lib/skip_embedded/validations_file.rb
 - lib/skip_embedded/web_service_util
 - lib/skip_embedded/web_service_util/client.rb
 - lib/skip_embedded/web_service_util/server.rb
@@ -103,13 +106,16 @@ files:
 - generators/skip_embedded/templates/public/javascripts/dropdown_navigation.js
 - generators/skip_embedded/templates/public/javascripts/flash_message.js
 - generators/skip_embedded/templates/public/javascripts/labeled_text_field.js
-- generators/skip_embedded/templates/public/javascripts/skip_fckeditor_config.js
+- generators/skip_embedded/templates/public/javascripts/skip
+- generators/skip_embedded/templates/public/javascripts/skip/skip_fckeditor_config.js
 - generators/skip_embedded_stylesheets
 - generators/skip_embedded_stylesheets/skip_embedded_stylesheets_generator.rb
 - generators/skip_embedded_stylesheets/templates
 - generators/skip_embedded_stylesheets/templates/public
 - generators/skip_embedded_stylesheets/templates/public/stylesheets
+- generators/skip_embedded_stylesheets/templates/public/stylesheets/editor_area.css
 - generators/skip_embedded_stylesheets/templates/public/stylesheets/sass
+- generators/skip_embedded_stylesheets/templates/public/stylesheets/sass/editor_area.sass
 - generators/skip_embedded_stylesheets/templates/public/stylesheets/sass/skip_base.sass
 - generators/skip_embedded_stylesheets/templates/public/stylesheets/sass/skip_embedded.sass
 - generators/skip_embedded_stylesheets/templates/public/stylesheets/sass/skip_footer.sass
@@ -130,7 +136,7 @@ files:
 - spec/skip_embedded/web_service_util_spec.rb
 - spec/spec_helper.rb
 - rails/init.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/openskip/skip_embedded/tree/master
 post_install_message: 
 rdoc_options: 
@@ -165,7 +171,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Utilities to collabolate SKIP, opensource buisiness SNS.
 test_files: 
 - spec/skip_embedded/fulltext_search_cache/builder_base_spec.rb