gollum_rails 1.5.13 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDJiNDIyYWE3Y2MyODMxOTk0NmFkNGFjMzBiYzc0NWI5NDlmNzg2OQ==
+    OTc1MGI5YjRhZjVlNTNlNmYzYzM4MThkMTY3NGUyMThiMzdiY2FjNw==
   data.tar.gz: !binary |-
-    YWM3YmM3M2VmNTk0YWQ2MTA5ZTRjNWU0ZjJkMjQ5NTYyOTg2ZmVlYg==
+    ODZkZDc5MTQwNDY5ODk1MjI2ZDk5MDFhYjQ0MjY1ZWEzZDRhZjMyNQ==
 SHA512:
   metadata.gz: !binary |-
-    NGRmNmViZDg3M2JjYjBjMTMzMDM2MmMzYjFiNmM1NDYwNmJlNjMyNTA5ODNi
-    ZDEzN2VlMWEyYzVlMGE0NTA3OTEyYmQ3NzNjYjIzNDlhNjgzNmU2NjZjNWM0
-    OWQwY2QwMmMxNjFlN2VlNjIzZjg4NTA0Y2YyNTIwNTMxNTYyYWI=
+    ZDMxNDllZDRkMWQ5ZmIzOWNjYmI0MDNkMTJhY2MxODQ1ZDg3NzY2MDFjYTg1
+    MDViNDE3MTkyMzMzMTQyYmExNDRmMzVlMGY5MmEzN2YzNWZmNGI2MTVjM2Qx
+    NTM2ZTc5NzJlNGRiNmQ2OGRiYzdmZTQ0Y2U1NzVhMzRiOWJiNzE=
   data.tar.gz: !binary |-
-    YzAyMTUxZDZmMGQxMmI3YjI4NzExZGE1MjBkMjliNjczZjQzYjk0YzIzMjA2
-    OTYyMmQ3NTE5ODdlYTkwZjlkZGMwYzdjYjMwZGNlYzc0MjNhMjVmOTc2ZWIz
-    NWFmZDU3NDZiMDdlODM2NmVjZjcwMjBiODExMmUyODNmNDE3NDU=
+    MmY0ZmJkZjk3NWM5MjNlZDNlYTM0YTBkYTMzMjk5MmUzMzJiMTM1MjJjMzBj
+    ODU2OTYzOTdiMmRkZDllZWE4MzYzZjA4MWNjNTBhNjUyNGNmNWMyOWI3Njc1
+    Nzc0ODk5ZDE2MTQyNjI2ODhhZDk0YzIyNzFjMDZmOTViMmJmOWI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.5.13)
+    gollum_rails (1.6.0)
       activemodel (>= 3.2.11)
       activesupport (>= 3.2.11)
       gollum-lib (~> 3.0.0)
@@ -56,7 +56,7 @@ GEM
     formatador (0.2.5)
     github-markup (1.1.2)
       posix-spawn (~> 0.3.8)
-    gitlab-grit (2.6.9)
+    gitlab-grit (2.6.10)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)

data/gollum_rails.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.5.13'
+  s.version = '1.6.0'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
@@ -59,9 +59,12 @@ Gem::Specification.new do |s|
     lib/gollum_rails/setup/options.rb
     lib/gollum_rails/store.rb
     lib/gollum_rails/upload.rb
+    lib/gollum_rails/upload/blacklisted_filetype_error.rb
     lib/gollum_rails/upload/class_definitions.rb
     lib/gollum_rails/upload/file_too_big_error.rb
     lib/gollum_rails/validation.rb
+    spec/GLD-LOTR-2T.jpg
+    spec/GLD-LOTR-2T.png
     spec/factories.rb
     spec/gollum_rails/page_core_spec.rb
     spec/gollum_rails/page_spec.rb
@@ -75,7 +78,6 @@ Gem::Specification.new do |s|
     spec/support/gollum_page_spec.rb
     spec/support/sample_upload.rb
     spec/support/special_commit.rb
-    uploads/GLD-LOTR-2T.jpg
   ]
   # = MANIFEST =
 

data/lib/gollum_rails.rb

@@ -45,7 +45,7 @@ module GollumRails
   autoload :Meta
 
   # GollumRails version
-  VERSION = '1.5.13'
+  VERSION = '1.6.0'
 
 end
 

data/lib/gollum_rails/upload.rb

@@ -11,6 +11,7 @@ module GollumRails
 
     autoload :ClassDefinitions, 'gollum_rails/upload/class_definitions'
     autoload :FileTooBigError, 'gollum_rails/upload/file_too_big_error'
