Merge branch 'master' into polls

app/models/proposal.rb

@@ -50,7 +50,7 @@ class Proposal < ActiveRecord::Base
   scope :last_week,                -> { where("proposals.created_at >= ?", 7.days.ago)}
   scope :retired,                  -> { where.not(retired_at: nil) }
   scope :not_retired,              -> { where(retired_at: nil) }
-  scope :successful,               -> { where("cached_votes_up + physical_votes >= ?", Proposal.votes_needed_for_success)}
+  scope :successful,               -> { where("cached_votes_up >= ?", Proposal.votes_needed_for_success) }
 
   def to_param
     "#{id}-#{title}".parameterize
@@ -99,7 +99,7 @@ class Proposal < ActiveRecord::Base
   end
 
   def total_votes
-    cached_votes_up + physical_votes
+    cached_votes_up
   end
 
   def voters

app/views/layouts/_meta_tags.html.erb

@@ -0,0 +1,5 @@
+<meta name="description"
+      content="<%= content_for?(:meta_description) ? yield(:meta_description) : setting["meta_description"]  %>" />
+
+<meta name="keywords"
+      content="<%= content_for?(:meta_keywords) ? yield(:meta_keywords) : setting["meta_keywords"]  %>" />

app/views/layouts/application.html.erb

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <%= render "layouts/tracking_data" %>
+    <%= render "layouts/meta_tags" %>
     <title><%= content_for?(:title) ? yield(:title) : setting['org_name'] %></title>
     <%= stylesheet_link_tag    "application" %>
     <!--[if lt IE 9]>

app/views/layouts/devise.html.erb

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <title><%= content_for?(:title) ? yield(:title) : "Gobierno abierto" %></title>
+    <%= render "layouts/meta_tags" %>
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
     <%= csrf_meta_tags %>

config/deploy.rb

@@ -30,6 +30,7 @@ set :keep_releases, 5
 set :local_user, ENV['USER']
 
 set :delayed_job_workers, 2
+set :delayed_job_roles, :background
 
 set(:config_files, %w(
   log_rotation

config/deploy/preproduction.rb

@@ -6,5 +6,5 @@ set :ssh_options, port: deploysecret(:ssh_port)
 set :stage, :preproduction
 set :rails_env, :preproduction
 
-server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron)
+server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron background)
 server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer)

config/deploy/production.rb

@@ -7,6 +7,6 @@ set :stage, :production
 set :rails_env, :production
 
 #server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer)
-server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron)
+server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron background)
 server deploysecret(:server3), user: deploysecret(:user), roles: %w(web app db importer)
 server deploysecret(:server4), user: deploysecret(:user), roles: %w(web app db importer)

config/locales/settings.en.yml

@@ -34,3 +34,5 @@ en:
         voting_allowed: Voting on investment projects
     mailer_from_name: Origin email name
     mailer_from_address: Origin email address
+    meta_description: "Site description (SEO)"
+    meta_keywords: "Keywords (SEO)"

config/locales/settings.es.yml

@@ -34,3 +34,5 @@ es:
         voting_allowed: Votaciones sobre propuestas de inversión.
     mailer_from_name: Nombre email remitente
     mailer_from_address: Dirección email remitente
+    meta_description: "Descripción del sitio (SEO)"
+    meta_keywords: "Palabras clave (SEO)"

db/dev_seeds.rb

@@ -36,7 +36,8 @@ Setting.create(key: 'per_page_code', value: "")
 Setting.create(key: 'comments_body_max_length', value: '1000')
 Setting.create(key: 'mailer_from_name', value: 'Consul')
 Setting.create(key: 'mailer_from_address', value: 'noreply@consul.dev')
-
+Setting.create(key: 'meta_description', value: 'Citizen Participation and Open Government Application')
+Setting.create(key: 'meta_keywords', value: 'citizen participation, open government')
 
 puts "Creating Geozones"
 

db/migrate/20161229110336_remove_physical_votes_from_proposals.rb

@@ -0,0 +1,5 @@
+class RemovePhysicalVotesFromProposals < ActiveRecord::Migration
+  def change
+    remove_column :proposals, :physical_votes
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161227140109) do
+ActiveRecord::Schema.define(version: 20161229110336) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -378,7 +378,6 @@ ActiveRecord::Schema.define(version: 20161227140109) do
     t.string   "responsible_name",    limit: 60
     t.text     "summary"
     t.string   "video_url"
-    t.integer  "physical_votes",                 default: 0
     t.tsvector "tsv"
     t.integer  "geozone_id"
     t.datetime "retired_at"

db/seeds.rb

@@ -57,6 +57,10 @@ Setting["org_name"] = "Consul"
 # Consul installation place name (City, Country...)
 Setting["place_name"] = "Consul-land"
 
+# Meta tags for SEO
+Setting["meta_description"] = nil
+Setting["meta_keywords"] = nil
+
 # Feature flags
 Setting['feature.debates'] = true
 Setting['feature.spending_proposals'] = true

spec/helpers/proposals_helper_spec.rb

@@ -13,11 +13,6 @@ describe ProposalsHelper do
       expect(progress_bar_percentage(proposal)).to eq 50
     end
 
-    it "should take into account the physical votes" do
-      proposal = create(:proposal, cached_votes_up: ((Proposal.votes_needed_for_success/2)-100), physical_votes: 100)
-      expect(progress_bar_percentage(proposal)).to eq 50
-    end
-
     it "should be 100 if there are more votes than needed" do
       proposal = create(:proposal, cached_votes_up: Proposal.votes_needed_for_success*2)
       expect(progress_bar_percentage(proposal)).to eq 100
@@ -45,10 +40,6 @@ describe ProposalsHelper do
       expect(supports_percentage(proposal)).to eq "100%"
     end
 
-    it "should take into account the physical votes" do
-      proposal = create(:proposal, physical_votes: Proposal.votes_needed_for_success/2)
-      expect(supports_percentage(proposal)).to eq "50%"
-    end
   end
 
 end