lines-engine 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c75b66e2862656500bbf544915c6c8b554b3cb8d
-  data.tar.gz: 3396baaf3becd71a03e255ea63af3a8bea533aa1
+  metadata.gz: efaf76786e0d64f0b0c688a19d7b05cefa2ed5a6
+  data.tar.gz: c665412cae4d55a0091bb5d097b792c1514b9afd
 SHA512:
-  metadata.gz: f427d273b55339e8639c344b77c23d3b4d8187e92f16474de74073b3bf921ec18feb956274d795d1bdaa874107aa599bc0a96faece4274ce02da117a879aee8d
-  data.tar.gz: 1d1ec819aeb65064243a2aa79356bcb8052191aa301feddc2c28059ba454abca12d5ad60e229548ef299e17c730e09974194eb8eda6ec32276da95d564674f32
+  metadata.gz: 1b6d6e8e98c1d9291cae3c43cc78a5b80c453f04db14b8c1f44c0f9ff7478530e4abb580b4202ba34d3fbbf0ded655cb8c5d19301c8c24b3643d6ae8d399f8aa
+  data.tar.gz: 15feb2f96d2d9a6a897e7cca3c243236360902c3f2ee7e9cb88d0d226aecd11f2ed8bbc486e75318cf77608f58afe4bb5bcfe5ce86dc6d66f9e9c37eb915f8ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lines-engine (0.1.17)
+    lines-engine (0.1.18)
       acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
       bcrypt (~> 3.1.0, >= 3.1.0)
       carrierwave (~> 0.10.0, >= 0.10.0)

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

@@ -6,14 +6,16 @@
 require_dependency "lines/application_controller"
 
 module Lines
+  module Admin
 
-  class Admin::ApplicationController < ApplicationController
-    protect_from_forgery
+    class ApplicationController < Lines::ApplicationController
+      protect_from_forgery
 
-    before_action :authorize
+      before_action :authorize
 
-    layout 'lines/admin'
+      layout 'lines/admin'
 
+    end
+    
   end
-
 end

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

@@ -7,166 +7,168 @@
 require_dependency "lines/admin/application_controller"
 
 module Lines
