decidim 0.9.3 → 0.10.0

data/lib/decidim/version.rb

@@ -3,6 +3,6 @@
 # This holds the decidim version and the faker version it uses.
 module Decidim
   def self.version
-    "0.9.3"
+    "0.10.0"
   end
 end

data/lib/generators/decidim/app_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "bundler"
 require "rails/generators"
 require "rails/generators/rails/app/app_generator"
 require "decidim/version"
@@ -36,10 +37,6 @@ module Decidim
                             default: nil,
                             desc: "Use a specific branch from GitHub's version"
 
-      class_option :database, type: :string,
-                              default: "postgresql",
-                              desc: "Configure for selected database (options: #{DATABASES.join("/")})"
-
       class_option :recreate_db, type: :boolean,
                                  default: false,
                                  desc: "Recreate test database"
@@ -48,9 +45,6 @@ module Decidim
                              default: false,
                              desc: "Seed test database"
 
-      class_option :app_const_base, type: :string,
-                                    desc: "The application constant name"
-
       class_option :skip_bundle, type: :boolean,
                                  default: true,
                                  desc: "Don't run bundle install"
@@ -59,7 +53,8 @@ module Decidim
                                   default: false,
                                   desc: "Don't generate a Gemfile for the application"
 
-      class_option :demo, type: :boolean, default: false,
+      class_option :demo, type: :boolean,
+                          default: false,
                           desc: "Generate a demo authorization handler"
 
       def database_yml
@@ -86,8 +81,8 @@ module Decidim
       def gemfile
         return if options[:skip_gemfile]
 
-        template path_to_root("Gemfile"), "Gemfile", force: true
-        template path_to_root("Gemfile.lock"), "Gemfile.lock", force: true
+        template target_gemfile, "Gemfile", force: true
+        template "#{target_gemfile}.lock", "Gemfile.lock", force: true
 
         gem_modifier = if options[:path]
                          "path: \"#{options[:path]}\""
@@ -99,8 +94,10 @@ module Decidim
                          "\"#{Decidim.version}\""
                        end
 
-        gsub_file "Gemfile", /gem "decidim([^"]*)".*/, "gem \"decidim\\1\", #{gem_modifier}"
-        run "BUNDLE_GEMFILE=Gemfile bundle install"
+        gsub_file "Gemfile", /gem "#{current_gem}".*/, "gem \"#{current_gem}\", #{gem_modifier}"
+        gsub_file "Gemfile", /gem "decidim-dev".*/, "gem \"decidim-dev\", #{gem_modifier}" if current_gem == "decidim"
+
+        Bundler.with_original_env { run "bundle install" }
       end
 
       def add_ignore_uploads
@@ -130,12 +127,32 @@ module Decidim
 
       private
 
-      def path_to_root(file)
-        File.expand_path(File.join("..", "..", "..", file), __dir__)
+      def current_gem
+        return "decidim" unless options[:path]
+
+        File.read(gemspec).match(/name\s*=\s*['"](?<name>.*)["']/)[:name]
+      end
+
+      def gemspec
+        File.expand_path(Dir.glob("*.gemspec", base: expanded_path).first, expanded_path)
+      end
+
+      def target_gemfile
+        root = if options[:path]
+                 expanded_path
+               else
+                 decidim_root
+               end
+
+        File.join(root, "Gemfile")
+      end
+
+      def expanded_path
+        File.expand_path(options[:path])
       end
 
-      def app_const_base
-        options["app_const_base"] || super
+      def decidim_root
+        File.expand_path(File.join("..", "..", ".."), __dir__)
       end
     end
   end

data/lib/generators/decidim/install_generator.rb

@@ -64,7 +64,7 @@ module Decidim
       def smtp_environment
         inject_into_file "config/environments/production.rb",
                          after: "config.log_formatter = ::Logger::Formatter.new" do
-          <<~RUBY.gsub(/^ *\|/, "")
+          cut <<~RUBY
             |
             |  config.action_mailer.smtp_settings = {
             |    :address        => Rails.application.secrets.smtp_address,
@@ -86,16 +86,18 @@ module Decidim
       end
 
       def letter_opener_web
-        route <<~RUBY.gsub(/^ *\|/, "")
+        letter_opener_route = cut <<~RUBY
           |
           |  if Rails.env.development?
           |    mount LetterOpenerWeb::Engine, at: "/letter_opener"
           |  end
         RUBY
 
+        route letter_opener_route
+
         inject_into_file "config/environments/development.rb",
                          after: "config.action_mailer.raise_delivery_errors = false" do
-          <<~RUBY.gsub(/^ *\|/, "")
+          cut <<~RUBY
             |
             |  config.action_mailer.delivery_method = :letter_opener_web
             |  config.action_mailer.default_url_options = { port: 3000 }
@@ -127,6 +129,10 @@ module Decidim
         variables = File.join(Gem.loaded_specs["decidim-core"].full_gem_path, "app", "assets", "stylesheets", "decidim", "_variables.scss")
         File.read(variables).split("\n").map { |line| "// #{line}".gsub(" !default", "") }.join("\n")
       end
+
+      def cut(text)
+        text.gsub(/^ *\|/, "").rstrip
+      end
     end
   end
 end

data/lib/generators/decidim/templates/database.yml.erb

@@ -28,7 +28,7 @@ default: &default
 
 development:
   <<: *default
-  database: <%%= ENV.fetch("DATABASE_NAME") { "<%= app_name %>_development" } %>
+  database: <%%= ENV.fetch("DEV_DATABASE_NAME") { "<%= app_name %>_development" } %>
 
   # The specified database role being used to connect to postgres.
   # To create additional roles in postgres see `$ createuser --help`.
@@ -62,7 +62,7 @@ development:
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: <%%= ENV.fetch("DATABASE_NAME") { "<%= app_name %>_test" } %>
+  database: <%%= ENV.fetch("TEST_DATABASE_NAME") { "<%= app_name %>_test" } %>
 
 # As with config/secrets.yml, you never want to store sensitive information,
 # like your database password, in your source code. If your source code is

data/lib/generators/decidim/templates/initializer.rb

@@ -16,7 +16,7 @@ Decidim.configure do |config|
   # }
 
   # Custom resource reference generator method
-  # config.resource_reference_generator = lambda do |resource, feature|
+  # config.reference_generator = lambda do |resource, feature|
   #   # Implement your custom method to generate resources references
   #   "1234-#{resource.id}"
   # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-accountability
@@ -18,210 +18,210 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-debates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -280,10 +280,19 @@ files:
 - README.md
 - Rakefile
 - bin/decidim
-- docs/analytics.md
-- docs/content_processors.md
-- docs/create_followers_from_comment_authors.md
-- docs/create_followers_from_resource_authors.md
+- docs/add_authenticable_action.md
+- docs/adding_fixtures_aka_dummy_content.md
+- docs/advanced/activity_log.md
+- docs/advanced/content_processors.md
+- docs/advanced/deploy.md
+- docs/advanced/features.md
+- docs/advanced/followers.md
+- docs/advanced/how_to_create_a_module.md
+- docs/advanced/managing_translations_i18n.md
+- docs/advanced/migrate_to_0.8.0.md
+- docs/advanced/testing.md
+- docs/advanced/tradeoffs.md
+- docs/advanced/view_hooks.md
 - docs/customization/authorizations.md
 - docs/customization/code.md
 - docs/customization/gemfile.md
@@ -292,15 +301,12 @@ files:
 - docs/customization/styles.md
 - docs/customization/texts.md
 - docs/customization/views.md
-- docs/features_and_components.md
-- docs/geocoding.md
+- docs/data-picker.md
 - docs/getting_started.md
-- docs/how_to_create_a_module.md
-- docs/managing_translations_i18n.md
-- docs/migrate_to_0.8.0.md
-- docs/social_providers.md
-- docs/testing.md
-- docs/view_hooks.md
+- docs/services/activejob.md
+- docs/services/analytics.md
+- docs/services/geocoding.md
+- docs/services/social_providers.md
 - lib/decidim.rb
 - lib/decidim/component_manager.rb
 - lib/decidim/version.rb
@@ -338,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Citizen participation framework for Ruby on Rails.