rails_voter 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36b9bfde64d9061cd68ee7c04cb88d88b3776664
-  data.tar.gz: 3025d3581689efa39c2e90f24f66346603015fa5
+  metadata.gz: 2cdf2dab644d3921613e5a11d4525a0f63b08f22
+  data.tar.gz: d5b0a6487b627b7baf10820855d6cacba596f655
 SHA512:
-  metadata.gz: 685fe8d2e45a8f87a78cdccaf3094ea7bf37dd0aa6a61ca0ececc722d811005e91ac7a5d268837295463ca80aa7b52a7bfcab1c3a0514aef61d5fa4025839f34
-  data.tar.gz: 186ea3ee743462623e4390b2e9df5ece76f8772bc01a6bde4ba80f529e4425e7d34f6a55fe035488e050b98529f46cc862178769ff3932c603cb96a4a5957bf0
+  metadata.gz: 4b03b5bf021633675bd766a500dfa3436b4881e57d8a082aeed2ae3f22b2f9f92f4b97cf58fb7a17577bf61548ee08dc620bc4fdc5aed9bc23c4f476676b176d
+  data.tar.gz: 5c4c983b59ffa845a488db1d356dcb13c16ffe1daabdb784fb763b2e6e866bda44fe1f458c30828eaeb06d08971ba346e445c92ee455debd426c9b574e803e9b

data/app/assets/javascripts/rails_voter/application.js

@@ -10,4 +10,8 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require jquery
+//= require jquery_ujs
+//= require bootstrap-sprockets
+
 //= require_tree .

data/app/assets/javascripts/rails_voter/voting_results.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/rails_voter/{application.css → application.scss}

@@ -10,6 +10,7 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require_tree .
- *= require_self
  */
+
+@import "bootstrap-sprockets";
+@import "bootstrap";

data/app/assets/stylesheets/rails_voter/voting_results.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/rails_voter/elections_controller.rb

@@ -0,0 +1,39 @@
+require_dependency "rails_voter/application_controller"
+
+module RailsVoter
+  class ElectionsController < ApplicationController
+    expose :elections, -> { Election.all }
+    expose :election, model: RailsVoter::Election
+    expose :election_details, -> { ElectionDetail.where(election_id: params[:id]) }
+    expose :voting_result, -> { RailsVoter::VotingResult.new }
+    expose :voting_result_show, -> { RailsVoter::VotingResult.show(params[:id]) }
+
+    def new
+      10.times do
+        election.election_details.new
+      end
+    end
+
+    def create
+      if election.save
+        redirect_to elections_path
+      else
+        render :new
+      end
+    end
+
+    def update
+      if election.update(election_params)
+        redirect_to elections_path
+      else
+        render :new
+      end
+    end
+
+    private
+
+    def election_params
+      params.require(:election).permit(:name, election_details_attributes: [:name, :id])
+    end
+  end
+end

data/app/controllers/rails_voter/voting_results_controller.rb

@@ -0,0 +1,17 @@
+require_dependency "rails_voter/application_controller"
+
+module RailsVoter
+  class VotingResultsController < ApplicationController
+    expose :voting_result, model: RailsVoter::VotingResult
+
+    def create
+      voting_result.save
+    end
+
+    private
+
+    def voting_result_params
+      params.require(:voting_result).permit(:election_detail_id)
+    end
+  end
+end

data/app/models/rails_voter/{ballot_form.rb → election.rb}

@@ -1,9 +1,9 @@
 module RailsVoter
-  class BallotForm < ActiveRecord::Base
-    has_many :ballot_form_details
+  class Election < ActiveRecord::Base
+    has_many :election_details
 
     accepts_nested_attributes_for(
-      :ballot_form_details,
+      :election_details,
       reject_if: proc { |bfd| bfd["name"].blank? },
       allow_destroy: true
     )

data/app/models/rails_voter/election_detail.rb

@@ -0,0 +1,6 @@
+module RailsVoter
+  class ElectionDetail < ActiveRecord::Base
+    belongs_to :election
+    has_many :voting_results
+  end
+end

data/app/models/rails_voter/voting_result.rb

@@ -1,5 +1,18 @@
 module RailsVoter
   class VotingResult < ActiveRecord::Base
-    belongs_to :ballot_form_detail
+    belongs_to :election_detail
+
+    scope :show, lambda { |election_id|
+      where(
+        "election_detail_id IN (?)", RailsVoter::Election.
+        find(election_id).
+        election_details.pluck(:id)
+      ).
+        group(:election_detail_id).
+        count.
+        sort_by { |_, v| v }.
+        reverse.
+        to_h
+    }
   end
 end

