decidim-dev 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b419f6b877873e6973b695d71c7acc55241beb4
-  data.tar.gz: aa684779d3a4ddaf048d2497673a905626ffd8ad
+  metadata.gz: e5fcec34b9e3326c82e1fd21f747ac9c512a93e1
+  data.tar.gz: 3a5454b2b66e730cbbd9ef52a49e9f4aa81961ca
 SHA512:
-  metadata.gz: 3baff9c589fb5ea04128ec6b29d2027b7b9d39ef7ae267a20f54a05889b91eea2c3b743448a2da7ecaef618effb8fb161ffc407ffcc8c00c728de41646092eec
-  data.tar.gz: 6ca808973ce0f262d169de313e6d078376fd91a638673a761e51213e053ae6a9ca497300347ba0b0729ade8f016f2b787c142eeecfd9f65143c5f76ed8b30e07
+  metadata.gz: 155c8491f7c2f3c019b1b03d5ae57560d09a445bd0a7d591b861c9d2b98242b7f0daf5995a7ef010ebeb6dd88a10783b2a5b05fb4cd3909ad548eba7cb9bbd70
+  data.tar.gz: 7199c58b5414234338ac34a9749ce903dea7fdd66caf9fc7e3355caf2ace6bd2570dfd9925ad1118cf0811fbeb8f6c0aaa07c649498474b4689d34e0fd85559b

data/config/locales/ca.yml

@@ -1,9 +1,10 @@
+---
 ca:
   decidim:
     dummy:
       admin:
         exports:
-          dummies: "Maniquins"
+          dummies: Maniquins
     resource_links:
       test_link:
         dummy_resource_dummy: Fictici relacionat

data/config/locales/en.yml

@@ -1,9 +1,10 @@
+---
 en:
   decidim:
     dummy:
       admin:
         exports:
-          dummies: "Dummies"
+          dummies: Dummies
     resource_links:
       test_link:
         dummy_resource_dummy: Related dummy

data/config/locales/es.yml

@@ -1,9 +1,10 @@
+---
 es:
   decidim:
     dummy:
       admin:
         exports:
-          dummies: "Maniquíes"
+          dummies: Maniquíes
     resource_links:
       test_link:
         dummy_resource_dummy: Ficticio relacionado

data/config/locales/eu.yml

@@ -3,7 +3,7 @@ eu:
     dummy:
       admin:
         exports:
-          dummies: "Manikiak"
+          dummies: Manikiak
     resource_links:
       test_link:
         dummy_resource_dummy: ' Honi buruzko adibidea '

data/config/locales/fi.yml

@@ -1,5 +1,9 @@
 fi:
   decidim:
+    dummy:
+      admin:
+        exports:
+          dummies: Esimerkkitiedot
     resource_links:
       test_link:
-        dummy_resource_dummy: Liittyvät dummy
+        dummy_resource_dummy: Liittyvät esimerkkitiedot

data/config/locales/fr.yml

@@ -1,5 +1,9 @@
 fr:
   decidim:
+    dummy:
+      admin:
+        exports:
+          dummies: Nuls
     resource_links:
       test_link:
         dummy_resource_dummy: Mannequin apparenté

data/config/locales/it.yml

@@ -3,7 +3,7 @@ it:
     dummy:
       admin:
         exports:
-          dummies: "Risorse Fittizie"
+          dummies: Risorse Fittizie
     resource_links:
       test_link:
         dummy_resource_dummy: Risorse fittizie correlate

data/config/locales/nl.yml

@@ -1,5 +1,9 @@
 nl:
   decidim:
+    dummy:
+      admin:
+        exports:
+          dummies: Dummies
     resource_links:
       test_link:
         dummy_resource_dummy: Gerelateerde dummy

data/config/locales/pl.yml

@@ -3,4 +3,7 @@ pl:
     dummy:
       admin:
         exports:
-          dummies: "Manekiny"
+          dummies: Manekiny
+    resource_links:
+      test_link:
+        dummy_resource_dummy: Podobne manekina

data/config/locales/uk.yml

