gollum_rails 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7722875d793d56642ad1a05a5ebc360e297ca6b2
-  data.tar.gz: 0fb1d9f345e5b93afab6ae91e4687710cd7725cc
+  metadata.gz: f3076697831022b1b1dd98dd135d4ca0e30d36d0
+  data.tar.gz: cce92fb00dcfa5506630e128b9cec8e39cb07dc4
 SHA512:
-  metadata.gz: 18f5e87b8172f330b77a418301f4805feea518ba72141c28a8ceeca98ee799d28e68ef69aed968ba17234b8ed88ed0f4407f628b981534d49f0bd3608cf4bb97
-  data.tar.gz: 8822651c8f55cbb3b49caeb9e2f2194989e46f738448bd3c118c4031ef0ffeb2a58fe9c326f1354faddc6071bf63f9e6f2c16f9505143682a89b7ca68fd928d1
+  metadata.gz: 650c5ffe41c2701ccb43cd063675bff2e0605624014edf84ebca863b4a2157be02c3434b95dc942f94793cf66ffa0b42a8b99f0b603c65e6d164d5a04c7140a1
+  data.tar.gz: 87ed66b6945e6a91a22d68b0e5d264bbafca6504cb517063e1e20da01e58f4d7f39436f07f5cea7e38e23f5062e70b4b7e9918c84f2331ef8ea8f299b2e5a228

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.5.3)
+    gollum_rails (1.5.4)
       activemodel (>= 3.2.11)
       activesupport (>= 3.2.11)
       gollum-lib (~> 1.0.9)

data/HISTORY.md

@@ -1,3 +1,6 @@
+# 1.5.4 20th February 2014
+* Bugfixing
+
 # 1.5.3 19th February 2014
 * Documentation improvements
 * Refactored find `find` method call to accept page resets and exact matches

data/gollum_rails.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.5.3'
+  s.version = '1.5.4'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'

data/lib/gollum_rails.rb

@@ -45,7 +45,7 @@ module GollumRails
   autoload :Meta
 
   # GollumRails version string
-  VERSION = '1.5.3'
+  VERSION = '1.5.4'
 
 end
 

data/lib/gollum_rails/core.rb

@@ -19,12 +19,10 @@ module GollumRails
           return if options.empty?
           options = options[:folder]
         end
-        Setup.wiki_options = { page_file_dir: options }
+        Setup.wiki_options ||= {}
+        Setup.wiki_options[:page_file_dir] = options
       end
       alias_method :folder=, :set_folder
-    
-
-      
     end
     
     # Initializes a new Page

data/lib/gollum_rails/finders.rb

@@ -28,7 +28,7 @@ module GollumRails
       # Return an instance of Gollum::Page
       def find(name, version=nil, reset_folder=false, exact=true)
         name = name[:name] if name.kind_of?(Hash) && name.has_key?(:name)
-        Setup.wiki_options.merge(:page_file_dir => nil) if reset_folder
+        Page.set_folder(nil) if reset_folder
         wiki.clear_cache
         path = File.split(name)
         if path.first == '/' || path.first == '.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel