gollum_rails 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5e3515f14116b1aeb5ed2717b76293cbd1548e7
-  data.tar.gz: 6de8ad0cee8e27e0d800f2ac323ed1182ae85b7f
+  metadata.gz: b87546f15e81ee861f432ab257ab70287196bc7c
+  data.tar.gz: 1ad1939ae2859a5a1ce7d7dc6e2d0d5f107d895c
 SHA512:
-  metadata.gz: c27bc643db23fdcd0c22847dfc202b32f9215e54fa48e67e48500a9a0b8733b41352bca8d27b064d9501f40aa62e64ff25b53596bee6946cdcf2a6d0a1bae7ff
-  data.tar.gz: a15689feba2f801ea6f6de6eacd37ebb71833d00c9c075dc19eaa9be66572fb93883af8486cb668edf76b57acaa36f2dd97e5503e6919fef8f12dc96ce0f0e9d
+  metadata.gz: cd4863a15684e585c59ed92390b14f65e77edd5c84a3975d876767f98d4c939357f896291281beee631b5d729638de1eefd5789f8eee655a2f14a5d9daaa754a
+  data.tar.gz: 60e919e7cd76defb8b20bc9535617f6430537b7279c92f5e60a423d0cb393c807d9b9f080133b967e44f0fbfb1dac9f84f8662ab0cee9545da4a47f07f58fe77

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.4.3)
+    gollum_rails (1.4.4)
       activemodel (>= 4.0.0)
-      gollum-lib (~> 1.0.4)
+      gollum-lib (~> 1.0.8)
 
 GEM
   remote: https://rubygems.org/
@@ -35,6 +35,7 @@ GEM
     arel (4.0.0)
     atomic (1.1.9)
     builder (3.1.4)
+    charlock_holmes (0.6.9.4)
     coderay (1.0.9)
     colorize (0.5.8)
     coveralls (0.6.4)
@@ -47,20 +48,19 @@ GEM
     erubis (2.7.0)
     ffi (1.9.0)
     formatador (0.2.4)
-    github-markdown (0.5.3)
     github-markup (0.7.5)
-    gollum-lib (1.0.4)
-      github-markdown (~> 0.5.3)
+    gitlab-grit (2.6.0)
+      charlock_holmes (~> 0.6.9)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
+    gollum-lib (1.0.8)
       github-markup (>= 0.7.5, < 1.0.0)
-      grit (~> 2.5.0)
+      gitlab-grit (~> 2.6.0)
       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)
-      posix-spawn (~> 0.3.6)
+      stringex (~> 2.1.0)
     guard (1.8.0)
       formatador (>= 0.2.4)
       listen (>= 1.0.0)
@@ -82,7 +82,7 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.23)
-    mini_portile (0.5.1)
+    mini_portile (0.5.2)
     minitest (4.7.5)
     multi_json (1.7.3)
     nokogiri (1.6.0)
@@ -145,7 +145,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    stringex (2.0.6)
+    stringex (2.1.0)
     thor (0.18.1)
     thread_safe (0.1.0)
       atomic

data/HISTORY.md

@@ -1,3 +1,10 @@
+# 1.4.4 31th October 2013
+* Removed Monkey patch for Grit
+* Upgraded Gollum lib version
+* Fixed specs for new gollum behavior
+* Removed String freedom patches
+*  
+
 # 1.4.3 1th September 2013
 * Display the current pages version (short OR long)
 * Display if the page is a sub page

data/README.md