-
-  class Admin::ArticlesController < Admin::ApplicationController
-
-    autocomplete :tag, :name, class_name: 'ActsAsTaggableOn::Tag'
-    before_action :process_base64_upload, only: [:create, :update]
-
-    # Lists all articles. Provides <tt>@articles_unpublished</tt> and 
-    # <tt>@articles_published</tt> to distinguish between published and
-    # unpublished articles
-    def index
-      @articles = Article.order('published ASC, featured DESC, published_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|
-        format.html # index.html.erb
+  module Admin
+
+    class ArticlesController < ApplicationController
+
+      autocomplete :tag, :name, class_name: 'ActsAsTaggableOn::Tag'
+      before_action :process_base64_upload, only: [:create, :update]
+
+      # Lists all articles. Provides <tt>@articles_unpublished</tt> and 
+      # <tt>@articles_published</tt> to distinguish between published and
+      # unpublished articles
+      def index
+        @articles = Article.order('published ASC, featured DESC, published_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|
+          format.html # index.html.erb
+        end
       end
-    end
 
-    # GET /admin/articles/1
-    def show
-      @article = Article.find(params[:id])
-      @first_page = true
+      # GET /admin/articles/1
+      def show
+        @article = Article.find(params[:id])
+        @first_page = true
 
-      respond_to do |format|
-        format.html {render :show, layout: 'lines/preview'}
+        respond_to do |format|
+          format.html {render :show, layout: 'lines/preview'}
+        end
       end
-    end
 
-    # GET /admin/articles/new
-    def new
-      @article = Lines::Article.new
+      # GET /admin/articles/new
+      def new
+        @article = Lines::Article.new
 
-      respond_to do |format|
-        format.html # new.html.erb
+        respond_to do |format|
+          format.html # new.html.erb
+        end
       end
-    end
 
-    # GET /admin/articles/1/edit
-    def edit
-      @article = Article.find(params[:id])
-    end
+      # GET /admin/articles/1/edit
+      def edit
+        @article = Article.find(params[:id])
+      end
 
-    # POST /admin/articles
-    def create
-      @article = Article.new(article_params)
+      # POST /admin/articles
+      def create
+        @article = Article.new(article_params)
 
-      respond_to do |format|
-        if @article.save
-          format.html { redirect_to admin_article_path(@article), notice: 'Article was successfully created.' }
-        else
-          format.html { render action: "new" }
+        respond_to do |format|
+          if @article.save
+            format.html { redirect_to admin_article_path(@article), notice: 'Article was successfully created.' }
+          else
+            format.html { render action: "new" }
+          end
         end
       end
-    end
 
-    # PUT /admin/articles/1
-    # TODO: Very much is happening here. Move deletion of hero_image to the article model
-    def update
-      @article = Article.find(params[:id])
-      a_params = article_params
+      # PUT /admin/articles/1
+      # TODO: Very much is happening here. Move deletion of hero_image to the article model
+      def update
+        @article = Article.find(params[:id])
+        a_params = article_params
 
-      # replace picture_path with the new uploaded file
-      a_params[:hero_image] = @uploaded_file if @uploaded_file
+        # replace picture_path with the new uploaded file
+        a_params[:hero_image] = @uploaded_file if @uploaded_file
 
-      # delete uploaded hero image when predifined image is selected
-      if !a_params[:hero_image_cache].present? && a_params[:short_hero_image].present?
-        @article.remove_hero_image! 
-        @article.remove_hero_image = true 
-        @article.save
-      end
+        # delete uploaded hero image when predifined image is selected
+        if !a_params[:hero_image_cache].present? && a_params[:short_hero_image].present?
+          @article.remove_hero_image! 
+          @article.remove_hero_image = true 
+          @article.save
+        end
 
-      respond_to do |format|
-        if @article.update_attributes(article_params)
-          ActionController::Base.new.expire_fragment(@article)
-          format.html { redirect_to admin_article_path(@article), notice: 'Article was successfully updated.' }
-        else
-          format.html { render action: "edit" }
+        respond_to do |format|
+          if @article.update_attributes(article_params)
+            ActionController::Base.new.expire_fragment(@article)
+            format.html { redirect_to admin_article_path(@article), notice: 'Article was successfully updated.' }
+          else
+            format.html { render action: "edit" }
+          end
         end
       end
-    end
 
-    # DELETE /admin/articles/1
-    def destroy
-      @article = Article.find(params[:id])
-      @article.destroy
+      # DELETE /admin/articles/1
+      def destroy
+        @article = Article.find(params[:id])
+        @article.destroy
 
-      respond_to do |format|
-        format.html { redirect_to admin_articles_url }
+        respond_to do |format|
+          format.html { redirect_to admin_articles_url }
+        end
       end
-    end
 
-    # Toggles published state of an article
-    def toggle_publish
-      @article = Article.find(params[:article_id])
-      @article.update_attributes(published: !@article.published)
-      redirect_to admin_articles_url, notice: 'Article updated!'
-    end
+      # Toggles published state of an article
+      def toggle_publish
+        @article = Article.find(params[:article_id])
+        @article.update_attributes(published: !@article.published)
+        redirect_to admin_articles_url, notice: 'Article updated!'
+      end
 
-    # Toggles featured state of an article
-    def toggle_feature
-      @article = Article.find(params[:article_id])
-      old_featured = Article.where(featured: true)
-      if old_featured.size > 0
-        old_featured.each do |article|
-          article.update_attributes(featured: false)
+      # Toggles featured state of an article
+      def toggle_feature
+        @article = Article.find(params[:article_id])
+        old_featured = Article.where(featured: true)
+        if old_featured.size > 0
+          old_featured.each do |article|
+            article.update_attributes(featured: false)
+          end
         end
+        @article.update_attributes(featured: !@article.featured)
+        redirect_to admin_articles_url, notice: 'Article updated!'
       end
-      @article.update_attributes(featured: !@article.featured)
-      redirect_to admin_articles_url, notice: 'Article updated!'
-    end
 
-    # Handles base64 encoded file uploads
-    def process_base64_upload
-      @uploaded_file = nil
-      #check if file is given
-      if params[:article][:hero_image_file] != ""
-
-        picture_filename = "hero_image"
-        picture_original_filename = "hero_image"
-        picture_content_type = splitBase64(params[:article][:hero_image_file])[:type]
-        picture_data = splitBase64(params[:article][:hero_image_file])[:data]
-
-        #create a new tempfile named fileupload
-        tempfile = Tempfile.new("fileupload")
-        tempfile.binmode
-
-        #get the file and decode it with base64 then write it to the tempfile
-        tempfile.write(Base64.decode64(picture_data))
-
-        #create a new uploaded file
-        @uploaded_file = ActionDispatch::Http::UploadedFile.new(
-          tempfile: tempfile, 
-          filename: picture_filename,
-          original_filename: picture_original_filename
-        )
-        @uploaded_file.content_type = picture_content_type
+      # Handles base64 encoded file uploads
+      def process_base64_upload
+        @uploaded_file = nil
+        #check if file is given
+        if params[:article][:hero_image_file] != ""
+
+          picture_filename = "hero_image"
+          picture_original_filename = "hero_image"
+          picture_content_type = splitBase64(params[:article][:hero_image_file])[:type]
+          picture_data = splitBase64(params[:article][:hero_image_file])[:data]
+
+          #create a new tempfile named fileupload
+          tempfile = Tempfile.new("fileupload")
+          tempfile.binmode
+
+          #get the file and decode it with base64 then write it to the tempfile
+          tempfile.write(Base64.decode64(picture_data))
+
+          #create a new uploaded file
+          @uploaded_file = ActionDispatch::Http::UploadedFile.new(
+            tempfile: tempfile, 
+            filename: picture_filename,
+            original_filename: picture_original_filename
+          )
+          @uploaded_file.content_type = picture_content_type
+        end
       end
-    end
 
-    def splitBase64(uri)
-      if uri.match(%r{^data:(.*?);(.*?),(.*)$})
-        return {
-          type:      $1, # "image/png"
-          encoder:   $2, # "base64"
-          data:      $3, # data string
-          extension: $1.split('/')[1] # "png"
-          }
+      def splitBase64(uri)
+        if uri.match(%r{^data:(.*?);(.*?),(.*)$})
+          return {
+            type:      $1, # "image/png"
+            encoder:   $2, # "base64"
+            data:      $3, # data string
+            extension: $1.split('/')[1] # "png"
+            }
+        end
       end
-    end
 
-    private
+      private
 
-      # Allowed attribute with strong_params
-      def article_params
-        params.require(:article).permit(:content, :hero_image, :short_hero_image, :published, :published_at, 
-          :sub_title, :title, :pictures, :author_ids, :hero_image_cache, :tag_list, :gplus_url, :featured, 
-          :document, :document_cache, :hero_image_file, :remove_document, :pictures, :authors,
-          pictures_attributes: [:id, :image, :name, :article_id], author_ids: [] )
-      end
+        # Allowed attribute with strong_params
+        def article_params
+          params.require(:article).permit(:content, :hero_image, :short_hero_image, :published, :published_at, 
+            :sub_title, :title, :pictures, :author_ids, :hero_image_cache, :tag_list, :gplus_url, :featured, 
+            :document, :document_cache, :hero_image_file, :remove_document, :pictures, :authors,
+            pictures_attributes: [:id, :image, :name, :article_id], author_ids: [] )
+        end
 
-  end
+    end
 
+  end
 end

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

@@ -3,68 +3,69 @@
 require_dependency "lines/admin/application_controller"
 
 module Lines
+  module Admin
+    class AuthorsController < ApplicationController
 
-  class Admin::AuthorsController < Admin::ApplicationController
-
-    # Listes all authroes
-    def index
-      @authors = Author.all
-    end
+      # Listes all authroes
+      def index
+        @authors = Author.all
+      end
 
-    # Shows an author
-    def show
-      @author = Author.find(params[:id])
-    end
+      # Shows an author
+      def show
+        @author = Author.find(params[:id])
+      end
 
-    # New author
-    def new
-      @author = Lines::Author.new
-    end
+      # New author
+      def new
+        @author = Lines::Author.new
+      end
 
-    # Edit an existing author
-    def edit
-      @author = Author.find(params[:id])
-    end
+      # Edit an existing author
+      def edit
+        @author = Author.find(params[:id])
+      end
 
-    # Create a new author from params
-    def create
-      @author = Author.new(author_params)
+      # Create a new author from params
+      def create
+        @author = Author.new(author_params)
 
-      if @author.save
-        redirect_to admin_author_path @author, notice: 'Author was successfully created.'
-      else
-        render action: "new"
+        if @author.save
+          redirect_to admin_author_path @author, notice: 'Author was successfully created.'
+        else
+          render action: "new"
+        end
       end
-    end
 
-    # Update an existing author from params
-    def update
-      @author = Author.find(params[:id])
+      # Update an existing author from params
+      def update
+        @author = Author.find(params[:id])
 
-      if @author.update_attributes(params[:author])
-        redirect_to admin_author_path @author, notice: 'Author was successfully updated.'
-      else
-        render action: "edit"
+        if @author.update_attributes(params[:author])
+          redirect_to admin_author_path @author, notice: 'Author was successfully updated.'
+        else
+          render action: "edit"
+        end
       end
-    end
 
-    # Delete an author
-    def destroy
-      @author = Author.find(params[:id])
-      if @author.destroy
-        redirect_to admin_authors_url
-      else
-        @authors = Author.all
-        render "index" 
+      # Delete an author
+      def destroy
+        @author = Author.find(params[:id])
+        if @author.destroy
+          redirect_to admin_authors_url
+        else
+          @authors = Author.all
+          render "index" 
+        end
       end
-    end
 
-    private
+      private
 
-      # Use strong_params
-      def author_params
-        params.require(:author).permit(:email, :name, :description, :gplus_profile)
-      end
-  end
+        # Use strong_params
+        def author_params
+          params.require(:author).permit(:email, :name, :description, :gplus_profile)
+        end
+    end
 
+  end
 end

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

@@ -2,42 +2,43 @@
 require_dependency "lines/admin/application_controller"
 
 module Lines
+  module Admin
 
+    class PicturesController < ApplicationController
+      def create
+        @picture = Picture.create(picture_params)
+      end
 
-  class Admin::PicturesController < Admin::ApplicationController
-    def create
-      @picture = Picture.create(picture_params)
-    end
-
-    # PUT /admin/pictures/1
-    def update
-      @picture = Picture.find(params[:id])
+      # PUT /admin/pictures/1
+      def update
+        @picture = Picture.find(params[:id])
 
-      respond_to do |format|
-        if @picture.update_attributes(picture_params[:picture])
-          format.html { redirect_to @picture, notice: 'Picture was successfully updated.' }
-        else
-          format.html { render action: "edit" }
+        respond_to do |format|
+          if @picture.update_attributes(picture_params[:picture])
+            format.html { redirect_to @picture, notice: 'Picture was successfully updated.' }
+          else
+            format.html { render action: "edit" }
+          end
         end
       end
-    end
 
-    # Deletes a picture. Only responds to JS requests.
-    def destroy
-      @picture = Picture.find(params[:id])
-      @picture.destroy
+      # Deletes a picture. Only responds to JS requests.
+      def destroy
+        @picture = Picture.find(params[:id])
+        @picture.destroy
 
-      respond_to do |format|
-        format.js
+        respond_to do |format|
+          format.js
+        end
       end
-    end
 
-    private
+      private
 
-      # strong_params
-      def picture_params
-        params.fetch(:picture, {}).permit(:image)
-      end
+        # strong_params
+        def picture_params
+          params.fetch(:picture, {}).permit(:image)
+        end
+    end
+  
   end
-
 end

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Opoloo GbR