+    autoload :BlacklistedFiletypeError, 'gollum_rails/upload/blacklisted_filetype_error'
 
     include Attributes
     include Store
@@ -69,9 +70,7 @@ module GollumRails
     def destroy(commit=nil)
       return false if !persisted?
       committer    = Gollum::Committer.new(self.class.wiki, commit||self.commit)
-
       committer.delete(self.gollum_file.path)
-
       committer.after_commit do |index, sha|
         path = self.gollum_file.path
         dir = ::File.dirname(path)
@@ -80,11 +79,9 @@ module GollumRails
         ext = ::File.extname(fullname)
         format = ext.split('.').last || "txt"
         filename = ::File.basename(fullname, ext)
-
         self.class.wiki.clear_cache
         index.update_working_dir(dir, filename, format)
       end
-
      sha = committer.commit
      _update_gollum_file(nil)
      sha
@@ -109,6 +106,16 @@ module GollumRails
         raise FileTooBigError,
           "File is too big. Max. size is #{self.class.max_size}" if tempfile.size > self.class.max_size
       end
+      ext = ::File.extname(tempfile.original_filename)
+      type = (ext.split('.').last || "txt").to_sym
+      if self.class.whitelist
+        raise BlacklistedFiletypeError,
+          "Filetype #{type} is blacklisted." unless self.class.whitelist.include?(type)
+      end
+      if self.class.blacklist
+        raise BlacklistedFiletypeError,
+          "Filetype #{type} is blacklisted." if self.class.blacklist.include?(type)
+      end
     end
 
     def _find_gollum_file(path)

data/lib/gollum_rails/upload/blacklisted_filetype_error.rb

@@ -0,0 +1,6 @@
+module GollumRails
+  class Upload
+    class BlacklistedFiletypeError < StandardError
+    end
+  end
+end

data/lib/gollum_rails/upload/class_definitions.rb

@@ -7,6 +7,16 @@ module GollumRails
       module ClassMethods
         attr_accessor :destination
         attr_accessor :overwrite
+        attr_accessor :blacklist
+        attr_accessor :whitelist
+        def blacklist_format(*formats)
+          self.blacklist ||= []
+          self.blacklist += Array(formats)
+        end
+        def whitelist_format(*formats)
+          self.whitelist ||= []
+          self.whitelist += Array(formats)
+        end
         def max_filesize(size)
           @max_size=size if size
         end

data/spec/factories.rb

@@ -24,17 +24,31 @@ FactoryGirl.define do
     initialize_with { attributes }
   end
 
-  factory :restrictions_upload, class: SampleClassDefinitions, traits: [:initialize] do
-    file Rack::Test::UploadedFile.new(File.expand_path('../GLD-LOTR-2T.jpg', __FILE__), "image/jpeg")
-    destination 'uploads'
+  trait :default_upload do
     initialize_with { new(attributes) }
     commit { build(:commit_fakes) }
+    destination 'uploads'
+  end
+  factory :blacklist_upload, class: SampleUploadBlacklistPng, traits: [:initialize, :default_upload] do
+    file Rack::Test::UploadedFile.new(File.expand_path('../GLD-LOTR-2T.png', __FILE__), "image/png")
   end
-  factory :upload, class: GollumRails::Upload, traits: [:initialize] do
+  factory :multi_blacklist_upload, class: MultiUploadBlacklistPng, traits: [:initialize, :default_upload] do
+    file Rack::Test::UploadedFile.new(File.expand_path('../GLD-LOTR-2T.png', __FILE__), "image/png")
+  end
+  factory :not_blacklist_upload, class: SampleUploadBlacklistPng, traits: [:initialize, :default_upload] do
+    file Rack::Test::UploadedFile.new(File.expand_path('../GLD-LOTR-2T.jpg', __FILE__), "image/jpeg")
+  end
+  factory :not_whitelist_upload, class: SampleUploadWhitelistPng, traits: [:initialize, :default_upload] do
+    file Rack::Test::UploadedFile.new(File.expand_path('../GLD-LOTR-2T.png', __FILE__), "image/png")
+  end
+  factory :whitelist_upload, class: SampleUploadWhitelistPng, traits: [:initialize, :default_upload] do
+    file Rack::Test::UploadedFile.new(File.expand_path('../GLD-LOTR-2T.jpg', __FILE__), "image/jpeg")
+  end
+  factory :restrictions_upload, class: SampleClassDefinitions, traits: [:initialize, :default_upload] do
+    file Rack::Test::UploadedFile.new(File.expand_path('../GLD-LOTR-2T.jpg', __FILE__), "image/jpeg")
+  end
+  factory :upload, class: GollumRails::Upload, traits: [:initialize, :default_upload] do
     file Rack::Test::UploadedFile.new(File.expand_path('../GLD-LOTR-2T.jpg', __FILE__), "image/jpeg")
-    destination 'uploads'
-    initialize_with { new(attributes) }
-    commit { build(:commit_fakes) }
   end
   #factory :commit_fakes, class: DefaultCommit do
   #end

data/spec/gollum_rails/upload/class_definitions_spec.rb

@@ -14,6 +14,12 @@ describe GollumRails::Upload::ClassDefinitions do
   it "overwrites existing files" do
     expect(SampleClassDefinitions.overwrite) == true
   end
+  it "blacklists formats" do
+    expect(SampleUploadBlacklistPng.blacklist).to include :png
+  end
+  it "whitelists formats" do
+    expect(SampleUploadWhitelistPng.whitelist).to include :png
+  end
   describe "validation" do
     let(:ins){build(:restrictions_upload)}
     let(:ins2){build(:upload)}
@@ -25,5 +31,54 @@ describe GollumRails::Upload::ClassDefinitions do
     end
   end
 
+  describe "allowed formats to upload" do
+    let(:ins2){build(:upload)}
+    let(:ins){build(:blacklist_upload)}
+    let(:not_blacklisted){build(:not_blacklist_upload)}
+    let(:multi){build(:multi_blacklist_upload)}
+    after(:each) do
+      ins2.save
+      ins2.destroy
+    end
+    it "accepts arrays" do
+      begin
+        expect{multi.save!}.to raise_error GollumRails::Upload::BlacklistedFiletypeError
+      ensure
+        multi.destroy
+      end
+    end
+    it "does not allow to upload blacklisted formats" do
+      begin
+        expect{ins.save!}.to raise_error GollumRails::Upload::BlacklistedFiletypeError
+      ensure
+        ins.destroy
+      end
+    end
+    it "does allow to upload non-blacklisted formats" do
+      begin
+        expect{not_blacklisted.save!}.not_to raise_error
+      ensure
+        not_blacklisted.destroy
+      end
+    end
+  end
+  describe "whitelist" do
+    let(:ins){build(:whitelist_upload)}
+    let(:whitelisted){build(:not_whitelist_upload)}
+     it "does not allow to upload non-whitelisted formats" do
+      begin
+        expect{ins.save!}.to raise_error GollumRails::Upload::BlacklistedFiletypeError
+      ensure
+        ins.destroy
+      end
+    end
+    it "does allow to upload whitelisted formats" do
+      begin
+        expect{whitelisted.save!}.not_to raise_error
+      ensure
+        whitelisted.destroy
+      end
+    end
+  end
 
 end

data/spec/spec_helper.rb

@@ -19,4 +19,8 @@ RSpec.configure do |config|
   config.before(:suite) do
     FactoryGirl.lint
   end
+  config.before(:all) do
+    folder = File.expand_path('../utils/wiki.git',__FILE__)
+    `test -d #{folder} || git init --bare #{folder}`
+  end
 end

data/spec/support/sample_upload.rb

@@ -3,3 +3,15 @@ class SampleClassDefinitions < GollumRails::Upload
   upload_directory 'uploads'
   overwrite_existing_files true
 end
+
+class SampleUploadBlacklistPng < GollumRails::Upload
+  blacklist_format :png
+end
+
+class MultiUploadBlacklistPng < GollumRails::Upload
+  blacklist_format :png, :tar, :gz
+end
+
+class SampleUploadWhitelistPng < GollumRails::Upload
+  whitelist_format :png
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.6.0
 platform: ruby
 authors:
 - Florian Kasper
@@ -198,9 +198,12 @@ files:
 - lib/gollum_rails/setup/options.rb
 - lib/gollum_rails/store.rb
 - lib/gollum_rails/upload.rb
+- lib/gollum_rails/upload/blacklisted_filetype_error.rb
 - lib/gollum_rails/upload/class_definitions.rb
 - lib/gollum_rails/upload/file_too_big_error.rb
 - lib/gollum_rails/validation.rb
+- spec/GLD-LOTR-2T.jpg
+- spec/GLD-LOTR-2T.png
 - spec/factories.rb
 - spec/gollum_rails/page_core_spec.rb
 - spec/gollum_rails/page_spec.rb
@@ -214,7 +217,6 @@ files:
 - spec/support/gollum_page_spec.rb
 - spec/support/sample_upload.rb
 - spec/support/special_commit.rb
-- uploads/GLD-LOTR-2T.jpg
 homepage: https://github.com/nirnanaaa/gollum_rails
 licenses:
 - AGPL