@@ -4,7 +4,7 @@ Gollum for Rails
 [![Dependency Status](https://gemnasium.com/nirnanaaa/gollum_rails.png)](https://gemnasium.com/nirnanaaa/gollum_rails)
 [![Gem Version](https://badge.fury.io/rb/gollum_rails.png)](http://badge.fury.io/rb/gollum_rails)
 [![Coverage Status](https://coveralls.io/repos/nirnanaaa/gollum_rails/badge.png?branch=master)](https://coveralls.io/r/nirnanaaa/gollum_rails)
-
+[![Code Climate](https://codeclimate.com/github/nirnanaaa/gollum_rails.png)](https://codeclimate.com/github/nirnanaaa/gollum_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.
@@ -17,6 +17,10 @@ with gollum_rails you can:
 * Use own preprocession e.g. background workers for data procession
 * Use user authentication e.g. Devise or Authlogic
 
+For an Editor to use with gollum_rails I personally like the [gollum_editor](https://github.com/samknight/gollum_editor)
+
+It provides nearly the same features as the official editor.
+
 ## SYSTEM REQUIREMENTS
 - Python 2.5+ (2.7.3 recommended)
 - Ruby 1.9.3+ (2.0.0 recommended)

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.3'
+  s.version = '1.4.4'
 
   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.4'
+  s.add_dependency 'gollum-lib', '~> 1.0.8'
 
   s.add_development_dependency 'rspec', '~> 2.13.0'
   s.add_development_dependency 'rr', '~> 1.1.1'
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
     README.md
     Rakefile
     gollum_rails.gemspec
-    lib/core_ext/string.rb
     lib/generators/gollum_rails/install/install_generator.rb
     lib/generators/gollum_rails/install/templates/gollum_initializer.rb
     lib/generators/gollum_rails/language/language_generator.rb
@@ -52,7 +51,6 @@ Gem::Specification.new do |s|
     lib/gollum_rails/adapters/gollum/wiki.rb
     lib/gollum_rails/page.rb
     lib/gollum_rails/setup.rb
-    lib/grit/git-ruby/internal/pack.rb
     spec/gollum_rails/adapters/activemodel/error_spec.rb
     spec/gollum_rails/adapters/activemodel/naming_spec.rb
     spec/gollum_rails/adapters/activemodel/validation_unused.rb

data/lib/gollum_rails.rb

@@ -6,9 +6,6 @@ require 'rubygems'
 # external
 require 'gollum-lib'
 
-# patches
-require 'grit/git-ruby/internal/pack'
-require 'core_ext/string'
 
 # GollumRails is a RubyGem for extending Rails and the Gollum wiki powered by github
 # It has the ability to combine the benefits from a git powered wiki with Rails.
@@ -23,7 +20,7 @@ module GollumRails
   autoload :Setup,    'gollum_rails/setup'
 
   # GollumRails version string
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
 
   # Simplified error
   class Error < StandardError; end

data/spec/gollum_rails/page_spec.rb

@@ -59,7 +59,7 @@ describe "Gollum Page" do
       end
       it "has the formatted data" do
         @rr.save
-        @rr.html_data.should == '<p>content data</p>'
+        @rr.html_data.should == 'content data'
       end
       it "was last changed by me" do
         @rr.save
@@ -124,13 +124,6 @@ describe "Gollum Page" do
       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
       RailsModel.create @call
@@ -338,7 +331,7 @@ describe "Gollum Page" do
       res.update_attributes("content",nil,:markdown, @commit)
       diff = res.compare_commits(res.history.first)
       expect(diff).to be_a String
-      expect(diff).to match(/diff/)
+      expect(diff).to match(/---/)
       res.delete
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-10-31 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.4
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,6 @@ files:
 - README.md
 - Rakefile
 - gollum_rails.gemspec
-- lib/core_ext/string.rb
 - lib/generators/gollum_rails/install/install_generator.rb
 - lib/generators/gollum_rails/install/templates/gollum_initializer.rb
 - lib/generators/gollum_rails/language/language_generator.rb
@@ -112,7 +111,6 @@ files:
 - lib/gollum_rails/adapters/gollum/wiki.rb
 - lib/gollum_rails/page.rb
 - lib/gollum_rails/setup.rb
-- lib/grit/git-ruby/internal/pack.rb
 - spec/gollum_rails/adapters/activemodel/error_spec.rb
 - spec/gollum_rails/adapters/activemodel/naming_spec.rb
 - spec/gollum_rails/adapters/activemodel/validation_unused.rb
@@ -150,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gollum_rails
-rubygems_version: 2.0.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Combines Gollum and Rails

data/lib/core_ext/string.rb

@@ -1,3 +0,0 @@
-class String
-    def getord(offset); self[offset].ord; end
-end

data/lib/grit/git-ruby/internal/pack.rb

@@ -1,397 +0,0 @@
-#
-# converted from the gitrb project
-#
-# authors:
-#    Matthias Lederhofer <matled@gmx.net>
-#    Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
-#    Scott Chacon <schacon@gmail.com>
-#
-# provides native ruby access to git objects and pack files
-#
-
-require 'zlib'
-require 'grit/git-ruby/internal/raw_object'
-require 'grit/git-ruby/internal/file_window'
-
-PACK_IDX_SIGNATURE = [0xFF, 0x74, 0x4F, 0x63]
-
-module Grit
-  module GitRuby
-    module Internal
-      class PackFormatError < StandardError
-      end
-
-      class PackStorage
-        OBJ_OFS_DELTA = 6
-        OBJ_REF_DELTA = 7
-
-        FanOutCount = 256
-        SHA1Size = 20
-        IdxOffsetSize = 4
-        OffsetSize = 4
-        ExtendedOffsetSize = 8
-        CrcSize = 4
-        OffsetStart = FanOutCount * IdxOffsetSize
-        SHA1Start = OffsetStart + OffsetSize
-        EntrySize = OffsetSize + SHA1Size
-        EntrySizeV2 = SHA1Size + CrcSize + OffsetSize
-
-        def initialize(file)
-          if file =~ /\.idx$/
-            file = file[0...-3] + 'pack'
-          end
-          @name = file
-          @cache = {}
-          init_pack
-        end
-
-        def with_idx(index_file = nil)
-          index_file ||= @name[0...-4] + 'idx'
-
-          begin
-            idxfile = File.open(index_file, 'rb')
-          rescue Errno::ENOENT => boom
-            # file went away. bail out without yielding.
-            return
-          end
-
-          # read header
-          sig = idxfile.read(4).unpack("C*")
-          ver = idxfile.read(4).unpack("N")[0]
-
-          if sig == PACK_IDX_SIGNATURE
-            if(ver != 2)
-              raise PackFormatError, "pack #@name has unknown pack file version #{ver}"
-            end
-            @version = 2
-          else
-            @version = 1
-          end
-
-          idx = FileWindow.new(idxfile, @version)
-          yield idx
-          idx.unmap
-        ensure
-          idxfile.close if idxfile
-        end
-
-        def with_packfile
-          begin
-            packfile = File.open(@name, 'rb')
-          rescue Errno::ENOENT
-            # file went away. bail out without yielding.
-            return
-          end
-          yield packfile
-        ensure
-          packfile.close if packfile
-        end
-
-        def cache_objects
-          @cache = {}
-          with_packfile do |packfile|
-            each_entry do |sha, offset|
-              data, type = unpack_object(packfile, offset, {:caching => true})
-              if data
-                @cache[sha] = RawObject.new(OBJ_TYPES[type], data)
-              end
-            end
-          end
-        end
-
-        def name
-          @name
-        end
-
-        def close
-          # shouldnt be anything open now
-        end
-
-        # given an index file, list out the shas that it's packfile contains
-        def get_shas
-          shas = []
-          each_sha1 { |sha| shas << sha.unpack("H*")[0] }
-          shas
-        end
-
-        def [](sha1)
-          if obj = @cache[sha1]
-            return obj
-          end
-
-          offset = find_object(sha1)
-          return nil if !offset
-          @cache[sha1] = obj = parse_object(offset)
-          return obj
-        end
-
-        def init_pack
-          with_idx do |idx|
-            @offsets = [0]
-            FanOutCount.times do |i|
-              pos = idx[i * IdxOffsetSize,IdxOffsetSize].unpack('N')[0]
-              if pos < @offsets[i]
-                raise PackFormatError, "pack #@name has discontinuous index #{i}"
-              end
-              @offsets << pos
-            end
-            @size = @offsets[-1]
-          end
-        end
-
-        def each_entry
-          with_idx do |idx|
-            if @version == 2
-              data = read_data_v2(idx)
-              data.each do |sha1, crc, offset|
-                yield sha1, offset
-              end
-            else
-              pos = OffsetStart
-              @size.times do
-                offset = idx[pos,OffsetSize].unpack('N')[0]
-                sha1 = idx[pos+OffsetSize,SHA1Size]
-                pos += EntrySize
-                yield sha1, offset
-              end
-            end
-          end
-        end
-
-        def read_data_v2(idx)
-          data = []
-          pos = OffsetStart
-          @size.times do |i|
-            data[i] = [idx[pos,SHA1Size], 0, 0]
-            pos += SHA1Size
-          end
-          @size.times do |i|
-            crc = idx[pos,CrcSize]
-            data[i][1] = crc
-            pos += CrcSize
-          end
-          @size.times do |i|
-            offset = idx[pos,OffsetSize].unpack('N')[0]
-            data[i][2] = offset
-            pos += OffsetSize
-          end
-          data
-        end
-        private :read_data_v2
-
-        def each_sha1
-          with_idx do |idx|
-            if @version == 2
-              data = read_data_v2(idx)
-              data.each do |sha1, crc, offset|
-                yield sha1
-              end
-            else
-              pos = SHA1Start
-              @size.times do
-                sha1 = idx[pos,SHA1Size]
-                pos += EntrySize
-                yield sha1
-              end
-            end
-          end
-        end
-
-        def find_object_in_index(idx, sha1)
-          slot = sha1.getord(0)
-          return nil if !slot
-          first, last = @offsets[slot,2]
-          while first < last
-            mid = (first + last) / 2
-            if @version == 2
-              midsha1 = idx[OffsetStart + (mid * SHA1Size), SHA1Size]
-              cmp = midsha1 <=> sha1
-
-              if cmp < 0
-                first = mid + 1
-              elsif cmp > 0
-                last = mid
-              else
-                pos = OffsetStart + (@size * (SHA1Size + CrcSize)) + (mid * OffsetSize)
-                offset = idx[pos, OffsetSize].unpack('N')[0]
-                if offset & 0x80000000 > 0
-                  offset &= 0x7fffffff
-                  pos = OffsetStart + (@size * (SHA1Size + CrcSize + OffsetSize)) + (offset * ExtendedOffsetSize)
-                  words = idx[pos, ExtendedOffsetSize].unpack('NN')
-                  offset = (words[0] << 32) | words[1]
-                end
-                return offset
-              end
-            else
-              midsha1 = idx[SHA1Start + mid * EntrySize,SHA1Size]
-              cmp = midsha1 <=> sha1
-
-              if cmp < 0
-                first = mid + 1
-              elsif cmp > 0
-                last = mid
-              else
-                pos = OffsetStart + mid * EntrySize
-                offset = idx[pos,OffsetSize].unpack('N')[0]
-                return offset
-              end
-            end
-          end
-          nil
-        end
-
-        def find_object(sha1)
-          obj = nil
-          with_idx do |idx|
-            obj = find_object_in_index(idx, sha1)
-          end
-          obj
-        end
-        private :find_object
-
-        def parse_object(offset)
-          obj = nil
-          with_packfile do |packfile|
-            data, type = unpack_object(packfile, offset)
-            obj = RawObject.new(OBJ_TYPES[type], data)
-          end
-          obj
-        end
-        protected :parse_object
-
-        def unpack_object(packfile, offset, options = {})
-          obj_offset = offset
-          packfile.seek(offset)
-
-          c = packfile.read(1).getord(0)
-          size = c & 0xf
-          type = (c >> 4) & 7
-          shift = 4
-          offset += 1
-          while c & 0x80 != 0
-            c = packfile.read(1).getord(0)
-            size |= ((c & 0x7f) << shift)
-            shift += 7
-            offset += 1
-          end
-
-          return [false, false] if !(type == OBJ_COMMIT || type == OBJ_TREE) && options[:caching]
-
-          case type
-          when OBJ_OFS_DELTA, OBJ_REF_DELTA
-            data, type = unpack_deltified(packfile, type, offset, obj_offset, size, options)
-            #puts type
-          when OBJ_COMMIT, OBJ_TREE, OBJ_BLOB, OBJ_TAG
-            data = unpack_compressed(offset, size)
-          else
-            raise PackFormatError, "invalid type #{type}"
-          end
-          [data, type]
-        end
-        private :unpack_object
-
-        def unpack_deltified(packfile, type, offset, obj_offset, size, options = {})
-          packfile.seek(offset)
-          data = packfile.read(SHA1Size)
-
-          if type == OBJ_OFS_DELTA
-            i = 0
-            c = data.getord(i)
-            base_offset = c & 0x7f
-            while c & 0x80 != 0
-              c = data.getord(i += 1)
-              base_offset += 1
-              base_offset <<= 7
-              base_offset |= c & 0x7f
-            end
-            base_offset = obj_offset - base_offset
-            offset += i + 1
-          else
-            base_offset = find_object(data)
-            offset += SHA1Size
-          end
-
-          base, type = unpack_object(packfile, base_offset)
-
-          return [false, false] if !(type == OBJ_COMMIT || type == OBJ_TREE) && options[:caching]
-
-          delta = unpack_compressed(offset, size)
-          [patch_delta(base, delta), type]
-        end
-        private :unpack_deltified
-
-        def unpack_compressed(offset, destsize)
-          outdata = ""
-          with_packfile do |packfile|
-            packfile.seek(offset)
-            zstr = Zlib::Inflate.new
-            while outdata.size < destsize
-              indata = packfile.read(4096)
-              if indata.size == 0
-                raise PackFormatError, 'error reading pack data'
-              end
-              outdata << zstr.inflate(indata)
-            end
-            if outdata.size > destsize
-              raise PackFormatError, 'error reading pack data'
-            end
-            zstr.close
-          end
-          outdata
-        end
-        private :unpack_compressed
-
-        def patch_delta(base, delta)
-          src_size, pos = patch_delta_header_size(delta, 0)
-          if src_size != base.size
-            raise PackFormatError, 'invalid delta data'
-          end
-
-          dest_size, pos = patch_delta_header_size(delta, pos)
-          dest = ""
-          while pos < delta.size
-            c = delta.getord(pos)
-            pos += 1
-            if c & 0x80 != 0
-              pos -= 1
-              cp_off = cp_size = 0
-              cp_off = delta.getord(pos += 1) if c & 0x01 != 0
-              cp_off |= delta.getord(pos += 1) << 8 if c & 0x02 != 0
-              cp_off |= delta.getord(pos += 1) << 16 if c & 0x04 != 0
-              cp_off |= delta.getord(pos += 1) << 24 if c & 0x08 != 0
-              cp_size = delta.getord(pos += 1) if c & 0x10 != 0
-              cp_size |= delta.getord(pos += 1) << 8 if c & 0x20 != 0
-              cp_size |= delta.getord(pos += 1) << 16 if c & 0x40 != 0
-              cp_size = 0x10000 if cp_size == 0
-              pos += 1
-              dest << base[cp_off,cp_size]
-            elsif c != 0
-              dest << delta[pos,c]
-              pos += c
-            else
-              raise PackFormatError, 'invalid delta data'
-            end
-          end
-          dest
-        end
-        private :patch_delta
-
-        def patch_delta_header_size(delta, pos)
-          size = 0
-          shift = 0
-          begin
-            c = delta.getord(pos)
-            if c == nil
-              raise PackFormatError, 'invalid delta header'
-            end
-            pos += 1
-            size |= (c & 0x7f) << shift
-            shift += 7
-          end while c & 0x80 != 0
-          [size, pos]
-        end
-        private :patch_delta_header_size
-      end
-    end
-  end
-end