decidim 0.0.1 → 0.0.2

data/decidim-proposals/spec/models/decidim/proposals/proposal_spec.rb

@@ -8,23 +8,40 @@ module Decidim
 
       it { is_expected.to be_valid }
 
+      it "has a votes association returning proposal votes" do
+        expect(subject.votes.count).to eq(0)
+      end
+      
       context "when the category is from another feature" do
-        subject { create(:proposal, category: create(:category))}
+        subject { build(:proposal, category: create(:category))}
 
         it { is_expected.to be_invalid}
       end
 
       context "when the author is from another organization" do
-        subject { create(:proposal, author: create(:user))}
+        subject { build(:proposal, author: create(:user))}
 
         it { is_expected.to be_invalid}
       end
 
       context "when the scope is from another organization" do
-        subject { create(:proposal, scope: create(:scope))}
+        subject { build(:proposal, scope: create(:scope))}
 
         it { is_expected.to be_invalid}
       end
+
+      describe "#voted_by?" do
+        let(:user) { create(:user, organization: subject.organization) }
+
+        it "returns false if the proposal is not voted by the given user" do
+          expect(subject.voted_by?(user)).to be_falsey
+        end
+
+        it "returns true if the proposal is not voted by the given user" do
+          create(:proposal_vote, proposal: subject, author: user)
+          expect(subject.voted_by?(user)).to be_truthy
+        end
+      end
     end
   end
 end

data/decidim-proposals/spec/models/decidim/proposals/proposal_vote_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe ProposalVote do
+      let!(:organization) { create(:organization) }
+      let!(:feature) { create(:feature, organization: organization)}      
+      let!(:participatory_process) { create(:participatory_process, organization: organization) }
+      let!(:author) { create(:user, organization: organization) }
+      let!(:proposal) { create(:proposal, feature: feature, author: author)}
+      let!(:proposal_vote) { create(:proposal_vote, proposal: proposal, author: author) }
+
+      it "is valid" do
+        expect(proposal_vote).to be_valid
+      end
+
+      it "has an associated author" do
+        expect(proposal_vote.author).to be_a(Decidim::User)
+      end
+
+      it "has an associated proposal" do
+        expect(proposal_vote.proposal).to be_a(Decidim::Proposals::Proposal)
+      end
+
+      it "validates uniqueness for author and proposal combination" do
+        expect {
+          create(:proposal_vote, proposal: proposal, author: author)
+        }.to raise_error(ActiveRecord::RecordInvalid)
+      end
+
+      context "when proposal and author have different organization" do
+        let(:other_author) { create(:user) }
+        let(:other_proposal) { create(:proposal) }
+
+        it "is invalid" do
+          proposal_vote = build(:proposal_vote, proposal: other_proposal, author: other_author)
+          expect(proposal_vote).to be_invalid
+        end
+      end
+    end
+  end
+end

data/decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb

@@ -4,13 +4,25 @@ module Decidim
   module Proposals
     describe ProposalSearch do
       let(:feature) { create(:feature) }
+      let(:user) { create(:user, organization: feature.organization) }
       let!(:proposal) { create(:proposal, feature: feature)}
       let(:page) { 1 }
 
-      describe "proposals" do
+      describe "results" do
         let(:random_seed) { 0.2 }
+        let(:activity) { [] }
+        let(:search_text) { nil }        
 
-        subject { described_class.new(feature, page, random_seed).proposals }
+        subject do 
+          described_class.new({
+            feature: feature,
+            page: page,
+            random_seed: random_seed,
+            activity: activity,
+            search_text: search_text,
+            current_user: user
+          }).results
+        end
 
         context "when given a random seed" do
           it "sets the seed at the database" do
@@ -35,15 +47,49 @@ module Decidim
 
         it "filters the proposals per page" do
           create_list(:proposal, 3, feature: feature)
-          proposals = described_class.new(feature, page, random_seed, 2).proposals
+          proposals = described_class.new({
+            feature: feature,
+            per_page: 2,
+            page: page,
+            random_seed: random_seed
+          }).results
 
           expect(proposals.total_pages).to eq(2)
           expect(proposals.total_count).to eq(4)
         end
+
+        describe "when the filter includes search_text" do
+          let(:search_text) { "dog" }        
+          
+          it "returns the proposals containing the search in the title or the body" do
+            create_list(:proposal, 3, feature: feature)
+            create(:proposal, title: "A dog", feature: feature)            
+            create(:proposal, body: "There is a dog in the office", feature: feature)
+
+            expect(subject.total_count).to eq(2)            
+          end
+        end
+
+        describe "when the filter includes activity" do
+          let(:activity) { ["voted"] }
+
+          it "returns the proposals voted by the user" do
+            create_list(:proposal, 3, feature: feature)
+            create(:proposal_vote, proposal: Proposal.first, author: user)
+
+            expect(subject.total_count).to eq(1)            
+          end
+        end
       end
 
       describe "random_seed" do
-        subject { described_class.new(feature, page, random_seed).random_seed }
+        subject do
+          described_class.new({
+            feature: feature,
+            page: page,
+            random_seed: random_seed
+          }).random_seed
+        end
 
         context "without a given random seed" do
           let(:random_seed) { nil }

data/decidim-proposals/spec/shared/manage_proposals_examples.rb

@@ -19,7 +19,7 @@ RSpec.shared_examples "manage proposals" do
       fill_in :proposal_title, with: "Make decidim great again"
       fill_in :proposal_body, with: "Decidim is great but it can be better"
       select category.name["en"], from: :proposal_category_id
-      select scope.name["en"], from: :proposal_scope_id
+      select scope.name, from: :proposal_scope_id
 
       find("*[type=submit]").click
     end

data/decidim-proposals/spec/spec_helper.rb

@@ -1,2 +1,2 @@
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
-require "decidim/test/base_spec_helper"
+require "decidim/dev/test/base_spec_helper"

data/decidim-system/Rakefile

@@ -1,2 +1,2 @@
 # frozen_string_literal: true
-require "decidim/common_rake"
+require "decidim/dev/common_rake"

data/decidim-system/app/commands/decidim/system/register_organization.rb

@@ -22,9 +22,11 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
 
         transaction do
-          organization = create_organization
-          invite_admin(organization)
-          CreateDefaultPages.call(organization)
+          @organization = create_organization
+          CreateDefaultPages.call(@organization)
+          invite_form = invite_user_form(@organization)
+          return broadcast(:invalid) if invite_form.invalid?
+          Decidim::InviteUser.call(invite_form)
         end
 
         broadcast(:ok)
@@ -45,16 +47,15 @@ module Decidim
         )
       end
 
