gollum_rails 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c1b7d1d834268e00fc9b8c63f0aca04cc83bc85
-  data.tar.gz: b7c4a10005a3837d4bf8d9eee0afb2ac2e7867e0
+  metadata.gz: 1dd1e54d072e792db90321826d56dfb77a87888b
+  data.tar.gz: 4983659fb53d6af311077327c7ad9e4b26afc8a8
 SHA512:
-  metadata.gz: dab8d76e647ba708e1c9ee1ac8cb705633642682f6509b5d97e3fd40566333d4561d51c4bd699ca69cbd7ac774f6f34ae87d8ab1e8d8abfa87a3759729ee4609
-  data.tar.gz: fae83809b25633f5dcff576ac3ce3531d4b9f50d02eabd35865f41d50c6fd5a3ab8b849336c9af01e15db09bc0b56a4797cc321c4674cb5b3c9427e3435ed015
+  metadata.gz: 3bb47d054fc9c8d222afefdb420ce6e3ae68718bf87afb6a4abf53139f2b00f63ddd914a328d4b7dc25f40afd174a8b093cf2e3b53442202ead7ab85cc22d6e8
+  data.tar.gz: 81720d04bd848724fa69988392e60db8bf62bcd7b526508440a1bf150dea6607946558ce905d428137686ce86a14ec9599a1109dceb3ffd5b183b0da69ce51b2

data/Gemfile

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

data/Gemfile.lock

@@ -1,111 +1,125 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.0.4)
-      activemodel (~> 3.2.13)
-      gollum-lib (~> 1.0.0)
+    gollum_rails (1.0.5)
+      activemodel (>= 3.2.11)
+      gollum-lib (~> 1.0.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.0.1)
+      actionpack (= 4.0.1)
+      mail (~> 2.5.4)
+    actionpack (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    colorize (0.5.8)
-    coveralls (0.6.4)
-      colorize
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.1)
+      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)
+    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)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
+      term-ansicolor
       thor
-    diff-lcs (1.2.2)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    github-markdown (0.5.3)
+    ffi (1.9.3)
+    formatador (0.2.4)
     github-markup (0.7.5)
-    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)
+    gitlab-grit (2.6.0)
+      charlock_holmes (~> 0.6.9)
       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)
-    json (1.7.7)
-    json (1.7.7-java)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    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)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.22)
-    multi_json (1.7.2)
-    nokogiri (1.5.9)
-    nokogiri (1.5.9-java)
+    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)
     polyglot (0.3.3)
-    posix-spawn (0.3.6)
-    pygments.rb (0.4.2)
+    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)
       yajl-ruby (~> 1.1.0)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.1)
+      actionmailer (= 4.0.1)
+      actionpack (= 4.0.1)
+      activerecord (= 4.0.1)
+      activesupport (= 4.0.1)
+      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)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.2)
+      ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rr (1.0.5)
+    rr (1.1.2)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -113,34 +127,46 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
+    rspec-mocks (2.13.1)
+    sanitize (2.0.6)
+      nokogiri (>= 1.4.4)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sprockets (2.2.2)
+    slop (3.4.6)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    stringex (1.5.1)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    stringex (2.1.2)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     thor (0.18.1)
-    tilt (1.3.6)
-    treetop (1.4.12)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    timers (1.1.0)
+    tins (0.12.0)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     yajl-ruby (1.1.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   coveralls
   gollum_rails!
-  rails (~> 3.2.13)
-  rr (~> 1.0.4)
+  guard
+  guard-rspec
+  rails (>= 3.2.11)
+  rr (~> 1.1.1)
   rspec (~> 2.13.0)

data/Guardfile

@@ -0,0 +1,7 @@
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+end
+

data/HISTORY.md

@@ -1,3 +1,35 @@
+# 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 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:
@@ -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)
@@ -28,6 +32,7 @@ with gollum_rails you can:
 ## [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 origin master"
+  sh "git push"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end

data/gollum_rails.gemspec

@@ -4,17 +4,17 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.0.4'
+  s.version = '1.0.5'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
 
-  s.add_dependency 'activemodel', '~> 3.2.13'
-  s.add_dependency 'gollum-lib', '~> 1.0.0'
+  s.add_dependency 'activemodel', '>= 3.2.11'
+  s.add_dependency 'gollum-lib', '~> 1.0.9'
 
   s.add_development_dependency 'rspec', '~> 2.13.0'
-  s.add_development_dependency 'rr', '~> 1.0.4'
-  s.add_development_dependency 'rails', '~> 3.2.13'
+  s.add_development_dependency 'rr', '~> 1.1.1'
+  s.add_development_dependency 'rails', '>= 3.2.11'
 
   s.author = 'Florian Kasper'
   s.email = 'mosny@zyg.li'
@@ -28,12 +28,12 @@ Gem::Specification.new do |s|
   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,11 +49,8 @@ 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/modulesDEPRECATED/hash.rb
-    lib/gollum_rails/modulesDEPRECATED/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
@@ -61,15 +58,12 @@ 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/modulesDEPRECATED/hash.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/gollum_rails_spec.rb
-    spec/spec.opts
     spec/spec_helper.rb
   ]
   # = MANIFEST =
@@ -86,3 +80,5 @@ Gem::Specification.new do |s|
   \trails g gollum_rails:language LANGUAGE
   END
 end
+
+