sunrise-votes 0.1.0 → 0.1.1

data/README.rdoc

@@ -11,4 +11,4 @@ http://www.jqplot.com/index.php
 
 == Usage
 
-  <%= link_to 'charts', manage_ballot_box_vote_path(:id => 'charts', :idea_id => idea.id) %>
+  <%= link_to 'charts', manage_ballot_box_vote_path(:id => 'charts', :voteable_id => work.id, :voteable_type => work.class.name) %>

data/app/controllers/manage/ballot_box/votes_controller.rb

@@ -1,36 +1,51 @@
 class Manage::BallotBox::VotesController < Manage::BaseController
   inherit_resources
   
-  belongs_to :idea, :polymorphic => true
   actions :index, :show, :destroy
   defaults :route_prefix => 'manage', :resource_class => BallotBox::Vote, 
            :collection_name => 'votes', :instance_name => 'vote'  
   
   respond_to :json, :only => [:show]
   
+  before_filter :find_voteable
   before_filter :make_filter, :only=>[:index]
   
-  load_and_authorize_resource :idea, :through => :challenge
+  authorize_resource :class => BallotBox::Vote
+  
+  helper_method :voteable_scope
     
   def destroy
-    destroy!{ manage_ballot_box_votes_path(:"#{parent_type}_id" => parent.id) }
+    destroy!{ manage_ballot_box_votes_path( voteable_scope(@voteable) ) }
   end
   
   def show
-    respond_with(parent) do |format|
-      format.json { render :json => parent.votes.chart(params[:id]) }
+    respond_with(@voteable) do |format|
+      format.json { render :json => @voteable.votes.chart(params[:id]) }
     end
   end
   
   protected
     
+    def begin_of_association_chain
+      @voteable
+    end
+    
     def collection
       @votes = (@votes || end_of_association_chain).page(params[:page]).merge(@search.scoped)
     end
     
+    def find_voteable
+      klass = params[:voteable_type].to_s.classify.constantize
+      @voteable = klass.find(params[:voteable_id])
+    end
+    
     def make_filter
       @search = Sunrise::ModelFilter.new(BallotBox::Vote, :attributes => [ :voter_type, :voter_id, :ip_address, 
                     :browser_name, :browser_version, :browser_platform])
       @search.update_attributes(params[:search])
     end
+    
+    def voteable_scope(record)
+      { :voteable_id => record.id, :voteable_type => record.class.name }
+    end
 end

data/app/views/manage/ballot_box/votes/_model_filter.html.erb

@@ -4,7 +4,8 @@
     
     <%= cookie_content_tag(:div, :id=>"block_filter", :class=>"filt") do %>
       <%= form_for @search, :as => :search, :url => manage_ballot_box_votes_path, :html=>{:method=>:get, :id=>"form_filter"} do |f| %>
-        <%= hidden_field_tag "#{parent_type}_id", parent.id %>
+        <%= hidden_field_tag "voteable_id", @voteable.id %>
+        <%= hidden_field_tag "voteable_type", @voteable.class.name %>
         
         <%= f.label :ip_address, t('activerecord.attributes.vote.ip_address') %>
         <%= f.text_field :ip_address, :class=>"text" %>
@@ -16,9 +17,11 @@
         <%= f.text_field :browser_platform, :class=>"text" %>
                 
         <div class="buts">
-          <%= f.submit t('manage.model_filter.search'), :style=>"display:none;" %>
-          <%= link_to_function content_tag(:span, t('manage.model_filter.search')), "$('#form_filter').submit()", :class=>"gr" %>                
-          <%= link_to t('manage.model_filter.clear'), manage_ballot_box_votes_path(:"#{parent_type}_id" => parent.id), :class=>"erase" %>
+          <%= content_tag(:button, :value => "search", :type => "submit", :name => "commit", :class => "gr cupid-green") do %>
+            <%= t('manage.model_filter.search') %>
+          <% end %>
+          
+          <%= link_to t('manage.model_filter.clear'), manage_ballot_box_votes_path( voteable_scope(@voteable) ), :class=>"erase" %>
         </div>
       <% end %>
     <% end %>

data/app/views/manage/ballot_box/votes/_vote.html.erb

@@ -1,7 +1,7 @@
 <%= content_tag(:div, :id=>dom_id(vote), :class=>"dinamic-bl") do %>
   <div class="act-bl" style="display:none;">
     <%= link_to image_tag("manage/ico_del.gif", :title=>t('manage.delete')), 
-      manage_ballot_box_vote_path(:id => vote.id, :"#{parent_type}_id" => parent.id), 
+      manage_ballot_box_vote_path( voteable_scope(@voteable).merge(:id => vote.id) ), 
       :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"icons" %>
   </div>
   

data/app/views/manage/ballot_box/votes/index.html.erb

@@ -4,7 +4,7 @@
     	<div class="row-container">
         <div class="white-row">
           <div class="r-corn">
-            <%= link_to parent.title, manage_ballot_box_votes_path(:"#{parent_type}_id" => parent.id), :class=>"dark-text" %>
+            <%= link_to @voteable.title, manage_ballot_box_votes_path( voteable_scope(@voteable) ), :class=>"dark-text" %>
           </div>
         </div>
       </div>

data/app/views/manage/ballot_box/votes/show.html.erb

@@ -8,10 +8,10 @@
 
 <div class="edit-bl">
   <div class="bot-bg">
-    <div id="voteable_title" class="block-title"><%= parent.title %></div>
+    <div id="voteable_title" class="block-title"><%= @voteable.title %></div>
     
     <div class="edit-cont">
-      <%= link_to t('manage.sunrise.votes.view'), manage_ballot_box_votes_path(:"#{parent_type}_id" => parent.id) %>
+      <%= link_to t('manage.sunrise.votes.view'), manage_ballot_box_votes_path( voteable_scope(@voteable) ) %>
       
       <div id="chart_dates" style="height:400px;width:800px;"></div>
     </div>

data/lib/sunrise/votes/version.rb

@@ -1,5 +1,5 @@
 module Sunrise
   module Votes
-    VERSION = "0.1.0".freeze
+    VERSION = "0.1.1".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunrise-votes
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Igor Galeta
@@ -16,9 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2011-05-31 00:00:00 +03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +30,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  type: :runtime
   name: ballot_box
+  version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,9 +44,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
-  type: :runtime
   name: sunrise
+  version_requirements: *id002
   prerelease: false
 description: Sunrise is a Aimbulance CMS
 email: galeta.igor@gmail.com
@@ -127,6 +128,7 @@ files:
 - lib/sunrise/votes.rb
 - lib/sunrise/votes/engine.rb
 - lib/sunrise/votes/version.rb
+has_rdoc: true
 homepage: https://github.com/galetahub/sunrise-votes
 licenses: []
 
@@ -156,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rails CMS