symphonia 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5b28e0e3450123e448544ebc31cc508547f46edf4720ae1ccd14388d43f4d79
-  data.tar.gz: 50220dbb88357b44759b56922ed45fbdb39d318abb6984d014b4b54d28ccbbe4
+  metadata.gz: c8399b31088e0c0ebd1514b698be2fd97940c32e8cebd2313f524b3fb3455559
+  data.tar.gz: f35d459eaa67c75f5c6e1fdee759f56eb37373f518f1ad1a212dc2d24386ba26
 SHA512:
-  metadata.gz: b3d488537c8872ce378ea9cb196b01f5cf0f5a116fa2b849e6e7d20cf5c4e4f56c5e69eae370c74885a752e837a58ecb7899649b0e47fa8c445510a8f806bf82
-  data.tar.gz: fb4e0f340bd7efa71dbca9a549151c01ffda76147282f2257dc0ba1fe19368880b442db5d810e538931c7a47e30ada443834e22f743dbbe6f5d5a85dcd13dff9
+  metadata.gz: df35e4035a31df68cc8c230d0605ec6c897fa2b43f79cc5bf77a1b1e77de3b98c3674af336517d0b577c3794ef02e47eac8b011da72e3b4bb27f5020c53ad2cc
+  data.tar.gz: d6666bbf5cd821d6ee4e662ec7e5574bbcfd09ef63d9979c4fca32062cd5d35c36f60ceb908a281dbc567660f941550695d8433dfeaed12b8c527b5fc4eb308c

data/app/assets/config/symphonia_manifest.js

@@ -1,5 +1,5 @@
 //= link_tree ../images
 // link_directory ../javascripts/symphonia .js
 // link_directory ../stylesheets/symphonia .css
-//= link ../../javascripts/symphonia/application.js
-//= link ../../stylesheets/symphonia/application.css
+//= link symphonia/application.js
+//= link symphonia/application.css

data/app/controllers/symphonia/accounts_controller.rb

@@ -24,25 +24,18 @@ module Symphonia
       menu_item(:register)
       @user.attributes = user_params
       @user.status = if Symphonia.config[:self_activation_enabled]
-                       @user.class.statuses[:active]
+                       :active
                      else
-                       @user.class.statuses[:pending]
+                       :pending
                      end
       respond_to do |format|
-        verified = if defined?(Recaptcha)
-                     @user.valid? && verify_recaptcha(model: @user)
-                   else
-                     true
-                   end
-        if verified && @user.save
+        if @user.valid? && verify_registration && @user.save(validate: false)
           Notifier.activation_user(@user).deliver_now
           Notifier.user_registered(@user).deliver_now
           format.html { redirect_to '/', notice: t(:text_user_registered) }
           format.json { render status: :created }
         else
-          format.html {
-            render action: 'register'
-          }
+          format.html { render action: 'register' }
           format.json { render json: @user.errors, status: :unprocessable_entity }
         end
       end
@@ -63,9 +56,7 @@ module Symphonia
           format.json { head :no_content }
           format.js
         else
-          format.html {
-            render action: 'edit'
-          }
+          format.html { render action: 'edit' }
           format.json { render json: @user.errors, status: :unprocessable_entity }
         end
       end
@@ -95,7 +86,7 @@ module Symphonia
       @user = find_account_by_token(params[:activation_code])
       if @user
         @user.activate!
-        redirect_to(login_path, notice: t(:text_activation_success))
+        redirect_to login_path, notice: t(:text_activation_success)
       else
         redirect_to root_path, flash: { error: t(:text_user_not_found_or_token_invalid) }
       end
@@ -165,6 +156,15 @@ module Symphonia
       User.find_using_perishable_token(id, 1.week)
     end
 
+    # @return [Boolean]
+    def verify_registration
+      if defined?(Recaptcha)
+        verify_recaptcha(model: @user)
+      else
+        true
+      end
+    end
+
   end
 
 end

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

@@ -35,7 +35,7 @@
     </div>
     <footer class="footer d-print-none">
       <div class="container text-center">
-        &copy; Lukáš Pokorný
+<!--        &copy; Lukáš Pokorný-->
         <%= yield :footer %>
       </div>
     </footer>

data/lib/generators/symphonia/setup/templates/500.html

@@ -4,14 +4,15 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>500 INTERNAL SERVER ERROR</title>
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" />
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
+  <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
+  <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
 </head>
 
 <body>
-  <!-- This file lives in public/500.html -->
-  <br />
-  <div class="rows">
+<!-- This file lives in public/500.html -->
+<br />
+<div class="container">
+  <div class="row">
     <p class="col-sm-6 col-md-3">
       <i class="fa fa-exclamation-triangle fa-5x" id="internal_static_page_sign" style="font-size: 20em"></i>
     </p>
@@ -33,5 +34,6 @@
       </ul>
     </div>
   </div>
+</div>
 </body>
 </html>

data/lib/symphonia/version.rb

@@ -1,3 +1,3 @@
 module Symphonia
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/spec/models/attachment_spec.rb

@@ -15,8 +15,8 @@ describe Symphonia::Attachment do
 
   context 'images' do
     let(:image) { FactoryBot.create(:image) }
-    it '#create' do
+    it '#create', pending: "When `identify` missing" do
       expect { image }.to change(described_class, :count).by 1
     end
   end
-end
+end

data/spec/requests/attachments_controller_spec.rb

@@ -12,7 +12,7 @@ describe Symphonia::AttachmentsController, logged: true do
     expect{ delete(symphonia.attachment_path(file)) }.to change(Symphonia::Attachment, :count).by -1
   end
 
-  it '#reorder' do
+  it '#reorder', pending: "When `identify` missing" do
     expect { images }.to change(Symphonia::Image, :count).by 3
     patch symphonia.reorder_attachment_path images.last, 1
     expect(response).to have_http_status :success
@@ -20,4 +20,4 @@ describe Symphonia::AttachmentsController, logged: true do
     expect(imgs.first.id).to be > imgs.last.id
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2019-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake