gollum_rails 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e28f59903e3501a35a990311a3289ffb7fabf8de
-  data.tar.gz: 6554db1a2ad83743510b428e527a12980e6eaa23
+  metadata.gz: 0e41af3125cdcc43422294feedf11dc6eef18661
+  data.tar.gz: f16d153ea9d97b819da9df159eff4670f0ab2ed8
 SHA512:
-  metadata.gz: 6b69256e1cec596b51086ee56dfc83df954d4a15563ad3b476ec155d325620ed081fb4963941cfe2f3833d6dc92bd53ddb24157d6a7cb30868ee7fc108423c2b
-  data.tar.gz: 90f3315569e2cfc5d070e6424de6b24ccc4dc780e4e8fed8e55a1227cde3bb5a5495af1419301e66a4f2986de3fe3ae82d30e244267b1eedd366c784e49ae817
+  metadata.gz: ae6e9c0ffdf2ca8807824065597dd936ad870781046385a7698bde4bd51b0fec5b358965e7e5c33a32e4b465447d09ff1b09eda9adad2c14f791fd111bc8a6bb
+  data.tar.gz: 5b2887aa33886262d52fceade5291de7d63bb3f797dea6f189688d947a8516204ae0b76af6d5e85f555287c8f5523cdc7d0f7a3d907830ccaff1d2e6e31c9e25

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    gollum_rails (0.0.7)
+    gollum_rails (0.0.8)
       activemodel (~> 3.2.13)
       builder (~> 3.0.0)
       gollum-lib (~> 0.0.1)
@@ -55,7 +55,7 @@ GEM
       rest-client
       simplecov (>= 0.7)
       thor
-    diff-lcs (1.2.1)
+    diff-lcs (1.2.2)
     erubis (2.7.0)
     github-markdown (0.5.3)
     github-markup (0.7.5)
@@ -75,7 +75,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.21)
+    mime-types (1.22)
     multi_json (1.7.2)
     nokogiri (1.5.9)
     polyglot (0.3.3)
@@ -110,7 +110,7 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rr (1.0.4)
+    rr (1.0.5)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -131,7 +131,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     stringex (1.5.1)
-    thor (0.18.0)
+    thor (0.18.1)
     tilt (1.3.6)
     treetop (1.4.12)
       polyglot

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.7'
+  s.version = '0.0.8'
 
   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'
@@ -40,10 +40,12 @@ Gem::Specification.new do |s|
     gollum_rails.gemspec
     lib/generators/gollum_rails/install/install_generator.rb
     lib/generators/gollum_rails/install/templates/gollum_initializer.rb
+    lib/generators/gollum_rails/language/language_generator.rb
+    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/callback.rb
     lib/gollum_rails/adapters/activemodel/error.rb
     lib/gollum_rails/adapters/activemodel/naming.rb
     lib/gollum_rails/adapters/activemodel/validation.rb

data/lib/generators/gollum_rails/language/language_generator.rb

@@ -0,0 +1,81 @@
+require 'rails/generators'
+
+module GollumRails
+
+  # Generators for GollumRails
+  module Generators
+
+    # Generates additional language files
+    class LanguageGenerator < ::Rails::Generators::Base
+      desc "This generator will install gollum_rails"
+      
+      argument :language, :type => :string
+
+      # installs languages
+      def install_languages
+        case language
+        when "ascii"
+          puts <<-EOT
+          \n Installation instructures for ASCIIDoc:\n
+          \n\n Ubuntu/Debian Linux:
+          \n (sudo) apt-get install asciidoc
+          \n\n Mac with homebrew:
+          \n brew install asciidoc 
+          \n
+          EOT
+        when "markdown"
+          run "gem install redcarped"
+          puts <<-EOT
+          \n Parser for type "markdown" was installed
+          \n
+          EOT
+        when "better-markdown"
+          run "gem install github-markdown"
+          puts <<-EOT
+          \n Parser for type "github-markdown" was installed
+          \n
+          EOT
+        when "textile"
+          run "gem install RedCloth"
+          puts <<-EOT
+          \n Parser for type "textile" was installed
+          \n
+          EOT
+        when "wiki"
+          run "gem install wikicloth"
+          puts <<-EOT
+          \n Parser for type "wiki" was installed
+          \n
+          EOT
+        when "org"
+          run "gem install org-ruby"
+          puts <<-EOT
+          \n Parser for type "org-ruby" was installed
+          \n
+          EOT
+        when "creole"
+          run "gem install creole"
+          puts <<-EOT
+          \n Parser for type "creole" was installed
+          \n
+          EOT
+        when "pod"
+          puts <<-EOT
+          \nPOT must be installed through CPAN (perl)
+          \nSee http://search.cpan.org/dist/perl/pod/perlpod.pod for further information
+          \n
+          EOT
+        when "rst"
+          puts <<-EOT
+          \nInstall through 'easy_install'
+          \nSee http://docutils.sourceforge.net/rst.html for further information
+          EOT
+        else
+          puts "UNKNOWN LANGUAGE"
+          exit 1
+        end
+      end
+    end
+  end
+end
+

data/lib/generators/gollum_rails/model/model_generator.rb

@@ -0,0 +1,51 @@
+require 'rails/generators'
+
+module GollumRails
+
+  # Generators for GollumRails
+  module Generators
+
+    # Generates models
+    class ModelGenerator < ::Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+      desc "This generator will create a model"
+      argument :model_name, :type => :string
+
+      # generates a model
+      def create_model
+        if ::File.exist? Rails.root.join("app", "models", "#{file_name}")
+          raw = <<-EOM
+          Warning: The file already exists
+          EOM
+          red raw
+        else
+          template "model_template.erb", "app/models/#{file_name}.rb"
+        end
+      end
+
+      private
+
+      # Gets the filename
+      def file_name
+        model_name.underscore
+      end
+
+      # Gets the classname
+      def class_name
+        model_name.camelize
+      end
+
+      # colorizes
+      def colorize(text, color_code)
+        "#{color_code}#{text}e[0m"
+      end
+
+      # colorizes red
+      def red(text); colorize(text, "e[31m"); end
+
+      # colorizes green
+      def green(text); colorize(text, "e[32m"); end
+    end
+  end
+end
+

data/lib/generators/gollum_rails/model/templates/model_template.erb

@@ -0,0 +1,13 @@
+# Gollum file
+class <%= class_name %> < GollumRails::Page
+  
+  # callbacks:
+  #
+  #  after_save :after_save
+  #
+  #  def after_save
+  #
+  #  end
+
+  
+end

data/lib/gollum_rails.rb

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

data/lib/gollum_rails/adapters/activemodel.rb

@@ -34,13 +34,12 @@ module GollumRails
     module ActiveModel
 
       # connector version
-      VERSION="0.0.4"
+      VERSION="1.9.0"
     end
   end
 end
 
 require File.expand_path '../activemodel/boolean', __FILE__
-require File.expand_path '../activemodel/callback', __FILE__
 require File.expand_path '../activemodel/naming', __FILE__
 require File.expand_path '../activemodel/error', __FILE__
 require File.expand_path '../activemodel/validation', __FILE__

data/lib/gollum_rails/adapters/gollum.rb

@@ -11,7 +11,7 @@ module GollumRails
     #
     module Gollum
       # connector version
-      VERSION="0.0.0"
+      VERSION="1.0.1rc-1"
 
       # Gollum connector class, keeping defaults!
       #

data/lib/gollum_rails/page.rb

@@ -152,8 +152,8 @@ module GollumRails
         rescue ::Gollum::DuplicatePageError => e 
           page.instance_variable_set "@page",page.find_page(name)
         end
+        return page.page
       end
-      return page.page
     end
 
     # aliasing save
@@ -183,9 +183,6 @@ module GollumRails
     # Returns an instance of Gollum::Page
     def self.create!(hash)
       action = self.create(hash)
-      if action.nil? or action.is_a? Adapters::ActiveModel::Boolean
-        raise GollumInternalError, "Page is nil"
-      end
       action
     end
 
@@ -246,7 +243,13 @@ module GollumRails
       self.class.validate self,true
     end
     
-    # todo
+    # Validation functions
+    #
+    # context - The current config
+    # check - check now
+    # block - Validations
+    #
+    # Returns true or raises an exception
     def self.validate(context=nil,check=false,&block)
       #if block
       #  @@gollum_page = block
@@ -256,36 +259,30 @@ module GollumRails
       #end
     end
 
-    # todo
-    def self.register_validations_for(*args)
-    end
-
-
-    # module templates following:
-
-    # empty
-    #def self.method_missing(name, *args)
-    #  
-    #end
-
-    # empty
-    #def method_missing(name, *args)
-    #end
-    
     # Finds an existing page or creates it
     #
+    # name - The name
+    # commit - Hash
+    #
     # Returns self
     def self.find_or_initialize_by_name(name, commit)
       result_for_find = self.find(name)
       self.create({:format => :markdown, :name => name, :content => ".", :commit => commit })
     end
 
+    # Checks if the fileformat is supported
+    #
+    # format - String
+    #
+    # Returns true or false
     def self.format_supported?(format)
       supported = ['ascii', 'github-markdown','markdown', 'creole', 'org', 'pod', 'rdoc']
       format.in?(supported)
     end
 
+    #######
     private
+    #######
 
     # Get the right commit out of 2 commits
     #

data/lib/gollum_rails/setup.rb

@@ -34,7 +34,7 @@ module GollumRails
         if action
           Adapters::Gollum::Connector.enabled = true
           if @repository == :application
-            initialize_wiki Rails.config.wiki_repository
+            initialize_wiki Rails.application.config.wiki_repository
           else
             initialize_wiki @repository
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Florian Kasper
@@ -139,10 +139,12 @@ files:
 - gollum_rails.gemspec
 - lib/generators/gollum_rails/install/install_generator.rb
 - lib/generators/gollum_rails/install/templates/gollum_initializer.rb
+- lib/generators/gollum_rails/language/language_generator.rb
+- 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/callback.rb
 - lib/gollum_rails/adapters/activemodel/error.rb
 - lib/gollum_rails/adapters/activemodel/naming.rb
 - lib/gollum_rails/adapters/activemodel/validation.rb

data/lib/gollum_rails/adapters/activemodel/callback.rb

@@ -1,61 +0,0 @@
-module GollumRails
-  module Adapters
-    module ActiveModel
-      
-      # Callback handling class
-      class Callback
-        extend ::ActiveModel::Callbacks
-        
-        define_model_callbacks :create, :only => [:after, :before]
-        define_model_callbacks :update, :only => [:after, :before]
-        define_model_callbacks :save, :only => [:after, :before]
-        define_model_callbacks :delete, :only => [:after, :before]
-        define_model_callbacks :find, :only => [:after, :before]
-
-        before_create :before_create
-        before_update :before_update
-        before_save :before_save
-        before_delete :before_delete
-        before_find :before_find
-
-        after_create :after_create
-        after_update :after_update
-        after_save :after_save
-        after_delete :after_delete
-        after_find :after_find
-
-        # Before create action
-        def before_create; end
-        
-        # Before update action
-        def before_update; end
-
-        # Before save action
-        def before_save; end
-
-        # Before delete action
-        def before_delete; end
-
-        # Before find action
-        def before_find; end
-
-        # After create action
-        def after_create; end
-
-        # After update action
-        def after_update; end
-
-        # After save action
-        def after_save; end
-
-        # After delete action
-        def after_delete; end
-
-        # After find action
-        def after_find; end
-
-      end
-
-    end
-  end
-end