refinerycms-polls 0.0.2.dev → 0.0.4.dev

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+## v0.0.1.dev
+
+* Create polls in refinerycms admin.
+* Add Answers to poll.
+* Render polls in refinerycms.
+
+## v0.0.2.dev
+
+* Config vote interval in config/refinery/poll initializer.
+
+## v0.0.3.dev
+
+* Add css file app/assets/stylesheets/refinery/polls/poll.css.scss to override poll styles.
+
+## v0.0.4.dev
+* Poll checkbox as labels to better user experience.
+* Translate js to coffee script.
+* Fix jquery library loads from extension and not from cms.
+* Fix poll form double submit if user does dobel click.
+* Fix howto finds votes for question with already_voted?(remote_ip) in Question model.
+* Fix tests for all models/controllers
+* Add tests for question controller
+* Add documentation

data/Gemfile

@@ -2,9 +2,9 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.0', :git => 'git://github.com/resolve/refinerycms.git'
+gem 'refinerycms', '~> 2.0.0', :git => 'git://github.com/resolve/refinerycms.git', :branch => '2-0-stable'
 gem 'refinerycms-i18n', :git => 'git://github.com/parndt/refinerycms-i18n.git'
-gem 'refinerycms-settings', :git => 'git://github.com/parndt/refinerycms-settings.git'
+gem 'refinerycms-settings', :git => 'git://github.com/parndt/refinerycms-settings.git', :branch => '2-0-stable'
 
 # Refinery/rails should pull in the proper versions of these
 group :assets do
@@ -19,6 +19,7 @@ group :development, :test do
   gem 'refinerycms-testing', '~> 2.0.0'
   gem 'factory_girl_rails'
   gem 'generator_spec'
+  gem 'activesupport'
 
   require 'rbconfig'
 

data/README.md

