gollum_rails 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57c07d301c92ee9ae439361a45e1a0317508396f
-  data.tar.gz: 813634ee9e35af6a7392fa2fd1cef28e1b7eb308
+  metadata.gz: 3b460090ab3b9641ec3ea08931ccec91b44f47e6
+  data.tar.gz: 068b8e6ebdb52b6a9e84651c03de154f3712ccbf
 SHA512:
-  metadata.gz: 6aa595beec356b66b0ac41a368623a5fcd1074aa308e15ffdda2e9a9100ee305c84d874310004ecea7eed0d9ea2ca7be947486c88fc10a0f2f52631c2bd56208
-  data.tar.gz: d5115ae21d4c26bca9cd76b134c55e966528da4e4e2bdad675611bc18fe5504d413ae01b3a1d6fb44244e46f8294f0667c6f1250bbf1a89eba81b878858dd377
+  metadata.gz: 333ff674a490887f45dbe5097a50433219d1094481303e8df7d0f59d3a863b80729770a23aebe49f8e1a794b99bcc6189057e9f440ff00bf341dc1618295d8a2
+  data.tar.gz: 3895b9ef0bbacc2c98df81e01e2e214f8f98042c9f83a1643f76f33df27ddc438363bd7d7376aefa544a6bcf767f4322baf594252ff87b0895b91a81f6c61b94

data/Gemfile.lock

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

data/HISTORY.md

@@ -1,3 +1,16 @@
+# 1.4.8 13th January 2013
+* Updated initializer
+* Better errors
+* no nil exception
+
+# 1.4.7 22th December 2013
+* rails3 and 4 support in a single release
+* Major code refactoring
+* Bugfixes
+* Stability improvements
+* Removed obsolete abstraction layer
+* Decentralized code à la ActiveRecord
+
 # 1.4.6 9th December 2013
 * Updated the initializer to support paths now
 * Updated error messages

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.4.7'
+  s.version = '1.4.8'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
@@ -46,11 +46,10 @@ Gem::Specification.new do |s|
     lib/gollum_rails.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/error.rb
     lib/gollum_rails/finders.rb
     lib/gollum_rails/orm.rb
     lib/gollum_rails/page.rb
@@ -58,12 +57,8 @@ Gem::Specification.new do |s|
     lib/gollum_rails/setup.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/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

@@ -34,6 +34,7 @@ module GollumRails
   
   autoload :Persistance
   autoload :Callbacks
+  autoload :Error
   autoload :Core
   autoload :Store
   autoload :Validation
@@ -43,33 +44,8 @@ module GollumRails
   autoload :Orm
 
   # GollumRails version string
-  VERSION = '1.4.7'
+  VERSION = '1.4.8'
 
-  # Simplified error
-  class Error < StandardError; end
-
-  # All Gollum internal exceptions will be redirected to this
-  class GollumInternalError < Error
-
-
-    attr_accessor :name
-    attr_accessor :message
-    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/gollum', __FILE__
+require 'gollum_rails/adapters/gollum'

data/lib/gollum_rails/adapters/gollum.rb

@@ -7,7 +7,6 @@ module GollumRails
     module Gollum
       autoload :Wiki,       'gollum_rails/adapters/gollum/wiki'
       autoload :Page,       'gollum_rails/adapters/gollum/page'
-      autoload :Error,      'gollum_rails/adapters/gollum/error'
 
       # connector version
       VERSION="2.0.0"
@@ -26,15 +25,6 @@ module GollumRails
           attr_writer :wiki_options
           
 
-          # Sets the applications status
-          attr_writer :enabled
-
-          # Gets the enabled status
-          #
-          # Returns a boolean value
-          def enabled
-            @enabled || false
-          end
           # Gets the Globally used Page class or use a new one if not defined
           #
           #

data/lib/gollum_rails/core.rb

@@ -24,11 +24,9 @@ module GollumRails
     # commit must be given to perform any page action!
     def initialize(attrs = {})
       run_callbacks :initialize do
-        if Adapters::Gollum::Connector.enabled
+        if wiki
           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

data/lib/gollum_rails/error.rb

@@ -0,0 +1,6 @@
+module GollumRails
+  class InitializationError < StandardError; end
+  
+  module Error
+  end
+end

data/lib/gollum_rails/page.rb

@@ -75,6 +75,7 @@ module GollumRails
       include ActiveModel::Validations
     end
     
+    include Error
     include Core
     include Store
     include Validation

data/lib/gollum_rails/setup.rb

@@ -12,37 +12,21 @@ module GollumRails
   #     config.startup
   #   end
   #
-  # TODO:
-  #   * more options
-  #
-  # FIXME:
-  #   currently nothing
   #
   class Setup
-
-    # static baby
     class << self
       
+      attr_accessor :wiki_path
+      
+      attr_accessor :wiki_options
 
-      # Gets / Sets the repository
       attr_accessor :repository
-
+      
+      attr_accessor :startup
+      
       # Gets / Sets the init options
       attr_accessor :options
       
-      # Startup action for building wiki components
-      #
-      # Returns true or throws an exception if the path is invalid
-      def startup=(action)
-        if action
-          Adapters::Gollum::Connector.enabled = true
-          if @repository == :application
-            initialize_wiki Rails.application.config.wiki_repository
-          else
-            initialize_wiki @repository
-          end
-        end
-      end
       
       # Wiki startup options
       def options=(options)
@@ -54,6 +38,16 @@ module GollumRails
       #
       def build(&block)
         block.call self
+        if @repository == :application
+          raise GollumRailsSetupError, "Rails configuration is not defined. 
+          Are you in a Rails app?" if Rails.application.nil?
+          
+          initialize_wiki Rails.application.config.wiki_repository
+        else
+          raise GollumRailsSetupError, "Git repository does not exist.
+          Was the specified pathname correct?" unless Pathname.new(@repository).exist?
+          initialize_wiki @repository
+        end
       end
 
       #######
@@ -75,15 +69,16 @@ module GollumRails
 
       def initialize_wiki(path)
         if path_valid? path
-          repository = Grit::Repo.new path.to_s
-          GollumRails::Adapters::Gollum::Wiki.new(repository, options || {})
+          @wiki_path = path.to_s
+          @wiki_options = options
           true
         else
-          raise GollumInternalError, 'Repistory path empty or invalid!'
+          raise GollumRailsSetupError, 'Repistory path is empty or invalid!'
         end
 
       end
 
     end
   end
+  class GollumRailsSetupError < ArgumentError; end
 end

data/lib/gollum_rails/store.rb

@@ -20,7 +20,8 @@ module GollumRails
     module ClassMethods
       # Gets the wiki instance
       def wiki
-        @wiki ||= Gollum::Wiki.new(Adapters::Gollum::Connector.wiki_path, Adapters::Gollum::Connector.wiki_options)
+        raise InitializationError, "Wiki path was not initialized!" if Setup.wiki_path.nil?
+        @wiki ||= Gollum::Wiki.new(Setup.wiki_path, Setup.wiki_options)
       end
     end
     # Gets the pages format

data/spec/gollum_rails/setup_spec.rb

@@ -3,64 +3,48 @@ require 'spec_helper'
 require 'rails'
 describe GollumRails::Setup do
   it "should setup the application" do
-    GollumRails::Setup.build do |setup|
+    expect{
+      GollumRails::Setup.build do |setup|
 
-      # => The repository path to the 
-      #
-      #
-      setup.repository = '.'      
+        # => The repository path to the 
+        #
+        #
+        setup.repository = '.'      
 
-      #setup.wiki.use = :default
-      setup.startup=(true).should be_true
+      end
+    }.not_to raise_error
+    
 
-      setup.repository = nil
-      expect{setup.startup=true}.to raise_error GollumRails::GollumInternalError
-
-    end
 
+  end
+  it "should raise an error because no repo was supplied" do
+    expect{
+      GollumRails::Setup.build do |setup|
+        setup.repository = nil     
 
+      end
+    }.to raise_error
   end
   class Bla < GollumRails::Page
   end
-  it "should test the disable behavior" do
-    GollumRails::Adapters::Gollum::Connector.enabled = false
 
-    committer = {
-          :name => "Flo",
-          :message => "no",
-          :email => "mosny@zyg.li"
-        }
-
-    expect{Bla.new :name => "Default page", :commit => committer, :content => "#title \n ##body", :format => :markdown}.to raise_error GollumRails::GollumInternalError
-  end
-  it "should test the applications config" do
-    GollumRails::Setup.build do |config|
-      config.repository = :application
+  it "could not start without a rails configuration" do
+    
+    expect {
+      GollumRails::Setup.build do |config|
+        config.repository = :application
 
-      expect{setup.startup=true}.to raise_error
-    end
+      end
+    }.to raise_error GollumRails::GollumRailsSetupError
+    
   end
   it "should throw an error if a pathname was supplied that does not exist" do
