gollum_rails 1.4.6 → 1.4.7

data/lib/gollum_rails/persistance.rb

@@ -0,0 +1,165 @@
+module GollumRails
+  module Persistance
+    extend ActiveSupport::Concern
+    
+    module ClassMethods
+      
+      # first creates an instance of itself and executes the save function.
+      #
+      # data - Hash containing the page data
+      #
+      #
+      # Returns an instance of Gollum::Page or false
+      def create(data)
+        page = Page.new(data)
+        page.save
+      end
+
+
+      # calls `create` on current class. If returned value is nil an exception will be thrown
+      #
+      # data - Hash of Data containing all necessary stuff
+      # TODO write this stuff
+      #
+      #
+      # Returns an instance of Gollum::Page
+      def create!(data)
+        page = Page.new(data)
+        page.save!
+      end
+      
+    end
+    #############
+    # activemodel
+    #############
+
+    # Handles the connection betweet plain activemodel and Gollum
+    # Saves current page in GIT wiki
+    # If another page with the same name is existing, gollum_rails
+    # will detect it and returns that page instead.
+    #
+    # Examples:
+    #
+    #   obj = GollumRails::Page.new <params>
+    #   @article = obj.save
+    #   # => Gollum::Page
+    #
+    #   @article.name
+    #   whatever name you have entered OR the name of the previous
+    #   created page
+    #
+    #
+    # TODO:
+    #   * overriding for creation(duplicates)
+    #   * do not alias save! on save
+    #
+    # Returns an instance of Gollum::Page or false
+    def save
+      return nil unless valid?
+      begin
+        create_or_update
+       rescue ::Gollum::DuplicatePageError => e
+         #false
+       end
+       @gollum_page = Adapters::Gollum::Page.find_page(name, wiki)
+       
+       self
+    end
+
+    # == Save without exception handling
+    # raises errors everytime something is wrong 
+    #
+    def save!
+      raise StandardError, "record is not valid" unless valid?
+      raise StandardError, "commit must not be empty" if commit == {}
+      create_or_update
+      self
+    end
+    
+    # == Creates a record or updates it!
+    #
+    # Returns a Commit id string
+    def create_or_update
+      if persisted?
+        update_record
+      else
+        create_record
+      end
+    end
+    
+    # == Creates a record
+    #
+    # Returns a Commit id
+    def create_record
+      wiki.write_page(canonicalized_filename, format, content, commit, path_name) 
+      wiki.clear_cache
+    end
+    
+    # == Update a record
+    #
+    # NYI
+    #
+    # returns a Commit id
+    def update_record
+    end
+    
+    
+    
+    # == 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_attributes(content=nil,name=nil,format=:markdown, commit=nil)
+      run_callbacks :update do
+        @gollum_page = page.update_page(gollum_page, wiki, content, get_right_commit(commit), name, format)
+      end
+    end
+    
+    # == Deletes current page
+    #
+    # commit - optional. If given this commit will be used instead of that one, used
+    #          to initialize the instance
+    #
+    # Returns the commit id of the current action as String
+    def destroy(commit=nil)
+      return false if @gollum_page.nil?
+      wiki.delete_page(@gollum_page, get_right_commit(commit))
+    end
+
+    # == Deletes current page
+    #
+    # commit - optional. If given this commit will be used instead of that one, used
+    #          to initialize the instance
+    #
+    # Returns the commit id of the current action as String
+    def delete(commit=nil)
+      destroy(commit)
+    end
+
+    # checks if entry already has been saved
+    #
+    #
+    def persisted?
+      return true if gollum_page
+      return false
+    end
+    
+
+    
+    
+    # == Checks if the page is valid
+    #
+    #    # 
+    # def valid?
+    #   #if Gollum::Page.valid_page_name?(self.name)
+    # end
+    
+    
+  end
+end

data/lib/gollum_rails/store.rb

@@ -0,0 +1,60 @@
+module GollumRails
+  module Store
+    extend ActiveSupport::Concern
+
+    
+    ATTR_READERS = []
+    ATTR_WRITERS = [:name, :content, :format]
+    ATTR_ACCESSORS = [:commit, :gollum_page]
+    
+    included do
+      ATTR_WRITERS.each do |a|
+        attr_writer a
+      end
+      ATTR_ACCESSORS.each do |a|
+        attr_accessor a
+      end
+      
+    end
+    
+    module ClassMethods
+      # Gets the wiki instance
+      def wiki
+        @wiki ||= Gollum::Wiki.new(Adapters::Gollum::Connector.wiki_path, Adapters::Gollum::Connector.wiki_options)
+      end
+    end
+    # Gets the pages format
+    def format
+      (@format || @gollum_page.format).to_sym
+    end
+
+    def name
+      @name ||= @gollum_page.name
+    end
+    
+    # == Outputs the pages filename on disc
+    #
+    # ext - Wether to output extension or not
+    def filename(ext=true)
+      @filename ||= (ext) ? @gollum_page.filename : @gollum_page.filename_stripped
+    end
+    
+    def content
+      @content ||= @gollum_page.content
+    end
+
+    # Gets the page class
+    def page
+      Adapters::Gollum::Page.new
+    end
+    
+    private 
+    # == To static
+    def wiki
+      self.class.wiki
+    end
+    
+    
+    
+  end
+end

data/lib/gollum_rails/validation.rb

@@ -0,0 +1,9 @@
+module GollumRails
+  module Validation
+    extend ActiveSupport::Concern
+    include ActiveModel::Validations
+    
+    module ClassMethods
+    end
+  end
+end

data/spec/gollum_rails/orm_spec.rb

@@ -0,0 +1,25 @@
+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

data/spec/gollum_rails/page_spec.rb

@@ -115,13 +115,7 @@ describe "Gollum Page" do
         delete = @cc.delete
         delete.should be_a String
       end
-      
-      it "should test the recreation" do
-        delete = @rr.delete
-        @rr.save.should be_a GollumRails::Page
-        @rr.delete.should be_a String
-        
-      end
+
     end
 
    
@@ -145,7 +139,9 @@ describe "Gollum Page" do
       it "should have a name" do
         expect(rr.name).to match(/^Goole$/)
       end
-      
+      it "should have a preview" do
+        expect(rr.preview).to match(/^content/)
+      end 
       it "should have a content" do
         expect(rr.content).to match(/^content\ data$/)
       end
@@ -177,6 +173,24 @@ describe "Gollum Page" do
       rr.format=(:markdown).should == :markdown
     end
     
+    it "builds an url for the page" do
+      page = RailsModel.find('Goole')
+      
+      p = RailsModel.new(name: "bla/testfa", commit: @commit, content: "[[Goole]]", format: :markdown)
+      #p.destroy(@commit)
+
+      
+
+    end
+    
+    it "gets the pages filename on disk with a 'DOT' in filename" do
+      expect(RailsModel.find('Goole').filename).to match('.')
+    end
+    
+    it "gets the pages filename on disk withOUT a 'dot' in filename" do
+      expect(RailsModel.find('Goole').filename(false)).not_to match('.md')
+    end
+    
     it "tests the find method to return nil if no page was found" do
       expect(RailsModel.find('whoooohoo')).to be_nil
     end
@@ -223,8 +237,8 @@ describe "Gollum Page" do
 
         before_save ::SaveCallback
         after_save :after_save
-        after_delete :after_delete
-        before_delete :before_delete
+        after_destroy :after_delete
+        before_destroy :before_delete
         before_update :before_update
         after_update :after_update
 
@@ -336,15 +350,7 @@ describe "Gollum Page" do
     end
     
   end
-  
-  describe "Filename" do
-    class Fns < GollumRails::Page
-    end
-    it "should assemble a filename" do
-      res = CommitDiff.new @call
-      expect(res.filename).to match(/^Goole\.md$/)
-    end
-  end
+
   
   describe "Sub Page" do
     class Fns < GollumRails::Page
@@ -418,20 +424,43 @@ describe "Gollum Page" do
     
   end
   
- # describe "the thread safety" do
-#    class ThreadModel < GollumRails::Page
-# 
-#    end
-#    it "should save " do
-#      100.times do |time|
-#        Thread.new do
-#          ThreadModel.new(@call)
-#          ThreadModel.save.should be_a(GollumRails::Page)
-#          ThreadModel.delete(@commit).length.should == 40
-#        end
-#      end
-# 
-#    end
+  describe "path names" do
+    class Fns < GollumRails::Page
+    end
+    it "should output nothing as there is no path" do
+      res = Fns.create @call
+      expect(res.path_name).to match ''
+      res.destroy(@commit)
+    end
+    
+    it "should output a path name as there was a path supplied" do
+      res = Fns.new @call.merge(name: 'test/pagess')
+      res.save
+      expect(res.path_name).not_to be_nil
+      res.destroy(@commit)
+    end
+    
+    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'
+      res.destroy(@commit)
+    end
+    it "should find a nested file" do
+      res = Fns.new @call.merge(name: 'test/my_page2')
+      res.save
+      expect(Fns.find('test/my_page2')).not_to be_nil
+      res.destroy
+    end
+    it "should search for a files content" do
+      res = Fns.new @call.merge(name: 'test/my_page3')
+      res.save
+      expect(Fns.search('content')).not_to be_empty
+      expect(Fns.search('content').first[:count]).to be(1)
+      res.destroy
+    end
+  end
+
 
 
 #end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.11
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: gollum-lib
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,56 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.11
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 description: include Gollum into Rails with ease
 email: mosny@zyg.li
 executables: []
@@ -100,26 +156,26 @@ 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/activemodel.rb
-- lib/gollum_rails/adapters/activemodel/boolean.rb
-- lib/gollum_rails/adapters/activemodel/error.rb
-- lib/gollum_rails/adapters/activemodel/naming.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/finders.rb
+- lib/gollum_rails/orm.rb
 - lib/gollum_rails/page.rb
+- lib/gollum_rails/persistance.rb
 - lib/gollum_rails/setup.rb
-- spec/gollum_rails/adapters/activemodel/error_spec.rb
-- spec/gollum_rails/adapters/activemodel/naming_spec.rb
-- spec/gollum_rails/adapters/activemodel/validation_unused.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/error_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