ballot_box 0.1.4 → 0.1.5

data/Gemfile

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+
+gemspec
+
+gem "rails", "3.0.10"
+gem "mysql2", "0.2.7"
+
+gem "rspec-rails", "~> 2.7.0"
+gem "database_cleaner", "~> 0.6.7"

data/README.rdoc

@@ -10,9 +10,9 @@ The BallotBox gem enables visitors to vote for and against voteable objects
   
 == Usage
 
-Use middleware with options:
+Use middleware with options: route and voteable_type
 
-  # Initialize BallotBox and set its configurations.
+  # Initialize BallotBox request manager and set its configurations.
   config.app_middleware.use BallotBox::Manager do |config|
     config.routes = { "/posts/votes" => "Post" }
   end
@@ -20,7 +20,10 @@ Use middleware with options:
 Set voteable model:
 
   class Post < ActiveRecord::Base
-    ballot_box :counter_cache => true
+    ballot_box :counter_cache => true,
+               :strategies => [:authenticated],
+               :place => :position,
+               :scope => :group_id
   end
 
 Set votes sum column:
@@ -48,9 +51,13 @@ or update votes sum only for one record:
 
   @post.ballot_box_update_votes!
 
-Update place directly:
+Update place directly for all scopes:
   
   Post.ballot_box_update_place!
+  
+or update place only for one scope:
+
+  @post.ballot_box_update_place!
 
 View (just send post request to configure route):
   
@@ -122,3 +129,5 @@ ActiveRecord callbacks:
       
     end
   end
+  
+This project rocks and uses MIT-LICENSE.

data/Rakefile

@@ -2,7 +2,6 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require File.join(File.dirname(__FILE__), 'lib', 'ballot_box', 'version')
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -23,22 +22,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "ballot_box"
-    s.version = BallotBox::VERSION.dup
-    s.summary = "The BallotBox gem enables visitors to vote for and against voteable objects"
-    s.description = "The BallotBox gem enables visitors to vote for and against voteable objects"
-    s.email = "galeta.igor@gmail.com"
-    s.homepage = "https://github.com/galetahub/ballot_box"
-    s.authors = ["Igor Galeta", "Pavlo Galeta"]
-    s.files =  FileList["[A-Z]*", "{app,lib}/**/*"] - ["Gemfile"]
-    #s.extra_rdoc_files = FileList["[A-Z]*"]
-  end
-  
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end

data/lib/ballot_box.rb

@@ -23,4 +23,5 @@ module BallotBox
   end
 end
 
-require 'ballot_box/engine' if defined?(Rails)
+require 'ballot_box/version'
+require 'ballot_box/engine'

data/lib/ballot_box/base.rb

@@ -8,17 +8,23 @@ module BallotBox
       #
       #  ballot_box :counter_cache => true,
       #             :strategies => [:authenticated],
-      #             :place => { :column => "place", :order => "votes_count DESC" }
+      #             :place => :position,
+      #             :scope => :group_id
       #
       def ballot_box(options = {})
         extend ClassMethods
         include InstanceMethods
         
-        options = { 
-          :strategies => [:authenticated], 
+        default_options = { 
+          :strategies => [:authenticated],
+          :counter_cache => false, 
           :place => false,
-          :refresh => true
-        }.merge(options)
+          :refresh => true,
+          :scope => nil
+        }
+        
+        options.assert_valid_keys(default_options.keys)
+        options = default_options.merge(options)
         
         class_attribute :ballot_box_options, :instance_writer => false
         self.ballot_box_options = options
@@ -92,14 +98,37 @@ module BallotBox
         unscoped.order("#{quoted_table_name}.#{ballot_box_cached_column} DESC")
       end
       
