gollum_rails 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f1d83fb2faa64453dcb5a65f5924a0c9964b031
-  data.tar.gz: f0244385a600d80b43c9c854e34320e34eed0ebc
+  metadata.gz: 57c07d301c92ee9ae439361a45e1a0317508396f
+  data.tar.gz: 813634ee9e35af6a7392fa2fd1cef28e1b7eb308
 SHA512:
-  metadata.gz: af72a2be4d4bd7727935b9272dd572230b432382ae542a9ecf4a79cd54050090b17f48485d3d43480261c375b75a780f1e04c8e14e852f534311014e82afc434
-  data.tar.gz: 08892031c42725374caf6b80fb4652aae56a367d6416c429ec9f1f9a0d5ed42b37f5650cb4aa80e83863af20a60e41f308f80dbf210d989d0a4d50866b2f5e47
+  metadata.gz: 6aa595beec356b66b0ac41a368623a5fcd1074aa308e15ffdda2e9a9100ee305c84d874310004ecea7eed0d9ea2ca7be947486c88fc10a0f2f52631c2bd56208
+  data.tar.gz: d5115ae21d4c26bca9cd76b134c55e966528da4e4e2bdad675611bc18fe5504d413ae01b3a1d6fb44244e46f8294f0667c6f1250bbf1a89eba81b878858dd377

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'coveralls', require: false
-gem 'guard'
-gem 'guard-rspec'
+
 
 gemspec

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.4.6)
-      activemodel (>= 4.0.0)
+    gollum_rails (1.4.7)
+      activemodel (>= 3.2.11)
+      activesupport (>= 3.2.11)
       gollum-lib (~> 1.0.9)
 
 GEM
@@ -86,7 +87,7 @@ GEM
     mini_portile (0.5.2)
     minitest (4.7.5)
     multi_json (1.8.2)
-    nokogiri (1.6.0)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     polyglot (0.3.3)
     posix-spawn (0.3.8)
@@ -167,6 +168,7 @@ DEPENDENCIES
   gollum_rails!
   guard
   guard-rspec
-  rails (>= 4.0.0)
+  rails (>= 3.2.11)
+  rb-fsevent
   rr (~> 1.1.1)
   rspec (~> 2.13.0)

data/Guardfile

@@ -2,6 +2,7 @@ guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
+  watch(%r{^lib/(orm|core|finders|persistance|store|callbacks)\.rb$}) { |m| "spec/gollum_rails/page_spec.rb" }
 
 end
 

data/gollum_rails.gemspec

@@ -4,18 +4,22 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.4.6'
+  s.version = '1.4.7'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
 
-  s.add_dependency 'activemodel', '>= 4.0.0'
+  s.add_dependency 'activemodel', '>= 3.2.11'
+  s.add_dependency 'activesupport', '>= 3.2.11'
+  
   s.add_dependency 'gollum-lib', '~> 1.0.9'
 
   s.add_development_dependency 'rspec', '~> 2.13.0'
   s.add_development_dependency 'rr', '~> 1.1.1'
-  s.add_development_dependency 'rails', '>= 4.0.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.author = 'Florian Kasper'
   s.email = 'mosny@zyg.li'
   s.homepage = 'https://github.com/nirnanaaa/gollum_rails'
@@ -40,26 +44,26 @@ Gem::Specification.new do |s|
     lib/generators/gollum_rails/model/model_generator.rb
     lib/generators/gollum_rails/model/templates/model_template.erb
     lib/gollum_rails.rb
-    lib/gollum_rails/adapters/activemodel.rb
-    lib/gollum_rails/adapters/activemodel/boolean.rb
-    lib/gollum_rails/adapters/activemodel/error.rb
-    lib/gollum_rails/adapters/activemodel/naming.rb
     lib/gollum_rails/adapters/gollum.rb
     lib/gollum_rails/adapters/gollum/.gitkeep
     lib/gollum_rails/adapters/gollum/error.rb
     lib/gollum_rails/adapters/gollum/page.rb
     lib/gollum_rails/adapters/gollum/wiki.rb
+    lib/gollum_rails/callbacks.rb
+    lib/gollum_rails/core.rb
+    lib/gollum_rails/finders.rb
+    lib/gollum_rails/orm.rb
     lib/gollum_rails/page.rb
+    lib/gollum_rails/persistance.rb
     lib/gollum_rails/setup.rb
-    spec/gollum_rails/adapters/activemodel/error_spec.rb
-    spec/gollum_rails/adapters/activemodel/naming_spec.rb
-    spec/gollum_rails/adapters/activemodel/validation_unused.rb
+    lib/gollum_rails/store.rb
+    lib/gollum_rails/validation.rb
     spec/gollum_rails/adapters/gollum/committer_spec.rb
     spec/gollum_rails/adapters/gollum/connector_spec.rb
-    spec/gollum_rails/adapters/gollum/error_spec.rb
     spec/gollum_rails/adapters/gollum/page_spec.rb
     spec/gollum_rails/adapters/gollum/wiki_spec_off.rb
     spec/gollum_rails/error_spec.rb