@@ -4,7 +4,7 @@
 
 Include the latest [gem](http://rubygems.org/gems/refinerycms-polls) into your Refinery CMS application's Gemfile:
 
-    gem 'refinerycms-polls', '~> 0.0.1.dev'
+    gem 'refinerycms-polls', '~> 0.0.4.dev'
 
 Then type the following at command line inside your Refinery CMS application's root directory:
 
@@ -60,11 +60,15 @@ In summary you can:
 * Set when starts and ends your polls.
 * Show results for your polls.
 * Set votes for anonymous users by IP addres
-* Set aa duration period to vote. (if a guest vote it will need to wait x time to vote again)
+* Set duration period to vote. (if a guest vote it will need to wait X time to vote again)
 
 ## Todo
 
 * Vote tracking by cookies.
 * Documentation
 * Tests
-* Wiki
+* Wiki
+
+
+## License
+RefineryCMS Polls extension is released under the MIT license and is copyright (c) 2012 Agustin Viñao

data/Rakefile

@@ -18,3 +18,5 @@ Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/testing.rake', __FILE__)
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+Bundler::GemHelper.install_tasks

data/app/assets/javascripts/refinery/polls/poll.js

@@ -0,0 +1,2 @@
+//= require jquery
+//= require jquery_ujs

data/app/assets/javascripts/refinery/polls/poll_form.js.coffee

@@ -0,0 +1,6 @@
+do_vote = (element) ->
+  $(element).parents().find('form').submit()
+jQuery ->
+  $("input[type=radio][name=answer_id]").click ->
+    do_vote(this)
+    $(this).attr "disabled", true

data/app/assets/stylesheets/refinery/polls/polls.css.scss

@@ -0,0 +1,7 @@
+.refinery-polls{
+  ul{
+    list-style-type: none;
+    padding: 10px;
+    margin: 0;
+  }
+}

data/app/controllers/refinery/polls/admin/answers_controller.rb

@@ -5,7 +5,7 @@ module Refinery
 
         crudify :'refinery/polls/answer', :title_attribute => 'title', :xhr_paging => true
         before_filter :find_question 
-        before_filter :find_answer, :only => [:edit, :update]
+        before_filter :find_answer, :only => [:edit, :update, :destroy]
         
         def index
           paginate_all_answers
@@ -16,18 +16,19 @@ module Refinery
 
         def create
           if (@answer = ::Refinery::Polls::Answer.create({:question_id => @question.id}.merge(params[:answer]))).valid?
-            flash.now[:notice] = "#{@answer.title} was successfully created."
+            flash.now[:notice] = "'#{@answer.title}' was successfully added."
             self.index
             @dialog_successful = true
             render :index
           else
+            flash.now[:notice] = "There were problems"
             render :action => 'new'
           end
         end
 
         def update
           if @answer.update_attributes({:question_id => @question.id}.merge(params[:answer]))
-            flash.now[:notice] = "#{@answer.title} was successfully updated."
+            flash.now[:notice] = "'#{@answer.title}' was successfully updated."
             self.index
             @dialog_successful = true
             render :index
@@ -36,6 +37,18 @@ module Refinery
           end
         end
         
+        def destroy
+          answer_title = @answer.title
+          if @answer.destroy
+            flash.now[:notice] = "'#{answer_title}' was successfully removed."
+            @dialog_successful = true
+          else
+            flash.now[:notice] = "There were problems"
+          end
+          self.index
+          render :index
+        end
+        
         private
         def find_answer
           @answer = ::Refinery::Polls::Answer.find_by_slug_or_id(params[:id])

data/app/controllers/refinery/polls/questions_controller.rb

@@ -2,11 +2,11 @@ module Refinery
   module Polls
     class QuestionsController < ::ApplicationController
 
-      before_filter :find_all_questions, :only => [:index]
+      before_filter :find_all_questions, :only => [:index, :show]
       before_filter :find_page, :except => [:submit]
-      before_filter :find_vote, :only => [:show, :create]
-      before_filter :find_answer, :only => [:submit]
       before_filter :find_question, :only => [:submit, :show]
+      before_filter :find_answer, :only => [:submit]
+      before_filter :find_vote, :only => [:show, :create, :submit]
       respond_to :html, :js, :json
       def index
         # you can use meta fields from your model instead (e.g. browser_title)
@@ -20,21 +20,24 @@ module Refinery
         present(@page)
       end
       
+      
+      # Handle votes from questions
+      #
+      # @param [id] Id of question voted
+      # @param [question_id] Value of the answer selected by guest
+      # @return [String] Question results
       def submit
-        @vote = nil
-        if @answer.nil?
-          flash[:notice] = t(".no_answer_selected")
-        else
-          unless @vote
-            @answer.votes_count += 1
-            @answer.save
-            @vote = ::Refinery::Polls::Vote.vote_by_ip(@question, @answer, request.remote_ip)
-          end
-          respond_to do |format|
-            format.js
-            format.html
+        if @vote.nil?
+          if @answer.nil?
+            flash[:notice] = t(".no_answer_selected")
+          else
+            @vote = ::Refinery::Polls::Vote.vote_by_ip(@answer, request.remote_ip)
           end
         end
+        respond_to do |format|
+          format.js
+          format.html
+        end
       end
 
     protected
@@ -55,7 +58,7 @@ module Refinery
       end
       
       def find_vote
-        @vote = ::Refinery::Polls::Vote.where("ip=? AND created_at > ?", request.remote_ip, Time.now - Refinery::Polls.vote_duration).first
+        @vote = ::Refinery::Polls::Vote.get_vote(@question, request.remote_ip)
       end
     end
   end

data/app/models/refinery/polls/answer.rb

@@ -8,7 +8,7 @@ module Refinery
     
       acts_as_indexed :fields => [:title]
 
-      validates :title, :presence => true, :uniqueness => true
+      validates :title, :presence => true, :uniqueness => { :scope => :question_id}
       
       attr_accessible :title, :question_id, :position
       attr_accessor :locale
@@ -22,6 +22,20 @@ module Refinery
         attr_accessible :locale
       end
       
+      # Get a string to represent a dom id
+      #
+      # @return [String] Returns the dom id representation for the current object
+      def dom_id
+        "answer_#{id}"
+      end
+      
+      # Get an array of title and votes_count
+      #
+      # @return [Array] Returns an array of title and votes_count
+      def data_result
+        [title, votes_count]
+      end
+      
       def self.translated
         with_translations(::Globalize.locale)
       end

data/app/models/refinery/polls/question.rb

@@ -26,17 +26,33 @@ module Refinery
       
       has_many :answers, :class_name => '::Refinery::Polls::Answer'
       
+      # Get all actives questions by start_date and end_date
+      #
+      # @return [Array] Array of Refinery::Polls::Question
       def self.actives
         where("start_date <= ? and end_date >= ?", Date.today, Date.today)
       end
       
+      # Check if we have a vote by ip address
+      #
+      # @param [String] A string to represent an IP address
+      # @return [::Refinery::Polls::Vote, nil] Returns the vote finded or nil
+      def already_voted?(remote_ip)
+        answers.joins(:votes).where(Refinery::Polls::Vote.table_name.to_sym => {:created_at => Time.now.utc - Refinery::Polls.vote_duration, :ip => remote_ip}).first
+      end
+      
+      # Get al data for answers and total votes count
+      #
+      # @return [Array] Returns an array with [[title,votes_count]..[title,votes_count]], total_votes]
       def answers_with_data
-        results, votes_total = [], 0
-        answers.each do |answer|
-          results << [answer.title, answer.votes_count]
-          votes_total += answer.votes_count
-        end
-        return results, votes_total
+        return answers.map(&:data_result), total_votes
+      end
+      
+      # Calculate the total votes for current question
+      #
+      # @return [Integer] Returns the value of total votes
+      def total_votes
+        answers.sum(&:votes_count)
       end
       
       class << self
@@ -48,15 +64,6 @@ module Refinery
           end
         end
       end
-      # def self.active_poll(user_id)
-      #   users_polls = UsersPoll.find_all_by_user_id(user_id, :select => :poll_id)
-      #   polls = users_polls.count > 0 ? Poll.active.find(:all, :conditions => ["id NOT IN (?)", users_polls.collect {|up| up.poll_id } ]) : Poll.active
-      #   polls.count > 0 ? polls.first : nil
-      # end
-      
-      
-      # acceso a variables connfiguradas
-      #self.per_page = Refinery::Blog.posts_per_page
     end
   end
 end

data/app/models/refinery/polls/vote.rb

@@ -5,20 +5,22 @@ module Refinery
       acts_as_indexed :fields => [:question_id, :answer_id, :ip]
 
       belongs_to :question, :class_name => '::Refinery::Polls::Question'
-      belongs_to :answer, :class_name => '::Refinery::Polls::Answer'
+      belongs_to :answer, :class_name => '::Refinery::Polls::Answer', :counter_cache => true
       
       attr_accessible :question_id, :answer_id, :ip
       
       # Create Vote for Question, Answer and IP
+      #
       # @param [::Refinery::Polls::Question] Question object
       # @parama [::Refinery::Polls::Answer] Answer object
       # @return [::Refinery::Polls::Vote] Vote object created
       
-      def self.vote_by_ip(question, answer, ip)
-        self.create(:answer_id => answer.id, :question_id => question.id, :ip => ip)
+      def self.vote_by_ip(answer, ip)
+        self.create(:answer_id => answer.id, :question_id => answer.question.id, :ip => ip)
       end
       
       # Find vote for Question by IP
+      #
       # @param [::Refinery::Polls::Question] Question object
       # @parama [Request] Request object to use remote_ip
       # @return [::Refinery::Polls::Vote] Vote object created

data/app/views/refinery/polls/questions/_answers_form.html.erb

@@ -4,7 +4,10 @@
                :remote => true, 
                :html => {:id => "reinerycms-poll-#{question.slug}"} do |f| %>
     <% question.answers.each do |answer| %>
-      <li><%= radio_button_tag("answer_id", answer.id, false) %> <%= answer.title %></li>
+      <%= content_tag_for :li, answer do %>
+        <%= radio_button_tag("answer_id", answer.id, false, id: answer.dom_id) %>
+        <%= label_tag answer.dom_id, answer.title %>
+      <% end %>
     <% end %>
   <% end %>
 </ul>

data/app/views/refinery/polls/questions/_poll.html.erb

@@ -6,5 +6,5 @@
       <%= (vote = ::Refinery::Polls::Vote.get_vote(question, request.remote_ip)).nil? ? render(:partial => 'refinery/polls/questions/answers_form', :locals => {:question => question}) : render(:partial => 'refinery/polls/questions/results', :locals => {:question => question, :vote => vote}) %>
     <% end %>
   </div>
-  <% content_for :javascripts, javascript_include_tag('application', 'refinery/polls/poll_form') %>
+  <% content_for :javascripts, javascript_include_tag('refinery/polls/poll', 'refinery/polls/poll_form') %>
 <% end %>

data/app/views/refinery/polls/questions/index.html.erb

@@ -1,9 +1,10 @@
 <% content_for :body_content_left do %>
+  <h4>Polls</h4>
   <ul id="questions">
-    <% @questions.each do |poll| %>
-      <li>
+    <% @questions.each do |question| %>
+      <%= content_tag_for :li, question do %>
         <%= link_to question.title, refinery.polls_question_path(question) %>
-      </li>
+      <% end %>
     <% end %>
   </ul>
 <% end %>

data/app/views/refinery/polls/questions/show.html.erb

@@ -1,33 +1,24 @@
+<% content_for :stylesheets, stylesheet_link_tag('refinery/polls/polls') %>
 <% content_for :body_content_title do %>
   <%= @question.title %>
 <% end %>
 
 <% content_for :body_content_left do %>
-  <section>
-    <h1>Title</h1>
-    <p>
-      <%=raw @question.title %>
-    </p>
-  </section>
-  <section>
-    <h1>Start Date</h1>
-    <p>
-      <%=raw @question.start_date %>
-    </p>
-  </section>
-  <section>
-    <h1>End Date</h1>
-    <p>
-      <%=raw @question.end_date %>
-    </p>
-  </section>
+  <div class="refinery-polls">
+    <ul>
+      <li>Title: <%=raw @question.title %></li>
+      <li>Start: <%=l(@question.start_date, :format => :short) %></li>
+      <li>End: <%=l(@question.end_date, :format => :short) %></li>
+      <li>Votes:   <%=pluralize(@question.total_votes, "vote") %></li>
+    <ul>
+  </div>
 <% end %>
 
 <% content_for :body_content_right do %>
   <aside>
     <h2><%= t('.other') %></h2>
     <ul id="questions">
-      <% @questions.each do |poll| %>
+      <% @questions.each do |question| %>
         <li>
           <%= link_to question.title, refinery.polls_question_path(question) %>
         </li>

data/config/locales/en.yml

@@ -2,39 +2,39 @@ en:
   refinery:
     plugins:
       polls:
-        title: Polls
+        title: Questions
     polls:
       admin:
         questions:
           actions:
-            create_new: Add New Poll
-            reorder: Reorder Polls
-            reorder_done: Done Reordering Polls
+            create_new: Add New Question
+            reorder: Reorder Questions
+            reorder_done: Done Reordering Questions
           records:
-            title: Polls
+            title: Questions
             sorry_no_results: Sorry! There are no results found.
-            no_items_yet: There are no Polls yet. Click "Add New Poll" to add your first poll.
+            no_items_yet: There are no Questions yet. Click "Add New Question" to add your first question.
           question:
-            view_live_html: View this poll live <br/><em>(opens in a new window)</em>
-            edit: Edit this poll
-            delete: Remove this poll forever
-            manage_answers: View answers for this poll
+            view_live_html: View this question live <br/><em>(opens in a new window)</em>
+            edit: Edit this question
+            delete: Remove this question forever
+            manage_answers: View answers for this question
         answers:
           actions:
-            create_new: Add New Poll Answer
-            reorder: Reorder Poll Answers
-            reorder_done: Done Reordering Poll Answers
+            create_new: Add New Question Answer
+            reorder: Reorder Question Answers
+            reorder_done: Done Reordering Question Answers
           records:
-            title: Poll Answers
+            title: Question Answers
             sorry_no_results: Sorry! There are no results found.
-            no_items_yet: There are no Poll Answers yet. Click "Add New Poll Answer" to add your first poll answer.
+            no_items_yet: There are no Question Answers yet. Click "Add New Question Answer" to add your first question answer.
           answer:
-            view_live_html: View this poll answer live <br/><em>(opens in a new window)</em>
-            edit: Edit this poll answer
-            delete: Remove this poll answer forever
+            view_live_html: View this question answer live <br/><em>(opens in a new window)</em>
+            edit: Edit this question answer
+            delete: Remove this question answer forever
       questions:
         show:
-          other: Other Polls
+          other: Other Questions
   activerecord:
     attributes:
       'refinery/polls/question':

data/lib/generators/refinery/polls_generator.rb

@@ -10,7 +10,11 @@ module Refinery
     def generate_poll_initializer
       template "config/initializers/refinery/poll.rb.erb", File.join(destination_root, "config", "initializers", "refinery", "poll.rb")
     end
-
+    
+    def generate_styles_to_assets
+      template "app/assets/stylesheets/refinery/polls/poll.css.scss", File.join(destination_root, "app", "assets", "stylesheets", "refinery", "polls", "poll.css.scss")
+    end
+    
     def append_load_seed_data
       create_file 'db/seeds.rb' unless File.exists?(File.join(destination_root, 'db', 'seeds.rb'))
       append_file 'db/seeds.rb', :verbose => true do

data/lib/generators/refinery/templates/app/assets/stylesheets/refinery/polls/poll.css.scss

@@ -0,0 +1,28 @@
+/* These are all classes used by poll to render */
+/*
+.reinerycms-polls-form h3{
+  padding:5px;
+}
+.reinerycms-polls-form ul{
+  list-style-type: none;
+  padding: 10px;
+  margin: 0;
+}
+.reinerycms-polls-pollbar {
+  margin: 1px;
+  font-size: 13px;
+  line-height: 15px;
+  height: 15px;
+  background-image: image_url('refinery/polls/pollbg.gif');
+  border: 1px solid #ffffff;
+}
+.reinerycms-polls-pollbar IMG {
+  display: inline;
+  border: 0px;
+  padding: 0px;
+  margin: 0px;
+}
+.reinerycms-polls-results{
+  border:1px solid #CCC;
+}
+*/

data/lib/refinery/polls/configuration.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/numeric/time'
 module Refinery
   module Polls
     include ActiveSupport::Configurable

data/lib/refinery/polls/engine.rb

@@ -12,7 +12,7 @@ module Refinery
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.polls_admin_questions_path }
           plugin.pathname = root
           plugin.activity = {
-            :class_name => :'refinery/polls/poll'
+            :class_name => :'refinery/polls/question'
           }
           
         end

data/lib/refinery/polls/version.rb

@@ -3,7 +3,7 @@ module Refinery
     class Version
       @major = 0
       @minor = 0 
-      @tiny  = 2
+      @tiny  = 4
       @build = 'dev'
 
       class << self

data/spec/models/refinery/polls/answer_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+module Refinery
+  module Polls
+    describe Answer do
+      describe "validations" do
+        subject do
+          FactoryGirl.create(:answer, :title => "Answer 1")
+        end
+
+        it { should be_valid }
+        its(:errors) { should be_empty }
+        its(:title) { should == "Answer 1" }
+      end
+    end
+  end
+end

data/spec/models/refinery/polls/question_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Refinery
   module Polls
-    describe quesiton do
+    describe Question do
       describe "validations" do
         subject do
           FactoryGirl.create(:question,
@@ -13,6 +13,36 @@ module Refinery
         its(:errors) { should be_empty }
         its(:title) { should == "Refinery CMS" }
       end
+      describe "class methods" do
+        before do 
+          Factory.create(:question) 
+          Factory.create(:question, 
+                          start_date: Time.now+2.days, 
+                          end_date: Time.now+10.days) 
+        end
+        subject { Question.first }
+        it "should get one question active" do 
+          Question.actives.should == [subject]
+        end
+      end
+      describe "instance methods" do
+        before do
+          question = Factory.create(:question)
+          @times = 3
+          @answer = Factory.create(:answer, question: question)
+          (@times-1).times{ Factory.create(:answer, question: question) }
+          @ip = "192.168.1.1"
+          @vote = Factory.create(:vote, answer: @answer, ip: @ip)
+        end
+        subject{ Question.first }
+        it { subject.answers.size == @times }
+        it { subject.total_votes.should == subject.answers.sum(&:votes_count) }
+        it "should get answers data for view" do
+          subject.answers_with_data.should == [subject.answers.collect{|a| [a.title, a.votes_count]}, subject.total_votes]
+        end
+        it { subject.already_voted?("127.0.0.1").should be_false }
+        it { subject.already_voted?("192.168.1.1").should be_nil }
+      end
     end
   end
 end

data/spec/models/refinery/polls/vote_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module Refinery
+  module Polls
+    describe Vote do
+      describe "validations" do
+        subject do
+          FactoryGirl.create(:vote)
+        end
+
+        it { should be_valid }
+        its(:errors) { should be_empty }
+      end
+      describe "class methods" do
+        before do 
+          question = Factory.create(:question)
+          @answer = Factory.create(:answer, question: question)
+          @vote = Factory.create(:vote, answer: @answer)
+          @ip = "192.168.1.1"
+        end
+        it "should create a vote by ip for an Answer" do 
+          vote = Vote.vote_by_ip(@answer, @ip)
+          vote.should be_valid
+          vote.ip.should == @ip
+        end
+        it "should get a vote by ip for a Question" do
+          Vote.get_vote(@question, @ip) == @vote
+        end
+      end
+      describe "instance methods" do
+        #nothing
+      end
+    end
+  end
+end

data/spec/requests/refinery/polls/admin/answers_spec.rb

@@ -0,0 +1,114 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe Refinery do
+  describe "Polls" do
+    describe "Admin" do
+      describe "Answers" do
+        login_refinery_user
+
+        describe "answers list" do
+          before(:each) do
+            @question = FactoryGirl.create(:question)
+            Factory.create(:answer, question: @question, title: "Option_1")
+            Factory.create(:answer, question: @question, title: "Option_2")
+          end
+
+          it "shows two items" do
+            visit refinery.polls_admin_question_answers_path(@question)
+            page.should have_content("Option_1")
+            page.should have_content("Option_2")
+          end
+        end
+
+        describe "create" do
+          before(:each) do
+            @question = FactoryGirl.create(:question)
+            visit refinery.polls_admin_question_answers_path(@question)
+        
+            click_link "Add New Question Answer"
+          end
+        
+          context "valid data" do
+            it "should succeed" do
+              fill_in "Title", :with => "This is a test of the first string field"
+              click_button "Save"
+        
+              page.should have_content("'This is a test of the first string field' was successfully added.")
+              Refinery::Polls::Answer.count.should == 1
+            end
+          end
+        
+          # we can't test this because admin/answers/_form.html creates wrong url helper for nested models
+          # context "invalid data" do
+          #   it "should fail" do
+          #     click_button "Save"
+          #         
+          #     page.should have_content("Title can't be blank")
+          #     Refinery::Polls::Answer.count.should == 0
+          #   end
+          # end
+        
+          # we can't test this because admin/answers/_form.html creates wrong url helper for nested models
+          # context "duplicate" do
+          #   before(:each) do
+          #     @question = FactoryGirl.create(:question, :title => "UniqueTitle") 
+          #     Factory.create(:answer, question: @question, :title => "Option repeated")
+          #   end
+          #         
+          #   it "should fail" do
+          #     visit refinery.polls_admin_question_answers_path(@question)
+          #         
+          #     click_link "Add New Question Answer"
+          #         
+          #     fill_in "Title", :with => "Option repeated"
+          #     click_button "Save"
+          #         
+          #     page.should have_content("There were problems")
+          #     Refinery::Polls::Answer.count.should == 1
+          #   end
+          # end
+        
+        end
+        
+        describe "edit" do
+          before(:each) do 
+            @question = FactoryGirl.create(:question, :title => "A title")
+            Factory.create(:answer, question: @question)
+          end
+        
+          it "should succeed" do
+            visit refinery.polls_admin_question_answers_path(@question)
+        
+            within ".actions" do
+              click_link "Edit this question answer"
+            end
+        
+            fill_in "Title", :with => "A different title"
+            click_button "Save"
+        
+            page.should have_content("'A different title' was successfully updated.")
+            page.should have_no_content("A title")
+          end
+        end
+        
+        describe "destroy" do
+          before(:each) do 
+            @question = FactoryGirl.create(:question, :title => "A title")
+            Factory.create(:answer, question: @question, title: "UniqueTitleOne")
+          end
+        
+          it "should succeed" do
+            visit refinery.polls_admin_question_answers_path(@question)
+        
+            click_link "Remove this question answer forever"
+        
+            page.should have_content("'UniqueTitleOne' was successfully removed.")
+            Refinery::Polls::Answer.count.should == 0
+          end
+        end
+
+      end
+    end
+  end
+end

data/spec/requests/refinery/polls/admin/questions_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 describe Refinery do
   describe "Polls" do
     describe "Admin" do
-      describe "questions" do
+      describe "Questions" do
         login_refinery_user
 
         describe "questions list" do

data/spec/requests/refinery/polls/questions_spec.rb

@@ -0,0 +1,138 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe Refinery do
+  describe "Polls" do
+    describe "Questions" do
+      login_refinery_user
+    
+      describe "questions index" do
+        before(:each) do
+          FactoryGirl.create(:question, :title => "UniqueTitleTwo")
+          FactoryGirl.create(:question, :title => "UniqueTitleOne")
+        end
+          
+        it "shows two items" do
+          visit refinery.polls_questions_path
+          page.should have_content("UniqueTitleOne")
+          page.should have_content("UniqueTitleTwo")
+        end
+      end
+      describe "question show" do
+        before(:each) do
+          @question = FactoryGirl.create(:question, :title => "UniqueTitleOne")
+        end
+        it "shows question" do
+          visit refinery.polls_question_path(@question)
+          page.should have_content(@question.title)
+          page.should have_content(I18n.l(@question.start_date, :format => :short))
+          page.should have_content(I18n.l(@question.end_date, :format => :short))
+          page.should have_content(@question.total_votes)
+        end
+      end
+
+      describe "question answer submit" do
+        before(:each) do
+          @question = FactoryGirl.create(:question, title: "submite_test")
+          @answers = []
+          3.times do |value|
+            @answers << Factory.create(:answer, question: @question, title: "Option #{value}")
+          end
+          ActionDispatch::Request.any_instance.stub(:remote_ip).and_return("192.168.0.1")
+          
+        end
+        it "should save vote", :js => true do
+          post refinery.submit_polls_question_path(@question), :answer_id => @answers.first.id, :format=> 'js'
+          Refinery::Polls::Vote.count.should == 1
+          @answers.first.votes_count == 1
+          @question.total_votes.should == 1
+        end
+        it "should not save second vote from same ip", :js => true do
+          Factory.create(:vote, question: @question, answer: @answers.first, ip: "192.168.0.1")
+          #second call to submit
+          post refinery.submit_polls_question_path(@question), :answer_id => @answers.first.id, :format=> 'js'
+          Refinery::Polls::Vote.count.should == 1
+          @answers.first.votes_count == 1
+          @question.total_votes.should == 1
+        end
+        
+      end
+    # 
+    #   describe "create" do
+    #     before(:each) do
+    #       visit refinery.polls_admin_questions_path
+    # 
+    #       click_link "Add New Question"
+    #     end
+    # 
+    #     context "valid data" do
+    #       it "should succeed" do
+    #         fill_in "Title", :with => "This is a test of the first string field"
+    #         click_button "Save"
+    # 
+    #         page.should have_content("'This is a test of the first string field' was successfully added.")
+    #         Refinery::Polls::Question.count.should == 1
+    #       end
+    #     end
+    # 
+    #     context "invalid data" do
+    #       it "should fail" do
+    #         click_button "Save"
+    # 
+    #         page.should have_content("Title can't be blank")
+    #         Refinery::Polls::Question.count.should == 0
+    #       end
+    #     end
+    # 
+    #     context "duplicate" do
+    #       before(:each) { FactoryGirl.create(:question, :title => "UniqueTitle") }
+    # 
+    #       it "should fail" do
+    #         visit refinery.polls_admin_questions_path
+    # 
+    #         click_link "Add New Question"
+    # 
+    #         fill_in "Title", :with => "UniqueTitle"
+    #         click_button "Save"
+    # 
+    #         page.should have_content("There were problems")
+    #         Refinery::Polls::Question.count.should == 1
+    #       end
+    #     end
+    # 
+    #   end
+    # 
+    #   describe "edit" do
+    #     before(:each) { FactoryGirl.create(:question, :title => "A title") }
+    # 
+    #     it "should succeed" do
+    #       visit refinery.polls_admin_questions_path
+    # 
+    #       within ".actions" do
+    #         click_link "Edit this question"
+    #       end
+    # 
+    #       fill_in "Title", :with => "A different title"
+    #       click_button "Save"
+    # 
+    #       page.should have_content("'A different title' was successfully updated.")
+    #       page.should have_no_content("A title")
+    #     end
+    #   end
+    # 
+    #   describe "destroy" do
+    #     before(:each) { FactoryGirl.create(:question, :title => "UniqueTitleOne") }
+    # 
+    #     it "should succeed" do
+    #       visit refinery.polls_admin_questions_path
+    # 
+    #       click_link "Remove this question forever"
+    # 
+    #       page.should have_content("'UniqueTitleOne' was successfully removed.")
+    #       Refinery::Polls::Question.count.should == 0
+    #     end
+    #   end
+    
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ def setup_environment
 
   require 'rspec/rails'
   require 'capybara/rspec'
+  require 'capybara/rails'
 
   Rails.backtrace_cleaner.remove_silencers!
 

data/spec/support/factories/refinery/polls.rb

@@ -1,7 +1,17 @@
-
 FactoryGirl.define do
-  factory :question, :class => Refinery::Polls::Question do
+  factory :question,  :class => Refinery::Polls::Question do
     sequence(:title) { |n| "refinery#{n}" }
+    start_date  Time.now-10.days
+    end_date    Time.now+10.days
+  end
+  factory :answer,    :class => Refinery::Polls::Answer do
+    sequence(:title) { |n| "refinery-answer#{n}" }
+    association :question, :factory => :question
+  end
+  factory :vote,      :class => Refinery::Polls::Vote do
+    association :question,  :factory => :question
+    association :answer,    :factory => :answer
+    sequence(:ip) { |n| "127.0.1.#{n}" }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-polls
 version: !ruby/object:Gem::Version
-  version: 0.0.2.dev
+  version: 0.0.4.dev
   prerelease: 6
 platform: ruby
 authors:
@@ -66,13 +66,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - README.md
 - Rakefile
 - app/assets/images/refinery/polls/pollbg.gif
-- app/assets/javascripts/refinery/polls/poll_form.js
+- app/assets/javascripts/refinery/polls/poll.js
+- app/assets/javascripts/refinery/polls/poll_form.js.coffee
 - app/assets/stylesheets/refinery/polls/poll_form.css.scss
+- app/assets/stylesheets/refinery/polls/polls.css.scss
 - app/controllers/refinery/polls/admin/answers_controller.rb
 - app/controllers/refinery/polls/admin/questions_controller.rb
 - app/controllers/refinery/polls/questions_controller.rb
@@ -118,6 +121,7 @@ files:
 - db/migrate/5_create_polls_translations.rb
 - db/seeds.rb
 - lib/generators/refinery/polls_generator.rb
+- lib/generators/refinery/templates/app/assets/stylesheets/refinery/polls/poll.css.scss
 - lib/generators/refinery/templates/config/initializers/refinery/poll.rb.erb
 - lib/refinery/polls.rb
 - lib/refinery/polls/configuration.rb
@@ -126,8 +130,12 @@ files:
 - lib/refinerycms-polls.rb
 - lib/tasks/refinery/polls.rake
 - refinerycms-polls.gemspec
+- spec/models/refinery/polls/answer_spec.rb
 - spec/models/refinery/polls/question_spec.rb
+- spec/models/refinery/polls/vote_spec.rb
+- spec/requests/refinery/polls/admin/answers_spec.rb
 - spec/requests/refinery/polls/admin/questions_spec.rb
+- spec/requests/refinery/polls/questions_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories/refinery/polls.rb
 - tasks/rspec.rake
@@ -146,6 +154,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -252205175820330906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -159,7 +170,11 @@ signing_key:
 specification_version: 3
 summary: Polls extension for Refinery CMS
 test_files:
+- spec/models/refinery/polls/answer_spec.rb
 - spec/models/refinery/polls/question_spec.rb
+- spec/models/refinery/polls/vote_spec.rb
+- spec/requests/refinery/polls/admin/answers_spec.rb
 - spec/requests/refinery/polls/admin/questions_spec.rb
+- spec/requests/refinery/polls/questions_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories/refinery/polls.rb

data/app/assets/javascripts/refinery/polls/poll_form.js

@@ -1,8 +0,0 @@
-function do_vote(element) {
-  $(element).parents().find('form').submit();
-}
-$(document).ready(function(){
-  $("input[type=radio][name=answer_id]").click(function() {
-    do_vote(this);
-  });
-})