bongo 0.0.1 → 0.1.1

data/app/controllers/bongo/application_controller.rb

@@ -1,5 +1,4 @@
 module Bongo
-  class ApplicationController < ActionController::Base
-    protect_from_forgery with: :exception
+  class ApplicationController < ApplicationController
   end
 end

data/app/controllers/bongo/articles_controller.rb

@@ -7,21 +7,32 @@ module Bongo
     before_action :set_article, only: [:show, :edit, :update, :destroy]
 
     def index
-      @articles = Article.all.order(publish_at: :desc)
+      @articles = policy_scope(Article).order(publish_at: :desc)
+      respond_to do |format|
+        format.html
+        format.rss do
+          @articles = @articles.published.order(publish_at: :desc)
+          render layout: false
+        end
+      end
     end
 
     def show
+      authorize @article
     end
 
     def new
       @article = Article.new
+      authorize @article
     end
 
     def edit
+      authorize @article
     end
 
     def create
       @article = Article.new(article_params)
+      authorize @article
 
       if @article.save
         redirect_to @article, notice: 'Article was successfully created.'
@@ -31,6 +42,8 @@ module Bongo
     end
 
     def update
+      authorize @article
+
       if @article.update(article_params)
         redirect_to @article, notice: 'Article was successfully updated.'
       else
@@ -39,6 +52,7 @@ module Bongo
     end
 
     def destroy
+      authorize @article
       @article.destroy
       redirect_to articles_url, notice: 'Article was successfully destroyed.'
     end

data/app/controllers/bongo/files_controller.rb

@@ -0,0 +1,22 @@
+require_dependency "bongo/application_controller"
+
+require "aws-sdk-s3"
+
+module Bongo
+  class FilesController < ApplicationController
+    before_action :authenticate_user!
+
+    skip_before_action :verify_authenticity_token
+
+    def create
+      extension = File.extname(params[:file].original_filename)
+      s3 = Aws::S3::Resource.new
+      obj = s3.bucket(ENV["AWS_S3_BUCKET"]).object(SecureRandom.uuid + extension)
+      obj.upload_file(params[:file])
+
+      respond_to do |format|
+        format.json { render json: obj.public_url }
+      end
+    end
+  end
+end

data/app/models/bongo/article.rb

@@ -5,5 +5,7 @@ module Bongo
     field :title, type: String
     field :text, type: String
     field :publish_at, type: Date
+
+    scope :published, -> { where(:publish_at.lte => Date.today) }
   end
 end

data/app/policies/bongo/article_policy.rb

@@ -0,0 +1,29 @@
+module Bongo
+  class ArticlePolicy < ApplicationPolicy
+    class Scope < Scope
+      def resolve
+        if user&.admin?
+          scope.all
+        else
+          scope.published
+        end
+      end
+    end
+
+    def show?
+      true
+    end
+
+    def create?
+      user&.admin?
+    end
+
+    def update?
+      user&.admin?
+    end
+
+    def destroy?
+      user&.admin?
+    end
+  end
+end

data/app/views/bongo/articles/_form.html.erb

@@ -15,7 +15,8 @@
   <%= form.text_field :title, required: true %>
 
   <%= form.label :text %>
-  <%= form.text_area :text, required: true %>
+  <%= form.hidden_field :text %>
+  <trix-editor input="article_text" class="trix-content" required></trix-editor>
 
   <%= form.label :publish_at %>
   <%= form.date_field :publish_at %>
@@ -23,6 +24,6 @@
   <button type="submit">Save</button>
 
   <%= link_to articles_path do %>
-    <em>Back</em>
+    <em>Cancel</em>
   <% end %>
 <% end %>

data/app/views/bongo/articles/index.html.erb

@@ -1,14 +1,20 @@
 <% @articles.each do |article| %>
   <article>
-    <h2><%= link_to article.title, article %></h2>
-    <small><%= article.publish_at ? l(article.publish_at, format: :long) : "Unpublished draft"%></small>
-    <p><%= simple_format truncate(article.text, length: 500) %></p>
+    <header>
+      <h2><%= link_to article.title, article %></h2>
+      <small><%= article.publish_at ? l(article.publish_at, format: :long) : "Unpublished draft"%></small>
+    </header>
+    <div class="trix-content">
+      <%= article.text.html_safe %>
+    </div>
   </article>
   <br>
 <% end %>
 
 <br>
 
-<%= link_to new_article_path do %>
-  <b>New Article</b>
+<% if policy(Bongo::Article).create? %>
+  <%= link_to new_article_path do %>
+    <b>New Article</b>
+  <% end %>
 <% end %>

data/app/views/bongo/articles/index.rss.builder

@@ -0,0 +1,18 @@
+xml.instruct! :xml, version: "1.0"
+xml.rss version: "2.0" do
+  xml.channel do
+    xml.title (Front.config.name rescue "My Blog")
+    xml.description (Front.config.description rescue "A bongo blog")
+    xml.link root_url
+
+    @articles.each do |article|
+      xml.item do
+        xml.title article.title
+        xml.description ActionView::Base.full_sanitizer.sanitize(article.text).truncate(180)
+        xml.pubDate article.publish_at.to_s(:rfc822)
+        xml.link article_url(article)
+        xml.guid article_url(article)
+      end
+    end
+  end
+end

data/app/views/bongo/articles/show.html.erb

@@ -3,19 +3,25 @@
     <h2><%= @article.title %></h2>
     <small><%= @article.publish_at ? l(@article.publish_at, format: :long) : "Unpublished draft"%></small>
   </header>
-  <main><%= simple_format @article.text %></main>
-</article>
 
-<br>
+  <div class="trix-content">
+    <%= @article.text.html_safe %>
+  </div>
 
-<%= link_to edit_article_path(@article) do %>
-  <b>Edit</b>
-<% end %>
+  <footer>
+    <% if policy(@article).update? %>
+      <%= link_to edit_article_path(@article) do %>
+        <b>Edit</b>
+      <% end %>
+    <% end %>
 
-<%= link_to @article, method: :delete, data: {confirm: "Are you sure?"} do %>
-  <em>Delete</em>
-<% end %>
+    <% if policy(@article).destroy? %>
+      <%= link_to @article, method: :delete, data: {confirm: "Are you sure?"} do %>
+        <em>Delete</em>
+      <% end %>
+    <% end %>
 
-<%= link_to articles_path do %>
-  <em>Back</em>
-<% end %>
+    <br>
+    <%= link_to 'Back', articles_path %>
+  </footer>
+</article>

data/app/views/layouts/bongo/application.html.erb

@@ -2,4 +2,8 @@
   Blog
 <% end %>
 
+<% content_for :head do %>
+  <%= auto_discovery_link_tag :rss, articles_url(format: :rss) %>
+<% end %>
+
 <%= render template: "layouts/application" %>

data/config/routes.rb

@@ -1,4 +1,5 @@
 Bongo::Engine.routes.draw do
   root to: "articles#index"
   resources :articles
+  resources :files, only: :create
 end

data/lib/bongo/version.rb

@@ -1,3 +1,3 @@
 module Bongo
-  VERSION = '0.0.1'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bongo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Thomas Hutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,7 +38,35 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.5
-description: Bongo is a mountable Rails engine for blogging using MongoDB.
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: pundit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+description: Rails engine for blogging using MongoDB.
 email:
 - tohu@tuta.io
 executables: []
@@ -49,18 +77,25 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/bongo_manifest.js
+- app/assets/javascripts/bongo/application.js
+- app/assets/javascripts/bongo/attachments.js.erb
+- app/assets/javascripts/bongo/trix.js
 - app/assets/stylesheets/bongo/application.css
+- app/assets/stylesheets/bongo/trix.css
 - app/controllers/bongo/application_controller.rb
 - app/controllers/bongo/articles_controller.rb
+- app/controllers/bongo/files_controller.rb
 - app/helpers/bongo/application_helper.rb
 - app/helpers/bongo/articles_helper.rb
 - app/jobs/bongo/application_job.rb
 - app/mailers/bongo/application_mailer.rb
 - app/models/bongo/article.rb
+- app/policies/bongo/article_policy.rb
 - app/views/bongo/articles/_form.html.erb
 - app/views/bongo/articles/_notice.html.erb
 - app/views/bongo/articles/edit.html.erb
 - app/views/bongo/articles/index.html.erb
+- app/views/bongo/articles/index.rss.builder
 - app/views/bongo/articles/new.html.erb
 - app/views/bongo/articles/show.html.erb
 - app/views/layouts/bongo/application.html.erb
@@ -69,7 +104,7 @@ files:
 - lib/bongo/engine.rb
 - lib/bongo/version.rb
 - lib/tasks/bongo_tasks.rake
-homepage: https://rubygems.org/gems/bongo
+homepage: https://github.com/thutterer/bongo
 licenses:
 - MIT
 metadata: {}
@@ -88,8 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A blogging engine
+summary: A blogging engine for Rails
 test_files: []