rails_voter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cdf2dab644d3921613e5a11d4525a0f63b08f22
-  data.tar.gz: d5b0a6487b627b7baf10820855d6cacba596f655
+  metadata.gz: eb0425f8f46eab75a51471f41999797c15837cd7
+  data.tar.gz: 0ce17fda1b85257f5c508de675b9b7ca5769c264
 SHA512:
-  metadata.gz: 4b03b5bf021633675bd766a500dfa3436b4881e57d8a082aeed2ae3f22b2f9f92f4b97cf58fb7a17577bf61548ee08dc620bc4fdc5aed9bc23c4f476676b176d
-  data.tar.gz: 5c4c983b59ffa845a488db1d356dcb13c16ffe1daabdb784fb763b2e6e866bda44fe1f458c30828eaeb06d08971ba346e445c92ee455debd426c9b574e803e9b
+  metadata.gz: a1019cb937b134155afdff0ba551b14bb02f025110598eddf4419948d72e3b54e41824d98b9472b0ebae2bd1092dc654e54b4206c50a3c2fb2e9fde37878db21
+  data.tar.gz: 240204b970ea046c0d4111d04c2c006b898c8757ab2c18f888e1292b3b3246597d5652fec7213eca0556cbd38fed19db5464ccc7a3a7cc0ac0be01ebea9ba5c9

data/app/controllers/rails_voter/elections_controller.rb

@@ -8,6 +8,8 @@ module RailsVoter
     expose :voting_result, -> { RailsVoter::VotingResult.new }
     expose :voting_result_show, -> { RailsVoter::VotingResult.show(params[:id]) }
 
+    before_action :render_layout_false, only: [:vote, :show_result]
+
     def new
       10.times do
         election.election_details.new
@@ -35,5 +37,9 @@ module RailsVoter
     def election_params
       params.require(:election).permit(:name, election_details_attributes: [:name, :id])
     end
+
+    def render_layout_false
+      render layout: false
+    end
   end
 end

data/app/controllers/rails_voter/voting_results_controller.rb

@@ -6,6 +6,7 @@ module RailsVoter
 
     def create
       voting_result.save
+      render layout: false
     end
 
     private

data/app/helpers/rails_voter/application_helper.rb

@@ -1,4 +1,23 @@
 module RailsVoter
   module ApplicationHelper
+    def embed_ballot_form(id)
+      content_tag(:div, nil) do
+        content_tag(
+          :iframe,
+          nil,
+          src: rails_voter.vote_election_path(id),
+        )
+      end
+    end
+
+    def embed_voting_result(id)
+      content_tag(:div, nil) do
+        content_tag(
+          :iframe,
+          nil,
+          src: rails_voter.show_result_election_path(id),
+        )
+      end
+    end
   end
 end

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

@@ -1,6 +1,7 @@
 .navbar.navbar-default
   .container
-    %button.navbar-toggle{ type: "button", 'data-toggle': "collapse", 'data-target': ".navbar-responsive-collapse" }
+    %button.navbar-toggle{ type: "button", 'data-toggle': "collapse",
+      'data-target': ".navbar-responsive-collapse" }
       %span.icon-bar
       %span.icon-bar
       %span.icon-bar

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

@@ -7,15 +7,20 @@
     %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 "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"
+      - h = "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"
+      = javascript_include_tag h
 
 
   %body

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

@@ -1,8 +1,21 @@
-= link_to "add", new_election_path
+= link_to "add", new_election_path, class: "btn btn-success"
 
 - elections.each do |bf|
   %p
-    = bf.name
+    %h2= 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)
+    %div
+      %h4 Add code to your view to display the ballot form.
+      %p erb:
+      %pre <%= embed_ballot_form(#{bf.id}) %>
+      %p haml:
+      %pre = embed_ballot_form(#{bf.id})
+
+      %h4 Add code to your view to display voting result.
+      %p erb:
+      %pre <%= embed_voting_result(#{bf.id}) %>
+      %p haml:
+      %pre = embed_voting_result(#{bf.id})
+  %hr

data/config/routes.rb

@@ -1,7 +1,7 @@
 RailsVoter::Engine.routes.draw do
   resources :elections do
-    get "vote", on: :member
-    get "show_result", on: :member
+    get :vote, on: :member
+    get :show_result, on: :member
   end
 
   resources :voting_results, only: [:create]

data/lib/generators/rails_voter/install/install_generator.rb

@@ -11,9 +11,13 @@ module RailsVoter
       rake("db:migrate")
     end
 
-    def add_seeds
-      copy_file "seeds.rb", "db/seeds.rb"
-      rake("db:seed")
+    def add_sample_data
+      copy_file "sample_data.rb", "lib/tasks/rails_voter.rake"
+      rake("rails_voter:add_sample_data")
+    end
+
+    def add_helpers
+      copy_file "helpers.rb", "config/initializers/rails_voter_helpers.rb"
     end
   end
 end

data/lib/generators/rails_voter/install/templates/helpers.rb

@@ -0,0 +1,3 @@
+ActiveSupport.on_load :action_controller do
+  helper RailsVoter::Engine.helpers
+end

data/lib/generators/rails_voter/install/templates/sample_data.rb

@@ -0,0 +1,25 @@
+namespace :rails_voter do
+  desc "Add sample data"
+  task add_sample_data: :environment do
+    RailsVoter::VotingResult.destroy_all
+    RailsVoter::ElectionDetail.destroy_all
+    RailsVoter::Election.destroy_all
+
+    p "Add sample data"
+    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 }
+  end
+end

data/lib/rails_voter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_voter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sunny Rails Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +275,7 @@ files:
 - app/assets/javascripts/rails_voter/ballot_forms.js
 - 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/elections.css
 - app/assets/stylesheets/rails_voter/voting_results.css
 - app/controllers/rails_voter/application_controller.rb
 - app/controllers/rails_voter/elections_controller.rb
@@ -285,7 +285,6 @@ files:
 - app/models/rails_voter/election_detail.rb
 - app/models/rails_voter/voting_result.rb
 - 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
@@ -307,9 +306,9 @@ files:
 - 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
+- lib/generators/rails_voter/install/templates/helpers.rb
+- lib/generators/rails_voter/install/templates/sample_data.rb
 - lib/generators/rails_voter/update/update_generator.rb
 - lib/rails_voter.rb
 - lib/rails_voter/engine.rb

data/app/views/layouts/rails_voter/aaaapplication.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>RailsVoter</title>
-  <%= stylesheet_link_tag    "rails_voter/application", media: "all" %>
-  <%= javascript_include_tag "rails_voter/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/db/seeds.rb

@@ -1,41 +0,0 @@
-require "faker"
-
-p "Remove seeds"
-RailsVoter::VotingResult.destroy_all
-RailsVoter::ElectionDetail.destroy_all
-RailsVoter::Election.destroy_all
-
-separator = ">>>>>>>><<<<<<<<<<"
-
-p separator
-
-5.times do
-  bf = RailsVoter::Election.create(name: Faker::StarWars.planet)
-  2.times do
-    bfd = bf.election_details.create(name: Faker::StarWars.character)
-    3.times do
-      bfd.voting_results.create
-    end
-  end
-end
-
-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/generators/rails_voter/install/templates/seeds.rb

@@ -1 +0,0 @@
-RailsVoter::Engine.load_seed