-      def ballot_box_update_place!(scope = nil)
+      def ballot_box_update_place!(record = nil)
+        relation = ballot_box_place_scope
+        
+        if ballot_box_options[:scope]
+          scope_columns = Array.wrap(ballot_box_options[:scope])
+          
+          unless record.nil?
+            scope_columns.each do |scope_item|
+              scope_value = record.send(scope_item)
+              relation = relation.where(scope_item => scope_value)
+            end
+          else
+            unscoped.select(scope_columns).group(scope_columns).each do |record|
+              ballot_box_update_place!(record)
+            end
+            
+            return
+          end
+        end
+        
+        ballot_box_update_place_by_relation(relation)
+      end
+      
+      def ballot_box_update_place_by_relation(relation)
         table = quoted_table_name
-        subquery = ballot_box_place_scope.select("@row := @row + 1 AS row, #{table}.id").from("#{table}, (SELECT @row := 0) r")
-        subquery = subquery.where(scope) if scope
+        
+        relation = relation.select("@row := @row + 1 AS row, #{table}.id").from("#{table}, (SELECT @row := 0) r")
         
         query = %(UPDATE #{table} AS a
           INNER JOIN (
-            #{subquery.to_sql}
+            #{relation.to_sql}
           ) AS b ON a.id = b.id
           SET a.#{ballot_box_place_column} = b.row;)
         
@@ -131,6 +160,12 @@ module BallotBox
           self.class.update_all("#{ballot_box_cached_column} = (#{count.to_sql})", ["id = ?", id])
         end
       end
+      
+      def ballot_box_update_place!
+        if persisted? && ballot_box_place_column
+          self.class.ballot_box_update_place!(self)
+        end
+      end
     end
   end
 end

data/lib/ballot_box/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module BallotBox
-  VERSION = "0.1.4".freeze
+  VERSION = "0.1.5".freeze
 end

metadata

@@ -1,25 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: ballot_box
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Igor Galeta
-- Pavlo Galeta
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-10-10 00:00:00 Z
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: browser
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +31,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  name: browser
-  prerelease: false
   type: :runtime
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: activemodel
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,10 +45,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: activemodel
-  prerelease: false
   type: :runtime
-  requirement: *id002
+  version_requirements: *id002
 description: The BallotBox gem enables visitors to vote for and against voteable objects
 email: galeta.igor@gmail.com
 executables: []
@@ -55,27 +54,26 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
 files: 
-- Gemfile.lock
-- LICENSE
-- README.rdoc
-- Rakefile
 - app/models/ballot_box/vote.rb
-- lib/ballot_box.rb
+- lib/generators/ballot_box/install_generator.rb
+- lib/generators/ballot_box/USAGE
+- lib/generators/ballot_box/templates/migrate/create_votes.rb
 - lib/ballot_box/base.rb
-- lib/ballot_box/callbacks.rb
 - lib/ballot_box/config.rb
-- lib/ballot_box/engine.rb
+- lib/ballot_box/callbacks.rb
 - lib/ballot_box/manager.rb
-- lib/ballot_box/strategies/authenticated.rb
-- lib/ballot_box/strategies/base.rb
 - lib/ballot_box/version.rb
+- lib/ballot_box/engine.rb
 - lib/ballot_box/voting.rb
-- lib/generators/ballot_box/USAGE
-- lib/generators/ballot_box/install_generator.rb
-- lib/generators/ballot_box/templates/migrate/create_votes.rb
+- lib/ballot_box/strategies/base.rb
+- lib/ballot_box/strategies/authenticated.rb
+- lib/ballot_box.rb
+- MIT-LICENSE
+- Rakefile
+- Gemfile
+- README.rdoc
 homepage: https://github.com/galetahub/ballot_box
 licenses: []
 
@@ -104,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.8.10
+rubyforge_project: ballot_box
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: The BallotBox gem enables visitors to vote for and against voteable objects

data/Gemfile.lock

@@ -1,20 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
-    browser (0.1.3)
-    builder (3.0.0)
-    i18n (0.6.0)
-    multi_json (1.0.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel
-  browser (~> 0.1.2)