gollum_rails 1.5.10 → 1.5.12

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c00fe61c117e9885588022ce58529d66056a004e
-  data.tar.gz: 15c7469f8d85879473f7a76193686a2ab767bfad
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmY0ZTZlZDNhZDQxZjBiM2YzNzM1NGM5ZTg3NWEzYWY4OTY4MzExNA==
+  data.tar.gz: !binary |-
+    NmNhY2FjODc1YTQ4MThmMDRlNDZhZjliY2Y2NTAzODgyMjY2MTM3Yg==
 SHA512:
-  metadata.gz: 5bb110256036daf9200c7c9504e6d05d29c6f93b220cda5519ee0e912279de07642ecfcc3bdbeb2d6ff2236f343b7e19c84fd9ba5dab809a339a70c1bf32fe9b
-  data.tar.gz: eba3fd0839d2c5c98e25ef30eebd58fea8bad59af893b426bca44abf9804af2af83129f8dcd2404baa0960390bc5c77048cd4bdf7a2b2a39be1820d66499bff9
+  metadata.gz: !binary |-
+    NjM5NzEyODg1MWEzZWFlNjg4ZDU0MTdlZDRhODQ0NzlhNDg1ZjUxOWQ0ZDIw
+    NTIzMjU1YjYxZWVlMDI5N2VhMTQ5YzIzMGMxN2VhZGYwYTU3ZDAyODg3N2Vm
+    OTg1NTU3MWMxMjdkZWFjMWI5MzkwZDdhZGQ4Nzg4ODUxNjdjODE=
+  data.tar.gz: !binary |-
+    OWY3NDkyNjdmMmUzZTdmMDAxYjVmMzVlMGFhYjhhOTBjZjAwY2Y1NjBlYWIx
+    YmY3NWFhNWZhZTdiZmFiMmY2YTU1YjkwNDllZTZmM2MxZGQ4NTZjOTVlMzgy
+    MmNjMjA5MjJkYjE2Mzc0ZDAzMzEyMzU0ZTYwNzM4Nzg2YmZjNzE=

data/Gemfile.lock

@@ -1,47 +1,45 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.5.10)
+    gollum_rails (1.5.12)
       activemodel (>= 3.2.11)
       activesupport (>= 3.2.11)
