gollum_rails 1.5.10 → 1.5.12

data/lib/gollum_rails/setup.rb

@@ -2,7 +2,7 @@ require 'gollum_rails/setup/error'
 module GollumRails
 
   # Setup functionality for Rails initializer
-  #  
+  #
   # will be generated by Rails generator: `rails g gollum_rails:install`
   #
   # manually:
@@ -16,7 +16,7 @@ module GollumRails
   #
   module Setup
     autoload :Options, 'gollum_rails/setup/options'
-    include Options 
+    include Options
 
     class << self
 
@@ -37,12 +37,12 @@ module GollumRails
             rescue NoMethodError
             end
           end
-          
+
         end
         if self.repository == :application
-          raise GollumRailsSetupError, "Rails configuration is not defined. 
+          raise GollumRailsSetupError, "Rails configuration is not defined.
           Are you in a Rails app?" if Rails.application.nil?
-          
+
           initialize_wiki Rails.application.config.wiki_repository
         else
           raise GollumRailsSetupError, "Git repository does not exist.
@@ -52,7 +52,7 @@ module GollumRails
       end
 
       private
-      
+
       def path_valid?(path)
         return path.exist? if path.is_a?(Pathname)
         return !(path.nil? || path.empty? || ! path.is_a?(String))

data/lib/gollum_rails/store.rb

@@ -2,11 +2,11 @@ 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
@@ -14,9 +14,9 @@ module GollumRails
       ATTR_ACCESSORS.each do |a|
         attr_accessor a
       end
-      
+
     end
-    
+
     module ClassMethods
       # Gets the wiki instance
       def wiki
@@ -33,26 +33,26 @@ module GollumRails
     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 
+
+    private
     # == To static
     def wiki
       self.class.wiki
     end
-    
-    
-    
+
+
+
   end
 end

data/lib/gollum_rails/validation.rb

@@ -2,8 +2,8 @@ module GollumRails
   module Validation
     extend ActiveSupport::Concern
     include ActiveModel::Validations
-    
+
     module ClassMethods
     end
   end
-end
+end

data/spec/factories.rb

@@ -0,0 +1,35 @@
+FactoryGirl.define do
+  trait :initialize do
+    after(:build) do
+      GollumRails::Setup.build do |config|
+        GollumRails::Setup.repository = File.expand_path('../utils/wiki.git', __FILE__)
+      end
+    end
+  end
+  trait :markdown do
+    format :markdown
+  end
+  trait :mediawiki do
+    format :mediawiki
+  end
+  factory :commit_fakes, class: DefaultCommit do
+    sequence :commit do |num|
+      { name: "mosny#{num}", message: "message number: #{num}", email: "mosny@zyg.li"}
+    end
+    initialize_with { attributes }
+  end
+  #factory :commit_fakes, class: DefaultCommit do
+  #end
+  factory :gollum_page_spec, traits: [:initialize, :markdown] do
+    name "Goole"
+    content "content data. content data. content data."
+    commit { {name: "mosny", message: "commit message", email: "mosny@zyg.li"} }
+    initialize_with { GollumPageSpec.new(attributes) }
+  end
+  factory :other_committer, class: GollumPageSpec, traits: [:initialize, :markdown] do
+    name "Google"
+    content "content data. content data. content data."
+    commit { {name: "flo", message: "other commit message", email: "info@zyg.li"} }
+    initialize_with { GollumPageSpec.new(attributes) }
+  end
+end

data/spec/gollum_rails/page_core_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe GollumRails::Core do
+  describe "Last changed by" do
+    it "tests if the correct ammount of commits is in history" do
+      commit1 = create(:gollum_page_spec)
+
+      10.times do |page|
+        commit1.update_attributes(name: "Page named: #{page}", commit: build(:commit_fakes)[:commit])
+      end
+      expect(commit1.last_changed_by) == "mosny11 <mosny@zyg.li>"
+      commit1.destroy(build(:commit_fakes)[:commit])
+
+    end
+
+  end
+  describe "#format_supported?(format)" do
+    ['markdown',
+     'rdoc',
+     'org',
+     'pod',
+     'creole',
+     'textile',
+     'rest',
+     'asciidoc',
+     'mediawiki',
+     'txt'
+    ].each do |format|
+      it "supports format #{format}" do
+        expect(GollumRails::Page.format_supported?(format)) == true
+      end
+    end
+  end
+
+end

data/spec/gollum_rails/page_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-
 describe "Gollum Page" do
   before(:each) do
     GollumRails::Setup.build do |config|
@@ -7,7 +6,6 @@ describe "Gollum Page" do
       config.options={}
       config.startup = true
     end
-    
       @commit = {
         name: "flo",
         message: "commit",
@@ -20,26 +18,18 @@ describe "Gollum Page" do
         format: :markdown
       }
     end
-    
   describe GollumRails::Page do
     class RailsModel < GollumRails::Page; end
-
     describe "the creation of a page" do
-      
-      before :each do 
+      before :each do
         @rr = RailsModel.new(@call)
       end
-      
       it "saves via .save" do
-        @rr.save.should be_a GollumRails::Page
+        expect(@rr.save).to be_a GollumRails::Page
       end
-      
-
       it "saves via .create" do
-        RailsModel.create(@call).should be_a GollumRails::Page
+        expect(RailsModel.create(@call)).to be_a GollumRails::Page
       end
-      
-
       it "fails if invalid arguments are supplied via the ! create" do
         args = {
           name: "Gaming",
@@ -51,15 +41,15 @@ describe "Gollum Page" do
       end
       it "has a history now" do
         @rr.save
-        @rr.history.should be_a Array
+        expect(@rr.history).to be_a Array
       end
       it "outputs the raw_data" do
         @rr.save
-        @rr.raw_data.should == @call[:content]
+        expect(@rr.raw_data) == @call[:content]
       end
       it "has the formatted data" do
         @rr.save
-        @rr.html_data.should == 'content data'
+        expect(@rr.html_data) == '<p>content data</p>'
       end
       it "can be saved using special characters in name" do
         @rr.name = 'test-page'
@@ -79,29 +69,22 @@ describe "Gollum Page" do
        expect(@rr.file_name).to match 'page'
        @rr.destroy
       end
-      it "was last changed by me" do
-        @rr.save
-        @rr.last_changed_by.should == 'flo <mosny@zyg.li>'
-      end
       it "has a title" do
         @rr.save
-        @rr.title.should == "Goole"
+        expect(@rr.title) == "Goole"
       end
       it "has a url" do
         @rr.save
-        @rr.url.should =="Goole"
+        expect(@rr.url) =="Goole"
       end
-
     end
-
     describe "the update of a page" do
-      before :each do 
+      before :each do
         @rr = RailsModel.new(@call)
         @rr.save
       end
-      
-      it "updates properly without all arguments, content+commit" do 
-        @rr.update_attributes({:name => "google", :format => :wiki}).should be_a GollumRails::Page
+      it "updates properly without all arguments, content+commit" do
+        expect(@rr.update_attributes({:name => "google", :format => :wiki})).to be_a GollumRails::Page
         @rr.delete(@commit)
       end
       it "sets the format as created" do
@@ -109,252 +92,189 @@ describe "Gollum Page" do
         expect(@rr.format).to eq :textile
         @rr.delete(@commit)
       end
-
       it "sets the name as created" do
         @rr.update_attributes(name: "omg", format: :textile)
-        expect(@rr.name).to eq "omg" 
+        expect(@rr.name).to eq "omg"
         @rr.delete(@commit)
       end
       it "updates properly without all arguments, name, format" do
-        @rr.update_attributes({:content => "test"}).should be_a GollumRails::Page 
+        expect(@rr.update_attributes({:content => "test"})).to be_a GollumRails::Page
         expect(@rr.name).to match "Goole"
         expect(@rr.format.to_s).to match "markdown"
         @rr.delete(@commit)
       end
-      
     end
-
-
     describe "should test the deletion of a page" do
-      before :each do 
+      before :each do
         @rr = RailsModel.new @call
         @cc = @rr.save
       end
-      
       it "should return a string" do
         delete = @rr.delete
-        delete.should be_a String
+        expect(delete).to be_a String
       end
-      
       it "should return a SHA1 hash" do
         delete = @rr.delete
-        delete.length.should == 40
+        expect(delete.length) == 40
       end
-      
       it "should also work was result from save" do
         delete = @cc.delete
-        delete.should be_a String
+        expect(delete).to be_a String
       end
-
     end
-
-   
     it "should test exception methods" do
       RailsModel.create @call
       expect{RailsModel.create! @call}.to raise_error Gollum::DuplicatePageError
     end
-
     describe "supported formats" do
       ['markdown', 'rdoc', 'org', 'pod'].each do |format|
         it "should support #{format}" do
-          RailsModel.format_supported?(format).should be_true
+          expect(RailsModel.format_supported?(format))== true
         end
       end
-      
     end
-    
     describe "accessors" do
       let(:rr){RailsModel.new @call}
-      
       it "should have a name" do
         expect(rr.name).to match(/^Goole$/)
       end
       it "should have a preview" do
-        expect(rr.preview).to match(/^content/)
-      end 
+        expect(rr.preview).to match(/content/)
+      end
       it "should have a content" do
         expect(rr.content).to match(/^content\ data$/)
       end
-      
       it "should have a commit which is a Hash" do
         expect(rr.commit).to be_a Hash
       end
-      
       it "should be @commit" do
         expect(rr.commit).to be(@commit)
       end
-      
       it "should have a format" do
         expect(rr.format.to_s).to match('markdown')
       end
-      
       it "should be a Gollum::Page after save" do
         rr.save
         expect(rr.gollum_page).to be_a Gollum::Page
       end
-      
     end
-    
     it "should test setters" do
       rr = RailsModel.new
-      rr.name=("google").should == "google"
-      rr.commit=(@commit).should == @commit
-      rr.content=("content").should == "content"
-      rr.format=(:markdown).should == :markdown
-    end
-    
-    it "builds an url for the page" do
-      page = RailsModel.find('Goole')
-      
-      p = RailsModel.new(name: "bla/testfa", commit: @commit, content: "[[Goole]]", format: :markdown)
-      #p.destroy(@commit)
-
-      
-
+      expect(rr.name=("google")) == "google"
+      expect(rr.commit=(@commit)) == @commit
+      expect(rr.content=("content")) == "content"
+      expect(rr.format=(:markdown)) == :markdown
     end
-    
     it "gets the pages filename on disk with a 'DOT' in filename" do
       expect(RailsModel.find('Goole').filename).to match('.')
     end
-    
     it "gets the pages filename on disk withOUT a 'dot' in filename" do
       expect(RailsModel.find('Goole').filename(false)).not_to match('.md')
     end
-    
     it "tests the find method to return nil if no page was found" do
       expect(RailsModel.find('whoooohoo')).to be_nil
     end
-    
     it "should initializes all with GollumRails::Page" do
       expect(RailsModel.all.first).to be_kind_of GollumRails::Page
     end
-    
     it "should have a gollum page after initializing with all" do
       expect(RailsModel.all.first.gollum_page).not_to be_nil
     end
-    
     it "tests the find method to return a gollum_rails:page if a page was found" do
       expect(RailsModel.find('Goole')).to be_a GollumRails::Page
     end
-    
     it 'should not be persisted on initialization or finding' do
       init = RailsModel.find_or_initialize_by_name('totallybad', @commit)
-      expect(init.persisted?).to be_false
+      expect(init.persisted?) == false
     end
-    
     it "should find the page without a commit if it exists" do
-      expect(RailsModel.find_or_initialize_by_name("Goole").persisted?).to be_true
+      expect(RailsModel.find_or_initialize_by_name("Goole").persisted?)== true
     end
-    
     it "should find the page with a commit if it exists" do
-      expect(RailsModel.find_or_initialize_by_name("Goole", @commit).persisted?).to be_true
+      expect(RailsModel.find_or_initialize_by_name("Goole", @commit).persisted?)== true
     end
-    
     it "should be valid on initialization or finding" do
       init = RailsModel.find_or_initialize_by_name('whoooohooo', @commit)
-      expect(init.valid?).to be_true
-      
-      #RailsModel.find_or_initialize_by_name(@call[:name], @commit).should  be_a GollumRails::Page
-      
+      expect(init.valid?)== true
+      #RailsModel.find_or_initialize_by_name(@call[:name], @commit)).to  be_a GollumRails::Page
     end
   end
-  describe "callbacks" do
-
-
-
-    it "should test the callback functions" do
-
-      class SaveCallback
-        def self.before_save( obj )
-          obj.name.should == "Goole"
-        end
-      end
-
-
-      class CallbackTest < GollumRails::Page
-
-        before_save ::SaveCallback
-        after_save :after_save
-        after_destroy :after_delete
-        before_destroy :before_delete
-        before_update :before_update
-        after_update :after_update
+  describe "callback testing" do
 
-        def after_save
-          @name.should == "Goole"
-        end
-        def before_update
-          @name.should == "Goole"
-        end
-
-        def after_update
-          @name.should == "Goole"
-        end
+    # Callback class definition
+    class SaveCallbacks < GollumRails::Page
+      after_save :after_save
 
-        def before_delete
-          @name.should == "Goole"
-        end
-
-        def after_delete
-          @name.should == "Goole"
-        end
+      before_destroy :before_delete
 
-      end
+      before_update :before_update
+      after_update :after_update
+      def after_save; end
+      def before_delete; end
+      def before_update; end
+      def after_update; end
+    end
+    let(:cls) { SaveCallbacks.new(@call) }
+    after(:each) do
+      cls.destroy(@commit)
+    end
 
-      test = CallbackTest.new @call
-      test.persisted?.should be_false
-      test.save
+    it "receives the after_save callback" do
+      expect(cls).to receive(:after_save)
+      cls.save
+    end
+    it "receives the before_delete callback" do
+      expect(cls).to receive(:before_delete)
+    end
+    it "receives the after_update callback" do
+      expect(cls).to receive(:after_update)
+      cls.save
+      cls.update_attributes(name: "Somepage")
+    end
+    it "receives the before_update callback" do
+      expect(cls).to receive(:before_update)
+      cls.save
+      cls.update_attributes(name: "Somepage")
     end
+
   end
   describe "testing validation" do
-
-
-
    it "should test the basic validation" do
      class Callbackt < GollumRails::Page
       validates_presence_of :name
      end
-     
      cla = Callbackt.new @call
-     cla.valid?.should be_true
+     expect(cla.valid?)== true
    end
-   
    class SugarBaby < GollumRails::Page
      validates_presence_of :name
      validates_length_of :name, :minimum => 20
      validates_length_of :format, :maximum => 14
    end
-   
    it "should test string validation" do
      @call[:name] = "das ist zu lang"*10
      cla = SugarBaby.new @call
-     cla.valid?.should be_true
+     expect(cla.valid?)== true
    end
-   
    it "should test the presence validator" do
      @call[:name] = [ ]
      bla = SugarBaby.new @call
-     bla.valid?.should be_false
+     expect(bla.valid?) == false
    end
-   
    it "should test the length validator for name" do
      @call[:name] = "das"
      res = SugarBaby.new @call
-     res.valid?.should be_false
+     expect(res.valid?) == false
    end
-   
    it "should test the length validator for format" do
      @call[:format] = :toolongformatstringforvalidator
      res = SugarBaby.new @call
-     res.valid?.should be_false
+     expect(res.valid?) == false
    end
-
   end
-  
   describe "diffing commits" do
     class CommitDiff < GollumRails::Page
     end
-    
     it "should display the diff commit" do
       commit = {
         name: "flo",
@@ -367,7 +287,6 @@ describe "Gollum Page" do
         commit: commit,
         format: :markdown
       }
-      
       res = CommitDiff.new call
       res.save
       diff = res.compare_commits(res.history.first)
@@ -375,14 +294,10 @@ describe "Gollum Page" do
       expect(diff).to match(/---/)
       res.delete
     end
-    
   end
-
-  
   describe "Sub Page" do
     class Fns < GollumRails::Page
     end
-    
     it "should return nil if not persisted" do
       res = CommitDiff.new @call
       expect(res.sub_page?).to be_nil
@@ -390,34 +305,29 @@ describe "Gollum Page" do
     it "should be true" do
       res = CommitDiff.new @call.merge(name: '_aPage')
       res.save
-      expect(res.sub_page?).to be_true
+      expect(res.sub_page?)== true
       res.delete
     end
-    
     it "should be false" do
       res = CommitDiff.new @call
       res.save
-      expect(res.sub_page?).to be_false
+      expect(res.sub_page?) == false
       res.delete
     end
-  end  
-  
+  end
   describe "Current version" do
     class Fns < GollumRails::Page
     end
-    
     it "current version should have 7 digest" do
       res = CommitDiff.new @call
       res.save
       expect(res.current_version.length).to be(7)
       res.delete
     end
-    
     it "should be nil if page has not been set" do
       res = CommitDiff.new @call
       expect(res.current_version).to be_nil
     end
-
     it "should be the latest version of the page but shortened" do
       res = CommitDiff.new @call
       res.save
@@ -430,28 +340,21 @@ describe "Gollum Page" do
       expect(res.gollum_page.version.to_s).to match(/^#{res.current_version(true)}$/)
       res.delete
     end
-    
   end
-  
   describe 'History' do
     class Fns < GollumRails::Page
     end
-    
     it "history should return nil if no gollum_page was saved" do
       res = Fns.new @call
       expect(res.history).to be_nil
     end
-    
     it "history should return the pages versions if there are changes" do
       res = Fns.new @call
       res.save
       expect(res.history).to be_a Array
       res.delete
     end
-    
   end
-  
-  
   describe "path names" do
     class Fns < GollumRails::Page
     end
@@ -460,7 +363,6 @@ describe "Gollum Page" do
       expect(res.path_name).to match ''
       res.destroy(@commit)
     end
-    
     it "should output a path name as there was a path supplied" do
       res = Fns.new @call.merge(name: 'test/pagess')
       res.save
@@ -479,37 +381,29 @@ describe "Gollum Page" do
       #Fns.all(folder: 'test1/').each{|p| puts p.url}
       expect(Fns.all(folder: 'test4').length).to be 1
       expect(Fns.all(folder: 'test5').length).to be 1
-      
       res2.destroy(@commit)
       res.destroy(@commit)
-      
     end
-    
     it "should be empty for a non existing folder" do
       res = Fns.new @call.merge(name: 'test/pagess')
       res.save
-      
       expect(Fns.first(folder: 'test2')).to be_nil
       expect(Fns.last(folder: 'test2')).to be_nil
-      
       res.destroy(@commit)
     end
     it "should not be empty for an existing folder" do
       res = Fns.new @call.merge(name: 'test/pagess')
       res.save
-      
-      expect(Fns.first(folder: 'test')).not_to be_nil 
+      expect(Fns.first(folder: 'test')).not_to be_nil
       expect(Fns.last(folder: 'test')).not_to be_nil
-      
       res.destroy(@commit)
-    end    
+    end
     it "should change the folder" do
       res = Fns.new @call.merge(name: 'test/pagess')
       res.save
       expect(res.path_name).not_to be_nil
       res.destroy(@commit)
     end
-    
     it "should create a nested page under /test" do
       res = Fns.new @call.merge(name: 'test/my_page')
       res.save
@@ -529,10 +423,6 @@ describe "Gollum Page" do
       expect(Fns.search('content').first[:count]).to be(1)
       res.destroy
     end
-
   end
-
-
-
 #end
 end