refinerycms-ballots 0.1.5 → 0.1.6

data/app/controllers/ballots_controller.rb

@@ -1,4 +1,4 @@
- class BallotsController < ApplicationController
+class BallotsController < ApplicationController
 
   before_filter :find_all_ballots
   before_filter :find_page

data/app/controllers/votes_controller.rb

@@ -37,7 +37,7 @@ protected
     if !@member
       flash[:error] = 'Please double check your number and try again. If it is correct, you may need to contact an admin.'
       redirect_to login_ballot_votes_path(@ballot)
-    elsif @member.has_voted_on?(@ballot)
+    elsif @ballot.voted_on_by?(@member)
       flash[:error] = "You have already voted on this ballot, revoting isn't allowed"
       redirect_to login_ballot_votes_path(@ballot)
     else

data/app/helpers/admin/ballots_helper.rb

@@ -1,5 +1,9 @@
 module Admin
   module BallotsHelper
+    def unique_identifier_name
+      Member.unique_identifier_name
+    end
+    
     def link_to_remove_fields name, f
       link_to_function(name, "remove_fields(this)") + f.hidden_field(:_destroy)
     end

data/app/models/ballot.rb

@@ -48,11 +48,11 @@ class Ballot < ActiveRecord::Base
   end
   
   def voting_members
-    Member.all.select { |member| member.has_voted_on? self }
+    Member.all.select { |member| voted_on_by? member }
   end
   
   def nonvoting_members
-    Member.all.reject { |member| member.has_voted_on? self }
+    Member.all.reject { |member| voted_on_by? member }
   end
   
   
@@ -60,6 +60,11 @@ class Ballot < ActiveRecord::Base
     return if start_date < end_date
     errors[:start_date] << 'must be after end date'
   end
+  
+  def voted_on_by?(member)
+    ballot_votes.where(:member_id => member.id, :ballot_id => id).any?
+  end
+  
 private
   def today
     Time.now

data/app/views/votes/login.html.erb

@@ -13,7 +13,7 @@
     </div>
 
     <div class="field">
-      <%= label_tag      :unique_identifier %>
+      <%= label_tag      :unique_identifier, unique_identifier_name %>
       <%= text_field_tag :unique_identifier %><br />
     </div>
     

data/lib/refinerycms-ballots.rb

@@ -1,5 +1,4 @@
 require 'refinerycms-base'
-require 'member_extensions'
 
 module Refinery
   module Ballots

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-ballots
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000 Z
+date: 2011-09-13 00:00:00.000000000 -05:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-simple_members
-  requirement: &70326298798500 !ruby/object:Gem::Requirement
+  requirement: &70235273747320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70326298798500
+  version_requirements: *70235273747320
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70326298812240 !ruby/object:Gem::Requirement
+  requirement: &70235273746620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +33,7 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70326298812240
+  version_requirements: *70235273746620
 description: Ruby on Rails Ballots engine for Refinery CMS
 email: 
 executables: []
@@ -40,7 +41,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/generators/refinerycms_ballots_generator.rb
-- lib/member_extensions.rb
 - lib/refinerycms-ballots.rb
 - lib/tasks/ballots.rake
 - config/locales/en.yml
@@ -78,6 +78,7 @@ files:
 - app/views/votes/create.html.erb
 - app/views/votes/login.html.erb
 - app/views/votes/new.html.erb
+has_rdoc: true
 homepage: 
 licenses: []
 post_install_message: 
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ballots engine for Refinery CMS

data/lib/member_extensions.rb

@@ -1,12 +0,0 @@
-class Member < ActiveRecord::Base
-  has_many :ballot_votes
-  
-  def number_of_times_voted
-    ballot_votes.count
-  end
-  
-  def has_voted_on?(ballot)
-    ballot_votes.where(:ballot_id => ballot.id).any?
-  end
-end
-