data/app/views/layouts/rails_voter/_menu.html.haml

@@ -0,0 +1,12 @@
+.navbar.navbar-default
+  .container
+    %button.navbar-toggle{ type: "button", 'data-toggle': "collapse", 'data-target': ".navbar-responsive-collapse" }
+      %span.icon-bar
+      %span.icon-bar
+      %span.icon-bar
+
+    %a.navbar-brand{ href: "/rails_voter" } Rails Voter
+    .navbar-collapse.collapse.navbar-responsive-collapse
+      %ul.nav.navbar-nav
+        %li= link_to "position 1", "#"
+        %li= link_to "position 2", "#"

data/app/views/layouts/rails_voter/application.html.haml

@@ -0,0 +1,32 @@
+!!! 5
+%html{ lang: "en" }
+  %head
+    %meta{ charset: "utf-8" }
+    %meta{ 'http-equiv': "X-UA-Compatible", content: "IE=Edge,chrome=1" }
+    %meta{ name: "viewport", content: "width=device-width, initial-scale=1.0" }
+    %title= content_for?(:title) ? yield(:title) : "Rails Voter"
+    = csrf_meta_tags
+    = stylesheet_link_tag "rails_voter/application", media: "all"
+    = favicon_link_tag "apple-touch-icon-144x144-precomposed.png", rel: "apple-touch-icon-precomposed", type: "image/png", sizes: "144x144"
+    = favicon_link_tag "apple-touch-icon-114x114-precomposed.png", rel: "apple-touch-icon-precomposed", type: "image/png", sizes: "114x114"
+    = favicon_link_tag "apple-touch-icon-72x72-precomposed.png", rel: "apple-touch-icon-precomposed", type: "image/png", sizes: "72x72"
+    = favicon_link_tag "apple-touch-icon-precomposed.png", rel: "apple-touch-icon-precomposed", type: "image/png"
+    = favicon_link_tag "favicon.ico", rel: "shortcut icon"
+    = javascript_include_tag "rails_voter/application"
+    / Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"
+
+
+  %body
+    = render "layouts/rails_voter/menu"
+    .container
+      .row
+        .col-lg-9
+          / = bootstrap_flash
+          = yield
+        .col-lg-3
+          .well.sidebar-nav
+            %h3= t("stats")
+      %footer
+        %p © Company 2016

data/app/views/rails_voter/{ballot_forms/_ballot_form_detail_record.html.haml → elections/_election_detail_record.html.haml}

@@ -1,4 +1,4 @@
-= f.fields_for :ballot_form_details do |bfd|
+= f.fields_for :election_details do |bfd|
   %p
     = bfd.label :name
     = bfd.text_field :name

data/app/views/rails_voter/elections/_form.html.haml

@@ -0,0 +1,9 @@
+= form_for election do |f|
+  %p
+    = f.label  t("rails_voter.election.name")
+    = f.text_field :name
+  %p
+    = render "election_detail_record", f: f
+    / = render "election_detail_record", f: f
+  %p
+  = f.submit

data/app/views/rails_voter/elections/index.html.haml

@@ -0,0 +1,8 @@
+= link_to "add", new_election_path
+
+- elections.each do |bf|
+  %p
+    = bf.name
+    = link_to "edit", edit_election_path(bf)
+    = link_to "vote", vote_election_path(bf)
+    = link_to "show result", show_result_election_path(bf)

data/app/views/rails_voter/elections/show_result.html.haml

@@ -0,0 +1,5 @@
+%h2= election.name
+
+- voting_result_show.each do |k, v|
+  %p
+    #{election_details.find(k).name} votes: #{v}

data/app/views/rails_voter/elections/vote.html.haml

@@ -0,0 +1,9 @@
+= election.name
+
+= form_for voting_result do |f|
+  - election_details.each do |bfd|
+    %p
+      = f.label :election_detail_id, bfd.name
+      = f.radio_button :election_detail_id, bfd.id
+
+  = f.submit

data/app/views/rails_voter/voting_results/create.html.haml

@@ -0,0 +1,2 @@
+%p
+  Thanks for voting!

data/config/locales/en.yml

@@ -1,4 +1,4 @@
 en:
   rails_voter:
-    ballot_form:
-      name: "Super Name ->"
+    election:
+      name: "Election title"

data/config/locales/pl.yml

@@ -1,4 +1,4 @@
 pl:
   rails_voter:
-    ballot_form:
-      name: "Nazwa"
+    election:
+      name: "Tytuł Wyborów"

data/config/routes.rb

@@ -1,5 +1,10 @@
 RailsVoter::Engine.routes.draw do
-  resources :ballot_forms
+  resources :elections do
+    get "vote", on: :member
+    get "show_result", on: :member
+  end
 
-  root to: 'ballot_forms#index'
+  resources :voting_results, only: [:create]
+
+  root to: "elections#index"
 end

data/db/migrate/20160707113355_change_ballot_form_name.rb

@@ -0,0 +1,9 @@
+class ChangeBallotFormName < ActiveRecord::Migration
+  def up
+    rename_table("rails_voter_ballot_forms", "rails_voter_elections")
+  end
+
+  def down
+    rename_table("rails_voter_elections", "rails_voter_ballot_forms")
+  end
+end

data/db/migrate/20160707114814_change_ballot_form_detail_name.rb

@@ -0,0 +1,9 @@
+class ChangeBallotFormDetailName < ActiveRecord::Migration
+  def up
+    rename_table("rails_voter_ballot_form_details", "rails_voter_election_details")
+  end
+
+  def down
+    rename_table("rails_voter_election_details", "rails_voter_ballot_form_details")
+  end
+end

data/db/migrate/20160707131546_change_ballot_form_detail_id_name.rb

@@ -0,0 +1,9 @@
+class ChangeBallotFormDetailIdName < ActiveRecord::Migration
+  def up
+    rename_column "rails_voter_voting_results", :ballot_form_detail_id, :election_detail_id
+  end
+
+  def down
+    rename_column "rails_voter_voting_results", :election_detail_id, :ballot_form_detail_id
+  end
+end

data/db/migrate/20160707143841_change_ballot_form_id_column_name.rb

@@ -0,0 +1,9 @@
+class ChangeBallotFormIdColumnName < ActiveRecord::Migration
+  def up
+    rename_column "rails_voter_election_details", :ballot_form_id, :election_id
+  end
+
+  def down
+    rename_column "rails_voter_election_details", :election_id, :ballot_form_id
+  end
+end

data/db/seeds.rb

@@ -1,26 +1,20 @@
 require "faker"
 
+p "Remove seeds"
+RailsVoter::VotingResult.destroy_all
+RailsVoter::ElectionDetail.destroy_all
+RailsVoter::Election.destroy_all
+
 separator = ">>>>>>>><<<<<<<<<<"
 
 p separator
 
-ballot_form_id = 0
-ballot_form_detail_id = 0
-
 5.times do
-  ballot_form_id += 1
-  RailsVoter::BallotForm.create(name: Faker::StarWars.planet)
-
+  bf = RailsVoter::Election.create(name: Faker::StarWars.planet)
   2.times do
-    ballot_form_detail_id += 1
-
-    RailsVoter::BallotFormDetail.create(
-      name: Faker::StarWars.character,
-      ballot_form_id: ballot_form_id
-    )
-
+    bfd = bf.election_details.create(name: Faker::StarWars.character)
     3.times do
-      RailsVoter::VotingResult.create(ballot_form_detail_id: ballot_form_detail_id)
+      bfd.voting_results.create
     end
   end
 end
@@ -29,3 +23,19 @@ message = "5 ballot forms, 10 ballot form details and 30 voting results created.
 p separator
 p message
 p separator
+
+p "United States presidential election, 2016 seeds"
+
+bf = RailsVoter::Election.create(name: "United States presidential election, 2016")
+
+bfd = bf.election_details.create(name: "Hillary Clinton")
+4.times { bfd.voting_results.create }
+
+bfd = bf.election_details.create(name: "Donald Trump")
+3.times { bfd.voting_results.create }
+
+bfd = bf.election_details.create(name: "Gary Johnson")
+2.times { bfd.voting_results.create }
+
+bfd = bf.election_details.create(name: "Jill Stein")
+2.times { bfd.voting_results.create }

data/lib/rails_voter/engine.rb

@@ -1,5 +1,8 @@
 module RailsVoter
   class Engine < ::Rails::Engine
+    require "bootstrap-sass"
+    require "jquery-rails"
+
     isolate_namespace RailsVoter
 
     config.generators do |g|

data/lib/rails_voter/version.rb

@@ -1,3 +1,3 @@
 module RailsVoter
-  VERSION = "0.0.3".freeze
+  VERSION = "0.1.0".freeze
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rails_voter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Sunny Rails Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-25 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: decent_exposure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.6
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml_lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - grafska@gmail.com
@@ -231,20 +273,28 @@ files:
 - Rakefile
 - app/assets/javascripts/rails_voter/application.js
 - app/assets/javascripts/rails_voter/ballot_forms.js
-- app/assets/stylesheets/rails_voter/application.css
+- app/assets/javascripts/rails_voter/voting_results.js
+- app/assets/stylesheets/rails_voter/application.scss
 - app/assets/stylesheets/rails_voter/ballot_forms.css
+- app/assets/stylesheets/rails_voter/voting_results.css
 - app/controllers/rails_voter/application_controller.rb
-- app/controllers/rails_voter/ballot_forms_controller.rb
+- app/controllers/rails_voter/elections_controller.rb
+- app/controllers/rails_voter/voting_results_controller.rb
 - app/helpers/rails_voter/application_helper.rb
-- app/models/rails_voter/ballot_form.rb
-- app/models/rails_voter/ballot_form_detail.rb
+- app/models/rails_voter/election.rb
+- app/models/rails_voter/election_detail.rb
 - app/models/rails_voter/voting_result.rb
-- app/views/layouts/rails_voter/application.html.erb
-- app/views/rails_voter/ballot_forms/_ballot_form_detail_record.html.haml
-- app/views/rails_voter/ballot_forms/_form.html.haml
-- app/views/rails_voter/ballot_forms/edit.html.haml
-- app/views/rails_voter/ballot_forms/index.html.haml
-- app/views/rails_voter/ballot_forms/new.html.haml
+- app/views/layouts/rails_voter/_menu.html.haml
+- app/views/layouts/rails_voter/aaaapplication.html.erb
+- app/views/layouts/rails_voter/application.html.haml
+- app/views/rails_voter/elections/_election_detail_record.html.haml
+- app/views/rails_voter/elections/_form.html.haml
+- app/views/rails_voter/elections/edit.html.haml
+- app/views/rails_voter/elections/index.html.haml
+- app/views/rails_voter/elections/new.html.haml
+- app/views/rails_voter/elections/show_result.html.haml
+- app/views/rails_voter/elections/vote.html.haml
+- app/views/rails_voter/voting_results/create.html.haml
 - config/locales/en.yml
 - config/locales/pl.yml
 - config/routes.rb
@@ -253,6 +303,10 @@ files:
 - db/migrate/20160607180028_add_ref_to_ballot_form_details.rb
 - db/migrate/20160608141052_create_rails_voter_voting_results.rb
 - db/migrate/20160608145149_add_ref_to_rails_voter_voting_result.rb
+- db/migrate/20160707113355_change_ballot_form_name.rb
+- db/migrate/20160707114814_change_ballot_form_detail_name.rb
+- db/migrate/20160707131546_change_ballot_form_detail_id_name.rb
+- db/migrate/20160707143841_change_ballot_form_id_column_name.rb
 - db/seeds.rb
 - lib/generators/rails_voter/install/install_generator.rb
 - lib/generators/rails_voter/install/templates/seeds.rb

data/app/controllers/rails_voter/ballot_forms_controller.rb

@@ -1,36 +0,0 @@
-require_dependency "rails_voter/application_controller"
-
-module RailsVoter
-  class BallotFormsController < ApplicationController
-    expose :ballot_forms, -> { BallotForm.all }
-    expose :ballot_form, model: RailsVoter::BallotForm
-
-    def new
-      10.times do
-        ballot_form.ballot_form_details.new
-      end
-    end
-
-    def create
-      if ballot_form.save
-        redirect_to ballot_forms_path
-      else
-        render :new
-      end
-    end
-
-    def update
-      if ballot_form.update(ballot_form_params)
-        redirect_to ballot_forms_path
-      else
-        render :new
-      end
-    end
-
-    private
-
-    def ballot_form_params
-      params.require(:ballot_form).permit(:name, ballot_form_details_attributes: [:name, :id])
-    end
-  end
-end

data/app/models/rails_voter/ballot_form_detail.rb

@@ -1,6 +0,0 @@
-module RailsVoter
-  class BallotFormDetail < ActiveRecord::Base
-    belongs_to :ballot_form
-    has_many :voting_results
-  end
-end

data/app/views/rails_voter/ballot_forms/_form.html.haml

@@ -1,9 +0,0 @@
-= form_for ballot_form do |f|
-  %p
-    = f.label  t('rails_voter.ballot_form.name')
-    = f.text_field :name
-  %p
-    = render 'ballot_form_detail_record', f: f
-    / = render 'ballot_form_detail_record', f: f
-  %p
-  = f.submit

data/app/views/rails_voter/ballot_forms/index.html.haml

@@ -1,6 +0,0 @@
-= link_to 'add', new_ballot_form_path
-
-- ballot_forms.each do |bf|
-  %p
-    = bf.name
-    = link_to 'edit', edit_ballot_form_path(bf)