decidim-sortitions 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b50e775b1ca8007aad074d1b0cecf9e203f179daf9832f353909cd370e86a9d4
-  data.tar.gz: 670acdc7e067b9e13b7c8d41c814fc640f966bdd850ae034ce26951dacc5f617
+  metadata.gz: 6b07ede6673cb3573653ce8dc00c008564ccea3fb6dc2f44108fb7978aa7286e
+  data.tar.gz: '02928a5f7d5b6bc4ed06bb25d402567fa7fce23fca3e30eaf9fc5bc94b94936e'
 SHA512:
-  metadata.gz: 83dc42ebe1959ff8ad9c867d9def603ce6779aea8ed2af4790b89f8908cd3824e878a435f8b114e33d69e38573f26be49f98d678aa484257ac988e625f308041
-  data.tar.gz: 8fdf97681c479cb4937021c67e73a23543728c38a3087e2244410ef00774201ac16bea70c9769fe4cb1d846b453ea4912f5613c22f913d0e6f7f02e764486d24
+  metadata.gz: 55992f82ad07b6671b8d7290ed81e0a906bd61d8d61b78e033b0102500179b589289ca27b5d1b519d0d078a753c3005f72ed5e446c464a98bc61f75df2bff680
+  data.tar.gz: acb31598de2b07bb4d4a100360802a46a0a07dac05d430288c18807113a5f1ec1a3604a642948af7ea7be04334eb050641a723fcb5e34aef5b9a8475181551da

data/app/cells/decidim/sortitions/sortition_m_cell.rb

@@ -28,11 +28,13 @@ module Decidim
 
       def badge_name
         return t("filters.cancelled", scope: "decidim.sortitions.sortitions") if model.cancelled?
+
         t("filters.active", scope: "decidim.sortitions.sortitions")
       end
 
       def state_classes
         return ["muted"] if model.cancelled?
+
         ["success"]
       end
 

data/app/commands/decidim/sortitions/admin/create_sortition.rb

@@ -23,7 +23,6 @@ module Decidim
 
           ActiveRecord::Base.transaction do
             sortition = create_sortition
-            categorize(sortition) if form.decidim_category_id.present?
             select_proposals_for(sortition)
             send_notification(sortition)
 
@@ -49,15 +48,13 @@ module Decidim
             witnesses: form.witnesses,
             additional_info: form.additional_info,
             selected_proposals: [],
-            candidate_proposals: []
+            candidate_proposals: [],
+            category: category
           )
         end
 
-        def categorize(sortition)
-          Decidim::Categorization.create!(
-            decidim_category_id: form.decidim_category_id,
-            categorizable: sortition
-          )
+        def category
+          Decidim::Category.find(form.decidim_category_id) if form.decidim_category_id.present?
         end
 
         def select_proposals_for(sortition)

data/app/commands/decidim/sortitions/admin/destroy_sortition.rb

@@ -20,6 +20,7 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
+
           destroy_sortition
           broadcast(:ok, sortition)
         end

data/app/controllers/concerns/decidim/sortitions/orderable.rb

@@ -9,15 +9,10 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        helper_method :order, :available_orders, :random_seed
+        include Decidim::Orderable
 
         private
 
-        # Gets how the proposals should be ordered based on the choice made by the user.
-        def order
-          @order ||= detect_order(params[:order]) || default_order
-        end
-
         # Available orders based on enabled settings
         def available_orders
           %w(random recent)
@@ -27,15 +22,6 @@ module Decidim
           "recent"
         end
 
-        # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
-        def random_seed
-          @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
-        end
-
-        def detect_order(candidate)
-          available_orders.detect { |order| order == candidate }
-        end
-
         def reorder(sortitions)
           case order
           when "random"

data/app/controllers/decidim/sortitions/sortitions_controller.rb

@@ -6,7 +6,7 @@ module Decidim
     class SortitionsController < Decidim::Sortitions::ApplicationController
       helper Decidim::WidgetUrlsHelper
       include FilterResource
-      include Orderable
+      include Decidim::Sortitions::Orderable
       include Paginable
 
       helper_method :sortition

data/app/models/decidim/sortitions/sortition.rb

@@ -12,6 +12,7 @@ module Decidim
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Comments::Commentable
+      include Decidim::Randomable
 
       component_manifest_name "sortitions"
 
@@ -76,13 +77,6 @@ module Decidim
         true
       end
 
-      def self.order_randomly(seed)
-        transaction do
-          connection.execute("SELECT setseed(#{connection.quote(seed)})")
-          order(Arel.sql("RANDOM()")).load
-        end
-      end
-
       # Public: Whether the object can have new comments or not.
       def user_allowed_to_comment?(user)
         can_participate_in_space?(user)

data/app/views/decidim/sortitions/sortitions/_sortitions.html.erb

@@ -11,4 +11,4 @@
 <div class="row small-up-1 medium-up-2 card-grid">
   <%= render @sortitions %>
 </div>
-<%= decidim_paginate @sortitions, random_seed: random_seed %>
+<%= decidim_paginate @sortitions %>

data/app/views/decidim/sortitions/sortitions/show.html.erb

@@ -101,7 +101,7 @@
         </div>
 
         <div class="sortition-details-item">
-          <span class="sortition-details-title sortition-details-text"><%= t ".algorithm" %></span><br />
+          <span class="sortition-details-title sortition-details-text"><%= t ".algorithm" %></span><br>
           <span class=sortition-details-text>
             <%= link_to Decidim::Sortitions.sortition_algorithm,
                         Decidim::Sortitions.sortition_algorithm,
@@ -129,6 +129,3 @@
 </div>
 
 <%= comments_for sortition %>
-
-<%= javascript_include_tag "decidim/sortitions/social_share" %>
-<%= stylesheet_link_tag "decidim/sortitions/social_share" %>

data/config/locales/nl.yml

@@ -147,5 +147,5 @@ nl:
           deleted: Verwijderde gebruiker
         sortitions_count:
           count:
-            one: 1 sortering
+            one: 1 loting
             other: "%{count} lotingen"

data/lib/decidim/sortitions/engine.rb

@@ -18,10 +18,6 @@ module Decidim
         root to: "sortitions#index"
       end
 
-      initializer "decidim_sorititions.assets" do |app|
-        app.config.assets.precompile += %w(decidim_sortitions_manifest.js decidim_sortitions_manifest.css)
-      end
-
       initializer "decidim_sortitions.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Sortitions::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Sortitions::Engine.root}/app/views") # for proposal partials

data/lib/decidim/sortitions/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     def self.version
-      "0.18.1"
+      "0.19.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-sortitions
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
@@ -16,84 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
-- !ruby/object:Gem::Dependency
-  name: social-share-button
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 description: This module makes possible to select amont a set of proposal by sortition
 email:
 - jsperezg@gmail.com
@@ -103,13 +89,9 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/decidim_sortitions_manifest.css
-- app/assets/config/decidim_sortitions_manifest.js
 - app/assets/images/decidim/sortitions/icon.svg
 - app/assets/javascripts/decidim/sortitions/admin/sortitions.js
-- app/assets/javascripts/decidim/sortitions/social_share.js
 - app/assets/stylesheets/decidim/sortitions/_sortitions.scss
-- app/assets/stylesheets/decidim/sortitions/social_share.css.scss
 - app/cells/decidim/sortitions/sortition_cell.rb
 - app/cells/decidim/sortitions/sortition_m/data.erb
 - app/cells/decidim/sortitions/sortition_m/footer.erb
@@ -162,7 +144,6 @@ files:
 - app/views/decidim/sortitions/sortitions/index.html.erb
 - app/views/decidim/sortitions/sortitions/index.js.erb
 - app/views/decidim/sortitions/sortitions/show.html.erb
-- config/initializers/social_share_button.rb
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
 - config/locales/ca.yml

data/app/assets/config/decidim_sortitions_manifest.css

@@ -1 +0,0 @@
-/* = link decidim/sortitions/social_share.css.scss */

data/app/assets/config/decidim_sortitions_manifest.js

@@ -1 +0,0 @@
-//= link decidim/sortitions/social_share.js

data/app/assets/javascripts/decidim/sortitions/social_share.js

@@ -1,2 +0,0 @@
-// = require social-share-button
-// = require_self

data/app/assets/stylesheets/decidim/sortitions/social_share.css.scss

@@ -1,22 +0,0 @@
-/*
- *= require social-share-button
- */
-
-$size: 45px;
-
-.share-link:hover{
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.social-share-button{
-  display: inline-block;
-  vertical-align: top;
-
-  .ssb-icon{
-    margin-right: 5px;
-    background-size: $size $size;
-    height: $size;
-    width: $size;
-  }
-}

data/config/initializers/social_share_button.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-SocialShareButton.configure do |config|
-  config.allow_sites = %w(twitter facebook google_plus)
-end