rails_wiki 0.0.1 → 0.0.3

data/app/controllers/rails_wiki/articles_controller.rb

@@ -3,56 +3,64 @@ require_dependency "rails_wiki/application_controller"
 module RailsWiki
   class ArticlesController < ApplicationController
     def index
-     @articles = Article.order(:slug).paginate per_page: 20, page: params[:page]
-   end
+      @articles = Article.order(:slug).paginate per_page: 20, page: params[:page]
+    end
 
 
-   def new
-     @article = Article.new
-   end
+    def new
+      @article = Article.new
+    end
 
-   def show
-     @article = Article.friendly.find(params[:id])
-     markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true)
-     @markdown_body = markdown.render(@article.text || '')
-     @versions_available = true if @article.versions.count > 1
+    def show
+      @article = Article.friendly.find(params[:id])
+      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true)
 
-   rescue ActiveRecord::RecordNotFound => ex
-     @article = Article.new(title: params[:id],text: "Article wasn't found, want to create one?")
-   end
+      if !@article.text.blank?
+        article_body_after_wiki_links = @article.text.gsub(/\[(?<link>\w[\w\s]+)\]\s/) do
+          link = Regexp.last_match[:link]
+          "[#{link}](/wiki/#{link.parameterize})"
+        end
+      end
 
-   def create
-     @article = Article.new(article_params)
+      @markdown_body = markdown.render(article_body_after_wiki_links || '')
+      @versions_available = true if @article.versions.count > 1
 
-     @article.save
-     redirect_to @article
-   end
+    rescue ActiveRecord::RecordNotFound => ex
+      @article = Article.new(title: params[:id],text: "Article wasn't found, want to create one?")
+    end
 
-   def edit
-     @article = Article.friendly.find(params[:id])
-   end
+    def create
+      @article = Article.new(article_params)
 
-   def versions
-     require 'differ'
-     Differ.format = :html
+      @article.save
+      redirect_to @article
+    end
 
+    def edit
+      @article = Article.friendly.find(params[:id])
+    end
 
-     @article = Article.friendly.find(params[:id])
-   end
+    def versions
+      require 'differ'
+      Differ.format = :html
 
-   def update
-     @article = Article.friendly.find(params[:id])
-     if @article.update_attributes article_params
-       redirect_to @article, notice: 'All good!'
-     else
-       render :edit
-     end
-   end
 
-   private
+      @article = Article.friendly.find(params[:id])
+    end
 
-   def article_params
-     params.require(:article).permit(:title, :text, :version, :references, :protected)
-   end
+    def update
+      @article = Article.friendly.find(params[:id])
+      if @article.update_attributes article_params
+        redirect_to @article, notice: 'All good!'
+      else
+        render :edit
+      end
+    end
+
+    private
+
+    def article_params
+      params.require(:article).permit(:title, :text, :version, :references, :protected)
+    end
   end
 end

data/app/views/rails_wiki/articles/versions.html.erb

@@ -32,7 +32,7 @@
                   <% history.changeset.each_with_index do |change,index| %>
                       <%= change[0] %>
                       <% if change[0] == 'text' %>
-                          <% Differ.diff_by_word(change[1][1].to_s, change[1][0].to_s).to_s.html_safe %>
+                          <%= Differ.diff_by_word(change[1][1].to_s, change[1][0].to_s).to_s.html_safe %>
                       <% else %>
                           <b><%= change[0] %></b> <%= change[1][0] %> to <%= change[1][1] %>
                       <% end %>

data/config/routes.rb

@@ -1,5 +1,5 @@
 RailsWiki::Engine.routes.draw do
-  resources :articles do
+  resources :articles, path: "wiki" do
     member do
       get :versions
     end

data/db/migrate/20140922203738_add_object_changes_if_not_there.rb

@@ -0,0 +1,9 @@
+class AddObjectChangesIfNotThere < ActiveRecord::Migration
+  def change
+    if PaperTrail::Version and !PaperTrail::Version.columns.map(&:name).include?('object_changes')
+      add_column :versions, :object_changes, :text
+    else
+      puts "SMART! You already have it!! "*100
+    end
+  end
+end

data/lib/rails_wiki/version.rb

@@ -1,3 +1,3 @@
 module RailsWiki
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rails_wiki
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
 - Troy Anderson
+- Max Wofford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70321928574740 !ruby/object:Gem::Requirement
+  requirement: &70207315022300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,32 @@ dependencies:
         version: 4.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70321928574740
+  version_requirements: *70207315022300
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: &70207315021820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70207315021820
+- !ruby/object:Gem::Dependency
+  name: paper_trail
+  requirement: &70207315020940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70207315020940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70321928574220 !ruby/object:Gem::Requirement
+  requirement: &70207315020340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321928574220
+  version_requirements: *70207315020340
 description: Rails Wiki is a simple engine to get you a markdown based wiki.
 email:
 - protected
@@ -54,6 +77,7 @@ files:
 - config/initializers/route_hack.rb
 - config/routes.rb
 - db/migrate/20140922180259_create_rails_wiki_articles.rb
+- db/migrate/20140922203738_add_object_changes_if_not_there.rb
 - lib/rails_wiki/engine.rb
 - lib/rails_wiki/version.rb
 - lib/rails_wiki.rb