lines-engine 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aef2fa0f45914942069afc763cedcc3ce21e897
-  data.tar.gz: bb29b382a0362bd60538cd75cc9390d3c3cc818a
+  metadata.gz: 0207d7cdc25de8c7ee3246d3675634f9053bc82f
+  data.tar.gz: e6818090c5d68c4301fe40a27095d472200eb925
 SHA512:
-  metadata.gz: 691cc02c2e7e077a39d7174d9fa344f0789577309635cdce6da5ee8f77451aee2d097505d0ed31872ff47640792a72ae6244234136cdccbca1f2ef93882da9da
-  data.tar.gz: 5819682fec4c262a5651c2412ff991620836d264b5b5ac3a075b2c475c66d760fa775a764819c3cbb29cf1c0481f0f97de998719903533d24e855fad16c97102
+  metadata.gz: 5f010862a3753e97cb21caa9c7a3c7b1cc7e5f58f0a7ce95402e12dd8ac8f975568b4658a37e1e0c0b17f73a5f068e97346f579596941dcf132ffceb4da433d3
+  data.tar.gz: d71c94e774063a04a21a25291931c7a05e6803e431440670e40560c492ab80d0e1527e04b2848fbacb50d2bad78702f28d0267fa86994f9ac4aedb3d35c73665

data/.ruby-gemset

@@ -0,0 +1 @@
+lines-engine

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.2.5
+- Allow ERB syntax in `lines_config.yml`
+
+## 1.2.4
+- Can specify carrierwave storage in `lines_config.yml`
+- Fixed namespacing bugs
+
 ## 1.2.3
 - fix No such middleware to insert before: ActionDispatch::Static (Thanks to @scottbarrow)
 

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    lines-engine (1.2.3)
+    lines-engine (1.2.5)
       acts-as-taggable-on (>= 3.5)
       bcrypt (~> 3.1.0, >= 3.1.0)
       bcrypt-ruby (>= 3.0.0)
       carrierwave (>= 0.10.0)
       coffee-rails (>= 4.0.0, < 6)
-      friendly_id (>= 5.1.0)
+      friendly_id (>= 5.2.4)
       i18n (>= 0.7.0)
       jquery-fileupload-rails (>= 0.4.1)
       jquery-rails (>= 3.1.0, < 6)
@@ -69,15 +69,15 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (5.0.0)
-      activerecord (>= 4.2.8)
+    acts-as-taggable-on (6.0.0)
+      activerecord (~> 5.0)
     addressable (2.4.0)
     airbrussh (1.1.1)
       sshkit (>= 1.6.1, != 1.7.0)
     arel (7.1.4)
     autoprefixer-rails (6.5.1.1)
       execjs
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     builder (3.2.2)
@@ -95,7 +95,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (1.2.1)
+    carrierwave (1.2.3)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
@@ -108,7 +108,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.2)
-    crass (1.0.2)
+    crass (1.0.4)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.7.0)
@@ -121,9 +121,9 @@ GEM
       i18n (~> 0.5)
     ffi (1.9.14)
     formatador (0.2.5)
-    friendly_id (5.2.3)
+    friendly_id (5.2.4)
       activerecord (>= 4.0.0)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
     guard (2.14.0)
       formatador (>= 0.2.4)
@@ -138,28 +138,28 @@ GEM
       guard (>= 2.1.1)
       rspec (>= 2.14, < 4.0)
     i18n (0.7.0)
-    jquery-fileupload-rails (0.4.7)
+    jquery-fileupload-rails (1.0.0)
       actionpack (>= 3.1)
       railties (>= 3.1)
-      sass (>= 3.2)
-    jquery-rails (4.3.1)
+      sassc
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    kaminari (1.1.0)
+    kaminari (1.1.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.0)
-      kaminari-activerecord (= 1.1.0)
-      kaminari-core (= 1.1.0)
-    kaminari-actionview (1.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
       actionview
-      kaminari-core (= 1.1.0)
-    kaminari-activerecord (1.1.0)
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
       activerecord
-      kaminari-core (= 1.1.0)
-    kaminari-core (1.1.0)
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     listen (3.1.5)
@@ -169,17 +169,18 @@ GEM
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.10)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    meta-tags (2.6.0)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    meta-tags (2.11.0)
       actionpack (>= 3.2.0, < 5.3)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
+    mini_mime (1.0.1)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     mysql2 (0.4.5)
     nenv (0.3.0)
     net-scp (1.2.1)
@@ -188,7 +189,7 @@ GEM
     nio4r (1.2.1)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    nokogumbo (1.4.13)
+    nokogumbo (1.5.0)
       nokogiri
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -198,7 +199,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pygments.rb (1.2.0)
+    pygments.rb (1.2.1)
       multi_json (>= 1.0.0)
     rack (2.0.1)
     rack-test (0.6.3)
@@ -252,26 +253,29 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     ruby_dep (1.5.0)
-    sanitize (4.5.0)
+    sanitize (4.6.6)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4.1)
-    sass (3.5.2)
+      nokogumbo (~> 1.4)
+    sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.6)
+    sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    sassc (2.0.0)
+      ffi (~> 1.9.6)
+      rake
     shellany (0.0.1)
     sitemap_generator (5.0.5)
       builder
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -286,11 +290,11 @@ GEM
     tilt (2.0.8)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.2.0)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yard (0.9.5)
@@ -316,4 +320,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.15.4
+   1.17.1

data/app/assets/stylesheets/lines/article.scss

@@ -1,3 +1,5 @@
+@import 'variables_and_mixins';
+
 .article {
   max-width: $max-width;
   font-family: $Merriweather;

data/app/assets/stylesheets/lines/footer.scss

@@ -1,3 +1,5 @@
+@import 'variables_and_mixins';
+
 footer, #footer {
   margin-top: 2em;
   background-color: $black;

data/app/assets/stylesheets/lines/general.scss

@@ -1,4 +1,6 @@
-* { 
+@import 'variables_and_mixins';
+
+* {
   margin: 0; padding: 0; 
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;

data/app/assets/stylesheets/lines/messages.scss

@@ -1,3 +1,4 @@
+@import 'variables_and_mixins';
 /*
  * Alerts and messages
  */

data/app/assets/stylesheets/lines/navbar.scss

@@ -1,3 +1,5 @@
+@import 'variables_and_mixins';
+
 #navbar {
   font-family: $MerriweatherSans;
   position: fixed;

data/app/assets/stylesheets/lines/pagination.scss

@@ -1,3 +1,5 @@
+@import 'variables_and_mixins';
+
 #pagination {
   font-family: $SourceSansPro;
   font-weight: 600;

data/app/controllers/lines/admin/articles_controller.rb

@@ -18,7 +18,7 @@ module Lines
       # <tt>@articles_published</tt> to distinguish between published and
       # unpublished articles
       def index
-        @articles = Article.order('published ASC, published_at DESC, created_at DESC').page(params[:page]).per(25)
+        @articles = Lines::Article.order('published ASC, published_at DESC, created_at DESC').page(params[:page]).per(25)
         @articles_unpublished = @articles.select{|a| a.published == false}
         @articles_published = @articles.select{|a| a.published == true}
         respond_to do |format|
@@ -28,7 +28,7 @@ module Lines
 
       # GET /admin/articles/1
       def show
-        @article = Article.friendly.find(params[:id])
+        @article = Lines::Article.friendly.find(params[:id])
         @first_page = true
 
         respond_to do |format|
@@ -47,12 +47,12 @@ module Lines
 
       # GET /admin/articles/1/edit
       def edit
-        @article = Article.friendly.find(params[:id])
+        @article = Lines::Article.friendly.find(params[:id])
       end
 
       # POST /admin/articles
       def create
-        @article = Article.new(article_params)
+        @article = Lines::Article.new(article_params)
 
         respond_to do |format|
           if @article.save
@@ -66,7 +66,7 @@ module Lines
       # PUT /admin/articles/1
       # TODO: Very much is happening here. Move deletion of hero_image to the article model
       def update
-        @article = Article.friendly.find(params[:id])
+        @article = Lines::Article.friendly.find(params[:id])
         a_params = article_params
 
         # replace picture_path with the new uploaded file
@@ -173,4 +173,4 @@ module Lines
     end
 
   end
-end
+end

data/app/controllers/lines/admin/authors_controller.rb

@@ -8,12 +8,12 @@ module Lines
 
       # Listes all authroes
       def index
-        @authors = Author.all
+        @authors = Lines::Author.all
       end
 
       # Shows an author
       def show
-        @author = Author.find(params[:id])
+        @author = Lines::Author.find(params[:id])
       end
 
       # New author
@@ -23,12 +23,12 @@ module Lines
 
       # Edit an existing author
       def edit
-        @author = Author.find(params[:id])
+        @author = Lines::Author.find(params[:id])
       end
 
       # Create a new author from params
       def create
-        @author = Author.new(author_params)
+        @author = Lines::Author.new(author_params)
 
         if @author.save
           redirect_to admin_author_path @author
@@ -39,7 +39,7 @@ module Lines
 
       # Update an existing author from params
       def update
-        @author = Author.find(params[:id])
+        @author = Lines::Author.find(params[:id])
 
         if @author.update_attributes(author_params)
           redirect_to admin_author_path(@author)
@@ -50,11 +50,11 @@ module Lines
 
       # Delete an author
       def destroy
-        @author = Author.find(params[:id])
+        @author = Lines::Author.find(params[:id])
         if @author.destroy
           redirect_to admin_authors_url
         else
-          @authors = Author.all
+          @authors = Lines::Author.all
           render "index" 
         end
       end
@@ -68,4 +68,4 @@ module Lines
     end
 
   end
-end
+end

data/app/controllers/lines/admin/pictures_controller.rb

@@ -6,12 +6,12 @@ module Lines
 
     class PicturesController < ApplicationController
       def create
-        @picture = Picture.create(picture_params)
+        @picture = Lines::Picture.create(picture_params)
       end
 
       # PUT /admin/pictures/1
       def update
-        @picture = Picture.find(params[:id])
+        @picture = Lines::Picture.find(params[:id])
 
         respond_to do |format|
           if @picture.update_attributes(picture_params[:picture])
@@ -24,7 +24,7 @@ module Lines
 
       # Deletes a picture. Only responds to JS requests.
       def destroy
-        @picture = Picture.find(params[:id])
+        @picture = Lines::Picture.find(params[:id])
         @picture.destroy
 
         respond_to do |format|
@@ -41,4 +41,4 @@ module Lines
     end
   
   end
-end
+end

data/app/controllers/lines/articles_controller.rb

@@ -18,9 +18,9 @@ module Lines
         format.html {
           @first_page = (params[:page] and params[:page].to_i > 0) ? false : true
           if params[:tag]
-            @articles = Article.published.tagged_with(params[:tag]).page(params[:page].to_i)
+            @articles = Lines::Article.published.tagged_with(params[:tag]).page(params[:page].to_i)
           else
-            @articles = Article.published.page(params[:page].to_i).padding(1)
+            @articles = Lines::Article.published.page(params[:page].to_i).padding(1)
           end
           
           if @articles.first_page?
@@ -41,7 +41,7 @@ module Lines
 
         }
         format.atom{
-          @articles = Article.published
+          @articles = Lines::Article.published
         }
       end
     end
@@ -49,7 +49,7 @@ module Lines
     # Shows specific article
     def show
       @first_page = true
-      @article = Article.published.find(params[:id])
+      @article = Lines::Article.published.find(params[:id])
       @article.teaser = nil unless @article.teaser.present?
       meta_tags = { title: @article.title,
         type: 'article',
@@ -64,9 +64,9 @@ module Lines
         return redirect_to @article, status: :moved_permanently
       end
 
-      @related_articles = Article.published.where('id != ?', @article.id).order('').limit(2)
+      @related_articles = Lines::Article.published.where('id != ?', @article.id).order('').limit(2)
     end
 
   end
 
-end
+end

data/app/controllers/lines/password_resets_controller.rb

@@ -12,7 +12,7 @@ module Lines
     end
   
     def create
-      @user = User.find_by(email: params[:password_reset][:email].downcase)
+      @user = Lines::User.find_by(email: params[:password_reset][:email].downcase)
       if @user
         @user.create_reset_digest
         @user.send_password_reset_email
@@ -67,7 +67,7 @@ module Lines
       end
 
       def get_user
-        @user = User.find_by(email: params[:email])
+        @user = Lines::User.find_by(email: params[:email])
       end
 
       # Confirms a valid user.

data/app/mailers/lines/user_mailer.rb

@@ -1,6 +1,6 @@
 module Lines
   class UserMailer < ActionMailer::Base
-    default from: CONFIG[:production]['from_email']
+    default from: CONFIG[Rails.env.to_sym]['from_email']
     
     def password_reset(user)
       @user = user

data/app/models/lines/picture.rb

@@ -8,7 +8,7 @@ require 'carrierwave/orm/activerecord'
 module Lines  
   class Picture < Lines::ApplicationRecord
     # Associations    
-    belongs_to :article, touch: true
+    belongs_to :article, touch: true, optional: true
 
     # Mount carrierwave picture uploader
     mount_uploader :image, PictureUploader

data/app/models/lines/user.rb

@@ -27,8 +27,8 @@ module Lines
 
     # Sets +rest_digest+ and +reset_sent_at+ for password reset.
     def create_reset_digest
-      self.reset_token = User.generate_token
-      update_attribute(:reset_digest,  User.digest(reset_token))
+      self.reset_token = Lines::User.generate_token
+      update_attribute(:reset_digest,  Lines::User.digest(reset_token))
       update_attribute(:reset_sent_at, Time.zone.now)
     end
 
@@ -69,4 +69,4 @@ module Lines
       end
 
   end
-end
+end

data/app/uploaders/document_uploader.rb

@@ -2,7 +2,7 @@
 # Carrierwave uploader for docuemnts.
 class DocumentUploader < CarrierWave::Uploader::Base
 
-  storage :file
+  storage CONFIG[:storage].to_sym
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:

data/app/uploaders/hero_image_uploader.rb

@@ -9,7 +9,7 @@ class HeroImageUploader < CarrierWave::Uploader::Base
   # include Sprockets::Helpers::IsolatedHelper
 
   # Choose what kind of storage to use for this uploader:
-  storage :file
+  storage CONFIG[:storage].to_sym
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:

data/app/uploaders/picture_uploader.rb

@@ -9,7 +9,8 @@ class PictureUploader < CarrierWave::Uploader::Base
   # include Sprockets::Helpers::IsolatedHelper
 
   # Choose what kind of storage to use for this uploader:
-  storage :file
+  #storage :ftp
+  storage CONFIG[:storage].to_sym
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:

data/app/views/lines/admin/articles/_form.html.erb

@@ -57,7 +57,7 @@
 
     <div class="input-field">
       <div class="documents">
-        <%= f.label :document, "#{@article.document? ? @article.document.file.filename + ' <span>(' + number_to_human_size(File.size(@article.document.file.file)) + ')</span>' : t('lines.buttons.attach_document').html_safe }".html_safe, class: "attachment-label", title: t('lines.buttons.change_attachment').html_safe -%>
+        <%= f.label :document, "#{@article.document? ? @article.document.file.filename + ' <span>(' + number_to_human_size(@article.document.file.size) + ')</span>' : t('lines.buttons.attach_document').html_safe }".html_safe, class: "attachment-label", title: t('lines.buttons.change_attachment').html_safe -%>
         <% if @article.document? %>
           <span class="icon-delete btn-delete-attachment" title="<%= t('lines.buttons.remove_attachment').html_safe %>"></span>
         <% end %>
@@ -96,4 +96,4 @@
     <% end %>        
 
   </div>
-<% end %>
+<% end %>

data/certs/lines-engine.pem

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZqb2No
-ZW4xFjAUBgoJkiaJk/IsZAEZFgZvcG9sb28xEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-Fw0xNzA3MjQxMTExMjlaFw0xODA3MjQxMTExMjlaMD0xDzANBgNVBAMMBmpvY2hl
-bjEWMBQGCgmSJomT8ixkARkWBm9wb2xvbzESMBAGCgmSJomT8ixkARkWAmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAulR8cGXRRO0i0UendNJ8J9Pk
-Z6gm/Mvp4D9UKIUdX9Xo/YvvsKUFtfUmRJrUDKeQDudBi/yVdTyvgNVT3bIt74Lm
-GR/kzaL58V7DRTp0zzxJvqN50YOAf56+Rk98d2GaQ5Jc4MmWwPDaLueO6/48bq4b
-XfLIKoCpCB5g0AuvNU3Qm3/m3cxeMCwphcounW5pBMAf9fZdrlm60f7CIsIart/U
-MGJRfWzsrVX+0PoEwCf/lYVibtUol9fG32SIRRLbIQhRuqs3KeHLxdPx6EdSnTpy
-+8EIIwB+zLNULfe9n0GqM6yMSuXjevl5kL8W6RasTF2pRi33fzinyFSZOQRMywID
-AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUUwrqTp4Z
-SvFdTcr2KSJdO71t1VIwGwYDVR0RBBQwEoEQam9jaGVuQG9wb2xvby5kZTAbBgNV
-HRIEFDASgRBqb2NoZW5Ab3BvbG9vLmRlMA0GCSqGSIb3DQEBBQUAA4IBAQAaftrN
-NWBEXcU4RY7nLjRfOjF+HXsA1SNPEqroOLCOLw1VHEomnKOPCecTp01n/fsKvNP5
-h318+8E9CCuw8hqtDFf7tNRk8Rx/UVgeknGd+5deKpcVWxbZyqank++eTUz5q2tv
-X/AOOWFqJH1e5WTWa5ugTBGxGuRYDg5n3Tkhk9BmgmFkZj88Opzw4M7vkG2nyB5i
-a7ziq9EOo3bgD3ONWvRM6z5Go+ouFxqsFBPXDDr/4zECif0JYwFRBRfyT+r9VdPH
-wY3tQr5y6n09S9cmFLHMM1DRAqhYQWSbqw/R0RTB9gqsI+4uX4gW4Qd4bDPdL+i5
-SdefFMfOAx3jQTFQ
+MIIDYDCCAkigAwIBAgIBATANBgkqhkiG9w0BAQUFADA7MQ0wCwYDVQQDDARpbmZv
+MRYwFAYKCZImiZPyLGQBGRYGb3BvbG9vMRIwEAYKCZImiZPyLGQBGRYCZGUwHhcN
+MTgxMTI3MTEyNjE5WhcNMTkxMTI3MTEyNjE5WjA7MQ0wCwYDVQQDDARpbmZvMRYw
+FAYKCZImiZPyLGQBGRYGb3BvbG9vMRIwEAYKCZImiZPyLGQBGRYCZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLo6cKj7H+u/uHHjVxMuouOGyS6+KY
+Ml2Dh+slLAZP3tXywLHK6kpnQzfX0PxX3tt+01OTw6CXfVQvHTX3pNQ/JCEPbDpz
+GkjJb0H+O6a2B1MURbngs6OTFJexJbrH9jnRYYz9XhclT9Pnql57Tvdx+81LMCYA
+PM/0K+J/5AurU0yZKoE4rtkUT6RawTRmiGztvfFCGnJw3y85dNkCNPpDk2AG4ILz
+ooIftk03e+LMXFQkubHvwQKEuR84P7tC7RCrEICGSTBAnl6hhs1inauRQqmRqZJi
+hlkHWQxP2uZxEhnYWMUseSvthEJUO0bJFGhcGlnSNA+xMVwXJTHdtS9zAgMBAAGj
+bzBtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQlIRIh0nakHIwo
+effiTSArnoshdTAZBgNVHREEEjAQgQ5pbmZvQG9wb2xvby5kZTAZBgNVHRIEEjAQ
+gQ5pbmZvQG9wb2xvby5kZTANBgkqhkiG9w0BAQUFAAOCAQEApr84I2BIzvlz1jtf
+24mmEoJj5eVLMxj28lvgxHrIUg8G9HtEfQBjeeCUVXX0xA641hJjwuqkYvkDJGdi
+F3iJYlntoyFcU6rTxIPaJFmprSVPpQg62TnFbdLl2EJyd64qSrEzq7vd6woL8x6b
+7XszW47oQrRiTlMiOsyftwEyANvHYgTc1xvIDRzFms+dk65w8wmLMdzbWTTKwPCH
+rS9aC6nx2nJEBLxOc+az83Rf62GulQzWukNgHOvMfFFnm+NsOG1rryoe3U3gq7za
+NTqmZPFbCjGiCRUQuSTUDBIe8IFcoba2zbnO1VjDuCsXfYDUZH779hRVKn7O0iQX
+2vhGFQ==
 -----END CERTIFICATE-----

data/config/initializers/load_config.rb

@@ -7,6 +7,7 @@ unless File.exists?(config_file)
 end
 
 # Load the configuration
-CONFIG = YAML.load_file(config_file)
+#CONFIG = YAML.load_file(config_file)
+CONFIG = YAML.load(ERB.new(File.read(config_file)).result)
 CONFIG.merge! CONFIG.fetch(Rails.env, {})
-CONFIG.symbolize_keys!
+CONFIG.symbolize_keys!

data/config/lines_config.yml

@@ -47,6 +47,9 @@ articles_per_page: 10 # Pagination: How many articles should be desplayed per pa
 # Your apps secret token. Generate a new one with 'rake secret' and paste it below
 secret_token: "afa4a436180a2febe9b814c6a57b6f3ad298aa82ce0ab4c9e8238713764b665e978f9fad8146587b6cf4a518de4a8f0eac1156cf43a778548e0082629d099fef"
 
+# Carrierwave uploader
+storage: :file # or "aws" if using carrierwave-aws or "ftp" of using carrierwave-ftp
+
 # Environment dependent configuration. Place your URLs here
 development:
   host: "localhost:3000"
@@ -56,4 +59,4 @@ test:
   from_email: 'noreply@example.com'
 production:
   host: "blog.opoloo.com"
-  from_email: 'noreply@example.com'
+  from_email: <%= ENV["MAILER_EMAIL"] %>

data/db/migrate/20140505122014_base_migration.rb

@@ -1,4 +1,4 @@
-class BaseMigration < ActiveRecord::Migration
+class BaseMigration < ActiveRecord::Migration[4.2]
   # encoding: UTF-8
   # This file is auto-generated from the current state of the database. Instead
   # of editing this file, please use the migrations feature of Active Record to

data/db/migrate/20140702160602_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb

@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 1)
-class ActsAsTaggableOnMigration < ActiveRecord::Migration
+class ActsAsTaggableOnMigration < ActiveRecord::Migration[4.2]
   def self.up
     create_table :tags do |t|
       t.string :name

data/db/migrate/20140702160603_add_missing_unique_indices.acts_as_taggable_on_engine.rb

@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 2)
-class AddMissingUniqueIndices < ActiveRecord::Migration
+class AddMissingUniqueIndices < ActiveRecord::Migration[4.2]
   def self.up
     add_index :tags, :name, unique: true
 

data/db/migrate/20140702160604_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb

@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 3)
-class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration[4.2]
   def self.up
     add_column :tags, :taggings_count, :integer, default: 0
 

data/db/migrate/20141027143656_add_teaser_to_article.rb

@@ -1,4 +1,4 @@
-class AddTeaserToArticle < ActiveRecord::Migration
+class AddTeaserToArticle < ActiveRecord::Migration[4.2]
   def change
     add_column :lines_articles, :teaser, :text
   end

data/db/migrate/20150421093311_add_reset_password_fields_to_users.rb

@@ -1,4 +1,4 @@
-class AddResetPasswordFieldsToUsers < ActiveRecord::Migration
+class AddResetPasswordFieldsToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :lines_users, :reset_digest, :string
     add_column :lines_users, :reset_sent_at, :datetime

data/lib/lines/engine.rb

@@ -29,7 +29,7 @@ module Lines
     end
 
     initializer 'lines.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
+      ActiveSupport.on_load :action_controller_base do
         helper Lines::ApplicationHelper
       end
     end

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "1.2.3"
+  VERSION = "1.2.5"
 end

data/lines.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'sass-rails', '>= 4.0.0'
   s.add_runtime_dependency 'coffee-rails', '< 6', '>= 4.0.0'
   s.add_runtime_dependency 'uglifier', '>= 2'
-  s.add_runtime_dependency 'friendly_id', '>= 5.1.0'
+  s.add_runtime_dependency 'friendly_id', '>= 5.2.4'
   s.add_runtime_dependency 'rails3-jquery-autocomplete', '>= 1.0.11'
   s.add_runtime_dependency 'meta-tags', '>= 2.0.0'
   s.add_runtime_dependency 'bcrypt-ruby', '>= 3.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Opoloo GbR
@@ -10,27 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZqb2No
-  ZW4xFjAUBgoJkiaJk/IsZAEZFgZvcG9sb28xEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-  Fw0xNzA3MjQxMTExMjlaFw0xODA3MjQxMTExMjlaMD0xDzANBgNVBAMMBmpvY2hl
-  bjEWMBQGCgmSJomT8ixkARkWBm9wb2xvbzESMBAGCgmSJomT8ixkARkWAmRlMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAulR8cGXRRO0i0UendNJ8J9Pk
-  Z6gm/Mvp4D9UKIUdX9Xo/YvvsKUFtfUmRJrUDKeQDudBi/yVdTyvgNVT3bIt74Lm
-  GR/kzaL58V7DRTp0zzxJvqN50YOAf56+Rk98d2GaQ5Jc4MmWwPDaLueO6/48bq4b
-  XfLIKoCpCB5g0AuvNU3Qm3/m3cxeMCwphcounW5pBMAf9fZdrlm60f7CIsIart/U
-  MGJRfWzsrVX+0PoEwCf/lYVibtUol9fG32SIRRLbIQhRuqs3KeHLxdPx6EdSnTpy
-  +8EIIwB+zLNULfe9n0GqM6yMSuXjevl5kL8W6RasTF2pRi33fzinyFSZOQRMywID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUUwrqTp4Z
-  SvFdTcr2KSJdO71t1VIwGwYDVR0RBBQwEoEQam9jaGVuQG9wb2xvby5kZTAbBgNV
-  HRIEFDASgRBqb2NoZW5Ab3BvbG9vLmRlMA0GCSqGSIb3DQEBBQUAA4IBAQAaftrN
-  NWBEXcU4RY7nLjRfOjF+HXsA1SNPEqroOLCOLw1VHEomnKOPCecTp01n/fsKvNP5
-  h318+8E9CCuw8hqtDFf7tNRk8Rx/UVgeknGd+5deKpcVWxbZyqank++eTUz5q2tv
-  X/AOOWFqJH1e5WTWa5ugTBGxGuRYDg5n3Tkhk9BmgmFkZj88Opzw4M7vkG2nyB5i
-  a7ziq9EOo3bgD3ONWvRM6z5Go+ouFxqsFBPXDDr/4zECif0JYwFRBRfyT+r9VdPH
-  wY3tQr5y6n09S9cmFLHMM1DRAqhYQWSbqw/R0RTB9gqsI+4uX4gW4Qd4bDPdL+i5
-  SdefFMfOAx3jQTFQ
+  MIIDYDCCAkigAwIBAgIBATANBgkqhkiG9w0BAQUFADA7MQ0wCwYDVQQDDARpbmZv
+  MRYwFAYKCZImiZPyLGQBGRYGb3BvbG9vMRIwEAYKCZImiZPyLGQBGRYCZGUwHhcN
+  MTgxMTI3MTEyNjE5WhcNMTkxMTI3MTEyNjE5WjA7MQ0wCwYDVQQDDARpbmZvMRYw
+  FAYKCZImiZPyLGQBGRYGb3BvbG9vMRIwEAYKCZImiZPyLGQBGRYCZGUwggEiMA0G
+  CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLo6cKj7H+u/uHHjVxMuouOGyS6+KY
+  Ml2Dh+slLAZP3tXywLHK6kpnQzfX0PxX3tt+01OTw6CXfVQvHTX3pNQ/JCEPbDpz
+  GkjJb0H+O6a2B1MURbngs6OTFJexJbrH9jnRYYz9XhclT9Pnql57Tvdx+81LMCYA
+  PM/0K+J/5AurU0yZKoE4rtkUT6RawTRmiGztvfFCGnJw3y85dNkCNPpDk2AG4ILz
+  ooIftk03e+LMXFQkubHvwQKEuR84P7tC7RCrEICGSTBAnl6hhs1inauRQqmRqZJi
+  hlkHWQxP2uZxEhnYWMUseSvthEJUO0bJFGhcGlnSNA+xMVwXJTHdtS9zAgMBAAGj
+  bzBtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQlIRIh0nakHIwo
+  effiTSArnoshdTAZBgNVHREEEjAQgQ5pbmZvQG9wb2xvby5kZTAZBgNVHRIEEjAQ
+  gQ5pbmZvQG9wb2xvby5kZTANBgkqhkiG9w0BAQUFAAOCAQEApr84I2BIzvlz1jtf
+  24mmEoJj5eVLMxj28lvgxHrIUg8G9HtEfQBjeeCUVXX0xA641hJjwuqkYvkDJGdi
+  F3iJYlntoyFcU6rTxIPaJFmprSVPpQg62TnFbdLl2EJyd64qSrEzq7vd6woL8x6b
+  7XszW47oQrRiTlMiOsyftwEyANvHYgTc1xvIDRzFms+dk65w8wmLMdzbWTTKwPCH
+  rS9aC6nx2nJEBLxOc+az83Rf62GulQzWukNgHOvMfFFnm+NsOG1rryoe3U3gq7za
+  NTqmZPFbCjGiCRUQuSTUDBIe8IFcoba2zbnO1VjDuCsXfYDUZH779hRVKn7O0iQX
+  2vhGFQ==
   -----END CERTIFICATE-----
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -334,14 +334,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: rails3-jquery-autocomplete
   requirement: !ruby/object:Gem::Requirement
@@ -498,6 +498,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-gemset"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock