gollum_rails 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31725c554d1fb9b5d052c746fa3e98f5c3c340c0
-  data.tar.gz: 832779213e534adc377ea9778a79023c24cfb0f7
+  metadata.gz: 5997873b85103d1d0ed0f94b46693a365d0529db
+  data.tar.gz: 57fee5ae386f2c24af584d033d562b6dd9f7eddc
 SHA512:
-  metadata.gz: dacfbd80c3b06a23164cd6cfe0ef1f593b9a0c2c0a3ebc8900f667d12250edfa4eaf0c674fae9a69f2b196733f1613f7caece461e10dd961621788dac0f250fb
-  data.tar.gz: 7ad2e6e515cbe372d639b0eee3401624427f4da055bb6aa336621d80111f800a7bbfb88ad8cda70f97de666d509cdd2096df472d9de809bdef8ee92ec2c08a1f
+  metadata.gz: d7d17cd47c838ba9a212ab1f9bc8d8c551fc4a16c4ec35ab7706a4fe47f65ddce80ac9546f5ed60a830841c34a30c78a625870583c1e31d26e072b74fe12125c
+  data.tar.gz: 21f43bad70858c468995c3b6b2e5189cb0a7d330b8ed4dcbddedfa84004c6b0cc1e6772ec670850912f68bb5ea3b2a56c4a8fede411ba8b87afa73af46bd44d9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.5.5)
+    gollum_rails (1.5.6)
       activemodel (>= 3.2.11)
       activesupport (>= 3.2.11)
       gollum-lib (~> 2.0.0)

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.5'
+  s.version = '1.5.6'
 
   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.5'
+  VERSION = '1.5.6'
 
 end
 

data/lib/gollum_rails/core.rb

@@ -13,14 +13,20 @@ module GollumRails
         Gollum::Markup.formats.include?(format.to_sym)
       end
       
+      # Resets the folder to /
+      def reset_folder
+        set_folder(nil)
+      end
+
+      # Sets the folder
       def set_folder(options)
-        if options.kind_of? Hash
-        
+        if options.is_a? Hash
           return if options.empty?
           options = options[:folder]
         end
         Setup.wiki_options ||= {}
         Setup.wiki_options[:page_file_dir] = options
+        Setup.wiki_options[:base_path] = options
       end
       alias_method :folder=, :set_folder
     end
@@ -40,14 +46,40 @@ module GollumRails
     end
     
 
-    
+    # Gets the pathname for current file 
     def path_name
-      f = File.split(name).first
+      f = full_path.first
       return '/' if f == '.'
       f
     end
+
+    def full_path
+      File.split(name)
+    end
+
+    def file_name
+      full_path.last
+    end
+
+    # Gets the next subfolder for current pathname
+    def next_folder(previous)
+      path = path_name
+      previous = File.split(previous).join
+      path.gsub!(/#{previous}/i, '')
+      ngxpath = File.split(path).first #use path only cuz we want the next folder not file
+      new_path = ngxpath.split('/').reject { |c| c.empty? }
+      px = new_path.join
+      if px == '.' || px.empty?
+        return nil
+      end
+      px
+
+    end
     
-    
+    def cname
+      Gollum::Page.cname(self.name)
+    end
+    # Gets a canonicalized filename of the page 
     def canonicalized_filename
       Gollum::Page.canonicalize_filename(name)
     end

data/lib/gollum_rails/finders.rb

@@ -22,13 +22,13 @@ module GollumRails
       #
       # name - the name of the page
       # version - optional - The pages version
-      # reset_folder - optional - resets the folder to / before performing the search
+      # folder_reset - optional - resets the folder to / before performing the search
       # exact - optional - perform an exact match
       #
       # Return an instance of Gollum::Page
-      def find(name, version=nil, reset_folder=false, exact=true)
+      def find(name, version=nil, folder_reset=false, exact=true)
         name = name[:name] if name.kind_of?(Hash) && name.has_key?(:name)
-        Page.set_folder(nil) if reset_folder
+        Page.reset_folder if folder_reset
         wiki.clear_cache
         path = File.split(name)
         if path.first == '/' || path.first == '.'

data/spec/gollum_rails/page_spec.rb

@@ -67,6 +67,43 @@ describe "Gollum Page" do
         expect(RailsModel.find('test-page')).not_to be_nil
         @rr.destroy
       end
+      it "has a cname" do
+        @rr.name = 'test page'
+        @rr.save
+        expect(@rr.cname).to match('test-page')
+        @rr.destroy
+      end
+      it "has a filename " do
+       @rr.name = '/home/page/test/page'
+       @rr.save
+       expect(@rr.file_name).to match 'page'
+       @rr.destroy
+      end
+      it "has a path name" do
+        @rr.name = '/home/page/test/page'
+        @rr.save
+
+        expect(@rr.path_name).to match 'home/page/test'
+        @rr.destroy
+      end
+      it "can get the next subfolder" do
+        @rr.name = '/home/page/test/page'
+        @rr.save
+        expect(@rr.next_folder('/home')).to match 'page'
+        @rr.destroy
+      end
+      it "can get the next subfolder again" do
+        @rr.name = '/home/page'
+        @rr.save
+        expect(@rr.next_folder("/home")).to be_nil
+        @rr.destroy
+      end
+      it "cannot get the next subfolder" do
+        @rr.name = 'page'
+        @rr.save
+        expect(@rr.next_folder("/")).to be_nil
+        @rr.destroy
+      end
       it "was last changed by me" do
         @rr.save
         @rr.last_changed_by.should == 'flo <mosny@zyg.li>'

metadata

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