gollum_rails 1.4.0.rc3 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a434e676dc3ae1204edb758d2d2918cbf35f84c4
-  data.tar.gz: 8072921f43ce01ae3d757745618f1a881c1bb58d
+  metadata.gz: b9baab7df51ee264f15748a5a0545fb5b9b8260e
+  data.tar.gz: 102049591d936c7daf3aaa2fbc38c1cb88be46ef
 SHA512:
-  metadata.gz: 91b19d14333e79f92bc1144d93c56ec506deb77e70bd4f21f3b1e5fa8e802650b2458a656f2cd2ed20127a5ee2d3c9fccf916efe5d6e6c622c31f4e949fdcdfb
-  data.tar.gz: d70e90582b942e2c719bf533c6a3f6ad950c79f5c32c87cc3f07843eca84040337edc1a0c1f3aad38de1f563af2b7af758f51e7b35f24857fa5261ae337af0f7
+  metadata.gz: 5b6803db7979639b77e5a1b676427b45072c1ae8e990ec425e074bacc2c50b3be55e12709c5427124635fc72272606e6c34377f47272dfbd99833d07b5cb6d55
+  data.tar.gz: c449d6e1a6e6b48f814fe67e99e68b4b1d8e5bb37c791eb6febd35310e0f51074d2b1731ec5a28d104ac4e7692109d054c3d0df159533db5f7c92eb14a8d877e

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.4.0.rc3)
-      activemodel (~> 4.0.0.rc1)
+    gollum_rails (1.4.1)
+      activemodel (>= 4.0.0)
       gollum-lib (~> 1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0.rc1)
-      actionpack (= 4.0.0.rc1)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
       mail (~> 2.5.3)
-    actionpack (4.0.0.rc1)
-      activesupport (= 4.0.0.rc1)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0.rc1)
-      activesupport (= 4.0.0.rc1)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
       builder (~> 3.1.0)
-    activerecord (4.0.0.rc1)
-      activemodel (= 4.0.0.rc1)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0.rc1)
+      activesupport (= 4.0.0)
       arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.2)
-    activesupport (4.0.0.rc1)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -46,52 +46,52 @@ GEM
     erubis (2.7.0)
     github-markdown (0.5.3)
     github-markup (0.7.5)
-    gollum-lib (1.0.0)
+    gollum-lib (1.0.3)
       github-markdown (~> 0.5.3)
       github-markup (>= 0.7.5, < 1.0.0)
       grit (~> 2.5.0)
-      nokogiri (~> 1.5.9)
-      pygments.rb (~> 0.4.2)
-      sanitize (~> 2.0.3)
+      nokogiri (~> 1.5.9, < 1.6.0)
+      pygments.rb (~> 0.5.0)
+      sanitize (~> 2.0.3, < 2.0.4)
       stringex (~> 1.5.1)
     grit (2.5.0)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
-    hike (1.2.2)
+    hike (1.2.3)
     i18n (0.6.4)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
-    minitest (4.7.4)
+    minitest (4.7.5)
     multi_json (1.7.3)
-    nokogiri (1.5.9)
+    nokogiri (1.5.10)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
-    pygments.rb (0.4.2)
+    pygments.rb (0.5.1)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0.rc1)
-      actionmailer (= 4.0.0.rc1)
-      actionpack (= 4.0.0.rc1)
-      activerecord (= 4.0.0.rc1)
-      activesupport (= 4.0.0.rc1)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0.rc1)
-      sprockets-rails (~> 2.0.0.rc4)
-    railties (4.0.0.rc1)
-      actionpack (= 4.0.0.rc1)
-      activesupport (= 4.0.0.rc1)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rr (1.0.5)
+    rr (1.1.1)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -106,12 +106,12 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sprockets (2.9.3)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0.rc4)
+    sprockets-rails (2.0.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
@@ -120,7 +120,7 @@ GEM
     thread_safe (0.1.0)
       atomic
     tilt (1.4.1)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
@@ -132,6 +132,6 @@ PLATFORMS
 DEPENDENCIES
   coveralls
   gollum_rails!
-  rails (~> 4.0.0.rc1)
-  rr (~> 1.0.4)
+  rails (>= 4.0.0)
+  rr (~> 1.1.1)
   rspec (~> 2.13.0)

data/gollum_rails.gemspec

@@ -4,21 +4,21 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.4.0.rc3'
+  s.version = '1.4.1'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
 
-  s.add_dependency 'activemodel', '~> 4.0.0.rc1'
+  s.add_dependency 'activemodel', '>= 4.0.0'
   s.add_dependency 'gollum-lib', '~> 1.0.0'
 
   s.add_development_dependency 'rspec', '~> 2.13.0'
-  s.add_development_dependency 'rr', '~> 1.0.4'
-  s.add_development_dependency 'rails', '~> 4.0.0.rc1'
+  s.add_development_dependency 'rr', '~> 1.1.1'
+  s.add_development_dependency 'rails', '>= 4.0.0'
 
   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'
@@ -65,7 +65,6 @@ Gem::Specification.new do |s|
     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/gollum_rails/adapters/gollum/page.rb

@@ -24,11 +24,18 @@ module GollumRails
           # Gets / Sets the wiki
         attr_accessor :wiki
 
-        # Initializer
-        def initialize
-          @wiki = Connector.wiki_class
-        end
+        class << self
+
+          # finds all versions of a page
+          #
+          # name - the pagename to search
+          #
+          # Returns the Gollum::Page class
+          def find_page(name)
+            Connector.wiki_class.page ::Gollum::Page.cname(name)
+          end
 
+        end
 
         # creates a new Page
         #
@@ -39,8 +46,8 @@ module GollumRails
         #
         # Returns the commit id
         def new_page( name, content,type=:markdown, commit={} )
-          @wiki.write_page name.to_s, type, content, commit if name
-          @page = @wiki.page name
+          Connector.wiki_class.write_page name.to_s, type, content, commit if name
+          @page = Connector.wiki_class.page name
           @page
         end
 
@@ -53,7 +60,7 @@ module GollumRails
         # Returns the commit id
         def update_page( new, commit={}, old=nil)
           if new.is_a?(Hash)
-            commit_id = @wiki.update_page (old||@page), 
+            commit_id = Connector.wiki_class.update_page (old||@page), 
                                           new[:name]||@page.name, 
                                           new[:format]||@page.format, 
                                           new[:content]||@page.raw_data, 
@@ -74,7 +81,7 @@ module GollumRails
         #
         # Returns the commit id
         def delete_page( commit={}, page = nil )
-          @wiki.delete_page (page||@page), commit
+          Connector.wiki_class.delete_page (page||@page), commit
         end
         
         # renames an existing page
@@ -94,7 +101,8 @@ module GollumRails
         #
         # Returns the Gollum::Page class
         def find_page(name)
-          @wiki.page ::Gollum::Page.cname(name)
+          puts "DEPRECATED! Use Page.find_page instead"
+          self.class.find_page(name)
         end
         
         # moves an existing page

data/lib/gollum_rails/page.rb

@@ -12,13 +12,14 @@ module GollumRails
   #   * new
   #   * save
   #   * delete
-  #   * find_or_initialize_by_naname
+  #   * find_or_initialize_by_name
   #
   class Page
-    extend ::ActiveModel::Callbacks
-    include ::ActiveModel::Validations
-    include ::ActiveModel::Conversion
-    extend ::ActiveModel::Naming
+    # extend ::ActiveModel::Callbacks
+    # include ::ActiveModel::Validations
+    # include ::ActiveModel::Conversion
+    # extend ::ActiveModel::Naming
+    include ::ActiveModel::Model
 
 
     # Callback for save
@@ -46,8 +47,8 @@ module GollumRails
       #
       # Returns self
       def find_or_initialize_by_name(name, commit)
-        result_for_find = self.find(name)
-        self.create({:format => :markdown, :name => name, :content => ".", :commit => commit })
+        result_for_find = find(name)
+        create({:format => :markdown, :name => name, :content => ".", :commit => commit })
       end
 
       # Checks if the fileformat is supported
@@ -79,8 +80,7 @@ module GollumRails
       #
       # Returns an instance of Gollum::Page
       def create!(hash)
-        action = self.create(hash)
-        action
+        create(hash)
       end
 
       # Finds a page based on the name and specified version
@@ -89,13 +89,12 @@ module GollumRails
       #
       # Return an instance of Gollum::Page
       def find(name)
-        page = GollumRails::Adapters::Gollum::Page.new
-        page.find_page name
+        GollumRails::Adapters::Gollum::Page.find_page name
       end
 
       # Gets all pages in the wiki
       def all
-        self.wiki.pages
+        wiki.pages
       end
       alias_method :find_all, :all
 
@@ -185,7 +184,7 @@ module GollumRails
         begin
           page.new_page(name,content,format,commit)
         rescue ::Gollum::DuplicatePageError => e
-          page.page = page.find_page(name)
+          page.page = Adapters::Gollum::Connector.page_class.find_page(name)
         end
         return page.page
       end

data/lib/gollum_rails.rb

@@ -23,7 +23,7 @@ module GollumRails
   autoload :Setup,    'gollum_rails/setup'
 
   # GollumRails version string
-  VERSION = '1.4.0.rc3'
+  VERSION = '1.4.1'
 
   # Simplified error
   class Error < StandardError; end
@@ -31,6 +31,7 @@ module GollumRails
   # All Gollum internal exceptions will be redirected to this
   class GollumInternalError < Error
 
+
     attr_accessor :name
     attr_accessor :message
     attr_accessor :target

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

@@ -17,7 +17,6 @@ describe GollumRails::Adapters::Gollum::Page do
     repo = Grit::Repo.init_bare location
     wiki = GollumRails::Adapters::Gollum::Wiki.new repo
     page = GollumRails::Adapters::Gollum::Page.new 
-    page.wiki.should be_instance_of Gollum::Wiki
   end
   it "should create a new page" do
     location = "#{File.dirname(__FILE__)}/../../../utils/wiki.git"
@@ -65,7 +64,7 @@ describe GollumRails::Adapters::Gollum::Page do
   it "should find a page" do
     @page.new_page 'content_page', 'content', :markdown, @commit
 
-    @page.find_page("content_page")
+    GollumRails::Adapters::Gollum::Page.find_page("content_page")
     @page.delete_page(@commit)
   end
   it "should test the commit methods" do

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc3
+  version: 1.4.1
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: gollum-lib
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
 description: include Gollum into Rails with ease
 email: mosny@zyg.li
 executables: []
@@ -125,10 +125,9 @@ files:
 - 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: {}
@@ -146,9 +145,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: gollum_rails
 rubygems_version: 2.0.3

data/spec/gollum_rails_spec.rb

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