+    spec/gollum_rails/orm_spec.rb
     spec/gollum_rails/page_spec.rb
     spec/gollum_rails/respository_spec.rb
     spec/gollum_rails/setup_spec.rb

data/lib/gollum_rails.rb

@@ -1,11 +1,25 @@
 # ~*~ 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/>.
+#++
 
-# stdlib
-require 'rubygems'
 
-# external
 require 'gollum-lib'
-
+require 'active_model'
+require 'active_support'
 
 # GollumRails is a RubyGem for extending Rails and the Gollum wiki powered by github
 # It has the ability to combine the benefits from a git powered wiki with Rails.
@@ -16,11 +30,20 @@ require 'gollum-lib'
 #   * ...
 #
 module GollumRails
-  autoload :Page,     'gollum_rails/page'
-  autoload :Setup,    'gollum_rails/setup'
+  extend ActiveSupport::Autoload
+  
+  autoload :Persistance
+  autoload :Callbacks
+  autoload :Core
+  autoload :Store
+  autoload :Validation
+  autoload :Finders
+  autoload :Page
+  autoload :Setup
+  autoload :Orm
 
   # GollumRails version string
-  VERSION = '1.4.6'
+  VERSION = '1.4.7'
 
   # Simplified error
   class Error < StandardError; end
@@ -49,6 +72,4 @@ module GollumRails
   end
 end
 
-
-require File.expand_path '../gollum_rails/adapters/activemodel', __FILE__
 require File.expand_path '../gollum_rails/adapters/gollum', __FILE__

data/lib/gollum_rails/adapters/gollum/page.rb

@@ -51,21 +51,6 @@ module GollumRails
           end
         end
 
-        # == Creates a new page
-        #
-        # name - The name of the page
-        # content - The content of the page
-        # wiki - An instance of Gollum::Wiki
-        # type - A filetype as symbol (optional)
-        # commit - Commit Hash
-        #
-        # Returns the page
-        def new_page( name, content, wiki, type=:markdown, commit={} )
-          path_data = self.class.parse_path(name)
-          wiki.write_page( path_data[:name], type, content, commit, path_data[:path].gsub!(/^\//, "").gsub!(/(\/)+$/,'') || "" )
-          wiki.clear_cache
-          self.class.find_page( name, wiki )
-        end
 
         # == Updates an existing page
         #
@@ -89,125 +74,6 @@ module GollumRails
           self.class.find_page( mixin(page.url_path, name), wiki )
         end
         
-        # == Preview page
-        #
-        # wiki - An instance of Gollum::Wiki
-        # content - New content
-        # name - A String
-        # format - A filetype as symbol (optional)
-        #
-        def preview_page(wiki, name, content, format=:markdown)
-          page = wiki.preview_page(name,content,format)
-          page.formatted_data
-        end
-
-        # == Deletes an existing page
-        #
-        # page - Gollum::Page
-        # wiki - Gollum::Wiki
-        # commit - Commit Hash
-        #
-        # Returns the commit id
-        def delete_page( page,wiki,commit={} )
-          wiki.clear_cache
-          wiki.delete_page(page, commit)
-        end
-        
-        # renames an existing page
-        #
-        # page - instance of myself
-        # newname - new pagename
-        # commit - Hash or instance of Committer
-        #
-        # Returns the commit id
-        def rename_page( page, newname, commit={} )
-
-        end
-
-        # finds all versions of a page
-        #
-        # name - the pagename to search
-        #
-        # Returns the Gollum::Page class
-        def find_page(name)
-          
-          self.class.find_page(name)
-        end
-        
-        # moves an existing page
-        #
-        # TODO:
-        #   * implement
-        def move_page()
-        end
-
-        # gets page last edit date
-        #
-        # Returns an instance of Time
-        def page_last_edited_date
-          if @page
-            return @page.versions.first.authored_date
-          else
-            raise Error.new  "page cannot be empty for #{__method__}", :high
-          end
-        end
-
-        # gets the latest commit
-        #
-        # Returns an instance of Grit::Commit
-        def page_last_commit
-          if @page
-            return @page.versions.first
-          else
-            raise Error.new "page cannot be empty for #{__method__}", :high
-          end
-        end
-
-        # gets the creation date of the page
-        #
-        # Returns an instance of Time
-        def page_created
-          if @page
-            return @page.versions.last.authored_date
-          else
-            raise Error.new  "page cannot be empty for #{__method__}", :high
-          end
-
-        end
-        
-        # gets the first page commit
-        #
-        # Returns an instance of Grit::Commit
-        def page_first_commit
-          if @page
-            return @page.versions.last
-          else
-            raise Error.new  "page cannot be empty for #{__method__}", :high
-          end
-        end
-
-        # gets a specific commit version
-        #
-        # Returns an instance of Grit::Commit
-        def page_commit(id)
-          if @page
-            return @page.versions.each{|v| return v if v.id == id}
-          else
-            raise Error.new  "page cannot be empty for #{__method__}", :high
-          end
-        end
-
-        # gets a specific commit time
-        #
-        # Returns an instance of Time
-        def page_commit_date(id)
-          if @page
-            return @page.versions.each{|v| return v.authored_date if v.id == id}
-          else
-            raise Error.new  "page cannot be empty for #{__method__}", :high
-          end
-        end
-        
         private
         
         # replaces old filename with new

data/lib/gollum_rails/adapters/gollum/wiki.rb

@@ -30,13 +30,6 @@ module GollumRails
           Wiki.new(location, options)
         end
 
-        # Forwards unknown methods to Gollum::Wiki
-        #
-        # may throw an Argument error or method missing
-        def self.method_missing(name, *args)
-          Connector.wiki_class.send(name, *args)
-        end
-
       end
     end
   end

data/lib/gollum_rails/callbacks.rb

@@ -0,0 +1,47 @@
+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(*)
+      run_callbacks(:destroy) { super }
+    end
+    
+    def save
+      run_callbacks(:save) { super }
+    end    
+    
+    private
+
+    # def create_or_update #:nodoc:
+    #  run_callbacks(:save) { super }
+    # end
+
+    def create_record #:nodoc:
+     run_callbacks(:create) { super }
+    end
+
+    def update_record(*) #:nodoc:
+     run_callbacks(:update) { super }
+    end
+       
+  end
+end

data/lib/gollum_rails/core.rb

@@ -0,0 +1,158 @@
+module GollumRails
+  module Core
+    extend ActiveSupport::Concern
+    
+    module ClassMethods
+      
+      # Checks if the fileformat is supported
+      #
+      # format - String
+      #
+      # Returns true or false
+      def format_supported?(format)
+        Gollum::Markup.formats.include?(format.to_sym)
+      end
+      
+
+      
+    end
+    
+    # Initializes a new Page
+    #
+    # attrs - Hash of attributes
+    #
+    # commit must be given to perform any page action!
+    def initialize(attrs = {})
+      run_callbacks :initialize do
+        if Adapters::Gollum::Connector.enabled
+          attrs.each{|k,v| self.public_send("#{k}=",v)} if attrs
+          update_attrs if attrs[:gollum_page]
+        else
+          raise GollumInternalError, 'gollum_rails is not enabled!'
+        end
+      end
+    end
+    
+    
+    def path_name
+      name.gsub(/(^\/|(\/){2}+|#{canonicalized_filename})/, "")
+    end
+    
+    def canonicalized_filename
+      Gollum::Page.canonicalize_filename(name)
+    end
+    
+    # == Previews the page - Mostly used if you want to see what you do before saving
+    #
+    # This is an extremely fast method!
+    # 1 rendering attempt take depending on the content about 0.001 (simple markdown)
+    # upto 0.004 (1000 chars markdown) seconds, which is quite good
+    #
+    #
+    # format - Specify the format you want to render with see {self.format_supported?}
+    #          for formats
+    #
+    # Returns a String
+    def preview(format=:markdown)
+      wiki.preview_page(name, content, format).formatted_data
+    end
+    
+    # == Gets the url for current page from Gollum::Page
+    #
+    # Returns a String
+    def url
+      gollum_page.url_path
+    end
+    
+    # == Gets the title for current Gollum::Page
+    #
+    # Returns a String
+    def title
+      gollum_page.title
+    end
+    
+    # == Gets formatted_data for current Gollum::Page
+    #
+    # Returns a String
+    def html_data
+      gollum_page.formatted_data
+    end
+    # == Gets raw_data for current Gollum::Page
+    #
+    # Returns a String
+    def raw_data
+      gollum_page.raw_data
+    end
+    
+    # == Gets the history of current gollum_page
+    #
+    # Returns an Array
+    def history
+      return nil unless persisted?
+      gollum_page.versions
+    end
+    
+    # == Gets the last modified by Gollum::Committer
+    #
+    # Returns a String
+    def last_changed_by
+      "%s <%s>" % [history.last.author.name, history.last.author.email]
+    end
+    
+    # == Compare 2 Commits.
+    #
+    # sha1 - SHA1
+    # sha2 - SHA1
+    def compare_commits(sha1,sha2=nil)
+      Page.wiki.full_reverse_diff_for(@gollum_page,sha1,sha2)
+    end
+
+    
+    # == The pages filename, based on the name and the format
+    # 
+    # Returns a String
+    # def filename
+    #   Page.wiki.page_file_name(@name, @format)
+    # end
+      
+    # == Checks if current page is a subpage
+    def sub_page?
+      return nil unless persisted?
+      @gollum_page.sub_page
+    end
+    
+    # == Gets the version of current commit
+    #
+    def current_version(long=false)
+      return nil unless persisted?
+      unless long
+        @gollum_page.version_short 
+      else
+        @gollum_page.version.to_s
+      end
+      
+    end
+    
+    private
+    
+    # == Gets the right commit out of 2 commits
+    #
+    # commit_local - local commit Hash
+    #
+    # Returns local_commit > class_commit
+    def get_right_commit(commit_local)
+      com = commit if commit_local.nil?
+      com = commit_local if !commit_local.nil?
+      return com
+    end
+    
+    # == Updates local attributes from gollum_page class
+    #
+    def update_attrs
+      @name = gollum_page.name
+      @content= gollum_page.raw_data
+      @format = gollum_page.format      
+    end
+    
+  end
+end