gollum_rails 1.4.13 → 1.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f67ec69d7746afcea87ebf4ae4cc57625b5735c
-  data.tar.gz: c9bf925679161f987317347e05fafa8caf5fd477
+  metadata.gz: 1b14f13cec09a2773a0f5a9c15005db2c886d8e1
+  data.tar.gz: 4ba9089266e351d09ea4beb5c3f385dbbcad19d8
 SHA512:
-  metadata.gz: 151b9810a740a25fea35423bde68cc862b39c27094479ed8329fcac3b7c4644ea9f485ef9cb311460a3e17a25378bcbd49ba414ce93e1da271b66fcd6c40d5b5
-  data.tar.gz: 6d4e9b50bcd96ee9c62372ba1f12422b3d3fa7612d33eed097d7c93035f0bc77bd3bc1ec57780c49da0225a9a3ef46d9cfcb82524464f9cabc85e8c68b6b61d8
+  metadata.gz: 189fad38e9cdc87b1b1939e99a5ab4a7f01ee11e7a00d1f2ae247089862fa21ec59dd4637b4f11406be3de600d0a9273b0c4beff7a900cd17364c0d356046d72
+  data.tar.gz: 331d7592754e7c9873e01c07c055cac68a6f8bf6b2a1fbe738448690f66760b47593a39ff03b98d734a97cd85ed674021429b24fcdd11ec851537d4a45a33c46

data/Gemfile.lock

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

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 1.4.14 21th January 2014
+* set directory by calling Page.folder= or Page.set_folder
+* all supports directories
+* improved specs 
+
 # 1.4.13 16th January 2014
 * Update wiki reloading
 

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.4.13'
+  s.version = '1.4.14'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'

data/lib/gollum_rails.rb

@@ -44,7 +44,7 @@ module GollumRails
   autoload :Orm
 
   # GollumRails version string
-  VERSION = '1.4.13'
+  VERSION = '1.4.14'
 
 end
 

data/lib/gollum_rails/core.rb

@@ -13,6 +13,16 @@ module GollumRails
         Gollum::Markup.formats.include?(format.to_sym)
       end
       
+      def set_folder(options)
+        if options.kind_of? Hash
+        
+          return if options.empty?
+          options = options[:folder]
+        end
+        Setup.wiki_options = { page_file_dir: options }
+      end
+      alias_method :folder=, :set_folder
+    
 
       
     end
@@ -31,6 +41,7 @@ module GollumRails
       end
     end
     
+
     
     def path_name
       name.gsub(/(^\/|(\/){2}+|#{canonicalized_filename})/, "")
@@ -55,6 +66,8 @@ module GollumRails
       wiki.preview_page(name, content, format).formatted_data
     end
     
+    
+
     # == Gets the url for current page from Gollum::Page
     #
     # Returns a String

data/lib/gollum_rails/finders.rb

@@ -41,13 +41,22 @@ module GollumRails
       end
 
       # Gets all pages in the wiki
-      def all
+      def all(options={})
+        set_folder(options)
         pages = wiki.pages
         r = pages.map do |page|
           self.new(gollum_page: page)
         end
       end
       
+      def first(options)
+        all(options).first
+      end
+      
+      def last(options)
+        all(options).last
+      end
+      
       alias_method :find_all, :all
       
       # TODO: implement more of this (format, etc)

data/spec/gollum_rails/page_spec.rb

@@ -432,6 +432,7 @@ describe "Gollum Page" do
     
   end
   
+  
   describe "path names" do
     class Fns < GollumRails::Page
     end
@@ -442,6 +443,48 @@ describe "Gollum Page" do
     end
     
     it "should output a path name as there was a path supplied" do
+      res = Fns.new @call.merge(name: 'test/pagess')
+      res.save
+      res2 = Fns.new @call.merge(name: 'test/pagess2')
+      res2.save
+      expect(Fns.all(folder: 'test').length).to be 2
+      #expect(res.path_name).not_to be_nil
+      res2.destroy(@commit)
+      res.destroy(@commit)
+    end
+    it "should find more pages under root without options" do
+      res = Fns.new @call.merge(name: 'test4/pagess')
+      res2 = Fns.new @call.merge(name: 'test5/pagess')
+      res.save
+      res2.save
+      #Fns.all(folder: 'test1/').each{|p| puts p.url}
+      expect(Fns.all(folder: 'test4').length).to be 1
+      expect(Fns.all(folder: 'test5').length).to be 1
+      
+      res2.destroy(@commit)
+      res.destroy(@commit)
+      
+    end
+    
+    it "should be empty for a non existing folder" do
+      res = Fns.new @call.merge(name: 'test/pagess')
+      res.save
+      
+      expect(Fns.first(folder: 'test2')).to be_nil
+      expect(Fns.last(folder: 'test2')).to be_nil
+      
+      res.destroy(@commit)
+    end
+    it "should not be empty for an existing folder" do
+      res = Fns.new @call.merge(name: 'test/pagess')
+      res.save
+      
+      expect(Fns.first(folder: 'test')).not_to be_nil 
+      expect(Fns.last(folder: 'test')).not_to be_nil
+      
+      res.destroy(@commit)
+    end    
+    it "should change the folder" do
       res = Fns.new @call.merge(name: 'test/pagess')
       res.save
       expect(res.path_name).not_to be_nil

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.4.14
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: gollum-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: include Gollum into Rails with ease
@@ -189,12 +189,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []