virgo 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a2352d32dcc17e1eb41fb8e5d7eb75dd59f3ec6
-  data.tar.gz: c4a0ebdffe6dd55086716f5d95a8c28b296aec22
+  metadata.gz: 9b11a069f93225b98aafd0e3c2d229cd1a1e4ae4
+  data.tar.gz: 6453923b4c1da1e525ff8a949339048af060e80b
 SHA512:
-  metadata.gz: 98c5f41de3d4d9a0500a9e294bfc609dd684913ec601eeb750147b8227f51013aec25593bd0955fabe485467c8bd6204a21b56e9b39cb939b426dfd2f4ff753b
-  data.tar.gz: 42bc83181fb037c6f9794be650ccc13a1a13b7ae2cf3fffaa8ecdb3ca8dff990400d4fe167ce83ec2cfe38aa158ceacb3d5223d507539d981258792266e14b21
+  metadata.gz: 0544545028d834950d1d71d6800f1124b59b1fb35ab9a7225e0ea2610207fda9fa832954f86060f51fa8286845331b434fc773733460dd316718cbbafa33c34e
+  data.tar.gz: 321da31f31201a55973d00b1e3dcbeedf3498844a7cfcf2082356e16b66462d60a9e5a1814656ee19c5c7c4e40583e518c0061f052d7fd0e0a2c3e5d8c345e5d

data/config/initializers/paper_trail.rb

@@ -6,7 +6,7 @@ module PaperTrail
     scope :by_date, ->{ order(created_at: :desc) }
 
     def version_user
-      @version_user ||= User.find_by(id: whodunnit)
+      @version_user ||= Virgo::User.find_by(id: whodunnit)
     end
 
     def pretty_changes

data/config/initializers/shortcode.rb

@@ -2,6 +2,7 @@ require File.expand_path "../../../app/helpers/virgo/video_helper", __FILE__
 require 'shortcode'
 
 template_root = File.expand_path "../../../app/views/virgo/shortcode_templates", __FILE__
+app_template_root = "#{Rails.root}/app/views/virgo/shortcode_templates"
 
 Shortcode.setup do |config|
   config.template_parser = :haml
@@ -9,4 +10,5 @@ Shortcode.setup do |config|
   config.block_tags = [:pullquote, :blockquote, :h1, :h2, :h3, :h4]
   config.self_closing_tags = [:image, :video, :tweet, :slideshow]
   config.template_paths.prepend(template_root)
+  config.template_paths.prepend(app_template_root)
 end

data/lib/virgo/version.rb

@@ -1,3 +1,3 @@
 module Virgo
-  VERSION = "0.3.4"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virgo
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Nicholas Zaillian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails