gollum_rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03defec1ea870b38272042b25121fec8e78bc853
-  data.tar.gz: 231dedf0f9e8d1d0fdca14d06747b11baa99b957
+  metadata.gz: 9c03ff854db8019836bed34d394b4164929c5658
+  data.tar.gz: e56ab20032a7e1a6aaa869b0e20b8a9ab3c2f454
 SHA512:
-  metadata.gz: 4415a2dba2417ba0fee03d232ce4bc673b698ff7abc652e7db52ae8a1ca2c701502e13abd482ab5e237e6a036235bba968e29c8c3910e108ad5110517b6e728f
-  data.tar.gz: f267de8bafdb95340c3b0b1f0cb10e5021833ccbbdd22ad47074d1f3703cae58d95dff304063f25b1d458e0248b464d101474a7b041091700c0a9f81005d5d5b
+  metadata.gz: e6794926269a51b059d16236781149fce0b31c7d20dde9c1a50af4b49cd6f64d8b58e4a1ab28cebca26549b94003817d91488fd3db8b9c20457bb4552b651fd7
+  data.tar.gz: d485279f1c32145f0c3a0be000d1cf7dd1d473aa1971a5447f3c7a05bd8106228234d8375baf55a018ebaa7cf0b1c349dc46346e779fff174d8d95b65864d86d

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    gollum_rails (0.0.5)
+    gollum_rails (0.0.6)
       activemodel (~> 3.2.13)
       builder (~> 3.0.0)
       gollum-lib (~> 0.0.1)

data/gollum_rails.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '0.0.5'
+  s.version = '0.0.6'
 
   s.summary = 'Combines the benefits from Gollum and Rails'
   s.description= 'Use all the benefits from Rails and combine them with the awesome Gollum wiki'
@@ -38,6 +38,8 @@ Gem::Specification.new do |s|
     Rakefile
     examples/rails/initializer.rb
     gollum_rails.gemspec
+    lib/generators/gollum_rails/install/install_generator.rb
+    lib/generators/gollum_rails/install/templates/gollum_initializer.rb
     lib/gollum_rails.rb
     lib/gollum_rails/adapters/activemodel.rb
     lib/gollum_rails/adapters/activemodel/boolean.rb
@@ -64,9 +66,9 @@ Gem::Specification.new do |s|
   s.post_install_message = "Important: \n\n" \
   "**********************************************\n\n" \
   "To use the 'autoinitializer' just run the following command:\n\n"\
-  "\t\trails g gollum_rails:install\n\n"\
+  "\trails g gollum_rails:install\n\n"\
   "To generate a new Page model just run:\n\n"\
-  "\t\rails g gollum_rails:model MODEL_NAME"\
+  "\trails g gollum_rails:model MODEL_NAME\n"\
   "**********************************************"
 end
 

data/lib/generators/gollum_rails/install/install_generator.rb

@@ -0,0 +1,22 @@
+require 'rails/generators'
+
+module GollumRails
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+      desc "This generator will install gollum_rails"
+
+      def install_application
+        if File.exist? 'config/initializers/gollum.rb'
+          puts <<-EOM
+            Warning! 'config/initializers/gollum.rb' exists
+            It should be removed, as it may contain data of a previous installation
+          EOM
+        else
+          copy_file "gollum_initializer.rb", "config/initializers/gollum.rb"
+        end
+      end
+    end
+  end
+end
+

data/lib/generators/gollum_rails/install/templates/gollum_initializer.rb

@@ -0,0 +1,22 @@
+# Initializer for the GollumRails gem.
+GollumRails::Setup.build do |config|
+
+  # Set the path to the GIT-Repository.
+  # 
+  # Possible values are:
+  #
+  # => an absolute path: '/home/railsapp/db/wiki.git'
+  # => a relative path: Path.join(RAILS_ROOT, 'db', 'wiki.git')
+  # => a symbol (only application) it uses the currently active rails environment configuration for the path
+  #
+  config.repository = :application
+
+  # Tells GollumRails to startup.
+  # 
+  # By default this value is disabled, because no path is set
+  # 
+  # Possible values are:
+  #
+  # true or false
+  config.startup = false
+end

data/lib/gollum_rails.rb

@@ -12,7 +12,7 @@ require 'gollum-lib'
 module GollumRails
   
   # GollumRails version string
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
   
   # Simplified error
   class Error < StandardError; end

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

@@ -26,7 +26,7 @@ module GollumRails
 
         # Initializer
         def initialize
-          @wiki = Wiki.class_variable_get(:@@wiki)
+          @wiki = Connector.wiki_class
         end
 
 

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

