gollum_rails 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f50bda67c1494f2a78ba4b911358604be522e49
-  data.tar.gz: ed0b30bf49b6471b1c76f61d941e43dadb6ecefe
+  metadata.gz: 0f5c86a6b0816f75daf382d0731715df5d7274a9
+  data.tar.gz: 99cd7e69fdf571ebbf48c98b7a2eff01b71d3e62
 SHA512:
-  metadata.gz: 4c73c57f7bbae447b6c8515535e99ecbc664dbbe9d7ac34b76deec4363762804f559f622e2dff5f7b80a0bf74266d6f1c412a9a4b1e2f9ee845215c97e19aa49
-  data.tar.gz: a10fa13ceed5c82695fce2815fda8d77c27eb16a4c87d259cac630bb3d77529ea82e9f91a8a1e95cfca216858850694e0fb0d2b73e13870db15fac5f8f44fd15
+  metadata.gz: eee8f381165c7de6ce549301dec98dcb31d2d4d2cdb38622e16d7a4bb5eafc5b8cf5bfee8bae7ff08a1a9758e2371594f0fc01f0dacc656cb8a27a3ad25d1e71
+  data.tar.gz: 2ee5cbf8c04839498b6483094a7b34e3fe3a3a435e9f8f34c7b0dbb03d93ce98b6853e1633827f91d57307e8ec71ba380504f23e81a74fd311f94ce8c12fd891

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.5.8)
+    gollum_rails (1.5.9)
       activemodel (>= 3.2.11)
       activesupport (>= 3.2.11)
       gollum-lib (~> 2.0.0)

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.5.8'
+  s.version = '1.5.9'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
@@ -44,9 +44,6 @@ Gem::Specification.new do |s|
     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/gollum.rb
-    lib/gollum_rails/adapters/gollum/.gitkeep
-    lib/gollum_rails/adapters/gollum/page.rb
     lib/gollum_rails/callbacks.rb
     lib/gollum_rails/core.rb
     lib/gollum_rails/error.rb
@@ -56,10 +53,10 @@ Gem::Specification.new do |s|
     lib/gollum_rails/page.rb
     lib/gollum_rails/persistance.rb
     lib/gollum_rails/setup.rb
+    lib/gollum_rails/setup/error.rb
+    lib/gollum_rails/setup/options.rb
     lib/gollum_rails/store.rb
     lib/gollum_rails/validation.rb
-    spec/gollum_rails/adapters/gollum/connector_spec.rb
-    spec/gollum_rails/adapters/gollum/page_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

@@ -24,10 +24,6 @@ require 'active_support'
 # GollumRails is a RubyGem for extending Rails and the Gollum wiki powered by github
 # It has the ability to combine the benefits from a git powered wiki with Rails.
 #
-# Example solutions:
-#   * Gollum Wiki pages - Devise authentication - GollumRails connector - Haml layouting
-#   * Gollum Wiki pages - Ember.js - Handlebars layout - Rails REST API
-#   * ...
 #
 module GollumRails
   extend ActiveSupport::Autoload
@@ -45,8 +41,7 @@ module GollumRails
   autoload :Meta
 
   # GollumRails version string
-  VERSION = '1.5.8'
+  VERSION = '1.5.9'
 
 end
 
-require 'gollum_rails/adapters/gollum'

data/lib/gollum_rails/callbacks.rb

@@ -31,9 +31,9 @@ module GollumRails
     
     private
 
-    # def create_or_update #:nodoc:
-    #  run_callbacks(:save) { super }
-    # end
+    def create_or_update #:nodoc:
+     run_callbacks(:save) { super }
+    end
 
     def create_record #:nodoc:
      run_callbacks(:create) { super }
@@ -44,4 +44,4 @@ module GollumRails
     end
        
   end
-end
+end

data/lib/gollum_rails/core.rb

@@ -22,11 +22,13 @@ module GollumRails
       def set_folder(options)
         if options.is_a? Hash
           return if options.empty?
+          base = options[:base]
           options = options[:folder]
         end
         Setup.wiki_options ||= {}
         Setup.wiki_options[:page_file_dir] = options
-        Setup.wiki_options[:base_path] = options
+
+        Setup.wiki_options[:base_path] = (base || options) || ''
       end
       alias_method :folder=, :set_folder
     end
@@ -37,33 +39,53 @@ module GollumRails
     #
     # commit must be given to perform any page action!
     def initialize(attrs = {})