-    GollumRails::Setup.build do |setup|
-      setup.repository = Pathname.new('/nonexistingdirectoryshouldbenonexisting') 
-      expect{setup.startup=(true)}.to raise_error(GollumRails::GollumInternalError)
-    end
+    expect{
+      GollumRails::Setup.build do |setup|
+        setup.repository = Pathname.new('/nonexistingdirectoryshouldbenonexisting') 
+      end
+    }.to raise_error GollumRails::GollumRailsSetupError
   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/spec_helper.rb

@@ -11,9 +11,6 @@ require 'gollum_rails'
 RSpec.configure do |config|
  config.treat_symbols_as_metadata_keys_with_true_values = true
 
- config.before(:each) do
-   GollumRails::Adapters::Gollum::Connector.enabled = true
- end
 
  config.mock_with :rr
  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -158,11 +158,10 @@ files:
 - lib/gollum_rails.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/error.rb
 - lib/gollum_rails/finders.rb
 - lib/gollum_rails/orm.rb
 - lib/gollum_rails/page.rb
@@ -170,12 +169,8 @@ files:
 - lib/gollum_rails/setup.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/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/adapters/gollum/error.rb

@@ -1,19 +0,0 @@
-module GollumRails
-  module Adapters
-    module Gollum
-
-      # Gollum adapter Error handling class
-      #
-      # provides better errors
-      class Error < ::StandardError
-
-        # does the formatting of the Error message
-        #
-        #
-        def initialize(error_message, urgence)
-          super "#{urgence.upcase} :: #{error_message}"
-        end
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-require 'grit'
-module GollumRails
-  module Adapters
-    module Gollum
-
-      # TODO: doc
-      class  Wiki
-
-        # Initializes the class
-        #
-        # location - String or Grit::Repo
-        def initialize(location, options={})
-          
-          Connector.wiki_options = options
-          
-          if location.is_a?(::String)
-            con = location
-          else
-            con = location.path
-          end
-          
-          Connector.wiki_path = con
-          
-        end
-      
-        # Static call from within any other class
-        #
-        # Returns a new instance of this class
-        def self.wiki(location, options={})
-          Wiki.new(location, options)
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-require 'spec_helper'
-require 'grit'
-
-describe GollumRails::Adapters::Gollum::Wiki do
-  before(:each) do
-    @location = "#{File.dirname(__FILE__)}/../../../utils/wiki.git"
-    @repo = Grit::Repo.init_bare @location
-    @wiki = GollumRails::Adapters::Gollum::Wiki.new @repo
-  end
-  it "should test initializer" do
-    wiki = GollumRails::Adapters::Gollum::Wiki.new @location
-    @wiki.git.should == @repo
-    wiki.git.should be_instance_of(String)
-    wiki.git.should == @location
-  end
-  it "should test the creation of a new wiki" do
-    wiki = GollumRails::Adapters::Gollum::Wiki.wiki @repo
-    wiki.git.should == @repo
-    wiki = GollumRails::Adapters::Gollum::Wiki.wiki @location
-    wiki.git.should == @location
-    GollumRails::Adapters::Gollum::Connector.wiki_class.should be_instance_of(::Gollum::Wiki)
-  end
-  it "should test the error throwing and forwarding" do
-    expect{GollumRails::Adapters::Gollum::Wiki.write_page}.to raise_error ArgumentError
-  end
-
-end

data/spec/gollum_rails/error_spec.rb

@@ -1,10 +0,0 @@
-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/orm_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-
-describe GollumRails::Orm do
-  let(:commit){{
-        name: "flo",
-        message: "commit",
-        email: "mosny@zyg.li"}}
-  let(:pageattrs){{
-        name: "Pagetester",
-        content: "content data",
-        commit: commit,
-        format: :markdown}}
-  class PTest < GollumRails::Page
-    include GollumRails::Orm
-  end
-  # before(:each){@rr = PTest.create(pageattrs)}
-  # after(:each){}
-
-  it "should alias the all function" do
-    @rr = PTest.new(pageattrs)
-    #expect(PTest).to respond_to(:all_pages)
-    #@rr.destroy(commit)
-  end
-end