-      def invite_admin(organization)
-        Decidim::User.invite!(
-          {
-            name: form.organization_admin_name,
-            email: form.organization_admin_email,
-            organization: organization,
-            roles: ["admin"]
-          },
-          nil,
+      def invite_user_form(organization)
+        Decidim::InviteAdminForm.from_params(
+          name: form.organization_admin_name,
+          email: form.organization_admin_email,
+          roles: %w(admin),
           invitation_instructions: "organization_admin_invitation_instructions"
+        ).with_context(
+          current_user: form.current_user,
+          current_organization: organization
         )
       end
     end

data/decidim-system/decidim-system.gemspec

@@ -20,11 +20,10 @@ Gem::Specification.new do |s|
   s.add_dependency "devise-i18n", "~> 1.1.0"
   s.add_dependency "rectify", "~> 0.8.0"
   s.add_dependency "devise_invitable", "~> 1.7.0"
-  s.add_dependency "foundation-rails", "~> 6.2.4.0"
   s.add_dependency "sassc-rails", "~> 1.3.0"
-  s.add_dependency "jquery-rails", "~> 4.0"
+  s.add_dependency "jquery-rails", "~> 4.2.2"
   s.add_dependency "turbolinks", *Decidim.rails_version
-  s.add_dependency "foundation_rails_helper", "~> 2.0.0"
+  s.add_dependency "foundation_rails_helper", "~> 3.0.0.rc"
   s.add_dependency "active_link_to", "~> 1.0.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version

data/decidim-system/spec/factories.rb

@@ -1,4 +1,4 @@
-require_relative "../../decidim-core/spec/factories"
+require "decidim/core/test/factories"
 
 FactoryGirl.define do
   factory :admin, class: Decidim::System::Admin do

data/decidim-system/spec/spec_helper.rb

@@ -1,2 +1,4 @@
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
-require "decidim/test/base_spec_helper"
+require "decidim/dev/test/base_spec_helper"
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/docs/social_providers.md

@@ -0,0 +1,41 @@
+# Social providers integration
+
+If you want to enable sign up through social providers like Facebook you will need to generate app credentials and write them into the Rails secrets file: `config/secrets.yml`.
+
+## Facebook
+
+1. Navigate to [Facebook Developers Page](https://developers.facebook.com/)
+2. Follow the "Add a New App" link.
+3. Click the "Website" option.
+4. Fill in your application name and click "Create New Facebook App ID" button.
+5. Fill in the contact email info and category.
+6. Validate the captcha.
+7. Ignore the source code and fill in the URL field.
+8. Navigate to the application dashboard and copy the APP_ID and APP_SECRET
+9. Paste credentials in `config/secrets.yml`. Ensure the `enabled` attribute is `true`.
+
+## Twitter
+
+1. Navigate to [Twitter Developers Page](https://dev.twitter.com/)
+2. Follow the "My apps" link.
+3. Click the "Create New App" button.
+4. Fill in the `Name`, `Description` fields. 
+5. Fill in the `Website` and `Callback URL` fields with the same value. If you are working on a development app you need to use `http://127.0.0.1:3000/` instead of `http://localhost:3000/`.
+5. Check the 'Developer Agreement' checkbox and click the 'Create your Twitter application' button.
+6. Navigate to the "Keys and Access Tokens" tab and copy the API_KEY and API_SECRET.
+8. (Optional) Navigate to the "Permissions" tab and check the "Request email addresses from users" checkbox.
+9. Paste credentials in `config/secrets.yml`. Ensure the `enabled` attribute is `true`.
+
+## Google
+
+1. Navigate to [Google Developers Page](https://console.developers.google.com)
+2. Follow the 'Create projecte' link.
+3. Fill in the name of your app.
+4. Navigate to the projecte dashboard and click on "Enable API"
+5. Click on `Google+ API` and then "Enable"
+6. Navigate to the project credentials page and click on `OAuth consent screen`.
+7. Fill in the `Product name` field
+8. Click on `Credentials` tab and click on "Create credentials" button. Select `OAuth client ID`.
+9. Select `Web applications`. Fill in the `Authorized Javascript origins` with your url. Then fill in the `Authorized redirect URIs` with your url and append the path `/users/auth/google_oauth2/callback`.
+10. Copy the CLIENT_ID AND CLIENT_SECRET
+11. Paste credentials in `config/secrets.yml`. Ensure the `enabled` attribute is `true`.

data/karma.conf.js

@@ -9,11 +9,13 @@ module.exports = function(config) {
   config.set({
     basePath: '',
     frameworks: ['jasmine'],
-    files: [testGlob, srcGlob],
+    files: [testGlob, srcGlob, 'decidim-core/**/*.component.js.es6', 'decidim-core/**/*.test.js'],
     exclude: ['decidim-*/app/frontend/entry.js'],
     preprocessors: {
       [testGlob]: ['webpack', 'sourcemap'],
-      [srcGlob]: ['webpack']
+      [srcGlob]: ['webpack'],
+      'decidim-core/**/*.test.js': ['webpack', 'sourcemap'],
+      'decidim-core/**/*.component.js.es6': ['webpack']
     },
     webpack: webpackConfig,
     webpackMiddleware: { noInfo: true },

data/lib/generators/decidim/app_generator.rb

@@ -80,6 +80,12 @@ module Decidim
         ]
       end
 
+      def add_ignore_uploads
+        unless options["skip_git"]
+          append_file ".gitignore", "\n# Ignore public uploads\npublic/uploads"
+        end
+      end
+
       def remove_default_error_pages
         remove_file "public/404.html"
         remove_file "public/500.html"

data/lib/generators/decidim/demo_generator.rb

@@ -11,16 +11,16 @@ module Decidim
     class DemoGenerator < Rails::Generators::Base
       def source_paths
         [
-          File.expand_path("../../../../decidim-dev/lib/decidim", __FILE__)
+          File.expand_path("../../../../decidim-dev/lib/decidim/dev", __FILE__)
         ]
       end
 
       def authorization_handlers
         remove_file "app/services/example_authorization_handler.rb"
+        template "dummy_authorization_handler.rb", "app/services/decidim/dummy_authorization_handler.rb"
         gsub_file "config/initializers/decidim.rb",
                   /ExampleAuthorizationHandler/,
                   "Decidim::DummyAuthorizationHandler"
-        template "dummy_authorization_handler.rb", "app/services/decidim/dummy_authorization_handler.rb"
       end
     end
   end

data/lib/generators/decidim/install_generator.rb

@@ -37,6 +37,11 @@ module Decidim
       def copy_initializer
         template "initializer.rb", "config/initializers/decidim.rb"
         template "carrierwave.rb", "config/initializers/carrierwave.rb"
+        template "social_share_button.rb", "config/initializers/social_share_button.rb"
+      end
+
+      def secrets
+        template "secrets.yml.erb", "config/secrets.yml", force: true
       end
 
       def remove_layout
@@ -84,10 +89,6 @@ module Decidim
         end
       end
 
-      def secrets
-        template "secrets.yml.erb", "config/secrets.yml", force: true
-      end
-
       private
 
       def recreate_db

data/lib/generators/decidim/templates/Gemfile.erb

@@ -4,17 +4,15 @@ ruby '<%= RUBY_VERSION %>'
 <% if options[:path] %>
 gem "decidim", path: "<%= options[:path] %>"
 <% elsif options[:edge] %>
-gem "decidim", github: 'AjuntamentdeBarcelona/decidim'
+gem "decidim", git: 'https://github.com/AjuntamentdeBarcelona/decidim.git'
 <% elsif options[:branch] %>
-gem "decidim", github: 'AjuntamentdeBarcelona/decidim', branch: "<%= options[:branch] %>"
+gem "decidim", git: 'https://github.com/AjuntamentdeBarcelona/decidim.git', branch: "<%= options[:branch] %>"
 <% else %>
 gem "decidim", "<%= Gem::Specification.find_by_name("decidim").version %>"
 <% end %>
 gem 'puma', '~> 3.0'
 gem 'uglifier', '>= 1.3.0'
 
-gem "foundation_rails_helper", git: "https://github.com/sgruhier/foundation_rails_helper.git", tag: "df0bd8e"
-
 group :development, :test do
   gem 'byebug', platform: :mri
 end
@@ -24,7 +22,7 @@ group :development do
   gem 'listen', '~> 3.0.5'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem 'faker', '~> 1.6.6'
+  gem 'faker', '~> <%= Gem::Specification.find_by_name("faker").version %>'
 end
 
 group :production do

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

@@ -5,5 +5,5 @@ Decidim.configure do |config|
   config.authorization_handlers = [ExampleAuthorizationHandler]
 
   # Uncomment this lines to set your preferred locales
-  # config.available_locales = %{en ca es}
+  # config.available_locales = %i{en ca es}
 end

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

@@ -10,15 +10,41 @@
 # Make sure the secrets in this file are kept private
 # if you're sharing your code publicly.
 
+default: &default
+  omniauth:
+    facebook:
+      # It must be a boolean. Remember ENV variables doesn't support booleans.
+      enabled: false
+      app_id: <%%= ENV["OMNIAUTH_FACEBOOK_APP_ID"] %>
+      app_secret: <%%= ENV["OMNIAUTH_FACEBOOK_APP_SECRET"] %>
+    twitter:
+      enabled: false
+      api_key: <%%= ENV["OMNIAUTH_TWITTER_API_KEY"] %>
+      api_secret: <%%= ENV["OMNIAUTH_TWITTER_API_SECRET"] %>
+    google_oauth2:
+      enabled: false
+      client_id: <%%= ENV["OMNIAUTH_GOOGLE_CLIENT_ID"] %>
+      client_secret: <%%= ENV["OMNIAUTH_GOOGLE_CLIENT_SECRET"] %>
+
 development:
+  <<: *default
   secret_key_base: <%= SecureRandom.hex(64) %>
 
 test:
+  <<: *default
   secret_key_base: <%= SecureRandom.hex(64) %>
+  omniauth:
+    facebook:
+      enabled: true
+    twitter:
+      enabled: true
+    google_oauth2:
+      enabled: true
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
+  <<: *default
   secret_key_base: <%%= ENV["SECRET_KEY_BASE"] %>
   sendgrid: <%%= !ENV["SENDGRID_USERNAME"].blank? %>
   smtp_username: <%%= ENV["SMTP_USERNAME"] || ENV["SENDGRID_USERNAME"] %>