@@ -6,28 +6,20 @@ module GollumRails
       # TODO: doc
       class  Wiki
 
-        Connector.wiki_class = self
-
         # Gets / Sets the git path or object
         attr_accessor :git
 
-        # Static callers
-        class << self
-          # Gets / Sets the wiki instance
-          attr_accessor :wiki
-        end
-
         # Initializes the class
         #
         # location - String or Grit::Repo
         def initialize(location)
-          gollum = ::Gollum::Wiki
           @git = location
           if location.is_a? ::String
-            @@wiki = gollum.new @git
+            con = ::Gollum::Wiki.new @git
           else
-            @@wiki = gollum.new @git.path
+            con= ::Gollum::Wiki.new @git.path
           end
+          Connector.wiki_class = con
         end
       
         # Static call from within any other class
@@ -37,6 +29,10 @@ module GollumRails
           Wiki.new(location)
         end
 
+        def self.method_missing(name, *args)
+          Connector.wiki_class.send(name, *args)
+        end
+
       end
     end
   end

data/lib/gollum_rails/page.rb

@@ -65,7 +65,7 @@ module GollumRails
 
     # Gets the wiki instance
     def wiki
-      @wiki || Adapters::Gollum::Connector.wiki_class.class_variable_get(:@@wiki)
+      @wiki || Adapters::Gollum::Connector.wiki_class
     end
 
     # Gets the pages' name
@@ -133,12 +133,11 @@ module GollumRails
     # Returns an instance of Gollum::Page or false
     def save
       begin
-        page.instance_variable_set("@page", page.new_page(name, content, format, commit)) if valid?
-        return page.page||false
+        page.new_page(name,content,format,commit)
       rescue ::Gollum::DuplicatePageError => e 
         page.instance_variable_set "@page",page.find_page(name)
-        return page.page 
       end
+      return page.page
     end
 
     # aliasing save
@@ -229,12 +228,12 @@ module GollumRails
     
     # todo
     def self.validate(context=nil,check=false,&block)
-      if block
-        @@gollum_page = block
-      end
-      if check
-        @@gollum_page.call context.class.validator 
-      end
+      #if block
+      #  @@gollum_page = block
+      #end
+      #if check
+      #  @@gollum_page.call context.class.validator 
+      #end
     end
 
     # todo

data/lib/gollum_rails/setup.rb

@@ -30,14 +30,15 @@ module GollumRails
       # Startup action for building wiki components
       #
       # Returns true or throws an exception if the path is invalid
-      def startup
-        if path_valid? @repository
-          repository = Grit::Repo.new @repository.to_s
-          GollumRails::Adapters::Gollum::Wiki.new repository
-          true
-        else
-          raise GollumInternalError, 'no repository path specified'
+      def startup=(action)
+        if action
+          if @repository == :application
+            initialize_wiki Rails.config.wiki_repository
+          else
+            initialize_wiki @repository
+          end
         end
+
       end
       
       # defines block builder for Rails initializer.
@@ -63,6 +64,17 @@ module GollumRails
         return !(path.nil? || path.empty? || ! path.is_a?(String))
       end
 
+      def initialize_wiki(path)
+        if path_valid? path
+          repository = Grit::Repo.new path.to_s
+          GollumRails::Adapters::Gollum::Wiki.new repository
+          true
+        else
+          raise GollumInternalError, 'no repository path specified'
+        end
+
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Florian Kasper
@@ -137,6 +137,8 @@ files:
 - Rakefile
 - examples/rails/initializer.rb
 - gollum_rails.gemspec
+- lib/generators/gollum_rails/install/install_generator.rb
+- lib/generators/gollum_rails/install/templates/gollum_initializer.rb
 - lib/gollum_rails.rb
 - lib/gollum_rails/adapters/activemodel.rb
 - lib/gollum_rails/adapters/activemodel/boolean.rb
@@ -160,8 +162,8 @@ licenses:
 - AGPL
 metadata: {}
 post_install_message: "Important: \n\n**********************************************\n\nTo
-  use the 'autoinitializer' just run the following command:\n\n\t\trails g gollum_rails:install\n\nTo
-  generate a new Page model just run:\n\n\t\rails g gollum_rails:model MODEL_NAME**********************************************"
+  use the 'autoinitializer' just run the following command:\n\n\trails g gollum_rails:install\n\nTo
+  generate a new Page model just run:\n\n\trails g gollum_rails:model MODEL_NAME\n**********************************************"
 rdoc_options: []
 require_paths:
 - lib