biovision-poll 0.0.170908 → 0.1.180917.0

data/db/migrate/20170906000001_create_polls.rb

@@ -3,9 +3,9 @@ class CreatePolls < ActiveRecord::Migration[5.1]
     unless Poll.table_exists?
       create_table :polls do |t|
         t.timestamps
-        t.references :user, foreign_key: true, null: false, on_update: :cascade, on_delete: :cascade
-        t.references :region, foreign_key: true, on_update: :cascade, on_delete: :cascade
-        t.references :agent, foreign_key: true, on_update: :cascade, on_delete: :nullify
+        t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+        t.integer :region_id, index: true
+        t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
         t.inet :ip
         t.integer :pollable_id
         t.string :pollable_type
@@ -14,6 +14,7 @@ class CreatePolls < ActiveRecord::Migration[5.1]
         t.boolean :show_on_homepage, default: true, null: false
         t.boolean :anonymous_votes, default: true, null: false
         t.boolean :open_results, default: true, null: false
+        t.boolean :exclusive, default: false, null: false
         t.date :end_date
         t.integer :poll_questions_count, default: 0, null: false
         t.integer :comments_count, default: 0, null: false
@@ -22,6 +23,10 @@ class CreatePolls < ActiveRecord::Migration[5.1]
         t.string :description
       end
 
+      if Gem.loaded_specs.key?('biovision-regions')
+        add_foreign_key :polls, :regions, column: :region_id, on_update: :cascade, on_delete: :cascade
+      end
+
       create_privileges
     end
   end
@@ -32,20 +37,28 @@ class CreatePolls < ActiveRecord::Migration[5.1]
     end
   end
 
+  private
+
   def create_privileges
-    Privilege.create(slug: 'chief_poll_manager', name: 'Главный управляющий опросами')
+    Privilege.create(
+      slug: 'chief_poll_manager',
+      name: 'Главный управляющий опросами',
+      administrative: true
+    )
     chief = Privilege.find_by!(slug: 'chief_poll_manager')
 
     Privilege.create(
       slug: 'poll_manager',
       name: 'Управляющий опросами центра',
-      parent_id: chief
+      parent_id: chief,
+      administrative: true
     )
     Privilege.create(
       slug: 'regional_poll_manager',
       name: 'Управляющий опросами региона',
       parent_id: chief,
-      regional: true
+      regional: true,
+      administrative: true
     )
 
     PrivilegeGroup.create(slug: 'poll_managers', name: 'Управляющие опросами')

data/db/migrate/20170906000002_create_poll_questions.rb

@@ -3,7 +3,7 @@ class CreatePollQuestions < ActiveRecord::Migration[5.1]
     unless PollQuestion.table_exists?
       create_table :poll_questions do |t|
         t.timestamps
-        t.references :poll, foreign_key: true, null: false, on_update: :cascade, on_delete: :cascade
+        t.references :poll, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
         t.integer :priority, limit: 2, default: 1, null: false
         t.integer :poll_answers_count, default: 0, null: false
         t.boolean :multiple_choice, default: false, null: false

data/db/migrate/20170906000003_create_poll_answers.rb

@@ -3,7 +3,7 @@ class CreatePollAnswers < ActiveRecord::Migration[5.1]
     unless PollAnswer.table_exists?
       create_table :poll_answers do |t|
         t.timestamps
-        t.references :poll_question, foreign_key: true, null: false, on_update: :cascade, on_delete: :cascade
+        t.references :poll_question, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
         t.integer :priority, limit: 2, default: 1, null: false
         t.integer :poll_votes_count, default: 0, null: false
         t.string :image

data/db/migrate/20170906000004_create_poll_votes.rb

@@ -3,11 +3,11 @@ class CreatePollVotes < ActiveRecord::Migration[5.1]
     unless PollVote.table_exists?
       create_table :poll_votes do |t|
         t.timestamps
-        t.references :poll_answer, foreign_key: true, null: false, on_update: :cascade, on_delete: :cascade
+        t.references :poll_answer, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
         t.references :user, foreign_key: true, on_update: :cascade, on_delete: :cascade
         t.references :agent, foreign_key: true, on_update: :cascade, on_delete: :nullify
         t.inet :ip
-        t.string :footprint
+        t.string :slug
       end
     end
   end

data/db/migrate/20180412000010_create_poll_users.rb

@@ -0,0 +1,21 @@
+class CreatePollUsers < ActiveRecord::Migration[5.2]
+  def up
+    unless PollUser.table_exists?
+      create_table :poll_users do |t|
+        t.timestamps
+        t.references :poll, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+        t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      end
+    end
+
+    unless column_exists? :polls, :exclusive
+      add_column :polls, :exclusive, :boolean, default: false, null: false
+    end
+  end
+
+  def down
+    if PollUser.table_exists?
+      drop_table :poll_users
+    end
+  end
+end

data/db/migrate/20180903111111_rename_vote_footprint.rb

@@ -0,0 +1,11 @@
+class RenameVoteFootprint < ActiveRecord::Migration[5.2]
+  def up
+    if column_exists?(:poll_votes, :footprint)
+      rename_column :poll_votes, :footprint, :slug
+    end
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/lib/biovision/poll/engine.rb

@@ -1,14 +1,18 @@
 module Biovision
   module Poll
-    class Engine < ::Rails::Engine
-      config.assets.precompile << %w(admin.scss)
-      config.assets.precompile << %w(biovision/base/icons/*)
-      config.assets.precompile << %w(biovision/base/placeholders/*)
-    end
-
     require 'biovision/base'
     require 'carrierwave'
     require 'carrierwave-bombshelter'
     require 'mini_magick'
+
+    class Engine < ::Rails::Engine
+      config.assets.precompile << %w(admin.scss)
+      config.assets.precompile << %w(biovision/base/**/*)
+
+      config.generators do |g|
+        g.test_framework :rspec
+        g.fixture_replacement :factory_bot, :dir => 'spec/factories'
+      end
+    end
   end
 end

data/lib/biovision/poll/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Poll
-    VERSION = '0.0.170908'
+    VERSION = '0.1.180917.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-poll
 version: !ruby/object:Gem::Version
-  version: 0.0.170908
+  version: 0.1.180917.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2018-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,35 +193,49 @@ files:
 - app/models/poll.rb
 - app/models/poll_answer.rb
 - app/models/poll_question.rb
+- app/models/poll_user.rb
 - app/models/poll_vote.rb
 - app/uploaders/poll_image_uploader.rb
+- app/views/admin/index/dashboard/_biovision_poll.html.erb
 - app/views/admin/poll_answers/entity/_in_list.html.erb
 - app/views/admin/poll_answers/show.html.erb
-- app/views/admin/poll_questions/_toggleable.html.erb
 - app/views/admin/poll_questions/entity/_in_list.html.erb
 - app/views/admin/poll_questions/show.html.erb
+- app/views/admin/poll_users/entity/_in_list.html.erb
 - app/views/admin/poll_votes/entity/_in_list.html.erb
 - app/views/admin/polls/_nav_item.html.erb
-- app/views/admin/polls/_toggleable.html.erb
 - app/views/admin/polls/entity/_in_list.html.erb
+- app/views/admin/polls/entity/_user_filter.html.erb
 - app/views/admin/polls/index.html.erb
 - app/views/admin/polls/show.html.erb
+- app/views/admin/polls/users.html.erb
+- app/views/admin/polls/users.jbuilder
 - app/views/layouts/biovision/poll/application.html.erb
 - app/views/poll_answers/_form.html.erb
+- app/views/poll_answers/_poll_answer.html.erb
 - app/views/poll_answers/edit.html.erb
 - app/views/poll_answers/new.html.erb
 - app/views/poll_questions/_form.html.erb
+- app/views/poll_questions/_poll_question.html.erb
 - app/views/poll_questions/edit.html.erb
 - app/views/poll_questions/new.html.erb
 - app/views/polls/_form.html.erb
+- app/views/polls/_list.html.erb
+- app/views/polls/_poll.html.erb
 - app/views/polls/edit.html.erb
+- app/views/polls/entity/_in_list.html.erb
+- app/views/polls/index.html.erb
 - app/views/polls/new.html.erb
+- app/views/polls/results.html.erb
+- app/views/polls/show.html.erb
 - config/locales/polls-ru.yml
 - config/routes.rb
 - db/migrate/20170906000001_create_polls.rb
 - db/migrate/20170906000002_create_poll_questions.rb
 - db/migrate/20170906000003_create_poll_answers.rb
 - db/migrate/20170906000004_create_poll_votes.rb
+- db/migrate/20180412000010_create_poll_users.rb
+- db/migrate/20180903111111_rename_vote_footprint.rb
 - lib/biovision/poll.rb
 - lib/biovision/poll/engine.rb
 - lib/biovision/poll/version.rb
@@ -246,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Polls for biovision-based applications

data/app/views/admin/poll_questions/_toggleable.html.erb

@@ -1,7 +0,0 @@
-<div class="toggleable" data-url="<%= toggle_admin_poll_question_path(entity) %>">
-  <% PollQuestion.toggleable_attributes.each do |flag| %>
-  <span class="<%= entity.attributes[flag.to_s] ? 'active' : 'inactive' %>" data-flag="<%= flag %>">
-    <%= t("activerecord.attributes.poll_question.#{flag}") %>
-  </span>
-  <% end %>
-</div>

data/app/views/admin/polls/_toggleable.html.erb

@@ -1,7 +0,0 @@
-<div class="toggleable" data-url="<%= toggle_admin_poll_path(entity) %>">
-  <% Poll.toggleable_attributes.each do |flag| %>
-  <span class="<%= entity.attributes[flag.to_s] ? 'active' : 'inactive' %>" data-flag="<%= flag %>">
-    <%= t("activerecord.attributes.poll.#{flag}") %>
-  </span>
-  <% end %>
-</div>