gollum_rails 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9baab7df51ee264f15748a5a0545fb5b9b8260e
-  data.tar.gz: 102049591d936c7daf3aaa2fbc38c1cb88be46ef
+  metadata.gz: ac973e7abd2f4b27cdc5568448bc2b604a8a43bc
+  data.tar.gz: b8dbaa9689b6ac1ada39efc362dea305a3fe00ef
 SHA512:
-  metadata.gz: 5b6803db7979639b77e5a1b676427b45072c1ae8e990ec425e074bacc2c50b3be55e12709c5427124635fc72272606e6c34377f47272dfbd99833d07b5cb6d55
-  data.tar.gz: c449d6e1a6e6b48f814fe67e99e68b4b1d8e5bb37c791eb6febd35310e0f51074d2b1731ec5a28d104ac4e7692109d054c3d0df159533db5f7c92eb14a8d877e
+  metadata.gz: 02ce3f25360dd389980da220ec91ce2f8a08abccb56799933e705523da96beccf5031ead746a3f24495d713db7b64bb46287f3919e8963e1ac118da3fe75ff7e
+  data.tar.gz: d4a7a8b643cfbf61a6c57e3f48eadac25d6434978ba972a2e288cbeac6824198cc349bd272d38b05f6e7ec3ce71147c49ad5369beb1d27dde8e91413a7a83fbf

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.4.1)
+    gollum_rails (1.4.2)
       activemodel (>= 4.0.0)
-      gollum-lib (~> 1.0.0)
+      gollum-lib (~> 1.0.4)
 
 GEM
   remote: https://rubygems.org/
@@ -46,14 +46,14 @@ GEM
     erubis (2.7.0)
     github-markdown (0.5.3)
     github-markup (0.7.5)
-    gollum-lib (1.0.3)
+    gollum-lib (1.0.4)
       github-markdown (~> 0.5.3)
       github-markup (>= 0.7.5, < 1.0.0)
       grit (~> 2.5.0)
-      nokogiri (~> 1.5.9, < 1.6.0)
-      pygments.rb (~> 0.5.0)
-      sanitize (~> 2.0.3, < 2.0.4)
-      stringex (~> 1.5.1)
+      nokogiri (~> 1.6.0)
+      pygments.rb (~> 0.5.2)
+      sanitize (~> 2.0.6)
+      stringex (~> 2.0.5)
     grit (2.5.0)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
@@ -64,12 +64,14 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
+    mini_portile (0.5.1)
     minitest (4.7.5)
     multi_json (1.7.3)
-    nokogiri (1.5.10)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
-    pygments.rb (0.5.1)
+    pygments.rb (0.5.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
@@ -100,8 +102,8 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
+    sanitize (2.0.6)
+      nokogiri (>= 1.4.4)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -115,7 +117,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    stringex (1.5.1)
+    stringex (2.0.6)
     thor (0.18.1)
     thread_safe (0.1.0)
       atomic

data/HISTORY.md

@@ -1,3 +1,12 @@
+# 1.4.2 1th August 2013
+* Found an issue that the Wiki was not updating from external pushes
+* Some helper methods implemented
+* Improved code quality
+* Should be threadsaver now
+* Updated documentation
+
+# 1.4.1 26th June 2013
+* Rails4
 
 # 1.0.4 1th May 2013
 * removed mutex again

data/README.md

@@ -6,7 +6,7 @@ Gollum for Rails
 [![Coverage Status](https://coveralls.io/repos/nirnanaaa/gollum_rails/badge.png?branch=master)](https://coveralls.io/r/nirnanaaa/gollum_rails)
 
 
-gollum_rails combines the git-powered wiki software gollum with the extremely popular webframework rails.
+gollum_rails combines the git-powered wiki software gollum with the extreme popular webframework rails.
 It improves the lightweight "gollum" experience which is quite awesome.
 
 with gollum_rails you can:

data/gollum_rails.gemspec

@@ -4,13 +4,13 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.4.1'
+  s.version = '1.4.2'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
 
   s.add_dependency 'activemodel', '>= 4.0.0'
-  s.add_dependency 'gollum-lib', '~> 1.0.0'
+  s.add_dependency 'gollum-lib', '~> 1.0.4'
 
   s.add_development_dependency 'rspec', '~> 2.13.0'
   s.add_development_dependency 'rr', '~> 1.1.1'
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
     spec/gollum_rails/adapters/gollum/connector_spec.rb
     spec/gollum_rails/adapters/gollum/error_spec.rb
     spec/gollum_rails/adapters/gollum/page_spec.rb
-    spec/gollum_rails/adapters/gollum/wiki_spec.rb
+    spec/gollum_rails/adapters/gollum/wiki_spec_off.rb
     spec/gollum_rails/error_spec.rb
     spec/gollum_rails/page_spec.rb
     spec/gollum_rails/respository_spec.rb

data/lib/gollum_rails.rb

@@ -23,7 +23,7 @@ module GollumRails
   autoload :Setup,    'gollum_rails/setup'
 
   # GollumRails version string
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 
   # Simplified error
   class Error < StandardError; end

data/lib/gollum_rails/adapters/gollum.rb

@@ -20,7 +20,11 @@ module GollumRails
           attr_writer :page_class
 
           # Sets the wiki class used by all instances
-          attr_writer :wiki_class
+          attr_writer :wiki_path
+          
+          # Sets the wiki options
+          attr_writer :wiki_options
+          
 
           # Sets the applications status
           attr_writer :enabled
@@ -38,13 +42,18 @@ module GollumRails
           def page_class
             @page_class || Page
           end
+          
+          # Gets the wiki options
+          def wiki_options
+            @wiki_options || {}
+          end
 
           # Gets the Globally used Page class or use a new one if not defined
           #
           #
           # Returns the internal page class or a fresh ::Gollum::Page
-          def wiki_class
-            @wiki_class || Wiki
+          def wiki_path
+            @wiki_path || ""
           end
 
         end

data/lib/gollum_rails/adapters/gollum/page.rb

@@ -18,70 +18,92 @@ module GollumRails
 
         Connector.page_class = self
 
-        # Gets / Sets current page
-        attr_accessor :page
-
-          # Gets / Sets the wiki
-        attr_accessor :wiki
-
         class << self
 
+          # == Parses a given filepath e.g. '/test/page'
+          # Name is page
+          # path is /test
+          #
+          # Returns a Hash
+          def parse_path(name)
+            path = '/'
+            name = name.to_s
+            if name.include?('/')
+              name = name[1..-1] if name[0] == "/"
+              content = name.split('/')
+              name = content.pop
+              path = '/'+content.join('/')
+            end
+            { path: path, name: name }
+          end
+          
           # finds all versions of a page
           #
           # name - the pagename to search
+          # wiki - instance of Gollum::Wiki
           #
           # Returns the Gollum::Page class
-          def find_page(name)
-            Connector.wiki_class.page ::Gollum::Page.cname(name)
+          def find_page(name, wiki)
+            path_data = parse_path(name)
+            wiki.paged(path_data[:name], path_data[:path], exact = true)
           end
-
         end
 
-        # creates a new Page
+        # == Creates a new page
         #
-        # name - String
-        # type - Symbol
-        # content - Text
-        # commit - Hash or instance of Committer
+        # name - The name of the page
+        # content - The content of the page
+        # wiki - An instance of Gollum::Wiki
+        # type - A filetype as symbol (optional)
+        # commit - Commit Hash
         #
-        # Returns the commit id
-        def new_page( name, content,type=:markdown, commit={} )
-          Connector.wiki_class.write_page name.to_s, type, content, commit if name
-          @page = Connector.wiki_class.page name
-          @page
+        # Returns the page
+        def new_page( name, content, wiki, type=:markdown, commit={} )
+          path_data = self.class.parse_path(name)
+          wiki.write_page( path_data[:name], type, content, commit, path_data[:path].gsub!(/^\//, "").gsub!(/(\/)+$/,'') || "" )
+          self.class.find_page( name, wiki )
         end
 
-        # updates an existing page
+        # == Updates an existing page
+        #
+        # page - An instance of Gollum::Page
+        # wiki - An instance of Gollum::Wiki
+        # content - New content
+        # commit - Commit Hash
+        # name - A new String (optional)
+        # format - A filetype as symbol (optional)
+        #
+        # Returns the page
+        def update_page( page, wiki, content=nil, commit={}, name=nil, format=nil)
+          return if !page || ((!content||page.raw_data == content) && page.format == format)
+          name ||= page.name
+          format = (format || page.format).to_sym
+          content ||= page.raw_data
+          wiki.update_page(page,name,format,content.to_s,commit)
+          self.class.find_page( mixin(page.url_path, name), wiki )
+        end
+        
+        # == Preview page
         #
-        # new - Hash with changed data
-        # commit - Hash or instance of Committer
-        # old - also an instance of self
+        # wiki - An instance of Gollum::Wiki
+        # content - New content
+        # name - A String
+        # format - A filetype as symbol (optional)
         #
-        # Returns the commit id
-        def update_page( new, commit={}, old=nil)
-          if new.is_a?(Hash)
-            commit_id = Connector.wiki_class.update_page (old||@page), 
-                                          new[:name]||@page.name, 
-                                          new[:format]||@page.format, 
-                                          new[:content]||@page.raw_data, 
-                                          commit 
-          else
-            raise Error.new  "commit must be a Hash. #{new.class} given", :crit
-          end
-
-          # this is very ugly. Shouldn't gollum return the new page?
-          @page = @page.find(new[:name]||@page.name, commit_id)
-          @page
+        def preview_page(wiki, name, content, format=:markdown)
+          page = wiki.preview_page(name,content,format)
+          page.formatted_data
         end
 
-        # deletes an existing page
+        # == Deletes an existing page
         #
-        # page - instance of self
-        # commit - Hash or instance of Committer
+        # page - Gollum::Page
+        # wiki - Gollum::Wiki
+        # commit - Commit Hash
         #
         # Returns the commit id
-        def delete_page( commit={}, page = nil )
-          Connector.wiki_class.delete_page (page||@page), commit
+        def delete_page( page,wiki,commit={} )
+          wiki.delete_page(page, commit)
         end
         
         # renames an existing page
@@ -101,7 +123,6 @@ module GollumRails
         #
         # Returns the Gollum::Page class
         def find_page(name)
-          puts "DEPRECATED! Use Page.find_page instead"
           self.class.find_page(name)
         end
         
@@ -178,6 +199,16 @@ module GollumRails
             raise Error.new  "page cannot be empty for #{__method__}", :high
           end
         end
+        
+        private
+        
+        # replaces old filename with new
+        def mixin(old_url, new_name)
+          url = old_url.split("/")
+          url.pop
+          url << new_name
+          url.join("/")
+        end
 
       end
     end

data/lib/gollum_rails/adapters/gollum/wiki.rb

@@ -6,27 +6,28 @@ module GollumRails
       # TODO: doc
       class  Wiki
 
-        # Gets / Sets the git path or object
-        attr_accessor :git
-
         # Initializes the class
         #
         # location - String or Grit::Repo
-        def initialize(location)
-          @git = location
-          if location.is_a? ::String
-            con = ::Gollum::Wiki.new @git
+        def initialize(location, options={})
+          
+          Connector.wiki_options = options
+          
+          if location.is_a?(::String)
+            con = location
           else
-            con= ::Gollum::Wiki.new @git.path
+            con = location.path
           end
-          Connector.wiki_class = con
+          
+          Connector.wiki_path = con
+          
         end
       
         # Static call from within any other class
         #
         # Returns a new instance of this class
-        def self.wiki(location)
-          Wiki.new(location)
+        def self.wiki(location, options={})
+          Wiki.new(location, options)
         end
 
         # Forwards unknown methods to Gollum::Wiki

data/lib/gollum_rails/page.rb

@@ -15,10 +15,6 @@ module GollumRails
   #   * find_or_initialize_by_name
   #
   class Page
-    # extend ::ActiveModel::Callbacks
-    # include ::ActiveModel::Validations
-    # include ::ActiveModel::Conversion
-    # extend ::ActiveModel::Naming
     include ::ActiveModel::Model
 
 
@@ -30,16 +26,19 @@ module GollumRails
 
     # Callback for delete
     define_model_callbacks :delete
-
+    
+    # Callback for initialize
+    define_model_callbacks :initialize
+    
+    # Callback for create
+    define_model_callbacks :create
+
+    # Callback for commit
+    define_model_callbacks :commit
+    
     # static
     class << self
-      # Gets / Sets the gollum page
-      #
-      attr_accessor :gollum_page
-
-      # Sets the validator
-      attr_writer :validator
-
+      
       # Finds an existing page or creates it
       #
       # name - The name
@@ -63,24 +62,26 @@ module GollumRails
 
       # first creates an instance of itself and executes the save function.
       #
-      # hash - Hash containing the page data
+      # data - Hash containing the page data
       #
       #
       # Returns an instance of Gollum::Page or false
-      def create(hash)
-        page = Page.new hash
+      def create(data)
+        page = Page.new(data)
         page.save
       end
 
 
       # calls `create` on current class. If returned value is nil an exception will be thrown
       #
-      # hash - Hash containing the page data
+      # data - Hash of Data containing all necessary stuff
+      # TODO write this stuff
       #
       #
       # Returns an instance of Gollum::Page
-      def create!(hash)
-        create(hash)
+      def create!(data)
+        page = Page.new(data)
+        page.save!
       end
 
       # Finds a page based on the name and specified version
@@ -89,23 +90,37 @@ module GollumRails
       #
       # Return an instance of Gollum::Page
       def find(name)
-        GollumRails::Adapters::Gollum::Page.find_page name
+        self.new(gollum_page: Adapters::Gollum::Page.find_page(name, wiki))
       end
 
       # Gets all pages in the wiki
       def all
         wiki.pages
       end
+      
       alias_method :find_all, :all
 
       # Gets the wiki instance
       def wiki
-        @wiki || Adapters::Gollum::Connector.wiki_class
+        @wiki ||= ::Gollum::Wiki.new(Adapters::Gollum::Connector.wiki_path, Adapters::Gollum::Connector.wiki_options)
+      end
+      
+      # TODO: implement more of this (format, etc)
+      #
+      def method_missing(name, *args)
+        if name =~ /^find_by_(name)$/
+          self.find(args.first)
+        else
+          raise NoMethodError, "Method #{name} was not found"
+        end
       end
 
     end
 
-
+    # Gets / Sets the gollum page
+    #
+    attr_accessor :gollum_page
+    
     # Initializes a new Page
     #
     # attrs - Hash of attributes
@@ -114,6 +129,7 @@ module GollumRails
     def initialize(attrs = {})
       if Adapters::Gollum::Connector.enabled
         attrs.each{|k,v| self.public_send("#{k}=",v)} if attrs
+        update_attrs if attrs[:gollum_page]
       else
         raise GollumInternalError, 'gollum_rails is not enabled!'
       end
@@ -150,8 +166,11 @@ module GollumRails
 
     # Gets the page class
     def page
-      @page ||= Adapters::Gollum::Connector.page_class.new
+      Adapters::Gollum::Page.new
     end
+    
+    # Gollum Page
+    attr_accessor :gollum_page
 
     #############
     # activemodel
@@ -180,37 +199,45 @@ module GollumRails
     # Returns an instance of Gollum::Page or false
     def save
       run_callbacks :save do
-        return false unless valid?
+        return nil unless valid?
         begin
-          page.new_page(name,content,format,commit)
+          @gollum_page = page.new_page(name,content,wiki,format,commit) 
         rescue ::Gollum::DuplicatePageError => e
-          page.page = Adapters::Gollum::Connector.page_class.find_page(name)
+          @gollum_page = Adapters::Gollum::Page.find_page(name, wiki)
         end
-        return page.page
+        return self
       end
     end
 
-    # aliasing save
+    # == Save without exception handling
+    # raises errors everytime something is wrong 
     #
-    # TODO:
-    #   * implement full method!
-    alias_method :save!, :save
+    def save!
+      run_callbacks :save do
+        raise StandardError, "record is not valid" unless valid?
+        raise StandardError, "commit could not be empty" if commit == {}
+        @gollum_page = page.new_page(name,content,wiki,format,commit)
+        return self
+      end
+    end
 
-    # Updates an existing page (or created)
+    # == Updates an existing page (or created)
     #
-    # hash - Hash containing the attributes, you want to update
+    # content - optional. If given the content of the gollum_page will be updated
+    # name - optional. If given the name of gollum_page will be updated
+    # format - optional. Updates the format. Uses markdown as default
     # commit - optional. If given this commit will be used instead of that one, used
     #          to initialize the instance
     #
     #
-    # Returns an instance of Gollum::Page
-    def update_attributes(hash, commit=nil)
+    # Returns an instance of GollumRails::Page
+    def update_attributes(content=nil,name=nil,format=:markdown, commit=nil)
       run_callbacks :update do
-        page.update_page hash, get_right_commit(commit)
+        @gollum_page = page.update_page(gollum_page, wiki, content, get_right_commit(commit), name, format)
       end
     end
 
-    # Deletes current page (also available static. See below)
+    # == Deletes current page (also available static. See below)
     #
     # commit - optional. If given this commit will be used instead of that one, used
     #          to initialize the instance
@@ -218,7 +245,7 @@ module GollumRails
     # Returns the commit id of the current action as String
     def delete(commit=nil)
       run_callbacks :delete do
-        page.delete_page get_right_commit(commit)
+        page.delete_page(gollum_page, wiki, get_right_commit(commit))
       end
     end
 
@@ -226,12 +253,13 @@ module GollumRails
     #
     #
     def persisted?
-      return true if page.page.instance_of?(::Gollum::Page)
+      return true if gollum_page
       return false
     end
-    # Previews the page - Mostly used if you want to see what you do before saving
+    
+    # == Previews the page - Mostly used if you want to see what you do before saving
     #
-    # This is an extremely performant method!
+    # This is an extremely fast method!
     # 1 rendering attempt take depending on the content about 0.001 (simple markdown)
     # upto 0.004 (1000 chars markdown) seconds, which is quite good
     #
@@ -241,16 +269,63 @@ module GollumRails
     #
     # Returns a String
     def preview(format=:markdown)
-      preview = self.class.wiki.preview_page @name, @content, format
-      preview.formatted_data
+      page.preview_page( wiki, name, content, format )
     end
 
-
+    # == Gets the url for current page from Gollum::Page
+    #
+    # Returns a String
+    def url
+      gollum_page.url_path
+    end
+    
+    # == Gets the title for current Gollum::Page
+    #
+    # Returns a String
+    def title
+      gollum_page.title
+    end
+    
+    # == Gets formatted_data for current Gollum::Page
+    #
+    # Returns a String
+    def html_data
+      gollum_page.formatted_data
+    end
+    
+    
+    # == Gets raw_data for current Gollum::Page
+    #
+    # Returns a String
+    def raw_data
+      gollum_page.raw_data
+    end
+    
+    # == Gets the history of current gollum_page
+    #
+    # Returns an Array
+    def history
+      gollum_page.versions
+    end
+    
+    # == Gets the last modified by Gollum::Committer
+    #
+    # Returns a String
+    def last_changed_by
+      "%s <%s>" % [history.last.author.name, history.last.author.email]
+    end
+    
+    
+    def compare_commits(sha1,sha2)
+      puts "NOT YET IMPLEMENTED"
+    end
+      
+    
     #######
     private
     #######
 
-    # Get the right commit out of 2 commits
+    # == Gets the right commit out of 2 commits
     #
     # commit_local - local commit Hash
     #
@@ -260,6 +335,19 @@ module GollumRails
       com = commit_local if !commit_local.nil?
       return com
     end
-
+    
+    # == Updates local attributes from gollum_page class
+    #
+    def update_attrs
+      @name = gollum_page.name
+      @content= gollum_page.raw_data
+      @format = gollum_page.format      
+    end
+    
+    # == To static
+    def wiki
+      self.class.wiki
+    end
+    
   end
  end

data/lib/gollum_rails/setup.rb

@@ -27,6 +27,9 @@ module GollumRails
       # Gets / Sets the repository
       attr_accessor :repository
 
+      # Gets / Sets the init options
+      attr_accessor :options
+      
       # Startup action for building wiki components
       #
       # Returns true or throws an exception if the path is invalid
@@ -39,7 +42,11 @@ module GollumRails
             initialize_wiki @repository
           end
         end
-
+      end
+      
+      # Wiki startup options
+      def options=(options)
+        @options = options
       end
       
       # defines block builder for Rails initializer.
@@ -68,7 +75,7 @@ module GollumRails
       def initialize_wiki(path)
         if path_valid? path
           repository = Grit::Repo.new path.to_s
-          GollumRails::Adapters::Gollum::Wiki.new repository
+          GollumRails::Adapters::Gollum::Wiki.new(repository, options || {})
           true
         else
           raise GollumInternalError, 'no repository path specified'

data/spec/gollum_rails/adapters/gollum/connector_spec.rb

@@ -5,9 +5,15 @@ describe GollumRails::Adapters::Gollum::Connector do
     @class = GollumRails::Adapters::Gollum::Connector 
   end
 
-  it "should test the Wiki class connector" do
-    @class.wiki_class.should == GollumRails::Adapters::Gollum::Wiki
+  it "should test the Wiki path connector" do
+    @class.wiki_path.should be_a String
   end
+  it "should test the Wiki options connector" do
+    @class.wiki_options.should be_a Hash
+  end  
+  it "should test the Wiki options content" do
+    @class.wiki_options.should == {}
+  end  
   it "should test the Page class connector" do
     @class.page_class.should == GollumRails::Adapters::Gollum::Page
   end

data/spec/gollum_rails/adapters/gollum/page_spec.rb

@@ -6,83 +6,24 @@ describe GollumRails::Adapters::Gollum::Page do
       :name => 'The Mosny',
       :email => 'mosny@zyg.li'
     }
-
-    @location = "#{File.dirname(__FILE__)}/../../../utils/wiki.git"
-    @repo = Grit::Repo.init_bare @location
-    @wiki = GollumRails::Adapters::Gollum::Wiki.new @repo
-    @page = GollumRails::Adapters::Gollum::Page.new 
   end
-  it "should initialize the correct wiki" do
-    location = "#{File.dirname(__FILE__)}/../../../utils/wiki.git"
-    repo = Grit::Repo.init_bare location
-    wiki = GollumRails::Adapters::Gollum::Wiki.new repo
-    page = GollumRails::Adapters::Gollum::Page.new 
-  end
-  it "should create a new page" do
-    location = "#{File.dirname(__FILE__)}/../../../utils/wiki.git"
-    repo = Grit::Repo.init_bare location
-    wiki = GollumRails::Adapters::Gollum::Wiki.new repo
-    page = GollumRails::Adapters::Gollum::Page.new 
-    page.new_page("testpage", "content",:markdown, @commit ).should be_instance_of Gollum::Page
-    page.delete_page(@commit)
-  end
-
-  it "should delete an existing page" do
-    page = @page.new_page 'testpage', 'content', :markdown, @commit
-    @page.delete_page(@commit,page).should be_instance_of String
-    
-    @page.new_page 'testpage', 'content', :markdown, @commit
-    @page.delete_page(@commit).should be_instance_of String
-  end
-  it "should update an existing page" do 
-    @page.new_page 'testpage', 'content', :markdown, @commit
-    page = {}
-    page[:name] = 'test'
-    page[:format] = :markdown
-    page[:content] = "content"
-    @page.update_page(page, @commit)
-
-    page = []
-    expect{@page.update_page(page, @commit)}.to raise_error GollumRails::Adapters::Gollum::Error
-
-    page = {}
-    page[:content] = "test"
-    @page.update_page(page, @commit).raw_data.should == page[:content]
-
-    page = {}
-    page[:name] = "test"
-    @page.update_page(page, @commit).name.should == page[:name]
-
-    page = {}
-    page[:format] = :wiki
-    @page.update_page(page, @commit).format.should == :mediawiki
-
-
-
-    @page.delete_page(@commit)
-  end
-  it "should find a page" do
-    @page.new_page 'content_page', 'content', :markdown, @commit
-
-    GollumRails::Adapters::Gollum::Page.find_page("content_page")
-    @page.delete_page(@commit)
-  end
-  it "should test the commit methods" do
-    @page.new_page 'content_page', 'content', :markdown, @commit
-    @page.page_last_edited_date.should be_instance_of Time
-    @page.page_created.should be_instance_of Time
-    @page.page_last_commit.should be_instance_of Grit::Commit
-    @page.page_commit(@page.page.versions.first.id).should be_instance_of Grit::Commit
-    @page.page_commit_date(@page.page.versions.first.id).should be_instance_of Time
-    @page.page_first_commit.should be_instance_of Grit::Commit
-    @page.delete_page(@commit)
-  end
-  it "should test the error throwing" do
-    expect{@page.page_last_commit}.to raise_error GollumRails::Adapters::Gollum::Error
-    expect{@page.page_first_commit}.to raise_error GollumRails::Adapters::Gollum::Error
-    expect{@page.page_last_edited_date}.to raise_error GollumRails::Adapters::Gollum::Error
-    expect{@page.page_created}.to raise_error GollumRails::Adapters::Gollum::Error
-    expect{@page.page_commit(1)}.to raise_error GollumRails::Adapters::Gollum::Error
-    expect{@page.page_commit_date(1)}.to raise_error GollumRails::Adapters::Gollum::Error
+  describe "Connector stuff" do
+    it "should have updated the page_class on initialize" do
+      adapter = GollumRails::Adapters::Gollum::Page.new
+      GollumRails::Adapters::Gollum::Connector.page_class.should == GollumRails::Adapters::Gollum::Page
+    end
+  end
+  describe "statically methods" do
+    it "is a hash" do
+      GollumRails::Adapters::Gollum::Page.parse_path('google/de').should be_a Hash
+    end
+    it "should equal" do
+      path1 = GollumRails::Adapters::Gollum::Page.parse_path('google/de')
+      path2 = GollumRails::Adapters::Gollum::Page.parse_path('/google/de')
+      path1.should == path2
+    end
+    it "adds a leading slash" do
+      GollumRails::Adapters::Gollum::Page.parse_path('google/de')[:path][0].should == '/'
+    end
   end
 end

data/spec/gollum_rails/page_spec.rb

@@ -2,58 +2,139 @@ require 'spec_helper'
 
 describe "Gollum Page" do
   before(:each) do
+    GollumRails::Setup.build do |config|
+      config.repository = File.join(File.dirname(__FILE__),'..','utils','wiki.git')
+      config.options={}
+      config.startup = true
+    end
+    
       @commit = {
-        :name => "flo",
-        :message => "commit",
-        :email => "mosny@zyg.li"
+        name: "flo",
+        message: "commit",
+        email: "mosny@zyg.li"
       }
       @call = {
-        :name => "Goole",
-        :content => "content data",
-        :commit => @commit,
-        :format => :markdown
+        name: "Goole",
+        content: "content data",
+        commit: @commit,
+        format: :markdown
       }
     end
+    
   describe GollumRails::Page do
-    class RailsModel < GollumRails::Page
+    class RailsModel < GollumRails::Page; end
 
+    describe "the creation of a page" do
+      
+      before :each do 
+        @rr = RailsModel.new(@call)
+      end
+      
+      it "saves via .save" do
+        @rr.save.should be_a GollumRails::Page
+      end
+      
 
-    end
+      it "saves via .create" do
+        RailsModel.create(@call).should be_a GollumRails::Page
+      end
+      
+
+      it "fails if invalid arguments are supplied via the ! create" do
+        args = {
+          name: "Gaming",
+          content: "content data",
+          commit: {},
+          format: :markdown
+        }
+        expect{RailsModel.create!(args)}.to raise_error  StandardError #change this
+      end
+      it "has a history now" do
+        @rr.save
+        @rr.history.should be_a Array
+      end
+      it "outputs the raw_data" do
+        @rr.save
+        @rr.raw_data.should == @call[:content]
+      end
+      it "has the formatted data" do
+        @rr.save
+        @rr.html_data.should == '<p>content data</p>'
+      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"
+      end
+      it "has a url" do
+        @rr.save
+        @rr.url.should =="Goole"
+      end
 
-    it "should test the creation of a page" do
-      rr = RailsModel.new(@call)
-      rr.save.should be_instance_of Gollum::Page
-      rr.save!.should be_instance_of Gollum::Page
-      RailsModel.create(@call)
     end
 
-    it "should test the update of a page" do
-      rr = RailsModel.new @call
-      cc = rr.save.should be_instance_of Gollum::Page
-      rr.update_attributes({:name => "google", :format => :wiki}).should be_instance_of Gollum::Page
+    describe "the update of a page" do
+      before :each do 
+        @rr = RailsModel.new(@call)
+        @rr.save
+      end
+      
+      it { @rr.update_attributes({:name => "google", :format => :wiki}).should be_a Gollum::Page }
+      
     end
-
-    it "should test the deletion of a page" do
-      rr = RailsModel.new @call
-      cc = rr.save.should be_instance_of Gollum::Page
-      rr.delete.should be_instance_of String
+    describe "method missings" do
+      
+      it "should perform a normal find" do
+        RailsModel.find_by_name('Goole').should be_a GollumRails::Page
+          
+        
+      end
+      
     end
 
-    it "should test the finding of a page" do
-      RailsModel.find('google').should be_instance_of Gollum::Page
-
-      #invalid input
-      RailsModel.find('<script type="text/javascript">alert(123);</script>').should be_nil
-    end
-    it "should test the preview" do
-      rr = RailsModel.new :content => "# content", :name => "somepage"
-      100.times do
-        rr.preview.should include("<h1>content<a class=\"anchor\" id=\"content\" href=\"#content\"></a></h1>")
+    describe "should test the deletion of a page" 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
+      end
+      
+      it "should return a SHA1 hash" do
+        delete = @rr.delete
+        delete.length.should == 40
+      end
+      
+      it "should also work was result from save" do
+        delete = @cc.delete
+        delete.should be_a String
+      end
+      
+      it "should test the recreation" do
+        delete = @rr.delete
+        @rr.save.should be_a GollumRails::Page
+        @rr.delete.should be_a String
+        
       end
     end
 
+
+    100.times do
+      it "should test the preview" do
+        rr = RailsModel.new :content => "# content", :name => "somepage"
+          rr.preview.should include("<h1>content<a class=\"anchor\" id=\"content\" href=\"#content\"></a></h1>")
+      end
+   end
+   
     it "should test exception methods" do
-      create = RailsModel.create! @call
+      RailsModel.create @call
+      expect{RailsModel.create! @call}.to raise_error Gollum::DuplicatePageError
     end
 
     it "should test the supported formats" do
@@ -69,11 +150,11 @@ describe "Gollum Page" do
       rr = RailsModel.new @call
       rr.name.should == "Goole"
       rr.content.should == "content data"
-      rr.commit.should be_instance_of Hash
+      rr.commit.should be_a Hash
       rr.commit.should == @commit
       rr.format.should == :markdown
       rr.save
-      rr.page.should be_instance_of GollumRails::Adapters::Gollum::Page
+      rr.page.should be_a GollumRails::Adapters::Gollum::Page
     end
     it "should test setters" do
       rr = RailsModel.new
@@ -87,7 +168,7 @@ describe "Gollum Page" do
     it "should test find or initialize" do
       rr = RailsModel.new @call
       rr.save
-      RailsModel.find_or_initialize_by_name(@call[:name], @commit).should  be_instance_of Gollum::Page
+      RailsModel.find_or_initialize_by_name(@call[:name], @commit).should  be_a GollumRails::Page
     end
   end
   describe "callbacks" do
@@ -136,16 +217,15 @@ describe "Gollum Page" do
       test = CallbackTest.new @call
       test.persisted?.should be_false
       test.save
-      test.delete @commit
-      test.save
-      test.update_attributes @call
-      test.persisted?.should be_true
     end
   end
   describe "rails extension" do
+    
     it "should test fetch_all" do
-      GollumRails::Page.all.length.should == 2
-      GollumRails::Page.find_all.length.should == 2
+      GollumRails::Page.all.length.should == 1
+    end
+    it "should test all" do 
+      GollumRails::Page.find_all.length.should == 1
     end
 
   end
@@ -195,7 +275,7 @@ describe "Gollum Page" do
      100.times do |time|
        Thread.new do
          ThreadModel.new(@call)
-         ThreadModel.save.should be_instance_of(Gollum::Page)
+         ThreadModel.save.should be_a(GollumRails::Page)
          ThreadModel.delete(@commit).length.should == 40
        end
      end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ files:
 - spec/gollum_rails/adapters/gollum/connector_spec.rb
 - spec/gollum_rails/adapters/gollum/error_spec.rb
 - spec/gollum_rails/adapters/gollum/page_spec.rb
-- spec/gollum_rails/adapters/gollum/wiki_spec.rb
+- spec/gollum_rails/adapters/gollum/wiki_spec_off.rb
 - spec/gollum_rails/error_spec.rb
 - spec/gollum_rails/page_spec.rb
 - spec/gollum_rails/respository_spec.rb
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gollum_rails
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Combines Gollum and Rails