gollum_rails 1.0.6 → 1.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9efbb648b9aa7ad7dffc2e02d8af20698ece92d9
-  data.tar.gz: 0822fe4e135626b88d25078ecbc02fb06207db20
+  metadata.gz: b79a53466331f67a215b23c364208835f1312e91
+  data.tar.gz: b8d0c3a589c002f0e809740faac6a8aa81fe19cb
 SHA512:
-  metadata.gz: 360e9669919ae31dfec11a9ad5ab7a902f20983b2e2de2448681b68130b467ee3a0b4c5467146a437441c0bdc8c48ec0436b6584eb9e2b2c8696d4d7fc7498b0
-  data.tar.gz: bca20d67aacf28cefd0e5217f9546d6c80199d0b0b2fa1eace6fae7a07a4d03d6d2c00fe627bfc415ed27fcfefe2f59d7adc01da79cdb17732bbb68c07bd76b8
+  metadata.gz: e77443f55f09e2080b3ac2c4b3eaee27ff701b818b964d76626a5f213300962fb25ea21a542b0e7e8d6907071b5b541bcb6469e0055beb421e58d166d665199b
+  data.tar.gz: 8d098838fa88e0b092e1e55523cc6e713689c2e4e1aba2a43fccd33291cde7cdb5ac2c7f52f38e8bc4211a63255bb0bd509b1c029416b5fb4b746948f939d1b5

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'coveralls', require: false
-gem 'guard'
-gem 'guard-rspec'
+
 
 gemspec

data/Gemfile.lock

@@ -1,125 +1,98 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.0.6)
-      activemodel (>= 3.2.11)
-      gollum-lib (~> 1.0.9)
+    gollum_rails (1.4.0.rc1)
+      activemodel (~> 4.0.0.rc1)
+      gollum-lib (~> 1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.1)
-      actionpack (= 4.0.1)
-      mail (~> 2.5.4)
-    actionpack (4.0.1)
-      activesupport (= 4.0.1)
+    actionmailer (4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
+      mail (~> 2.5.3)
+    actionpack (4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
+    activemodel (4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
       builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
+    activerecord (4.0.0.rc1)
+      activemodel (= 4.0.0.rc1)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
+      activesupport (= 4.0.0.rc1)
       arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
+    activerecord-deprecated_finders (1.0.2)
+    activesupport (4.0.0.rc1)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.1)
-    atomic (1.1.14)
+    arel (4.0.0)
+    atomic (1.1.9)
     builder (3.1.4)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    charlock_holmes (0.6.9.4)
-    coderay (1.0.9)
-    coveralls (0.7.0)
+    colorize (0.5.8)
+    coveralls (0.6.4)
+      colorize
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
-      term-ansicolor
       thor
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.2)
     erubis (2.7.0)
-    ffi (1.9.3)
-    formatador (0.2.4)
+    github-markdown (0.5.3)
     github-markup (0.7.5)
-    gitlab-grit (2.6.0)
-      charlock_holmes (~> 0.6.9)
+    gollum-lib (1.0.0)
+      github-markdown (~> 0.5.3)
+      github-markup (>= 0.7.5, < 1.0.0)
+      grit (~> 2.5.0)
+      nokogiri (~> 1.5.9)
+      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)
-    gollum-lib (1.0.9)
-      github-markup (>= 0.7.5, < 1.0.0)
-      gitlab-grit (= 2.6.0)
-      nokogiri (~> 1.6.0)
-      pygments.rb (~> 0.5.2)
-      sanitize (~> 2.0.6)
-      stringex (~> 2.1.0)
-    guard (2.2.3)
-      formatador (>= 0.2.4)
-      listen (~> 2.1)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-rspec (3.1.0)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    hike (1.2.3)
-    i18n (0.6.5)
-    listen (2.2.0)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
-    mail (2.5.4)
+    hike (1.2.2)
+    i18n (0.6.4)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.2)
-    mime-types (1.25)
-    mini_portile (0.5.2)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
+    mime-types (1.22)
+    minitest (4.7.4)
+    multi_json (1.7.2)
+    nokogiri (1.5.9)
     polyglot (0.3.3)
-    posix-spawn (0.3.8)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pygments.rb (0.5.4)
+    posix-spawn (0.3.6)
+    pygments.rb (0.4.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.1)
-      actionmailer (= 4.0.1)
-      actionpack (= 4.0.1)
-      activerecord (= 4.0.1)
-      activesupport (= 4.0.1)
+    rails (4.0.0.rc1)
+      actionmailer (= 4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
+      activerecord (= 4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.1)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.1)
-      actionpack (= 4.0.1)
-      activesupport (= 4.0.1)
+      railties (= 4.0.0.rc1)
+      sprockets-rails (~> 2.0.0.rc4)
+    railties (4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
+    rake (10.0.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rr (1.1.2)
+    rr (1.0.5)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -127,46 +100,40 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    sanitize (2.0.6)
-      nokogiri (>= 1.4.4)
+    rspec-mocks (2.13.0)
+    sanitize (2.0.3)
+      nokogiri (>= 1.4.4, < 1.6)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.6)
-    sprockets (2.10.0)
+    sprockets (2.9.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.0.0.rc4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    stringex (2.1.2)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    stringex (1.5.1)
     thor (0.18.1)
-    thread_safe (0.1.3)
+    thread_safe (0.1.0)
       atomic
-    tilt (1.4.1)
-    timers (1.1.0)
-    tins (0.12.0)
-    treetop (1.4.15)
+    tilt (1.4.0)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (0.3.37)
     yajl-ruby (1.1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   coveralls
   gollum_rails!
-  guard
-  guard-rspec
-  rails (>= 3.2.11)
-  rr (~> 1.1.1)
+  rails (~> 4.0.0.rc1)
+  rr (~> 1.0.4)
   rspec (~> 2.13.0)

data/HISTORY.md

@@ -1,38 +1,3 @@
-# 1.0.6 9th December 2013
-* Rails 3 backwards compability
-
-# 1.4.5 6th November 2013
-* Updated Gollum-Lib version to 1.0.9
-* Updated Rails stuff to 4.0.1
-
-
-# 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
-* Display the pages filename
-* Improved specs
-* Refactored find method to return nil if no page was found (BUG)
-* Refactored find_or_initialize_by_name to be useable :)
-* Returning nil on history if a page was not saved
-* Added finding with version string
-* Using activemodel convenient `destroy` and deprecated old `delete`
-* Added callback for initializer
-
-# 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

@@ -4,9 +4,9 @@ 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.
+
+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.
 
 with gollum_rails you can:
@@ -17,10 +17,6 @@ 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)
@@ -32,7 +28,6 @@ It provides nearly the same features as the official editor.
 ## [Usage](https://github.com/nirnanaaa/gollum_rails/wiki/Usage)
 
 
-
 ## DEVELOPER
 
 Very cool. Just fork this repository and send me pull requests.

data/Rakefile

@@ -112,14 +112,14 @@ end
 
 desc 'Create a release build'
 task :release => :build do
-  # unless `git branch` =~ /^\* master$/
-  #   puts "You must be on the master branch to release!"
-  #   exit!
-  # end
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git pull"
   sh "git tag v#{version}"
-  sh "git push"
+  sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end

data/gollum_rails.gemspec

@@ -4,36 +4,35 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.0.6'
+  s.version = '1.4.0.rc1'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
 
-  s.add_dependency 'activemodel', '>= 3.2.11'
-  s.add_dependency 'gollum-lib', '~> 1.0.9'
+  s.add_dependency 'activemodel', '~> 4.0.0.rc1'
+  s.add_dependency 'gollum-lib', '~> 1.0.0'
 
   s.add_development_dependency 'rspec', '~> 2.13.0'
-  s.add_development_dependency 'rr', '~> 1.1.1'
-  s.add_development_dependency 'rails', '>= 3.2.11'
+  s.add_development_dependency 'rr', '~> 1.0.4'
+  s.add_development_dependency 'rails', '~> 4.0.0.rc1'
 
   s.author = 'Florian Kasper'
   s.email = 'mosny@zyg.li'
-  s.homepage = 'https://github.com/nirnanaaa/gollum_rails'
+  s.homepage = 'http://gollum.zyg.li'
   s.license = 'AGPL'
   s.platform = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.3'
 
-
   # = MANIFEST =
   s.files = %w[
     Gemfile
     Gemfile.lock
-    Guardfile
     HISTORY.md
     LICENSE
     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
@@ -49,8 +48,11 @@ Gem::Specification.new do |s|
     lib/gollum_rails/adapters/gollum/error.rb
     lib/gollum_rails/adapters/gollum/page.rb
     lib/gollum_rails/adapters/gollum/wiki.rb
+    lib/gollum_rails/modules/hash.rb
+    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
@@ -58,12 +60,13 @@ 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_off.rb
-    spec/gollum_rails/error_spec.rb
+    spec/gollum_rails/adapters/gollum/wiki_spec.rb
+    spec/gollum_rails/modules/hash_spec.rb
     spec/gollum_rails/page_spec.rb
     spec/gollum_rails/respository_spec.rb
     spec/gollum_rails/setup_spec.rb
     spec/gollum_rails/wiki_spec.rb
+    spec/spec.opts
     spec/spec_helper.rb
   ]
   # = MANIFEST =
@@ -80,5 +83,3 @@ Gem::Specification.new do |s|
   \trails g gollum_rails:language LANGUAGE
   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,11 +1,7 @@
-# ~*~ encoding: utf-8 ~*~
-
-# stdlib
 require 'rubygems'
-
-# external
 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.
@@ -20,35 +16,21 @@ module GollumRails
   autoload :Setup,    'gollum_rails/setup'
 
   # GollumRails version string
-  VERSION = '1.0.6'
+  VERSION = '1.4.0.rc1'
 
   # Simplified error
   class Error < StandardError; end
 
-  # All Gollum internal exceptions will be redirected to this
+  # For use with internal gollumGem exceptions
+  #
   class GollumInternalError < Error
 
-
-    attr_accessor :name
-    attr_accessor :message
-    attr_accessor :target
-
-    # modifies content for throwing an exception
-    def initialize(name, target = nil, message = nil)
-      @name = name
-      @target = target
-      @message = message
-
-      super(message || "An Error occured: #{name} on #{target}")
-    end
-
-    # Fancy inspects
-    def inspect
-      "#<GollumRails::GollumInternalError:#{object_id} {name: #{name.inspect}, message: #{message.inspect}, target: #{target.inspect}}>"      
-    end
   end
 end
 
 
 require File.expand_path '../gollum_rails/adapters/activemodel', __FILE__
 require File.expand_path '../gollum_rails/adapters/gollum', __FILE__
+# load extensions
+# TODO: Remove this shit. It is unnecessary
+require File.expand_path '../gollum_rails/modules/loader', __FILE__