@@ -0,0 +1,9 @@
+uk:
+  decidim:
+    dummy:
+      admin:
+        exports:
+          dummies: Неробочі псевдо-частини
+    resource_links:
+      test_link:
+        dummy_resource_dummy: Пов'язана неробоча псевдо-частина

data/lib/decidim/dev/test/promoted_participatory_processes_shared_examples.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+shared_examples "with promoted participatory processes" do
+  before do
+    @request.env["decidim.current_organization"] = organization
+  end
+
+  describe "promoted_participatory_processes" do
+    it "orders them by active_step end_date" do
+      create(
+        :participatory_process,
+        :with_steps,
+        :unpublished,
+        :promoted,
+        organization: organization
+      )
+
+      create(
+        :participatory_process,
+        :with_steps,
+        :unpublished,
+        organization: organization
+      )
+
+      last = create(
+        :participatory_process,
+        :with_steps,
+        :published,
+        :promoted,
+        organization: organization
+      )
+      last.active_step.update_attribute(:end_date, nil)
+
+      first = create(
+        :participatory_process,
+        :with_steps,
+        :published,
+        :promoted,
+        organization: organization,
+        end_date: Time.current.advance(days: 10)
+      )
+      first.active_step.update_attribute(:end_date, Time.current.advance(days: 2))
+
+      second = create(
+        :participatory_process,
+        :with_steps,
+        :published,
+        :promoted,
+        organization: organization,
+        end_date: Time.current.advance(days: 8)
+      )
+      second.active_step.update_attribute(:end_date, Time.current.advance(days: 4))
+
+      expect(controller.helpers.promoted_participatory_processes)
+        .to match_array([first, second, last])
+    end
+  end
+end

data/lib/decidim/dev/test/rspec_support/feature.rb

@@ -22,6 +22,11 @@ module Decidim
     end
   end
 
+  class DummyResourceEvent < Events::BaseEvent
+    include Decidim::Events::EmailEvent
+    include Decidim::Events::NotificationEvent
+  end
+
   class DummyResource < ActiveRecord::Base
     include HasFeature
     include Resourceable
@@ -30,20 +35,13 @@ module Decidim
     include HasCategory
     include HasScope
     include Decidim::Comments::Commentable
+    include Followable
 
     feature_manifest_name "dummy"
 
     def reported_content_url
       ResourceLocatorPresenter.new(self).url
     end
-
-    def notifiable?(_context)
-      true
-    end
-
-    def users_to_notify
-      [author]
-    end
   end
 
   class DummyResourcesController < ActionController::Base

data/lib/decidim/dev/test/rspec_support/feature_context.rb

@@ -14,10 +14,10 @@ shared_context "feature" do
   let!(:feature) do
     create(:feature,
            manifest: manifest,
-           participatory_process: participatory_process)
+           participatory_space: participatory_process)
   end
 
-  let!(:category) { create :category, participatory_process: participatory_process }
+  let!(:category) { create :category, participatory_space: participatory_process }
 
   let!(:scope) { create :scope, organization: organization }
 
@@ -57,7 +57,7 @@ shared_context "feature admin" do
   #
   # Returns a url.
   def edit_feature_path(feature)
-    decidim_admin.edit_feature_path(id: feature.id, participatory_process_id: feature.participatory_process.id)
+    Decidim::EngineRouter.admin_proxy(feature.participatory_space).edit_feature_path(feature.id)
   end
 end
 

data/lib/decidim/dev/test/spec_helper.rb

@@ -26,6 +26,7 @@ RSpec.configure do |config|
   config.fail_fast = ENV["FAIL_FAST"] == "true"
   config.infer_spec_type_from_file_location!
   config.mock_with :rspec
+  config.order = :random
   config.raise_errors_for_deprecations!
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your

data/lib/tasks/locale_checker.rake

@@ -2,19 +2,19 @@
 
 namespace :decidim do
   desc "Allows a decidim installation to check whether its locales are complete"
-  task :check_locales do
-    env = {
-      "BUNDLE_GEMFILE" => File.expand_path("Gemfile"),
-      "ENFORCED_LOCALES" => Decidim.available_locales.join(",")
-    }
+  task check_locales: :environment do
+    FileUtils.remove_dir("tmp/decidim_repo", true)
 
-    Bundler.definition.specs.each do |spec|
-      next unless spec.name.match?(/decidim-/)
+    branch = ENV["TARGET_BRANCH"] || "master"
+    status = system("git clone --depth=1 --single-branch --branch #{branch} https://github.com/decidim/decidim tmp/decidim_repo")
+    return unless status
 
-      Dir.chdir(spec.full_gem_path) do
-        Bundler.with_clean_env do
-          system(env, "bundle exec rspec spec/i18n_spec.rb")
-        end
+    Dir.chdir("tmp/decidim_repo") do
+      env = { "ENFORCED_LOCALES" => Decidim.available_locales.join(",") }
+
+      Bundler.with_clean_env do
+        system(env, "bundle install")
+        system(env, "bundle exec rspec spec/i18n_spec.rb")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-dev
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.15.0
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
@@ -88,20 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 3.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 3.6.1
 - !ruby/object:Gem::Dependency
   name: rspec-repeat
   requirement: !ruby/object:Gem::Requirement
@@ -178,14 +172,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.15
+        version: 0.9.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.15
+        version: 0.9.18
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -206,14 +200,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -262,14 +256,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.49.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: db-query-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -339,7 +333,6 @@ files:
 - Rakefile
 - app/assets/images/decidim/dummy.svg
 - app/views/decidim/dummy_resource/_linked_dummys.html.erb
-- config/i18n-tasks.yml
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -349,6 +342,7 @@ files:
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
+- config/locales/uk.yml
 - lib/decidim/dev.rb
 - lib/decidim/dev/assets/Exampledocument.pdf
 - lib/decidim/dev/assets/avatar.jpg
@@ -362,7 +356,7 @@ files:
 - lib/decidim/dev/railtie.rb
 - lib/decidim/dev/test/authorization_shared_examples.rb
 - lib/decidim/dev/test/base_spec_helper.rb
-- lib/decidim/dev/test/i18n_shared_examples.rb
+- lib/decidim/dev/test/promoted_participatory_processes_shared_examples.rb
 - lib/decidim/dev/test/rspec_support/action_mailer.rb
 - lib/decidim/dev/test/rspec_support/active_job.rb
 - lib/decidim/dev/test/rspec_support/attachments.rb

data/config/i18n-tasks.yml

@@ -1,6 +0,0 @@
-base_locale: en
-ignore_unused:
-- "decidim.resource_links.test_link.*"
-- "decidim.dummy.admin.exports.dummies"
-search:
-  strict: false

data/lib/decidim/dev/test/i18n_shared_examples.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require "i18n/tasks"
-
-shared_examples_for "I18n sanity" do
-  let(:locales) do
-    ENV["ENFORCED_LOCALES"].present? ? ENV["ENFORCED_LOCALES"].split(",") : [:en]
-  end
-
-  let(:i18n) { I18n::Tasks::BaseTask.new(locales: locales) }
-  let(:missing_keys) { i18n.missing_keys }
-  let(:unused_keys) { i18n.unused_keys }
-
-  it "does not have missing keys" do
-    expect(missing_keys).to be_empty, "#{missing_keys.inspect} are missing"
-  end
-
-  it "does not have unused keys" do
-    expect(unused_keys).to be_empty, "#{unused_keys.inspect} are unused"
-  end
-
-  it "is normalized" do
-    previous_locale_hashes = locale_hashes
-    i18n.normalize_store!
-    new_locale_hashes = locale_hashes
-
-    expect(previous_locale_hashes).to eq(new_locale_hashes),
-                                      "Please normalize your locale files with `i18n-tasks normalize`"
-  end
-
-  def locale_hashes
-    Dir.glob("config/locales/**/*.yml").inject({}) do |results, file|
-      md5 = Digest::MD5.file(file).hexdigest
-      results.merge(file => md5)
-    end
-  end
-end