biovision-vote 0.1.1.170713 → 0.1.2.170925

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d1fceb881320631d5c9d0a3808fb2d333e8a50f
-  data.tar.gz: 6779b532195a2a5b6388a49a03b82a04eb718514
+  metadata.gz: 2896e74fd3e5c25c96555df47134054a1dd6f590
+  data.tar.gz: 9864256f76fcc4c69b4a8e3a051f92ec7a1278f0
 SHA512:
-  metadata.gz: 7fa528b1e84ff60e750cf4988fa2759307d91013b68109aeb622b73c5cd098a80791babbb2e85f065eea455f02e12247b07c5f64541eb1b8a5f9a507366924f7
-  data.tar.gz: ef480eada0e9169f2024415c6c8886524b44fe5d06e041106b96acf72e60fd17c16be489bfa43fc8ca8da4a6184154311a3df50715427f535cb9b6ca7bcda038
+  metadata.gz: 2e04835cfee1d598a18143385563b64aaa394368bf5cf419cff484e45265579d8a1823ce1f5413827cb7b7bb76801e8ab612d20fd8083dd6cfd1ea60f9f3ad97
+  data.tar.gz: d34535db6f6717c29c73268052f0f578713bc1da3ec0c26a9af184f0a72345daab2054b57727d970f8aa8d116bc78d8775ab53e818c1c07efdca5a1bca61f60a

data/README.md

@@ -11,7 +11,7 @@ Biovision::Vote
 Для возможности голосовать за модель у неё должны быть поля такого вида:
 
 ```ruby
-class AddVotableToModels < ActiveRecord::Migration[5.0]
+class AddVotableToModels < ActiveRecord::Migration[5.1]
   def change
     add_column :posts, :upvote_count, :integer, default: 0, null: false
     add_column :posts, :downvote_count, :integer, default: 0, null: false
@@ -26,9 +26,11 @@ end
 Допустимость голосования определяется методом `VotableItem#votable_by?`, который
 можно переопределить в моделях, если требуется.
 
-Для ссылки на голосуемый объект в админке и за её пределами нужно в какой-нибудь
-помощник добавить методы `votable_item_link(entity)` 
-и `admin_votable_item_link(entity)`.
+Чтобы заработал фронт, нужно в `application.js` добавить это:
+
+```javascript
+//= require biovision/vote/biovision-vote.js
+```
 
 ## Installation
 Add this line to your application's Gemfile:

data/app/assets/images/biovision/vote/icons/downvote-active.svg

@@ -1,3 +1,3 @@
-<svg version="1.1" baseProfile="full" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" baseProfile="full" viewBox="0 0 24 24" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
   <polyline points="9 2, 9 12, 4 12, 11 21, 13 21, 20 12, 15 12, 15 2, 9 2" fill="#822" stroke="#844" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 </svg>

data/app/assets/images/biovision/vote/icons/downvote-error.svg

@@ -1,3 +1,3 @@
-<svg version="1.1" baseProfile="full" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" baseProfile="full" viewBox="0 0 24 24" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
   <polyline points="9 2, 9 12, 4 12, 11 21, 13 21, 20 12, 15 12, 15 2, 9 2" fill="#888" stroke="#444" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 </svg>

data/app/assets/images/biovision/vote/icons/downvote-switch.svg

@@ -1,3 +1,3 @@
-<svg version="1.1" baseProfile="full" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" baseProfile="full" viewBox="0 0 24 24" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
   <polyline points="9 2, 9 12, 4 12, 11 21, 13 21, 20 12, 15 12, 15 2, 9 2" fill="#ff4" stroke="#884" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 </svg>

data/app/assets/images/biovision/vote/icons/downvote.svg

@@ -1,3 +1,3 @@
-<svg version="1.1" baseProfile="full" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" baseProfile="full" viewBox="0 0 24 24" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
   <polyline points="9 2, 9 12, 4 12, 11 21, 13 21, 20 12, 15 12, 15 2, 9 2" fill="none" stroke="#844" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 </svg>

data/app/assets/images/biovision/vote/icons/upvote-active.svg

@@ -1,3 +1,3 @@
-<svg version="1.1" baseProfile="full" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" baseProfile="full" viewBox="0 0 24 24" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
   <polyline points="9 21, 9 11, 4 11, 11 2, 13 2, 20 11, 15 11, 15 21, 9 21" fill="#282" stroke="#484" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 </svg>

data/app/assets/images/biovision/vote/icons/upvote-error.svg

@@ -1,3 +1,3 @@
-<svg version="1.1" baseProfile="full" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" baseProfile="full" viewBox="0 0 24 24" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
   <polyline points="9 21, 9 11, 4 11, 11 2, 13 2, 20 11, 15 11, 15 21, 9 21" fill="#888" stroke="#444" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 </svg>

data/app/assets/images/biovision/vote/icons/upvote-switch.svg

@@ -1,3 +1,3 @@
-<svg version="1.1" baseProfile="full" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" baseProfile="full" viewBox="0 0 24 24" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
   <polyline points="9 21, 9 11, 4 11, 11 2, 13 2, 20 11, 15 11, 15 21, 9 21" fill="#ff4" stroke="#884" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 </svg>

data/app/assets/images/biovision/vote/icons/upvote.svg

@@ -1,3 +1,3 @@
-<svg version="1.1" baseProfile="full" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" baseProfile="full" viewBox="0 0 24 24" width="24" height="24" xmlns="http://www.w3.org/2000/svg">
   <polyline points="9 21, 9 11, 4 11, 11 2, 13 2, 20 11, 15 11, 15 21, 9 21" fill="none" stroke="#484" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 </svg>

data/app/assets/javascripts/biovision/vote/biovision-vote.js

@@ -1,36 +1,45 @@
 'use strict';
 
-$(function () {
-    $('.vote-block.active .vote').on('click', function () {
-        var $button = $(this);
-        var $container = $(this).closest('.vote-block');
-        var votable_id = $container.data('id');
-        var upvote = $(this).hasClass('upvote');
-        var $form = $container.find('form');
-
-        $('#vote_delta_' + votable_id).val(upvote ? '1' : '-1');
-
-        if ($container.hasClass('active')) {
-            $button.addClass('switch');
-
-            $.post($form.attr('action'), $form.serialize(), function (result) {
-                console.log(result);
-                $button.removeClass('switch');
-                if (result.hasOwnProperty('data')) {
-                    var vote_type = result['data']['vote_type'];
-                    var vote_result = result['data']['vote_result'];
-
-                    $container.removeClass('voted-none');
-                    $container.addClass('voted-' + vote_type);
-                    $container.find('.result').html(vote_result);
-                }
-            }).fail(function(result) {
-                $button.removeClass('switch');
-                $button.addClass('error');
-                handle_ajax_failure(result);
-            });
-        }
-
-        $container.removeClass('active');
+document.addEventListener('DOMContentLoaded', function () {
+    document.querySelectorAll('.vote-block.active .vote').forEach(function (element) {
+        element.addEventListener('click', function () {
+            const $button = this;
+            const $container = $button.closest('.vote-block');
+            const votable_id = $container.getAttribute('data-id');
+            const upvote = $button.classList.contains('upvote');
+
+            document.getElementById('vote_delta_' + votable_id).value = upvote ? '1' : '-1';
+
+            if ($container.classList.contains('active')) {
+                const $form = $container.querySelector('form');
+                const on_success = function () {
+                    const result = JSON.parse(this.responseText);
+
+                    $button.classList.remove('switch');
+                    if (result.hasOwnProperty('data')) {
+                        const vote_type = result['data']['vote_type'];
+                        const vote_result = result['data']['vote_result'];
+
+                        $container.classList.remove('voted-none');
+                        $container.classList.add('voted-' + vote_type);
+                        $container.querySelector('.result').innerHTML = vote_result;
+                    }
+                };
+
+                const on_failure = function(result) {
+                    $button.classList.remove('switch');
+                    $button.classList.add('error');
+                    handle_ajax_failure(result);
+                };
+
+                const request = Biovision.new_ajax_request('POST', $form.getAttribute('action'), on_success, on_failure);
+
+                $button.classList.add('switch');
+
+                request.send(new FormData($form));
+            }
+
+            $container.classList.remove('active');
+        });
     });
 });

data/app/assets/stylesheets/biovision/vote/vote.scss

@@ -1,5 +1,3 @@
-$font-size-decreased: 1.2rem !default;
-
 .vote-block {
   align-items: center;
   display: flex;
@@ -78,8 +76,9 @@ $font-size-decreased: 1.2rem !default;
   }
 
   .result {
-    font-size: $font-size-decreased;
+    font-size: 1.2rem;
+    line-height: 1.2rem;
     padding: 0 .8rem;
     text-align: center;
   }
-}
+}

data/app/helpers/biovision/vote/application_helper.rb

@@ -9,6 +9,19 @@ module Biovision
           image_tag('biovision/vote/icons/downvote-active.svg', alt: '⇩')
         end
       end
+
+      # @param [ApplicationRecord] entity
+      def biovision_votable_link(entity)
+        text = entity.model_name.human
+        if entity.respond_to?(:title)
+          text << " «#{entity.title}»"
+        elsif entity.respond_to?(:name)
+          text << " «#{entity.name}»"
+        else
+          text << " №#{entity.id}"
+        end
+        link_to(text, entity)
+      end
     end
   end
 end

data/app/views/admin/votes/entity/_in_list.html.erb

@@ -3,11 +3,10 @@
 </div>
 <div class="data">
   <div>
-    <%= entity.votable.model_name.human %>
-    <cite><%= admin_votable_link(entity.votable) %></cite>
+    <%= biovision_votable_link(entity.votable) %>
   </div>
   <div class="info">
-    <%= admin_user_link(votable.user) %>
+    <%= admin_user_link(entity.user) %>
   </div>
   <div class="secondary info">
     <%= time_tag(entity.created_at) %>

data/app/views/admin/votes/index.html.erb

@@ -1,6 +1,9 @@
-<% content_for :meta_title, t('.title') %>
+<% content_for :meta_title, t('.title', page: current_page) %>
+<% content_for :breadcrumbs do %>
+    <span><%= t('admin.votes.nav_item.text') %></span>
+<% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
   <ul class="actions">
     <li><%= back_icon(admin_path) %></li>

data/lib/biovision/vote/engine.rb

@@ -1,6 +1,14 @@
 module Biovision
   module Vote
+    require 'biovision/base'
+
     class Engine < ::Rails::Engine
+      config.assets.precompile << %w(biovision/vote/**/*)
+
+      config.generators do |g|
+        g.test_framework :rspec
+        g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      end
     end
   end
 end

data/lib/biovision/vote/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Vote
-    VERSION = '0.1.1.170713'
+    VERSION = '0.1.2.170925'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-vote
 version: !ruby/object:Gem::Version
-  version: 0.1.1.170713
+  version: 0.1.2.170925
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Voting functionality for biovision-based applications