-      run_callbacks :initialize do
-        if wiki
-          attrs.each{|k,v| self.public_send("#{k}=",v)} if attrs
-          update_attrs if attrs[:gollum_page]
-        end
+      assign_attributes(attrs)
+      _update_page_attributes if attrs[:gollum_page]
+      yield self if block_given?
+      run_callbacks :initialize unless _initialize_callbacks.empty?
+    end
+
+
+    # Allows you to set all the attributes by passing in a hash of attributes with
+    # keys matching the attribute name
+    #
+    # new_attributes - Hash - Hash of arguments
+    def assign_attributes(new_attributes)
+      if !new_attributes.respond_to?(:stringify_keys)
+        raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
+      end
+      return if new_attributes.blank?
+
+      attributes = new_attributes.stringify_keys
+      attributes.each do |k, v|
+        _assign_attribute(k, v)
       end
     end
     
 
-    # Gets the pathname for current file 
-    def path_name
+    
+    def url_path #:nodoc:
+      File.split(url)
+    end
+
+    def path_name #:nodoc:
       f = full_path.first
       return '/' if f == '.'
       f
     end
 
-    def full_path
+    def full_path #:nodoc:
       File.split(name)
     end
 
-    def file_name
+    def file_name #:nodoc:
       full_path.last
     end
 
-    def cname
+    def cname #:nodoc:
       Gollum::Page.cname(self.name)
     end
+
     # Gets a canonicalized filename of the page 
     def canonicalized_filename
       Gollum::Page.canonicalize_filename(name)
@@ -90,7 +112,9 @@ module GollumRails
     #
     # Returns a String
     def url
-      gollum_page.url_path
+      if gollum_page
+        gollum_page.url_path
+      end
     end
     
     # == Gets the title for current Gollum::Page
@@ -175,10 +199,18 @@ module GollumRails
       com = commit_local if !commit_local.nil?
       return com
     end
+
+    def _assign_attribute(key, value)
+      public_send("#{key}=", value)
+    rescue NoMethodEr3ror
+      if respond_to?("#{key}=")
+        raise
+      end
+    end
     
     # == Updates local attributes from gollum_page class
     #
-    def update_attrs
+    def _update_page_attributes
       @name = gollum_page.name
       @content= gollum_page.raw_data
       @format = gollum_page.format      

data/lib/gollum_rails/persistance.rb

@@ -11,7 +11,7 @@ module GollumRails
       #
       # Returns an instance of Gollum::Page or false
       def create(data)
-        page = Page.new(data)
+        page = self.new(data)
         page.save
       end
 
@@ -24,7 +24,7 @@ module GollumRails
       #
       # Returns an instance of Gollum::Page
       def create!(data)
-        page = Page.new(data)
+        page = self.new(data)
         page.save!
       end
       
@@ -58,12 +58,11 @@ module GollumRails
       return nil unless valid?
       begin
         create_or_update
-       rescue ::Gollum::DuplicatePageError => e
-         #false
-       end
-       @gollum_page = Adapters::Gollum::Page.find_page(name, wiki)
-       
-       self
+      rescue ::Gollum::DuplicatePageError => e
+      end
+      self.gollum_page = wiki.paged(file_name, path_name, true, wiki.ref)
+      _update_page_attributes
+      self
     end
 
     # == Save without exception handling
@@ -101,42 +100,34 @@ module GollumRails
     #
     # returns a Commit id
     def update_record
+      wiki.update_page(self.gollum_page,
+                       self.name,
+                       self.format, 
+                       self.content,
+                       self.commit)
     end
     
     
     
     # == Updates an existing page (or created)
     #
-    # args - Argument chain
+    # attributes - Hash of arguments
     #
     # Returns an instance of GollumRails::Page
-    def update_attributes(*args)
-      run_callbacks :update do
-        return update_deprecated(*args) if args.length > 1
-        #content=nil,name=nil,format=:markdown, commit=nil
-        args = args.first
-        @gollum_page = page.update_page(gollum_page, wiki, 
-          args[:content], 
-          get_right_commit(args[:commit]), 
-          args[:name], 
-          args[:format]||:markdown)
-      end
+    def update_attributes(attributes)
+      assign_attributes(attributes)
+      save
     end
     
-    # == DEPRECATED: Updates an existing page (or created)
-    #
-    # content - optional. If given the content of the gollum_page will be updated
-    # name - optional. If given the name of gollum_page will be updated
-    # format - optional. Updates the format. Uses markdown as default
-    # commit - optional. If given this commit will be used instead of that one, used
-    #          to initialize the instance
-    #
-    #
-    # Returns an instance of GollumRails::Page
-    def update_deprecated(content=nil,name=nil,format=:markdown, commit=nil)
-      @gollum_page = page.update_page(gollum_page, wiki, content, get_right_commit(commit), name, format)
-      
+    def seperate_path(path)
+      path = File.split(name)
+      if path.first == '/' || path.first == '.'
+        folder = nil
+      else
+        folder = path.first
+      end
     end
+
     
     # == Deletes current page
     #
@@ -179,4 +170,4 @@ module GollumRails
     
     
   end
-end
+end

data/lib/gollum_rails/setup.rb

@@ -1,3 +1,4 @@
+require 'gollum_rails/setup/error'
 module GollumRails
 
   # Setup functionality for Rails initializer
@@ -13,59 +14,45 @@ module GollumRails
   #   end
   #
   #
-  class Setup
+  module Setup
+    autoload :Options, 'gollum_rails/setup/options'
+    include Options 
+
     class << self
-      
-      attr_accessor :wiki_path
-      
-      attr_writer :wiki_options
 
-      attr_accessor :repository
-      
-      attr_accessor :startup
-      
-      # Gets / Sets the init options
-      attr_accessor :options
-      
-      
-      def wiki_options
-        return {} unless @wiki_options.kind_of? Hash
-        @wiki_options ||= {} 
-      end
-      # Wiki startup options
-      def options=(options)
-        @options = options
-      end
-      
       # defines block builder for Rails initializer.
       # executes public methods inside own class
       #
-      def build(&block)
-        block.call self
-        if @repository == :application
+      def build(new_attributes = nil, &block)
+        if block_given?
+          yield self
+        else
+          if !new_attributes.respond_to?(:stringify_keys)
+            raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
+          end
+          attributes = new_attributes.stringify_keys
+          attributes.each do |k, v|
+            begin
+              public_send("#{k}=", v)
+            rescue NoMethodError
+            end
+          end
+          
+        end
+        if self.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
+          Was the specified pathname correct?" unless Pathname.new(self.repository).exist?
+          initialize_wiki self.repository
         end
       end
 
-      #######
       private
-      #######
-
-      # Checks if provided path is present and valid
-      #
-      # Example
-      #   path_valid? '/'
-      #   # =>true
-      #  
-      #   path_valid? nil
-      #   # =>false
+      
       def path_valid?(path)
         return path.exist? if path.is_a?(Pathname)
         return !(path.nil? || path.empty? || ! path.is_a?(String))
@@ -73,16 +60,15 @@ module GollumRails
 
       def initialize_wiki(path)
         if path_valid? path
-          @wiki_path = path.to_s
-          @wiki_options = options
+          self.wiki_path = path.to_s
+          self.wiki_options = options
           true
         else
-          raise GollumRailsSetupError, 'Repistory path is empty or invalid!'
+          raise GollumRailsSetupError, 'Path to repository is empty or invalid!'
         end
 
       end
 
     end
   end
-  class GollumRailsSetupError < ArgumentError; end
 end

data/lib/gollum_rails/setup/error.rb

@@ -0,0 +1,5 @@
+module GollumRails
+  module Setup
+    class GollumRailsSetupError < ArgumentError; end
+  end
+end

data/lib/gollum_rails/setup/options.rb

@@ -0,0 +1,16 @@
+module GollumRails
+  module Setup
+    module Options
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        attr_accessor :wiki_options
+        attr_accessor :repository
+        attr_accessor :startup
+        attr_accessor :options
+        attr_accessor :wiki_path
+      end
+
+    end
+  end
+end

data/lib/gollum_rails/store.rb

@@ -44,10 +44,6 @@ module GollumRails
       @content ||= (@gollum_page.content || "")
     end
 
-    # Gets the page class
-    def page
-      Adapters::Gollum::Page.new
-    end
     
     private 
     # == To static
@@ -58,4 +54,4 @@ module GollumRails
     
     
   end
-end
+end

data/spec/gollum_rails/page_spec.rb

@@ -101,11 +101,22 @@ describe "Gollum Page" do
       end
       
       it "updates properly without all arguments, content+commit" do 
-        @rr.update_attributes({:name => "google", :format => :wiki}).should be_a Gollum::Page 
+        @rr.update_attributes({:name => "google", :format => :wiki}).should be_a GollumRails::Page
+        @rr.delete(@commit)
+      end
+      it "sets the format as created" do
+        @rr.update_attributes(name: "omg", format: :textile)
+        expect(@rr.format).to eq :textile
+        @rr.delete(@commit)
+      end
+
+      it "sets the name as created" do
+        @rr.update_attributes(name: "omg", format: :textile)
+        expect(@rr.name).to eq "omg" 
         @rr.delete(@commit)
       end
       it "updates properly without all arguments, name, format" do
-        @rr.update_attributes({:content => "test"}).should be_a Gollum::Page 
+        @rr.update_attributes({:content => "test"}).should be_a GollumRails::Page 
         expect(@rr.name).to match "Goole"
         expect(@rr.format.to_s).to match "markdown"
         @rr.delete(@commit)
@@ -295,16 +306,6 @@ describe "Gollum Page" do
       test.save
     end
   end
-  describe "rails extension" do
-    
-    it "should test fetch_all" do
-      GollumRails::Page.all.length.should == 1
-    end
-    it "should test all" do 
-      GollumRails::Page.find_all.length.should == 1
-    end
-
-  end
   describe "testing validation" do
 
 
@@ -369,7 +370,6 @@ describe "Gollum Page" do
       
       res = CommitDiff.new call
       res.save
-      res.update_attributes("content",nil,:markdown, @commit)
       diff = res.compare_commits(res.history.first)
       expect(diff).to be_a String
       expect(diff).to match(/---/)
@@ -513,7 +513,7 @@ describe "Gollum Page" do
     it "should create a nested page under /test" do
       res = Fns.new @call.merge(name: 'test/my_page')
       res.save
-      expect(res.path_name).to match 'test'
+      expect(res.url_path).to include 'test'
       res.destroy(@commit)
     end
     it "should find a nested file" do

data/spec/gollum_rails/setup_spec.rb

@@ -35,7 +35,7 @@ describe GollumRails::Setup do
         config.repository = :application
 
       end
-    }.to raise_error GollumRails::GollumRailsSetupError
+    }.to raise_error GollumRails::Setup::GollumRailsSetupError
     
   end
   it "should throw an error if a pathname was supplied that does not exist" do
@@ -43,7 +43,12 @@ describe GollumRails::Setup do
       GollumRails::Setup.build do |setup|
         setup.repository = Pathname.new('/nonexistingdirectoryshouldbenonexisting') 
       end
-    }.to raise_error GollumRails::GollumRailsSetupError
+    }.to raise_error GollumRails::Setup::GollumRailsSetupError
+  end
+  it "should also initialize without a block given" do
+    expect{
+      GollumRails::Setup.build(repository: '.')
+    }.not_to raise_error
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -156,9 +156,6 @@ files:
 - 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/gollum.rb
-- lib/gollum_rails/adapters/gollum/.gitkeep
-- lib/gollum_rails/adapters/gollum/page.rb
 - lib/gollum_rails/callbacks.rb
 - lib/gollum_rails/core.rb
 - lib/gollum_rails/error.rb
@@ -168,10 +165,10 @@ files:
 - lib/gollum_rails/page.rb
 - lib/gollum_rails/persistance.rb
 - lib/gollum_rails/setup.rb
+- lib/gollum_rails/setup/error.rb
+- lib/gollum_rails/setup/options.rb
 - lib/gollum_rails/store.rb
 - lib/gollum_rails/validation.rb
-- spec/gollum_rails/adapters/gollum/connector_spec.rb
-- spec/gollum_rails/adapters/gollum/page_spec.rb
 - spec/gollum_rails/page_spec.rb
 - spec/gollum_rails/respository_spec.rb
 - spec/gollum_rails/setup_spec.rb
@@ -200,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gollum_rails
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Combines Gollum and Rails

data/lib/gollum_rails/adapters/gollum.rb

@@ -1,53 +0,0 @@
-# ~*~ encoding: utf-8 ~*~
-module GollumRails
-  module Adapters
-    # Gollum Wiki connector classes
-    #
-    #
-    module Gollum
-      autoload :Wiki,       'gollum_rails/adapters/gollum/wiki'
-      autoload :Page,       'gollum_rails/adapters/gollum/page'
-
-      # connector version
-      VERSION="2.0.0"
-
-      # Gollum connector class, keeping defaults!
-      #
-      class Connector
-        class << self
-          # Sets the page class used by all instances
-          attr_writer :page_class
-
-          # Sets the wiki class used by all instances
-          attr_writer :wiki_path
-          
-          # Sets the wiki options
-          attr_writer :wiki_options
-          
-
-          # Gets the Globally used Page class or use a new one if not defined
-          #
-          #
-          # Returns the internal page class or a fresh ::Gollum::Page
-          def page_class
-            @page_class || Page
-          end
-          
-          # Gets the wiki options
-          def wiki_options
-            @wiki_options || {}
-          end
-
-          # Gets the Globally used Page class or use a new one if not defined
-          #
-          #
-          # Returns the internal page class or a fresh ::Gollum::Page
-          def wiki_path
-            @wiki_path || ""
-          end
-
-        end
-      end
-    end
-  end
-end

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