-      gollum-lib (~> 2.0.0)
+      gollum-lib (~> 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
       mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
+      arel (~> 5.0.0)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    atomic (1.1.14)
-    builder (3.1.4)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    charlock_holmes (0.6.9.4)
+    charlock_holmes (0.7.3)
     coderay (1.1.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
@@ -50,129 +48,140 @@ GEM
       term-ansicolor
       thor
     diff-lcs (1.2.5)
-    docile (1.1.3)
+    docile (1.1.5)
     erubis (2.7.0)
+    factory_girl (4.4.0)
+      activesupport (>= 3.0.0)
     ffi (1.9.3)
-    formatador (0.2.4)
-    github-markup (0.7.5)
-    gitlab-grit (2.6.0)
-      charlock_holmes (~> 0.6.9)
+    formatador (0.2.5)
+    github-markup (1.1.2)
+      posix-spawn (~> 0.3.8)
+    gitlab-grit (2.6.9)
+      charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-    gollum-lib (2.0.0)
-      github-markup (>= 0.7.5, < 1.0.0)
-      gitlab-grit (= 2.6.0)
-      nokogiri (~> 1.6.0)
-      rouge (~> 1.3.1)
-      sanitize (~> 2.0.6)
-      stringex (~> 2.1.0)
-    guard (2.4.0)
+      posix-spawn (~> 0.3)
+    gollum-lib (3.0.0)
+      github-markup (~> 1.1.0)
+      gitlab-grit (~> 2.6.5)
+      nokogiri (~> 1.6.1)
+      rouge (~> 1.3.3)
+      sanitize (~> 2.1.0)
+      stringex (~> 2.5.1)
+    guard (2.6.1)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (3.1.0)
-      guard (>= 1.8)
-      rspec (~> 2.13)
+    guard-rspec (4.2.10)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    hashr (0.0.22)
     hike (1.2.3)
     i18n (0.6.9)
-    listen (2.5.0)
+    json (1.8.1)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
+    lumberjack (1.0.9)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
-    minitest (4.7.5)
-    multi_json (1.8.4)
-    nio4r (1.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    polyglot (0.3.4)
+    mini_portile (0.6.0)
+    minitest (5.3.5)
+    multi_json (1.10.1)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    polyglot (0.3.5)
     posix-spawn (0.3.8)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.1.4)
+      actionmailer (= 4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      activemodel (= 4.1.4)
+      activerecord (= 4.1.4)
+      activesupport (= 4.1.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+      railties (= 4.1.4)
+      sprockets-rails (~> 2.0)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
+    redcarpet (3.1.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rouge (1.3.2)
-    rr (1.1.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    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)
+    rouge (1.3.4)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
+    sanitize (2.1.0)
       nokogiri (>= 1.4.4)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.4.7)
-    sprockets (2.11.0)
+    slop (3.5.0)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    stringex (2.1.2)
+    stringex (2.5.2)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timers (1.1.0)
-    tins (1.0.0)
+    tins (1.3.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   coveralls
+  factory_girl (~> 4.4)
   gollum_rails!
-  guard
-  guard-rspec
+  guard (~> 2.6.0)
+  guard-rspec (~> 4.2.8)
+  hashr (~> 0.0.22)
   rails (>= 3.2.11)
-  rb-fsevent
-  rr (~> 1.1.1)
-  rspec (~> 2.13.0)
+  rb-fsevent (>= 0.9.3)
+  redcarpet (>= 3.1.1)
+  rspec (~> 3.0)

data/Rakefile

@@ -111,7 +111,7 @@ end
 #############################################################################
 
 desc 'Create a release build'
-task :release => :build do
+task :release do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
@@ -121,7 +121,6 @@ task :release => :build do
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
 end
 
 desc 'Build gem'

data/gollum_rails.gemspec

@@ -4,22 +4,23 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.5.10'
+  s.version = '1.5.12'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
 
   s.add_dependency 'activemodel', '>= 3.2.11'
   s.add_dependency 'activesupport', '>= 3.2.11'
-  
-  s.add_dependency 'gollum-lib', '~> 2.0.0'
+  s.add_dependency 'gollum-lib', '~> 3.0.0'
 
-  s.add_development_dependency 'rspec', '~> 2.13.0'
-  s.add_development_dependency 'rr', '~> 1.1.1'
+  s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rails', '>= 3.2.11'
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'rb-fsevent'
+  s.add_development_dependency 'guard', '~> 2.6.0'
+  s.add_development_dependency 'guard-rspec', '~> 4.2.8'
+  s.add_development_dependency 'rb-fsevent', '>= 0.9.3'
+  s.add_development_dependency 'redcarpet', '>= 3.1.1'
+  s.add_development_dependency 'factory_girl', '~> 4.4'
+  s.add_development_dependency 'hashr','~> 0.0.22'
   s.author = 'Florian Kasper'
   s.email = 'mosny@zyg.li'
   s.homepage = 'https://github.com/nirnanaaa/gollum_rails'
@@ -57,11 +58,16 @@ Gem::Specification.new do |s|
     lib/gollum_rails/setup/options.rb
     lib/gollum_rails/store.rb
     lib/gollum_rails/validation.rb
+    spec/factories.rb
+    spec/gollum_rails/page_core_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_helper.rb
+    spec/support/default_commit.rb
+    spec/support/gollum_page_spec.rb
+    spec/support/special_commit.rb
   ]
   # = MANIFEST =
 

data/lib/generators/gollum_rails/language/language_generator.rb

@@ -24,7 +24,7 @@ module GollumRails
           \n
           EOT
         when "markdown"
-          run "gem install redcarped"
+          run "gem install redcarpet"
           puts <<-EOT
           \n Parser for type "markdown" was installed
           \n

data/lib/gollum_rails.rb

@@ -1,17 +1,17 @@
 # ~*~ encoding: utf-8 ~*~
 #--
 # Copyright (C) 2013  Florian Kasper
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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/>.
 #++
@@ -27,7 +27,7 @@ require 'active_support'
 #
 module GollumRails
   extend ActiveSupport::Autoload
-  
+
   autoload :Persistance
   autoload :Callbacks
   autoload :Error
@@ -40,8 +40,8 @@ module GollumRails
   autoload :Orm
   autoload :Meta
 
-  # GollumRails version string
-  VERSION = '1.5.10'
+  # GollumRails version
+  VERSION = '1.5.12'
 
 end
 

data/lib/gollum_rails/callbacks.rb

@@ -1,34 +1,32 @@
 module GollumRails
   module Callbacks
     extend ActiveSupport::Concern
-    
+
     CALLBACKS = [
       :after_initialize,
       :before_save, :around_save, :after_save, :before_create, :around_create,
       :after_create, :before_update, :around_update, :after_update,
       :before_destroy, :around_destroy, :after_destroy, :after_commit
     ]
+
     module ClassMethods
       include ActiveModel::Callbacks
     end
-    
+
     included do
       include ActiveModel::Validations::Callbacks
-
       define_model_callbacks :initialize, :only => :after
       define_model_callbacks :save, :create, :update, :destroy
     end
-    
-    
-    
-    def destroy(*)
+
+    def destroy(*) #:nodoc:
       run_callbacks(:destroy) { super }
     end
-    
-    def save
+
+    def save #:nodoc:
       run_callbacks(:save) { super }
-    end    
-    
+    end
+
     private
 
     def create_or_update #:nodoc:
@@ -42,6 +40,6 @@ module GollumRails
     def update_record(*) #:nodoc:
      run_callbacks(:update) { super }
     end
-       
+
   end
 end