gollum_rails 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dd7344f385aa410641d4306e45816ded6fcc3ab
-  data.tar.gz: 4c575604cbf42c6c261a282fe8bddba7d9e05b0e
+  metadata.gz: 8e56f1c38049b5c88e4774cd88ceb414d3a88e3c
+  data.tar.gz: 4238c31d63ca8597e1ed8b0e69a9aaa46a31f253
 SHA512:
-  metadata.gz: 6ac3f7568b4f3125dd80d0bf90126216d46defc5a06c304a1ee1a241dc2f9b96f1c208ed9fa0b92c7618e92d851e2012200ab768aafc4639eba09fd69f766f57
-  data.tar.gz: 4541dd32cf2e51123f88a4daa0970dcfa08b214099c05f86d65f7d07ec0c3a7c78fdcc5f76210ddf28635e8ff9274ed828cbe0b27cafabdfbbcdb22a97abf1ca
+  metadata.gz: 6599a1872724fbb09a65bb489e845eef9d2b07cfd9c7e093d82eaacdbf6af6e3633c511b147cae1600f9297ab7503f7dac1a00df97e03ff9236011f79abe4dd7
+  data.tar.gz: 9a6c1f70a997384592437c2295fffab178639fdb1ef1d94c2690eacc844a6cba06db48fa8070a2813845b873d7ad6ec5950604a82b15b5c3dd748392957495d9

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'coveralls', require: false
-gem "grit", git: "git://github.com/styx/grit.git"
+
 
 gemspec

data/Gemfile.lock

@@ -1,17 +1,9 @@
-GIT
-  remote: git://github.com/styx/grit.git
-  revision: 2109888819d23f18cdc30c0fbb6280ec3208fa7d
-  specs:
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-
 PATH
   remote: .
   specs:
-    gollum_rails (1.0.1)
+    gollum_rails (1.0.2)
       activemodel (~> 3.2.13)
+      gitlab-grit (~> 1.0.0)
       gollum-lib (~> 1.0.0)
 
 GEM
@@ -57,6 +49,10 @@ GEM
     erubis (2.7.0)
     github-markdown (0.5.3)
     github-markup (0.7.5)
+    gitlab-grit (1.0.0)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
     gollum-lib (1.0.0)
       github-markdown (~> 0.5.3)
       github-markup (>= 0.7.5, < 1.0.0)
@@ -65,6 +61,10 @@ GEM
       pygments.rb (~> 0.4.2)
       sanitize (~> 2.0.3)
       stringex (~> 1.5.1)
+    grit (2.5.0)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
@@ -145,7 +145,6 @@ PLATFORMS
 DEPENDENCIES
   coveralls
   gollum_rails!
-  grit!
   rails (~> 3.2.13)
   rr (~> 1.0.4)
   rspec (~> 2.13.0)

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 1.0.2 23th April 2013
+* added standalone compability for ruby 2.0
+* added patches by styx
+* added string corext for ruby2
+* added mutex locks for ugly threadsave
+
 # 1.0.1 5th April 2013
 * added find_all and all for Page
 * removed some unused functions

data/README.md

@@ -7,7 +7,7 @@ Gollum for Rails
 
 
 gollum_rails combines the git-powered wiki software gollum with the extremely popular webframework rails.
-It improves the lightweight "gollum" experience which is quite awesome. 
+It improves the lightweight "gollum" experience which is quite awesome.
 
 with gollum_rails you can:
 
@@ -23,7 +23,6 @@ with gollum_rails you can:
 - Unix like operating system (OS X, Ubuntu, Debian, and more)
 - Will not work on Windows (see [gollum](https://github.com/github/gollum/blob/master/README.md#system-requirements))
 
-## [RUBY >= 2.0 READ THIS](https://github.com/nirnanaaa/gollum_rails/wiki/Ruby#ruby-2.0)
 ## [Installation](https://github.com/nirnanaaa/gollum_rails/wiki/Installation)
 
 ## [Usage](https://github.com/nirnanaaa/gollum_rails/wiki/Usage)
@@ -37,11 +36,11 @@ Very cool. Just fork this repository and send me pull requests.
 
 Clone the repository:
 
-	$ git clone git://github.com/nirnanaaa/gollum_rails.git
+    $ git clone git://github.com/nirnanaaa/gollum_rails.git
 
 Run the [Bundler](http://gembundler.com/):
 
-	$ bundle install
+    $ bundle install
 
 
 ### TESTING
@@ -51,13 +50,13 @@ All tests are stored under the `spec/` directory.
 
 To run tests just use the `rspec` command:
 
-	$ bundle exec rspec
+    $ bundle exec rspec
 
 ## LICENSE
 
 [![AGPLv3](http://www.gnu.org/graphics/agplv3-155x51.png)](http://www.gnu.org/licenses/agpl-3.0.en.html)
 
-gollum_rails is licensed under the AGPL license. 
+gollum_rails is licensed under the AGPL license.
 
 Copyright (C) 2013  Florian Kasper
 
@@ -73,4 +72,3 @@ GNU Affero General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-

data/gollum_rails.gemspec

@@ -1,24 +1,20 @@
 Gem::Specification.new do |s|
   s.rubygems_version = '>= 1.3.5'
-  
+
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.0.1'
+  s.version = '1.0.2'
 
   s.summary = 'Combines the benefits from Gollum and Rails'
   s.description= 'Use all the benefits from Rails and combine them with the awesome Gollum wiki'
-  #File.read(File.join(File.dirname(__FILE__), 'README.md'))
 
   s.add_dependency 'activemodel', '~> 3.2.13'
   s.add_dependency 'gollum-lib', '~> 1.0.0'
-  #s.add_dependency 'grit', '~> 2.5.0'
-  #s.add_dependency 'builder', '~> 3.0.0'
-  #s.add_dependency 'rack', '~> 1.4.5'
+  s.add_dependency 'gitlab-grit', '~> 1.0.0'
 
   s.add_development_dependency 'rspec', '~> 2.13.0'
-  s.add_development_dependency 'rails', '~> 3.2.13'
-  s.add_development_dependency 'rr', '~> 1.0.4' 
+  s.add_development_dependency 'rr', '~> 1.0.4'
   s.add_development_dependency 'rails', '~> 3.2.13'
 
   s.author = 'Florian Kasper'
@@ -37,6 +33,7 @@ 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
@@ -57,6 +54,7 @@ Gem::Specification.new do |s|
     lib/gollum_rails/modules/loader.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
@@ -77,7 +75,7 @@ Gem::Specification.new do |s|
 
 
   s.require_paths = %w[lib]
-  s.post_install_message = <<-END 
+  s.post_install_message = <<-END
   Important: \n
   **********************************************
   To use the installer just run the following command:
@@ -89,4 +87,3 @@ Gem::Specification.new do |s|
   **********************************************"
   END
 end
-

data/lib/core_ext/string.rb

@@ -0,0 +1,10 @@
+class String
+  if ((defined? RUBY_VERSION) && (['1.9', '2.0'].include? RUBY_VERSION[0..2]))
+    def getord(offset); self[offset].ord; end
+  else
+    alias :getord :[]
+  end
+
+
+
+end

data/lib/gollum_rails.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'gollum-lib'
-
+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.
 #
@@ -12,17 +13,17 @@ require 'gollum-lib'
 module GollumRails
   autoload :Page,     'gollum_rails/page'
   autoload :Setup,    'gollum_rails/setup'
-  
+
   # GollumRails version string
-  VERSION = '1.0.1'
-  
+  VERSION = '1.0.2'
+
   # Simplified error
   class Error < StandardError; end
 
   # For use with internal gollumGem exceptions
-  # 
+  #
   class GollumInternalError < Error
-  
+
   end
 end
 
@@ -33,5 +34,3 @@ require File.expand_path '../gollum_rails/adapters/gollum', __FILE__
 #require File.expand_path '../gollum_rails/page', __FILE__
 # load extensions
 require File.expand_path '../gollum_rails/modules/loader', __FILE__
-
-

data/lib/gollum_rails/page.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module GollumRails
 
   # Main class, used to interact with rails.
@@ -12,12 +14,12 @@ module GollumRails
   #   * delete
   #   * find_or_initialize_by_naname
   #
-  class Page 
+  class Page
     extend ::ActiveModel::Callbacks
     include ::ActiveModel::Validations
     include ::ActiveModel::Conversion
     extend ::ActiveModel::Naming
-    
+
 
     # Callback for save
     define_model_callbacks :save
@@ -80,7 +82,7 @@ module GollumRails
         action = self.create(hash)
         action
       end
-      
+
       # Finds a page based on the name and specified version
       #
       # name - the name of the page
@@ -104,6 +106,8 @@ module GollumRails
 
     end
 
+    # mutex lock for multithreading
+    attr_reader :mutex
 
     # Initializes a new Page
     #
@@ -111,6 +115,7 @@ module GollumRails
     #
     # commit must be given to perform any page action!
     def initialize(attrs = {})
+      @mutex = Mutex.new
       if Adapters::Gollum::Connector.enabled
         attrs.each{|k,v| self.public_send("#{k}=",v)} if attrs
       else
@@ -121,7 +126,7 @@ module GollumRails
     #########
     # Setters
     #########
-     
+
 
     # Gets / Sets the pages name
     attr_accessor :name
@@ -135,7 +140,7 @@ module GollumRails
     # Sets the format
     attr_writer :format
 
-    
+
     #########
     # Getters
     #########
@@ -151,7 +156,7 @@ module GollumRails
     def page
       @page ||= Adapters::Gollum::Connector.page_class.new
     end
-    
+
     #############
     # activemodel
     #############
@@ -162,30 +167,32 @@ module GollumRails
     # will detect it and returns that page instead.
     #
     # Examples:
-    #   
+    #
     #   obj = GollumRails::Page.new <params>
     #   @article = obj.save
     #   # => Gollum::Page
-    #   
+    #
     #   @article.name
-    #   whatever name you have entered OR the name of the previous 
+    #   whatever name you have entered OR the name of the previous
     #   created page
-    #       
+    #
     #
     # TODO:
     #   * overriding for creation(duplicates)
-    #   * do not alias save! on save 
-    # 
+    #   * do not alias save! on save
+    #
     # Returns an instance of Gollum::Page or false
     def save
-      run_callbacks :save do
-        return false unless valid?
-        begin
-          page.new_page(name,content,format,commit)
-        rescue ::Gollum::DuplicatePageError => e 
-          page.page = page.find_page(name)
+      mutex.synchronize do
+        run_callbacks :save do
+          return false unless valid?
+          begin
+            page.new_page(name,content,format,commit)
+          rescue ::Gollum::DuplicatePageError => e
+            page.page = page.find_page(name)
+          end
+          return page.page
         end
-        return page.page
       end
     end
 
@@ -202,39 +209,45 @@ module GollumRails
     #          to initialize the instance
     #
     #
-    # Returns an instance of Gollum::Page 
+    # Returns an instance of Gollum::Page
     def update_attributes(hash, commit=nil)
-      run_callbacks :update do
-        page.update_page hash, get_right_commit(commit)
+      mutex.synchronize do
+        run_callbacks :update do
+          page.update_page hash, get_right_commit(commit)
+        end
       end
+
     end
-    
+
     # 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
     #
-    # Returns the commit id of the current action as String 
+    # 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)
+      mutex.synchronize do
+        run_callbacks :delete do
+          page.delete_page get_right_commit(commit)
+        end
       end
+
     end
 
     # checks if entry already has been saved
-    # 
+    #
     #
     def persisted?
       return true if page.page.instance_of?(::Gollum::Page)
       return false
     end
     # Previews the page - Mostly used if you want to see what you do before saving
-    # 
+    #
     # This is an extremely performant method!
-    # 1 rendering attempt take depending on the content about 0.001 (simple markdown) 
+    # 1 rendering attempt take depending on the content about 0.001 (simple markdown)
     # upto 0.004 (1000 chars markdown) seconds, which is quite good
     #
-    # 
+    #
     # format - Specify the format you want to render with see {self.format_supported?}
     #          for formats
     #

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

@@ -0,0 +1,397 @@
+#
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: gitlab-grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
+        version: 1.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ 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
@@ -128,6 +129,7 @@ files:
 - lib/gollum_rails/modules/loader.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