diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml index 97a02fd21..981aca200 100644 --- a/.rubocop_basic.yml +++ b/.rubocop_basic.yml @@ -4,12 +4,12 @@ AllCops: DisplayCopNames: true DisplayStyleGuide: true Include: - - '**/Rakefile' - - '**/config.ru' + - "**/Rakefile" + - "**/config.ru" Exclude: - - 'db/**/*' - - 'config/**/*' - - 'script/**/*' + - "db/**/*" + - "config/**/*" + - "script/**/*" TargetRubyVersion: 2.3 # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop # to ignore them, so only the ones explicitly set in this file are enabled. diff --git a/.travis.yml b/.travis.yml index cb4ffd0ac..0aa683c04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby addons: - postgresql: '9.4' + postgresql: "9.4" chrome: stable rvm: - 2.3.2 diff --git a/Capfile b/Capfile index ea11eb9b6..cef760291 100644 --- a/Capfile +++ b/Capfile @@ -1,22 +1,22 @@ # Load DSL and set up stages -require 'capistrano/setup' +require "capistrano/setup" # Include default deployment tasks -require 'capistrano/deploy' +require "capistrano/deploy" require "capistrano/bundler" -require 'capistrano/rails/assets' -require 'capistrano/rails/migrations' -#require 'capistrano/passenger' -require 'capistrano/delayed_job' -require 'whenever/capistrano' -require 'rvm1/capistrano3' +require "capistrano/rails/assets" +require "capistrano/rails/migrations" +#require "capistrano/passenger" +require "capistrano/delayed_job" +require "whenever/capistrano" +require "rvm1/capistrano3" #SCM: Git require "capistrano/scm/git" install_plugin Capistrano::SCM::Git # Load custom tasks from `lib/capistrano/tasks` if you have any defined -Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r } -Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r } -Dir.glob('lib/capistrano/**/*.rb').each { |r| import r } +Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r } +Dir.glob("lib/capistrano/tasks/*.cap").each { |r| import r } +Dir.glob("lib/capistrano/**/*.rb").each { |r| import r } diff --git a/Gemfile b/Gemfile index 07ec1353a..318f0a2ce 100644 --- a/Gemfile +++ b/Gemfile @@ -1,100 +1,100 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rails', '4.2.11.1' +gem "rails", "4.2.11.1" -gem 'acts-as-taggable-on', '~> 5.0.0' -gem 'acts_as_votable', '~> 0.11.1' -gem 'ahoy_matey', '~> 1.6.0' -gem 'ancestry', '~> 3.0.2' -gem 'autoprefixer-rails', '~> 8.2.0' -gem 'browser', '~> 2.5.3' -gem 'cancancan', '~> 2.3.0' -gem 'ckeditor', '~> 4.2.3' -gem 'cocoon', '~> 1.2.9' -gem 'coffee-rails', '~> 4.2.2' -gem 'daemons', '~> 1.2.4' -gem 'dalli', '~> 2.7.6' -gem 'delayed_job_active_record', '~> 4.1.3' -gem 'devise', '~> 3.5.7' -gem 'devise-async', '~> 0.10.2' -gem 'devise_security_extension', '~> 0.10.0' -gem 'foundation-rails', '~> 6.4.3.0' -gem 'foundation_rails_helper', '~> 2.0.0' -gem 'graphiql-rails', '~> 1.4.1' -gem 'graphql', '~> 1.7.8' -gem 'groupdate', '~> 3.2.0' -gem 'initialjs-rails', '~> 0.2.0.5' -gem 'invisible_captcha', '~> 0.10.0' -gem 'jquery-fileupload-rails' -gem 'jquery-rails', '~> 4.3.3' -gem 'jquery-ui-rails', '~> 6.0.1' -gem 'kaminari', '~> 1.1.1' -gem 'newrelic_rpm', '~> 4.1.0.333' -gem 'omniauth', '~> 1.8.1' -gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-google-oauth2', '~> 0.4.0' -gem 'omniauth-twitter', '~> 1.4.0' -gem 'paperclip', '~> 5.2.1' -gem 'paranoia', '~> 2.4.1' -gem 'pg', '~> 0.21.0' -gem 'pg_search', '~> 2.0.1' -gem 'redcarpet', '~> 3.4.0' -gem 'responders', '~> 2.4.0' -gem 'rinku', '~> 2.0.2', require: 'rails_rinku' -gem 'rollbar', '~> 2.18.0' -gem 'sass-rails', '~> 5.0', '>= 5.0.4' -gem 'savon', '~> 2.12.0' -gem 'sitemap_generator', '~> 6.0.1' -gem 'social-share-button', '~> 1.1' -gem 'sprockets', '~> 3.7.2' -gem 'turbolinks', '~> 2.5.3' -gem 'turnout', '~> 2.4.0' -gem 'uglifier', '~> 4.1.19' -gem 'unicorn', '~> 5.4.1' -gem 'whenever', '~> 0.10.0', require: false -gem 'globalize', '~> 5.0.0' -gem 'globalize-accessors', '~> 0.2.1' -gem 'recipient_interceptor', '~> 0.2.0' +gem "acts-as-taggable-on", "~> 5.0.0" +gem "acts_as_votable", "~> 0.11.1" +gem "ahoy_matey", "~> 1.6.0" +gem "ancestry", "~> 3.0.2" +gem "autoprefixer-rails", "~> 8.2.0" +gem "browser", "~> 2.5.3" +gem "cancancan", "~> 2.3.0" +gem "ckeditor", "~> 4.2.3" +gem "cocoon", "~> 1.2.9" +gem "coffee-rails", "~> 4.2.2" +gem "daemons", "~> 1.2.4" +gem "dalli", "~> 2.7.6" +gem "delayed_job_active_record", "~> 4.1.3" +gem "devise", "~> 3.5.7" +gem "devise-async", "~> 0.10.2" +gem "devise_security_extension", "~> 0.10.0" +gem "foundation-rails", "~> 6.4.3.0" +gem "foundation_rails_helper", "~> 2.0.0" +gem "graphiql-rails", "~> 1.4.1" +gem "graphql", "~> 1.7.8" +gem "groupdate", "~> 3.2.0" +gem "initialjs-rails", "~> 0.2.0.5" +gem "invisible_captcha", "~> 0.10.0" +gem "jquery-fileupload-rails" +gem "jquery-rails", "~> 4.3.3" +gem "jquery-ui-rails", "~> 6.0.1" +gem "kaminari", "~> 1.1.1" +gem "newrelic_rpm", "~> 4.1.0.333" +gem "omniauth", "~> 1.8.1" +gem "omniauth-facebook", "~> 4.0.0" +gem "omniauth-google-oauth2", "~> 0.4.0" +gem "omniauth-twitter", "~> 1.4.0" +gem "paperclip", "~> 5.2.1" +gem "paranoia", "~> 2.4.1" +gem "pg", "~> 0.21.0" +gem "pg_search", "~> 2.0.1" +gem "redcarpet", "~> 3.4.0" +gem "responders", "~> 2.4.0" +gem "rinku", "~> 2.0.2", require: "rails_rinku" +gem "rollbar", "~> 2.18.0" +gem "sass-rails", "~> 5.0", ">= 5.0.4" +gem "savon", "~> 2.12.0" +gem "sitemap_generator", "~> 6.0.1" +gem "social-share-button", "~> 1.1" +gem "sprockets", "~> 3.7.2" +gem "turbolinks", "~> 2.5.3" +gem "turnout", "~> 2.4.0" +gem "uglifier", "~> 4.1.19" +gem "unicorn", "~> 5.4.1" +gem "whenever", "~> 0.10.0", require: false +gem "globalize", "~> 5.0.0" +gem "globalize-accessors", "~> 0.2.1" +gem "recipient_interceptor", "~> 0.2.0" -source 'https://rails-assets.org' do - gem 'rails-assets-leaflet' - gem 'rails-assets-markdown-it', '~> 8.2.1' +source "https://rails-assets.org" do + gem "rails-assets-leaflet" + gem "rails-assets-markdown-it", "~> 8.2.1" end group :development, :test do - gem 'bullet', '~> 5.7.0' - gem 'byebug', '~> 10.0.0' - gem 'factory_bot_rails', '~> 4.8.2' - gem 'faker', '~> 1.8.7' - gem 'i18n-tasks', '~> 0.9.25' - gem 'knapsack_pro', '~> 1.1.0' - gem 'launchy', '~> 2.4.3' - gem 'letter_opener_web', '~> 1.3.4' - gem 'quiet_assets', '~> 1.1.0' - gem 'spring', '~> 2.0.1' - gem 'spring-commands-rspec', '~> 1.0.4' + gem "bullet", "~> 5.7.0" + gem "byebug", "~> 10.0.0" + gem "factory_bot_rails", "~> 4.8.2" + gem "faker", "~> 1.8.7" + gem "i18n-tasks", "~> 0.9.25" + gem "knapsack_pro", "~> 1.1.0" + gem "launchy", "~> 2.4.3" + gem "letter_opener_web", "~> 1.3.4" + gem "quiet_assets", "~> 1.1.0" + gem "spring", "~> 2.0.1" + gem "spring-commands-rspec", "~> 1.0.4" end group :test do - gem 'capybara', '~> 2.17.0' - gem 'coveralls', '~> 0.8.22', require: false - gem 'database_cleaner', '~> 1.7.0' - gem 'email_spec', '~> 2.1.0' - gem 'rspec-rails', '~> 3.8' - gem 'selenium-webdriver', '~> 3.10' + gem "capybara", "~> 2.17.0" + gem "coveralls", "~> 0.8.22", require: false + gem "database_cleaner", "~> 1.7.0" + gem "email_spec", "~> 2.1.0" + gem "rspec-rails", "~> 3.8" + gem "selenium-webdriver", "~> 3.10" end group :development do - gem 'capistrano', '~> 3.10.1', require: false - gem 'capistrano-bundler', '~> 1.2', require: false - gem 'capistrano-rails', '~> 1.4.0', require: false - gem 'capistrano3-delayed-job', '~> 1.7.3' - gem 'mdl', '~> 0.5.0', require: false - gem 'rubocop', '~> 0.54.0', require: false - gem 'rubocop-rspec', '~> 1.26.0', require: false - gem 'rvm1-capistrano3', '~> 1.4.0', require: false - gem 'scss_lint', '~> 0.55.0', require: false - gem 'web-console', '~> 3.3.0' + gem "capistrano", "~> 3.10.1", require: false + gem "capistrano-bundler", "~> 1.2", require: false + gem "capistrano-rails", "~> 1.4.0", require: false + gem "capistrano3-delayed-job", "~> 1.7.3" + gem "mdl", "~> 0.5.0", require: false + gem "rubocop", "~> 0.54.0", require: false + gem "rubocop-rspec", "~> 1.26.0", require: false + gem "rvm1-capistrano3", "~> 1.4.0", require: false + gem "scss_lint", "~> 0.55.0", require: false + gem "web-console", "~> 3.3.0" end -eval_gemfile './Gemfile_custom' +eval_gemfile "./Gemfile_custom" diff --git a/Rakefile b/Rakefile index c4d34f626..b99dafeef 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. -require File.expand_path('../config/application', __FILE__) +require File.expand_path("../config/application", __FILE__) Rails.application.load_tasks if Rake::Task.tasks.empty? KnapsackPro.load_tasks if defined?(KnapsackPro) diff --git a/db/dev_seeds/spending_proposals.rb b/db/dev_seeds/spending_proposals.rb index f4af7aa96..44c519a16 100644 --- a/db/dev_seeds/spending_proposals.rb +++ b/db/dev_seeds/spending_proposals.rb @@ -17,7 +17,7 @@ section "Creating Spending Proposals" do feasible: feasible, feasible_explanation: feasible_explanation, valuation_finished: valuation_finished, - tag_list: tags.sample(3).join(','), + tag_list: tags.sample(3).join(","), price: rand(1000000), terms_of_service: "1") end diff --git a/doc/api/examples/ruby/example_1.rb b/doc/api/examples/ruby/example_1.rb index 2dd36e766..4362e0f4f 100644 --- a/doc/api/examples/ruby/example_1.rb +++ b/doc/api/examples/ruby/example_1.rb @@ -1,9 +1,9 @@ -require 'http' +require "http" -API_ENDPOINT = 'https://decide.madrid.es/graphql'.freeze +API_ENDPOINT = "https://decide.madrid.es/graphql".freeze def make_request(query_string) - HTTP.headers('User-Agent' => 'Mozilla/5.0', accept: 'application/json') + HTTP.headers("User-Agent" => "Mozilla/5.0", accept: "application/json") .get( API_ENDPOINT, params: { query: query_string.delete("\n").delete(" ") } diff --git a/doc/api/examples/ruby/example_2.rb b/doc/api/examples/ruby/example_2.rb index 9a2e77493..9309eca88 100644 --- a/doc/api/examples/ruby/example_2.rb +++ b/doc/api/examples/ruby/example_2.rb @@ -1,9 +1,9 @@ -require 'http' +require "http" -API_ENDPOINT = 'https://decide.madrid.es/graphql'.freeze +API_ENDPOINT = "https://decide.madrid.es/graphql".freeze def make_request(query_string) - HTTP.headers('User-Agent' => 'Mozilla/5.0', accept: 'application/json') + HTTP.headers("User-Agent" => "Mozilla/5.0", accept: "application/json") .get( API_ENDPOINT, params: { query: query_string.delete("\n").delete(" ") } @@ -48,15 +48,15 @@ loop do response = make_request(query) response_hash = JSON.parse(response.body) - page_info = response_hash['data']['proposals']['pageInfo'] - has_next_page = page_info['hasNextPage'] - next_cursor = page_info['endCursor'] - proposal_edges = response_hash['data']['proposals']['edges'] + page_info = response_hash["data"]["proposals"]["pageInfo"] + has_next_page = page_info["hasNextPage"] + next_cursor = page_info["endCursor"] + proposal_edges = response_hash["data"]["proposals"]["edges"] puts "\tHTTP code: #{response.code}" proposal_edges.each do |edge| - proposals << edge['node'] + proposals << edge["node"] end page_number += 1 diff --git a/docker-compose.yml b/docker-compose.yml index 5c03e071b..81d1f6684 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3" services: # service configuration for our database database: @@ -17,7 +17,7 @@ services: # use the Dockerfile next to this file build: . entrypoint: /usr/local/bin/entrypoint.sh - command: bundle exec rails s -p 3000 -b '0.0.0.0' + command: bundle exec rails s -p 3000 -b "0.0.0.0" working_dir: /var/www/consul # rely on the RAILS_ENV value of the host machine