gollum_rails 1.5.12 → 1.5.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmY0ZTZlZDNhZDQxZjBiM2YzNzM1NGM5ZTg3NWEzYWY4OTY4MzExNA==
+    ZDJiNDIyYWE3Y2MyODMxOTk0NmFkNGFjMzBiYzc0NWI5NDlmNzg2OQ==
   data.tar.gz: !binary |-
-    NmNhY2FjODc1YTQ4MThmMDRlNDZhZjliY2Y2NTAzODgyMjY2MTM3Yg==
+    YWM3YmM3M2VmNTk0YWQ2MTA5ZTRjNWU0ZjJkMjQ5NTYyOTg2ZmVlYg==
 SHA512:
   metadata.gz: !binary |-
-    NjM5NzEyODg1MWEzZWFlNjg4ZDU0MTdlZDRhODQ0NzlhNDg1ZjUxOWQ0ZDIw
-    NTIzMjU1YjYxZWVlMDI5N2VhMTQ5YzIzMGMxN2VhZGYwYTU3ZDAyODg3N2Vm
-    OTg1NTU3MWMxMjdkZWFjMWI5MzkwZDdhZGQ4Nzg4ODUxNjdjODE=
+    NGRmNmViZDg3M2JjYjBjMTMzMDM2MmMzYjFiNmM1NDYwNmJlNjMyNTA5ODNi
+    ZDEzN2VlMWEyYzVlMGE0NTA3OTEyYmQ3NzNjYjIzNDlhNjgzNmU2NjZjNWM0
+    OWQwY2QwMmMxNjFlN2VlNjIzZjg4NTA0Y2YyNTIwNTMxNTYyYWI=
   data.tar.gz: !binary |-
-    OWY3NDkyNjdmMmUzZTdmMDAxYjVmMzVlMGFhYjhhOTBjZjAwY2Y1NjBlYWIx
-    YmY3NWFhNWZhZTdiZmFiMmY2YTU1YjkwNDllZTZmM2MxZGQ4NTZjOTVlMzgy
-    MmNjMjA5MjJkYjE2Mzc0ZDAzMzEyMzU0ZTYwNzM4Nzg2YmZjNzE=
+    YzAyMTUxZDZmMGQxMmI3YjI4NzExZGE1MjBkMjliNjczZjQzYjk0YzIzMjA2
+    OTYyMmQ3NTE5ODdlYTkwZjlkZGMwYzdjYjMwZGNlYzc0MjNhMjVmOTc2ZWIz
+    NWFmZDU3NDZiMDdlODM2NmVjZjcwMjBiODExMmUyODNmNDE3NDU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.5.12)
+    gollum_rails (1.5.13)
       activemodel (>= 3.2.11)
       activesupport (>= 3.2.11)
       gollum-lib (~> 3.0.0)

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.12'
+  s.version = '1.5.13'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
     lib/generators/gollum_rails/model/model_generator.rb
     lib/generators/gollum_rails/model/templates/model_template.erb
     lib/gollum_rails.rb
+    lib/gollum_rails/attributes.rb
     lib/gollum_rails/callbacks.rb
     lib/gollum_rails/core.rb
     lib/gollum_rails/error.rb
@@ -57,17 +58,24 @@ Gem::Specification.new do |s|
     lib/gollum_rails/setup/error.rb
     lib/gollum_rails/setup/options.rb
     lib/gollum_rails/store.rb
+    lib/gollum_rails/upload.rb
+    lib/gollum_rails/upload/class_definitions.rb
+    lib/gollum_rails/upload/file_too_big_error.rb
     lib/gollum_rails/validation.rb
     spec/factories.rb
     spec/gollum_rails/page_core_spec.rb
     spec/gollum_rails/page_spec.rb
     spec/gollum_rails/respository_spec.rb
     spec/gollum_rails/setup_spec.rb
+    spec/gollum_rails/upload/class_definitions_spec.rb
+    spec/gollum_rails/upload_spec.rb
     spec/gollum_rails/wiki_spec.rb
     spec/spec_helper.rb
     spec/support/default_commit.rb
     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

@@ -31,17 +31,21 @@ module GollumRails
   autoload :Persistance
   autoload :Callbacks
   autoload :Error
+  autoload :Attributes
   autoload :Core
   autoload :Store
   autoload :Validation
   autoload :Finders
+
   autoload :Page
+  autoload :Upload
+
   autoload :Setup
   autoload :Orm
   autoload :Meta
 
   # GollumRails version
-  VERSION = '1.5.12'
+  VERSION = '1.5.13'
 
 end
 

data/lib/gollum_rails/attributes.rb

@@ -0,0 +1,33 @@
+module GollumRails
+  module Attributes
+    extend ActiveSupport::Concern
+
+    # Allows you to set all the attributes by passing in a hash of attributes with
+    # keys matching the attribute name
+    #
+    # new_attributes - Hash - Hash of arguments
+    def assign_attributes(new_attributes)
+      if !new_attributes.respond_to?(:stringify_keys)
+        raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
+      end
+      return if new_attributes.blank?
+      attributes = new_attributes.stringify_keys
+      attributes.each do |k, v|
+        _assign_attribute(k, v)
+      end
+    end
+
+    private
+
+    def _assign_attribute(key, value)
+      public_send("#{key}=", value)
+    rescue NoMethodError
+      if respond_to?("#{key}=")
+        raise
+      end
+    end
+
+
+
+  end
+end

data/lib/gollum_rails/core.rb

@@ -1,6 +1,22 @@
 module GollumRails
   module Core
     extend ActiveSupport::Concern
+
+    ATTR_READERS = []
+    ATTR_WRITERS = [:name, :content, :format]
+    ATTR_ACCESSORS = [:commit, :gollum_page]
+
+    included do
+      ATTR_WRITERS.each do |a|
+        attr_writer a
+      end
+      ATTR_ACCESSORS.each do |a|
+        attr_accessor a
+      end
+
+    end
+
+
     module ClassMethods
 
       # Checks if the fileformat is supported
@@ -44,21 +60,6 @@ module GollumRails
       run_callbacks :initialize unless _initialize_callbacks.empty?
     end
 
-    # Allows you to set all the attributes by passing in a hash of attributes with
-    # keys matching the attribute name
-    #
-    # new_attributes - Hash - Hash of arguments
-    def assign_attributes(new_attributes)
-      if !new_attributes.respond_to?(:stringify_keys)
-        raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
-      end
-      return if new_attributes.blank?
-      attributes = new_attributes.stringify_keys
-      attributes.each do |k, v|
-        _assign_attribute(k, v)
-      end
-    end
-
     def url_path #:nodoc:
       File.split(url)
     end
@@ -172,6 +173,27 @@ module GollumRails
 
     end
 
+    # Gets the pages format
+    def format
+      (@format || (@gollum_page.format||:markdown)).to_sym
+    end
+
+    def name
+      @name ||= (@gollum_page.name || "")
+    end
+
+    # == Outputs the pages filename on disc
+    #
+    # ext - Wether to output extension or not
+    def filename(ext=true)
+      @filename ||= (ext) ? @gollum_page.filename : @gollum_page.filename_stripped
+    end
+
+    def content
+      @content ||= (@gollum_page.content || "")
+    end
+
+
     private
 
     # == Gets the right commit out of 2 commits
@@ -185,14 +207,6 @@ module GollumRails
       return com
     end
 
-    def _assign_attribute(key, value)
-      public_send("#{key}=", value)
-    rescue NoMethodError
-      if respond_to?("#{key}=")
-        raise
-      end
-    end
-
     # == Updates local attributes from gollum_page class
     #
     def _update_page_attributes

data/lib/gollum_rails/page.rb

@@ -74,6 +74,7 @@ module GollumRails
       include ActiveModel::Validations
     end
     include Error
+    include Attributes
     include Core
     include Meta
     include Store

data/lib/gollum_rails/store.rb

@@ -2,21 +2,6 @@ module GollumRails
   module Store
     extend ActiveSupport::Concern
 
-
-    ATTR_READERS = []
-    ATTR_WRITERS = [:name, :content, :format]
-    ATTR_ACCESSORS = [:commit, :gollum_page]
-
-    included do
-      ATTR_WRITERS.each do |a|
-        attr_writer a
-      end
-      ATTR_ACCESSORS.each do |a|
-        attr_accessor a
-      end
-
-    end
-
     module ClassMethods
       # Gets the wiki instance
       def wiki
@@ -25,26 +10,6 @@ module GollumRails
         @wiki = Gollum::Wiki.new(Setup.wiki_path, Setup.wiki_options)
       end
     end
-    # Gets the pages format
-    def format
-      (@format || (@gollum_page.format||:markdown)).to_sym
-    end
-
-    def name
-      @name ||= (@gollum_page.name || "")
-    end
-
-    # == Outputs the pages filename on disc
-    #
-    # ext - Wether to output extension or not
-    def filename(ext=true)
-      @filename ||= (ext) ? @gollum_page.filename : @gollum_page.filename_stripped
-    end
-
-    def content
-      @content ||= (@gollum_page.content || "")
-    end
-
 
     private
     # == To static

data/lib/gollum_rails/upload.rb

@@ -0,0 +1,135 @@
+module GollumRails
+  class Upload
+    if ActiveModel::VERSION::MAJOR == 4
+      include ActiveModel::Model
+    else
+      extend ActiveModel::Naming
+      extend ActiveModel::Callbacks
+      include ActiveModel::Conversion
+      include ActiveModel::Validations
+    end
+
+    autoload :ClassDefinitions, 'gollum_rails/upload/class_definitions'
+    autoload :FileTooBigError, 'gollum_rails/upload/file_too_big_error'
+
+    include Attributes
+    include Store
+    include ClassDefinitions
+
+    attr_accessor :file
+    attr_accessor :destination
+    attr_accessor :commit
+    attr_accessor :gollum_file
+
+    def initialize(attrs)
+      assign_attributes(attrs)
+      yield self if block_given?
+    end
+
+    def save!
+      if self.file
+        fullname = Gollum::Page.cname(self.file.original_filename)
+        tempfile = self.file
+        validate! tempfile
+      end
+
+      @dir = self.destination || self.class.destination
+      @fullname = fullname
+      ext = ::File.extname(fullname)
+
+      # Allowed formats in future
+      format = ext.split('.').last || "txt"
+      filename = ::File.basename(fullname, ext)
+      contents = ::File.read(tempfile)
+      #reponame = filename + '.' + format
+      head = self.class.wiki.repo.head
+
+      options = self.commit.merge(parent: head.commit)
+      committer = Gollum::Committer.new(self.class.wiki, options)
+      committer.add_to_index(@dir, filename, format, contents)
+      committer.after_commit do |cmntr, sha|
+        self.class.wiki.clear_cache
+        cmntr.update_working_dir(@dir, filename, format)
+      end
+      committer.commit
+      _update_gollum_file(File.join(@dir,@fullname))
+      self
+    end
+
+    def save
+      save!
+    rescue Gollum::DuplicatePageError
+      _update_gollum_file(File.join(@dir,@fullname))
+      self
+    rescue FileTooBigError => e
+      @error = e.message
+      self
+    end
+
+    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)
+        dir = '' if dir == '.'
+        fullname = ::File.basename(path)
+        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
+    end
+
+    def self.create(attributes)
+      self.new(attributes).save
+    end
+
+    def self.find(path)
+      ins = self.new({})
+      ins._update_gollum_file(path)
+      ins
+    end
+
+    def persisted?
+      !!self.gollum_file
+    end
+
+    def validate!(tempfile)
+      if self.class.max_size
+        raise FileTooBigError,
+          "File is too big. Max. size is #{self.class.max_size}" if tempfile.size > self.class.max_size
+      end
+    end
+
+    def _find_gollum_file(path)
+      wiki.file(path)
+    end
+
+    def _update_gollum_file(path)
+      if path
+        self.gollum_file = _find_gollum_file(path)
+      else
+        self.gollum_file = nil
+      end
+    end
+
+    def to_s
+      if @error
+        "Error occured: <%s>" % @error
+      else
+        super
+      end
+    end
+
+  end
+end

data/lib/gollum_rails/upload/class_definitions.rb

@@ -0,0 +1,25 @@
+
+module GollumRails
+  class Upload
+    module ClassDefinitions
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        attr_accessor :destination
+        attr_accessor :overwrite
+        def max_filesize(size)
+          @max_size=size if size
+        end
+        def max_size
+          @max_size
+        end
+        def upload_directory(dir)
+          self.destination = dir
+        end
+        def overwrite_existing_files(bool)
+          self.overwrite = bool
+        end
+      end
+    end
+  end
+end

data/lib/gollum_rails/upload/file_too_big_error.rb

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

data/spec/factories.rb

@@ -1,8 +1,13 @@
+require 'rack/test'
+require 'rack/test/uploaded_file'
+
 FactoryGirl.define do
   trait :initialize do
     after(:build) do
+      g_path = File.expand_path('../utils/wiki.git', __FILE__)
+      `test -d #{g_path} || git init --bare #{g_path}`
       GollumRails::Setup.build do |config|
-        GollumRails::Setup.repository = File.expand_path('../utils/wiki.git', __FILE__)
+        config.repository = File.expand_path('../utils/wiki.git', __FILE__)
       end
     end
   end
@@ -18,6 +23,19 @@ FactoryGirl.define do
     end
     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'
