decidim 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27bb691103122554a865daf2afc72cfa61f45faf
-  data.tar.gz: 04a47b02b840cadafc126b87571e76a840949035
+  metadata.gz: 1bc82fc62d979f0e9f2cd96d6b40f9915c978b68
+  data.tar.gz: 7da8480f5d6ef8eae53ad0b3fcf00f1c61606bfb
 SHA512:
-  metadata.gz: a1499c8162b78081ee48360fb17747bc51d60528ed615b6396b9ce421d7418d8eba760058696cf1f2a72d4b2a5858c810bc16c5c262b6c6e42064ee088d6185d
-  data.tar.gz: 3ba6a58e6d062ddd98399615339651f2c08ab5d25d02ece837a9ebb487c8a5ba7cc8e0057447546fd2e38d385b3d3c75fe7eab508ac4b6c134a969cf8f974044
+  metadata.gz: 8af8c5e4f0707f774f7ce84b374acf280fffcfa3de1deef879e9fdb39d2c289192c4dbcea7a427402b0e76ccd62a7641ed80214adea66ec65dd4cac52a71002a
+  data.tar.gz: ea561c10b0ad24eecd528c3999a20b22a02ddfe7dcb6215440b395ac2e8517547953b170f1261022b21fa6e67f6ef799fa14cffe8ca8656ea1ff465d9b19953e

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## [Unreleased](https://github.com/decidim/decidim/tree/HEAD)
 
+## [v0.6.1](https://github.com/decidim/decidim/tree/v0.6.1) (2017-09-15)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.6.0...v0.6.1)
+
+**Fixed**
+
+- **decidim**: Use the same set of dependencies for the generated applications. [\#1845](https://github.com/decidim/decidim/pull/1845)
+- **decidim-core**: Remove `distinct` from `Resourcable` concern which was causing the wrong behaviour computing some data in `decidim-results`.  [\#1845](https://github.com/decidim/decidim/pull/1845)
+
 ## [v0.6.0](https://github.com/decidim/decidim/tree/v0.6.0) (2017-09-15)
 [Full Changelog](https://github.com/decidim/decidim/compare/v0.5.1...v0.6.0)
 
@@ -14,8 +22,6 @@
 - **decidim-proposals**: Fix incorrect button displayed when proposal creation not enabled. [\#1847](https://https://github.com/decidim/decidim/pull/1847)
 - **decidim-surveys**: Drag & drop icon incorrectly rendered in form. [\#1761](https://https://github.com/decidim/decidim/pull/1761)
 
-[Full Changelog](https://github.com/decidim/decidim/compare/v0.5.1...HEAD)
-
 **Added**
 
 - **decidim**: Support for multiple participatory spaces via custom plugins. [\#1659](https://https://github.com/decidim/decidim/pull/1659)
@@ -24,6 +30,7 @@
 - **decidim**: Add a flag for users so they can enable/disable emails on notifications. [\#1812](https://https://github.com/decidim/decidim/pull/1812)
 - **decidim**: Added Ukrainian language. [\#1804](https://https://github.com/decidim/decidim/pull/1804)
 - **decidim-assemblies**: New optional beta plugin to manage participatory organs A.K.A. assemblies. [\#1659](https://https://github.com/decidim/decidim/pull/1659)
+- **decidim-comments**: Deprecate old comment notifications system in favor of the new one. Read [create_followers_from_resource_authors.md](https://github.com/decidim/decidim/blob/master/docs/create_followers_from_resource_authors.md) and [create_followers_from_comment_authors.md](https://github.com/decidim/decidim/blob/master/docs/create_followers_from_comment_authors.md) to create resource followers so they are notified when a comment is created. [\#1831](https://github.com/decidim/decidim/pull/1831)
 - **decidim-meetings**: Let users follow meetings. Updating or closing a meeting will send a notification and an email to the users following that meeting. [\#1784](https://https://github.com/decidim/decidim/pull/1784)
 - **decidim-meetings**: When joining a meeting the user receives an email with its calendar information. [\#1803](https://https://github.com/decidim/decidim/pull/1803)
 - **decidim-meetings**: Users following a meeting receives a notification 48h before it starts. [\#1811](https://https://github.com/decidim/decidim/pull/1811)
@@ -35,7 +42,6 @@
 **Changed**
 
 - **decidim-core**: Prevent creation of a `Organization` with a `default_locale` not present in `available_locales`. [\#1754](https://github.com/decidim/decidim/pull/1754)
-- **decidim-comments**: Deprecate old comment notifications system in favor of the new one. Read [create_followers_from_resource_authors.md](https://github.com/decidim/decidim/blob/master/docs/create_followers_from_resource_authors.md) and [create_followers_from_comment_authors.md](https://github.com/decidim/decidim/blob/master/docs/create_followers_from_comment_authors.md) to create resource followers so they are notified when a comment is created. [\#1831](https://github.com/decidim/decidim/pull/1831)
 
 **Fixed**
 

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    decidim (0.6.0)
-      decidim-admin (= 0.6.0)
-      decidim-api (= 0.6.0)
-      decidim-budgets (= 0.6.0)
-      decidim-comments (= 0.6.0)
-      decidim-core (= 0.6.0)
-      decidim-meetings (= 0.6.0)
-      decidim-pages (= 0.6.0)
-      decidim-participatory_processes (= 0.6.0)
-      decidim-proposals (= 0.6.0)
-      decidim-results (= 0.6.0)
-      decidim-surveys (= 0.6.0)
-      decidim-system (= 0.6.0)
-    decidim-admin (0.6.0)
+    decidim (0.6.1)
+      decidim-admin (= 0.6.1)
+      decidim-api (= 0.6.1)
+      decidim-budgets (= 0.6.1)
+      decidim-comments (= 0.6.1)
+      decidim-core (= 0.6.1)
+      decidim-meetings (= 0.6.1)
+      decidim-pages (= 0.6.1)
+      decidim-participatory_processes (= 0.6.1)
+      decidim-proposals (= 0.6.1)
+      decidim-results (= 0.6.1)
+      decidim-surveys (= 0.6.1)
+      decidim-system (= 0.6.1)
+    decidim-admin (0.6.1)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.6.0)
+      decidim-core (= 0.6.1)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -26,29 +26,29 @@ PATH
       rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
       select2-rails (~> 4.0.3)
-    decidim-api (0.6.0)
+    decidim-api (0.6.1)
       graphiql-rails (~> 1.4.2)
       graphql (~> 1.6.0)
       rack-cors (~> 0.4.0)
       rails (~> 5.1.3)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.6.0)
-      decidim-comments (= 0.6.0)
-      decidim-core (= 0.6.0)
+    decidim-budgets (0.6.1)
+      decidim-comments (= 0.6.1)
+      decidim-core (= 0.6.1)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.6.0)
-      decidim-core (= 0.6.0)
+    decidim-comments (0.6.1)
+      decidim-core (= 0.6.1)
       jquery-rails (~> 4.0)
       rails (~> 5.1.3)
-    decidim-core (0.6.0)
+    decidim-core (0.6.1)
       active_link_to (~> 1.0.4)
       autoprefixer-rails (~> 7.1.1)
       cancancan (~> 2.0.0)
       carrierwave (~> 1.1.0)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.6.0)
+      decidim-api (= 0.6.1)
       devise (~> 4.3)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -76,39 +76,39 @@ PATH
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
       wisper (~> 2.0.0)
-    decidim-meetings (0.6.0)
+    decidim-meetings (0.6.1)
       date_validator (~> 0.9)
-      decidim-core (= 0.6.0)
+      decidim-core (= 0.6.1)
       httparty (~> 0.15.0)
       icalendar (~> 2.4.1)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-pages (0.6.0)
-      decidim-core (= 0.6.0)
+    decidim-pages (0.6.1)
+      decidim-core (= 0.6.1)
       rectify (~> 0.9.1)
-    decidim-participatory_processes (0.6.0)
-      decidim-core (= 0.6.0)
+    decidim-participatory_processes (0.6.1)
+      decidim-core (= 0.6.1)
       rails (~> 5.1.3)
-    decidim-proposals (0.6.0)
-      decidim-comments (= 0.6.0)
-      decidim-core (= 0.6.0)
+    decidim-proposals (0.6.1)
+      decidim-comments (= 0.6.1)
+      decidim-core (= 0.6.1)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       social-share-button (~> 0.10.0)
-    decidim-results (0.6.0)
-      decidim-comments (= 0.6.0)
-      decidim-core (= 0.6.0)
+    decidim-results (0.6.1)
+      decidim-comments (= 0.6.1)
+      decidim-core (= 0.6.1)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-surveys (0.6.0)
-      decidim-core (= 0.6.0)
+    decidim-surveys (0.6.1)
+      decidim-core (= 0.6.1)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.6.0)
+    decidim-system (0.6.1)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.6.0)
+      decidim-core (= 0.6.1)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
@@ -121,14 +121,14 @@ PATH
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.6.0)
+    decidim-dev (0.6.1)
       byebug
       capybara (~> 2.15.0)
       capybara-screenshot (~> 1.0.14)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.6.0)
       db-query-matchers (~> 0.9.0)
-      decidim (= 0.6.0)
+      decidim (= 0.6.1)
       factory_girl_rails
       faker (~> 1.8.4)
       i18n-tasks (= 0.9.18)
@@ -573,4 +573,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.15.4
+   1.16.0.pre.2

data/decidim-core/lib/decidim/core/version.rb

@@ -3,7 +3,7 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.6.0"
+    "0.6.1"
   end
 
   def self.rails_version

data/decidim-core/lib/decidim/resourceable.rb

@@ -33,7 +33,7 @@ module Decidim
              .joins(:resource_links_to)
              .where(decidim_resource_links: { name: link_name, from_id: id, from_type: self.class.name })
 
-        scope.where(id: from).or(scope.where(id: to)).distinct
+        scope.where(id: from).or(scope.where(id: to))
       end
 
       # Builds an ActiveRecord::Relation in order to load all the resources

data/decidim-dev/lib/generators/decidim/dummy_generator.rb

@@ -35,14 +35,9 @@ module Decidim
       def create_dummy_app
         Decidim::Generators::AppGenerator.start [
           dummy_app_path,
+          "--path",
+          "../..",
           "--app_const_base=DummyApplication",
-          "--skip-gemfile",
-          "--skip-bundle",
-          "--skip-git",
-          "--skip-keeps",
-          "--skip-listen",
-          "--skip-spring",
-          "--skip-test",
           "--recreate_db"
         ]
       end

data/decidim-dev/lib/tasks/test_app.rake

@@ -9,8 +9,7 @@ namespace :decidim do
 
     Decidim::Generators::DummyGenerator.start(
       [
-        "--dummy_app_path=#{dummy_app_path}",
-        "--quiet"
+        "--dummy_app_path=#{dummy_app_path}"
       ]
     )
   end

data/lib/generators/decidim/app_generator.rb

@@ -3,7 +3,6 @@
 require "rails/generators"
 require "rails/generators/rails/app/app_generator"
 require "decidim/core/version"
-require_relative "app_builder"
 require_relative "install_generator"
 
 module Decidim
@@ -16,25 +15,15 @@ module Decidim
     class AppGenerator < Rails::Generators::AppGenerator
       hide!
 
-      source_root File.expand_path("templates", __dir__)
-
       def source_paths
         [
           File.expand_path("templates", __dir__),
-          File.expand_path(
-            File.join(
-              Gem::Specification.find_by_name("railties").gem_dir,
-              "lib",
-              "rails",
-              "generators",
-              "rails",
-              "app",
-              "templates"
-            )
-          )
+          Rails::Generators::AppGenerator.source_root
         ]
       end
 
+      source_root File.expand_path("templates", __dir__)
+
       class_option :path, type: :string, default: nil,
                           desc: "Path to the gem"
 
@@ -74,6 +63,10 @@ module Decidim
         template "README.md.erb", "README.md", force: true
       end
 
+      def gemfile
+        template "Gemfile.erb", "Gemfile", force: true
+      end
+
       def secret_token
         require "securerandom"
         SecureRandom.hex(64)
@@ -104,13 +97,6 @@ module Decidim
       def authorization_handler
         template "authorization_handler.rb", "app/services/example_authorization_handler.rb", force: true
       end
-
-      private
-
-      # rubocop:disable Style/AccessorMethodName
-      def get_builder_class
-        AppBuilder
-      end
     end
   end
 end

data/lib/generators/decidim/demo_generator.rb

@@ -3,7 +3,6 @@
 require "rails/generators"
 require "rails/generators/rails/app/app_generator"
 require "decidim/core/version"
-require_relative "app_builder"
 require_relative "install_generator"
 
 module Decidim

data/lib/generators/decidim/install_generator.rb

@@ -19,6 +19,10 @@ module Decidim
       class_option :recreate_db, type: :boolean, default: false,
                                  desc: "Recreate db after installing decidim"
 
+      def bundle_install
+        run "bundle install"
+      end
+
       def install
         route "mount Decidim::Core::Engine => '/'"
       end

data/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4726,15 +4726,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -4745,6 +4736,15 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -9063,15 +9063,6 @@
         "xtend": "4.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-length": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
@@ -9110,6 +9101,15 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,168 +18,168 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -2471,7 +2471,6 @@ files:
 - docs/testing.md
 - jsconfig.json
 - lib/decidim.rb
-- lib/generators/decidim/app_builder.rb
 - lib/generators/decidim/app_generator.rb
 - lib/generators/decidim/demo_generator.rb
 - lib/generators/decidim/docker_generator.rb

data/lib/generators/decidim/app_builder.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "decidim/core"
-
-module Decidim
-  module Generators
-    # Custom app builder to inject own Gemfile.
-    class AppBuilder < Rails::AppBuilder
-      def gemfile
-        template "Gemfile.erb", "Gemfile", rails_version: Decidim.rails_version
-      end
-    end
-  end
-end