@@ -1,90 +0,0 @@
-module GollumRails
-  module Adapters
-    module Gollum
-
-      # Main page class for the Gollum connector.
-      #
-      # It provides some awesome features for connecting gollum to gollum_rails such as:
-      #   * new_page
-      #   * find_page
-      #   * delete_page
-      #   * rename_page
-      #   * move_page
-      #   * first_page_commit
-      #   * page_creation time
-      #   * ...
-      #
-      class Page
-
-        Connector.page_class = self
-
-        class << self
-
-          # == Parses a given filepath e.g. '/test/page'
-          # Name is page
-          # path is /test
-          #
-          # Returns a Hash
-          def parse_path(name)
-            path = '/'
-            name = name.to_s
-            if name.include?('/')
-              name = name[1..-1] if name[0] == "/"
-              content = name.split('/')
-              name = content.pop
-              path = '/'+content.join('/')
-            end
-            { path: path, name: name }
-          end
-          
-          # finds all versions of a page
-          #
-          # name - the pagename to search
-          # wiki - instance of Gollum::Wiki
-          # version - optional - The pages version
-          #
-          # Returns the Gollum::Page class
-          def find_page(name, wiki, version=nil)
-            wiki.clear_cache
-            path_data = parse_path(name)
-            wiki.paged(path_data[:name], path_data[:path], exact = true, version)
-          end
-        end
-
-
-        # == Updates an existing page
-        #
-        # page - An instance of Gollum::Page
-        # wiki - An instance of Gollum::Wiki
-        # content - New content
-        # commit - Commit Hash
-        # name - A new String (optional)
-        # format - A filetype as symbol (optional)
-        #
-        # Returns the page
-        def update_page( page, wiki, content=nil, commit={}, name=nil, format=nil)
-          wiki.clear_cache
-          return page if page.nil?
-          name ||= page.name
-          format = (format || page.format).to_sym
-          content ||= page.raw_data
-          
-          wiki.update_page(page,name,format,content.to_s,commit) unless ((!content||page.raw_data == content) && page.format == format)
-          
-          self.class.find_page( mixin(page.url_path, name), wiki )
-        end
-        
-        private
-        
-        # replaces old filename with new
-        def mixin(old_url, new_name)
-          url = old_url.split("/")
-          url.pop
-          url << new_name
-          url.join("/")
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe GollumRails::Adapters::Gollum::Connector do
-  before(:each) do
-    @class = GollumRails::Adapters::Gollum::Connector 
-  end
-
-  it "should test the Wiki path connector" do
-    @class.wiki_path.should be_a String
-  end
-  it "should test the Wiki options connector" do
-    @class.wiki_options.should be_a Hash
-  end  
-  it "should test the Wiki options content" do
-    @class.wiki_options.should == {}
-  end  
-  it "should test the Page class connector" do
-    @class.page_class.should == GollumRails::Adapters::Gollum::Page
-  end
-    
-end

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

@@ -1,29 +0,0 @@
-require 'spec_helper'
-describe GollumRails::Adapters::Gollum::Page do
-  before(:each) do
-    @commit = {
-      :message => 'page action',
-      :name => 'The Mosny',
-      :email => 'mosny@zyg.li'
-    }
-  end
-  describe "Connector stuff" do
-    it "should have updated the page_class on initialize" do
-      adapter = GollumRails::Adapters::Gollum::Page.new
-      GollumRails::Adapters::Gollum::Connector.page_class.should == GollumRails::Adapters::Gollum::Page
-    end
-  end
-  describe "statically methods" do
-    it "is a hash" do
-      GollumRails::Adapters::Gollum::Page.parse_path('google/de').should be_a Hash
-    end
-    it "should equal" do
-      path1 = GollumRails::Adapters::Gollum::Page.parse_path('google/de')
-      path2 = GollumRails::Adapters::Gollum::Page.parse_path('/google/de')
-      path1.should == path2
-    end
-    it "adds a leading slash" do
-      GollumRails::Adapters::Gollum::Page.parse_path('google/de')[:path][0].should == '/'
-    end
-  end
-end