+    initialize_with { new(attributes) }
+    commit { build(:commit_fakes) }
+  end
+  factory :upload, class: GollumRails::Upload, traits: [:initialize] 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
   factory :gollum_page_spec, traits: [:initialize, :markdown] do

data/spec/gollum_rails/upload/class_definitions_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'active_support/core_ext/numeric'
+require 'active_support/core_ext/module/attribute_accessors'
+
+describe GollumRails::Upload::ClassDefinitions do
+
+
+  it "has a max filesize defined" do
+    expect(SampleClassDefinitions.max_size).to eq 2.bytes
+  end
+  it "has a upload directory defined" do
+    expect(SampleClassDefinitions.destination).to eq 'uploads'
+  end
+  it "overwrites existing files" do
+    expect(SampleClassDefinitions.overwrite) == true
+  end
+  describe "validation" do
+    let(:ins){build(:restrictions_upload)}
+    let(:ins2){build(:upload)}
+
+    it "fails if the file is bigger than 2byte" do
+      id2 = ins.save
+      id2 = ins.destroy
+      expect{ins.save!}.to raise_error GollumRails::Upload::FileTooBigError
+    end
+  end
+
+
+end

data/spec/gollum_rails/upload_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe GollumRails::Upload do
+  describe "#initialize(file, destination='uploads')" do
+    let(:ins){build(:upload)}
+    it "should set accessor file to file" do
+      expect(ins.file).to be_instance_of Rack::Test::UploadedFile
+    end
+    it "should set accessor destination to /uploads" do
+      expect(ins.destination) == "uploads"
+    end
+    it "should set accessor commit to factory hash" do
+      expect(ins.commit).to be_kind_of Hash
+    end
+    it "has not an empty commit" do
+      expect(ins.commit).not_to be_empty
+    end
+  end
+
+  describe "#save" do
+    let(:ins){build(:upload, destination: "blafasel")}
+
+    it "performs debugging" do
+      ins.save
+      file = GollumRails::Upload.wiki.file("blafasel/#{ins.file.original_filename}")
+      expect(file).not_to be_nil
+      ins.destroy
+    end
+    it "is persisted after save" do
+      ins.save
+      expect(ins.persisted?) == true
+      ins.destroy
+    end
+    it "is not persisted after destroy" do
+      ins.save
+      ins.destroy
+      expect(ins.persisted?) == false
+    end
+    it "is not persisted without saving" do
+      expect(ins.persisted?) == false
+    end
+  end
+
+  describe "#destroy" do
+    let(:ins){build(:upload, destination: "destroy")}
+    it "is empty after destruction" do
+      ins.destroy
+      file = GollumRails::Upload.find("destroy/#{ins.file.original_filename}")
+      expect(file.gollum_file).to be_nil
+    end
+    it "returns a commit id on destroy" do
+      ins.save
+      expect(ins.destroy).to be_instance_of(String)
+    end
+  end
+
+  describe "::create" do
+
+  end
+
+  describe "::find(path)" do
+
+  end
+end

data/spec/support/sample_upload.rb

@@ -0,0 +1,5 @@
+class SampleClassDefinitions < GollumRails::Upload
+  max_filesize 2
+  upload_directory 'uploads'
+  overwrite_existing_files true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.13
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -184,6 +184,7 @@ files:
 - lib/generators/gollum_rails/model/model_generator.rb
 - lib/generators/gollum_rails/model/templates/model_template.erb
 - lib/gollum_rails.rb
+- lib/gollum_rails/attributes.rb
 - lib/gollum_rails/callbacks.rb
 - lib/gollum_rails/core.rb
 - lib/gollum_rails/error.rb
@@ -196,17 +197,24 @@ files:
 - lib/gollum_rails/setup/error.rb
 - lib/gollum_rails/setup/options.rb
 - lib/gollum_rails/store.rb
+- lib/gollum_rails/upload.rb
+- lib/gollum_rails/upload/class_definitions.rb
+- lib/gollum_rails/upload/file_too_big_error.rb
 - lib/gollum_rails/validation.rb
 - spec/factories.rb
 - spec/gollum_rails/page_core_spec.rb
 - spec/gollum_rails/page_spec.rb
 - spec/gollum_rails/respository_spec.rb
 - spec/gollum_rails/setup_spec.rb
+- spec/gollum_rails/upload/class_definitions_spec.rb
+- spec/gollum_rails/upload_spec.rb
 - spec/gollum_rails/wiki_spec.rb
 - spec/spec_helper.rb
 - spec/support/default_commit.rb
 - 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