gollum_rails 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11fed99873df70a7a7d86d323bce04bc21bb71c6
-  data.tar.gz: 3fa18480d1a55a289c488e2c731b8f7e8fd20b5c
+  metadata.gz: 7722875d793d56642ad1a05a5ebc360e297ca6b2
+  data.tar.gz: 0fb1d9f345e5b93afab6ae91e4687710cd7725cc
 SHA512:
-  metadata.gz: 090c0e3d6986db52a453b2fa1516af14f4f2c335d5a9cc5d6beb02a97af7213d0297d8269657ac6ae585bf255e63ee450d86b00cba49451c157c6e4cdc471bd1
-  data.tar.gz: 94a1f37f9965e2ed65db0663d815329272115cc44f6c51d506f5a15a5986dcf447b93c7648260d2862c6cdb771a346e4afe37ef0c3671fd62e8aff32e6c5234a
+  metadata.gz: 18f5e87b8172f330b77a418301f4805feea518ba72141c28a8ceeca98ee799d28e68ef69aed968ba17234b8ed88ed0f4407f628b981534d49f0bd3608cf4bb97
+  data.tar.gz: 8822651c8f55cbb3b49caeb9e2f2194989e46f738448bd3c118c4031ef0ffeb2a58fe9c326f1354faddc6071bf63f9e6f2c16f9505143682a89b7ca68fd928d1

data/Gemfile.lock

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

data/HISTORY.md

@@ -1,3 +1,11 @@
+# 1.5.3 19th February 2014
+* Documentation improvements
+* Refactored find `find` method call to accept page resets and exact matches
+* Bugfixing
+
+# 1.5.2 18th February 2014
+* Bugfixing
+
 # 1.5.1 28th January 2014
 * Updated `update_attributes` to work with hashes
 * Bugfixing

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

data/lib/gollum_rails/finders.rb

@@ -1,6 +1,7 @@
 module GollumRails
   module Finders
     extend ActiveSupport::Concern
+
     module ClassMethods
       # Finds an existing page or creates it
       #
@@ -9,9 +10,9 @@ module GollumRails
       #
       # Returns self
       def find_or_initialize_by_name(name, commit={})
-        result_for_find = find(name)
-        unless result_for_find.nil?
-          result_for_find
+        result = find(name)
+        if result
+          result
         else
           new(:format => :markdown, :name => name, :content => ".", :commit => commit)
         end
@@ -21,14 +22,26 @@ module GollumRails
       #
       # name - the name of the page
       # version - optional - The pages version
+      # reset_folder - 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)
-        page = Adapters::Gollum::Page.find_page(name, wiki, version)
-        
-        return new( :gollum_page => page ) unless page.nil?
-        return nil
-        
+      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
+        wiki.clear_cache
+        path = File.split(name)
+        if path.first == '/' || path.first == '.'
+          folder = nil
+        else
+          folder = path.first
+        end
+        page = wiki.paged(path.last, folder, exact, version)
+        if page
+          new(gollum_page: page)
+        else
+          nil
+        end
       end
       
       # == Searches the wiki for files CONTENT!
@@ -41,26 +54,38 @@ module GollumRails
       end
 
       # Gets all pages in the wiki
+      #
+      # Returns an Array with GollumRails::Page s
       def all(options={})
         set_folder(options)
         pages = wiki.pages
-        r = pages.map do |page|
+        pages.map do |page|
           self.new(gollum_page: page)
         end
       end
       
+      # Gets the last item from `all` method call
+      #
+      # options - optional - some options e.g. :folder
+      #
+      # Returns a single GollumRails::Page
       def first(options={})
         all(options).first
       end
       
+      # Gets the first item from `all` method call
+      #
+      # options - optional - some options e.g. :folder
+      #
+      # Returns a single GollumRails::Page
       def last(options={})
         all(options).last
       end
       
+      # Aliasing this for ActiveRecord behavior
       alias_method :find_all, :all
       
-      # TODO: implement more of this (format, etc)
-      #
+      # Catch-all method
       def method_missing(name, *args)
         if name =~ /^find_by_(name)$/
           self.find(args.first)
@@ -71,4 +96,4 @@ module GollumRails
       
     end
   end
-end
+end

metadata

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