gollum_rails 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a2c2e98a8c012221cdd7df298985e2a78e484a7
-  data.tar.gz: 0541fe5604df89959e2f164cec74cfe3cac97546
+  metadata.gz: 7c1b7d1d834268e00fc9b8c63f0aca04cc83bc85
+  data.tar.gz: b7c4a10005a3837d4bf8d9eee0afb2ac2e7867e0
 SHA512:
-  metadata.gz: ecde48f9e07329566993ad8372bd6ea6ac859be2801a37cbab1c564944c9fb15546956cb5232f66927b98bc6fdb97f3a10dcb6b05492ba80fdeea072161ff42a
-  data.tar.gz: 3aec45e7526934f729262afb84c9f563d70ff25213e41bdbd61b73c542cb881683f83cb4b7297439c1c00dacd614fe3ba6712f9a243e9753aa0d076f555ade4a
+  metadata.gz: dab8d76e647ba708e1c9ee1ac8cb705633642682f6509b5d97e3fd40566333d4561d51c4bd699ca69cbd7ac774f6f34ae87d8ab1e8d8abfa87a3759729ee4609
+  data.tar.gz: fae83809b25633f5dcff576ac3ce3531d4b9f50d02eabd35865f41d50c6fd5a3ab8b849336c9af01e15db09bc0b56a4797cc321c4674cb5b3c9427e3435ed015

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.0.3)
+    gollum_rails (1.0.4)
       activemodel (~> 3.2.13)
       gollum-lib (~> 1.0.0)
 
@@ -72,6 +72,7 @@ GEM
     mime-types (1.22)
     multi_json (1.7.2)
     nokogiri (1.5.9)
+    nokogiri (1.5.9-java)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
     pygments.rb (0.4.2)

data/HISTORY.md

@@ -1,3 +1,19 @@
+
+# 1.0.4 1th May 2013
+* removed mutex again
+* added gemspec name to Gemfile
+* removed odd modules
+* updated description
+* improved documentation
+* removed unused activemodel adapters
+* added fancy inspects
+* concept to make gollum page adapter threadsave
+* new documentation standard
+* removed unused GollumRails::Adapters::Gollum::Committer (unused)
+* removed .gitkeep from filled directories
+* removed old and deprecated require style
+
+
 # 1.0.3 25th April 2013
 * fixed post install messsage
 * removed unused require statements

data/gollum_rails.gemspec

@@ -4,10 +4,10 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.0.3'
+  s.version = '1.0.4'
 
-  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'
+  s.summary = 'Combines Gollum and Rails'
+  s.description= 'include Gollum into Rails with ease'
 
   s.add_dependency 'activemodel', '~> 3.2.13'
   s.add_dependency 'gollum-lib', '~> 1.0.0'
@@ -18,11 +18,12 @@ Gem::Specification.new do |s|
 
   s.author = 'Florian Kasper'
   s.email = 'mosny@zyg.li'
-  s.homepage = 'http://gollum.zyg.li'
+  s.homepage = 'https://github.com/nirnanaaa/gollum_rails'
   s.license = 'AGPL'
   s.platform = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.3'
 
+
   # = MANIFEST =
   s.files = %w[
     Gemfile
@@ -45,12 +46,11 @@ Gem::Specification.new do |s|
     lib/gollum_rails/adapters/activemodel/naming.rb
     lib/gollum_rails/adapters/gollum.rb
     lib/gollum_rails/adapters/gollum/.gitkeep
-    lib/gollum_rails/adapters/gollum/committer.rb
     lib/gollum_rails/adapters/gollum/error.rb
     lib/gollum_rails/adapters/gollum/page.rb
     lib/gollum_rails/adapters/gollum/wiki.rb
-    lib/gollum_rails/modules/hash.rb
-    lib/gollum_rails/modules/loader.rb
+    lib/gollum_rails/modulesDEPRECATED/hash.rb
+    lib/gollum_rails/modulesDEPRECATED/loader.rb
     lib/gollum_rails/page.rb
     lib/gollum_rails/setup.rb
     lib/grit/git-ruby/internal/pack.rb
@@ -62,11 +62,13 @@ Gem::Specification.new do |s|
     spec/gollum_rails/adapters/gollum/error_spec.rb
     spec/gollum_rails/adapters/gollum/page_spec.rb
     spec/gollum_rails/adapters/gollum/wiki_spec.rb
-    spec/gollum_rails/modules/hash_spec.rb
+    spec/gollum_rails/error_spec.rb
+    spec/gollum_rails/modulesDEPRECATED/hash.rb
     spec/gollum_rails/page_spec.rb
     spec/gollum_rails/respository_spec.rb
     spec/gollum_rails/setup_spec.rb
     spec/gollum_rails/wiki_spec.rb
+    spec/gollum_rails_spec.rb
     spec/spec.opts
     spec/spec_helper.rb
   ]

data/lib/core_ext/string.rb

@@ -1,10 +1,3 @@
 class String
-  if ((defined? RUBY_VERSION) && (['1.9', '2.0'].include? RUBY_VERSION[0..2]))
     def getord(offset); self[offset].ord; end
-  else
-    alias :getord :[]
-  end
-
-
-
 end

data/lib/gollum_rails.rb

@@ -1,5 +1,12 @@
+# ~*~ encoding: utf-8 ~*~
+
+# stdlib
 require 'rubygems'
+
+# external
 require 'gollum-lib'
+
+# patches
 require 'grit/git-ruby/internal/pack'
 require 'core_ext/string'
 
@@ -16,20 +23,39 @@ module GollumRails
   autoload :Setup,    'gollum_rails/setup'
 
   # GollumRails version string
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 
   # Simplified error
   class Error < StandardError; end
 
-  # For use with internal gollumGem exceptions
-  #
+  # All Gollum internal exceptions will be redirected to this
   class GollumInternalError < Error
 
+    # The classes name, that raised the exception
+    attr_accessor :name
+
+    # The messsage, brought by the class
+    attr_accessor :message
+
+    # The target, the class wanted to interact with
+    attr_accessor :target
+
+    # modifies content for throwing an exception
+    def initialize(name, target = nil, message = nil)
+      @name = name
+      @target = target
+      @message = message
+
+      super(message || "An Error occured: #{name} on #{target}")
+    end
+
+    # Fancy inspects
+    def inspect
+      "#<GollumRails::GollumInternalError:#{object_id} {name: #{name.inspect}, message: #{message.inspect}, target: #{target.inspect}}>"      
+    end
   end
 end
 
 
 require File.expand_path '../gollum_rails/adapters/activemodel', __FILE__
 require File.expand_path '../gollum_rails/adapters/gollum', __FILE__
-# load extensions
-require File.expand_path '../gollum_rails/modules/loader', __FILE__

data/lib/gollum_rails/adapters/activemodel.rb

@@ -13,27 +13,20 @@ module GollumRails
     # 
     # The following files are involved:
     #   * boolean.rb -> Boolean features for validation
-    #   * callback.rb -> Callback functionality
     #   * naming.rb -> Conversion and Naming
     #   * error.rb -> Active Model error handling
-    #   * validation.rb -> Object validation
     #
     # Released under the AGPL License. For further information see the LICENSE file distributed
     # with this package.
     #
     # TODO:
     #   * a lot of testing
-    #   * implementing the rest of the error class
-    #   * deleting the model template out
-    #   * move into own gem
     #
-    # FIXME:
-    #   none a.t.m.
     #
     module ActiveModel
 
       # connector version
-      VERSION="1.20.0"
+      VERSION="1.21.0"
     end
   end
 end

data/lib/gollum_rails/adapters/gollum.rb

@@ -3,19 +3,14 @@ module GollumRails
   module Adapters
     # Gollum Wiki connector classes
     #
-    # TODO:
-    #   * implement
-    #
-    # FIXME:
-    #   currently nothing implemented
     #
     module Gollum
       autoload :Wiki,       'gollum_rails/adapters/gollum/wiki'
       autoload :Page,       'gollum_rails/adapters/gollum/page'
-      autoload :Committer,  'gollum_rails/adapters/gollum/committer'
       autoload :Error,      'gollum_rails/adapters/gollum/error'
+
       # connector version
-      VERSION="1.0.3"
+      VERSION="2.0.0"
 
       # Gollum connector class, keeping defaults!
       #
@@ -27,9 +22,6 @@ module GollumRails
           # Sets the wiki class used by all instances
           attr_writer :wiki_class
 
-          # Sets the committer
-          attr_writer :committer_class
-
           # Sets the applications status
           attr_writer :enabled
 
@@ -55,20 +47,8 @@ module GollumRails
             @wiki_class || Wiki
           end
 
-          # Gets the current committer or using anon
-          #
-          #
-          def committer_class
-            @committer_class || Committer
-          end
         end
       end
     end
   end
 end
-
-#require File.expand_path '../gollum/error', __FILE__
-#require File.expand_path '../gollum/wiki', __FILE__
-#require File.expand_path '../gollum/committer', __FILE__
-#require File.expand_path '../gollum/page', __FILE__
-

data/lib/gollum_rails/page.rb

@@ -106,8 +106,6 @@ module GollumRails
 
     end
 
-    # mutex lock for multithreading
-    attr_reader :mutex
 
     # Initializes a new Page
     #
@@ -115,7 +113,6 @@ module GollumRails
     #
     # commit must be given to perform any page action!
     def initialize(attrs = {})
-      @mutex = Mutex.new
       if Adapters::Gollum::Connector.enabled
         attrs.each{|k,v| self.public_send("#{k}=",v)} if attrs
       else
@@ -183,16 +180,14 @@ module GollumRails
     #
     # Returns an instance of Gollum::Page or false
     def save
-      mutex.synchronize do
-        run_callbacks :save do
-          return false unless valid?
-          begin
-            page.new_page(name,content,format,commit)
-          rescue ::Gollum::DuplicatePageError => e
-            page.page = page.find_page(name)
-          end
-          return page.page
+      run_callbacks :save do
+        return false unless valid?
+        begin
+          page.new_page(name,content,format,commit)
+        rescue ::Gollum::DuplicatePageError => e
+          page.page = page.find_page(name)
         end
+        return page.page
       end
     end
 
@@ -211,12 +206,9 @@ module GollumRails
     #
     # Returns an instance of Gollum::Page
     def update_attributes(hash, commit=nil)
-      mutex.synchronize do
-        run_callbacks :update do
-          page.update_page hash, get_right_commit(commit)
-        end
+      run_callbacks :update do
+        page.update_page hash, get_right_commit(commit)
       end
-
     end
 
     # Deletes current page (also available static. See below)
@@ -226,12 +218,9 @@ module GollumRails
     #
     # Returns the commit id of the current action as String
     def delete(commit=nil)
-      mutex.synchronize do
-        run_callbacks :delete do
-          page.delete_page get_right_commit(commit)
-        end
+      run_callbacks :delete do
+        page.delete_page get_right_commit(commit)
       end
-
     end
 
     # checks if entry already has been saved

data/spec/gollum_rails/adapters/gollum/connector_spec.rb

@@ -11,8 +11,5 @@ describe GollumRails::Adapters::Gollum::Connector do
   it "should test the Page class connector" do
     @class.page_class.should == GollumRails::Adapters::Gollum::Page
   end
-  it "should test the Committer class connector" do
-    @class.committer_class.should == GollumRails::Adapters::Gollum::Committer
-  end
     
 end

data/spec/gollum_rails/error_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+describe GollumRails::GollumInternalError do
+
+  it "should display a fancy inspect" do
+ 	GollumRails::GollumInternalError.new("hihi").inspect.should include("{name: \"hihi\"")
+  end
+  it "should raise an error with custom message" do
+  	expect{raise GollumRails::GollumInternalError.new("myname", "is", "i am the message")}.to raise_error
+  end
+end

data/spec/gollum_rails/setup_spec.rb

@@ -40,5 +40,21 @@ describe GollumRails::Setup do
       expect{setup.startup=true}.to raise_error
     end
   end
+  it "should test the Rails configuration" do
+    GollumRails::Setup.build do |setup|
+
+      # => The repository path to the 
+      #
+      #
+      setup.repository = :application    
+
+      #setup.wiki.use = :default
+      expect{setup.startup=(true)}.to raise_error(NoMethodError, "undefined method `config' for nil:NilClass")
+
+      #setup.repository = nil
+      #expect{setup.startup=true}.to raise_error GollumRails::GollumInternalError
+
+    end
+  end
 
 end

data/spec/gollum_rails_spec.rb

@@ -0,0 +1,9 @@
+# Setup testing
+require 'spec_helper'
+describe GollumRails do
+
+  it "should equal the current version" do
+    GollumRails::VERSION.should == "1.0.4"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -80,8 +80,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
-description: Use all the benefits from Rails and combine them with the awesome Gollum
-  wiki
+description: include Gollum into Rails with ease
 email: mosny@zyg.li
 executables: []
 extensions: []
@@ -107,12 +106,11 @@ files:
 - lib/gollum_rails/adapters/activemodel/naming.rb
 - lib/gollum_rails/adapters/gollum.rb
 - lib/gollum_rails/adapters/gollum/.gitkeep
-- lib/gollum_rails/adapters/gollum/committer.rb
 - lib/gollum_rails/adapters/gollum/error.rb
 - lib/gollum_rails/adapters/gollum/page.rb
 - lib/gollum_rails/adapters/gollum/wiki.rb
-- lib/gollum_rails/modules/hash.rb
-- lib/gollum_rails/modules/loader.rb
+- lib/gollum_rails/modulesDEPRECATED/hash.rb
+- lib/gollum_rails/modulesDEPRECATED/loader.rb
 - lib/gollum_rails/page.rb
 - lib/gollum_rails/setup.rb
 - lib/grit/git-ruby/internal/pack.rb
@@ -124,14 +122,16 @@ files:
 - spec/gollum_rails/adapters/gollum/error_spec.rb
 - spec/gollum_rails/adapters/gollum/page_spec.rb
 - spec/gollum_rails/adapters/gollum/wiki_spec.rb
-- spec/gollum_rails/modules/hash_spec.rb
+- spec/gollum_rails/error_spec.rb
+- spec/gollum_rails/modulesDEPRECATED/hash.rb
 - spec/gollum_rails/page_spec.rb
 - spec/gollum_rails/respository_spec.rb
 - spec/gollum_rails/setup_spec.rb
 - spec/gollum_rails/wiki_spec.rb
+- spec/gollum_rails_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-homepage: http://gollum.zyg.li
+homepage: https://github.com/nirnanaaa/gollum_rails
 licenses:
 - AGPL
 metadata: {}
@@ -157,5 +157,5 @@ rubyforge_project: gollum_rails
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Combines the benefits from Gollum and Rails
+summary: Combines Gollum and Rails
 test_files: []

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

@@ -1,9 +0,0 @@
-module GollumRails
-  module Adapters
-    module Gollum
-      # TODO: doc
-      class  Committer < ::Gollum::Committer
-      end
-    end
-  end
-end