punching_bag 0.3.1 → 0.3.2

data/lib/punching_bag/acts_as_punchable.rb

@@ -5,15 +5,15 @@ module PunchingBag
 
       # Note: this method will only return items if they have 1 or more hits
       def most_hit(since=nil, limit=5)
-        query = self.scoped.joins(:punches).group(:punchable_type, :punchable_id)
+        query = self.scoped.joins(:punches).group(Punch.arel_table[:punchable_type], Punch.arel_table[:punchable_id], arel_table.primary_key)
         query = query.where('punches.average_time >= ?', since) unless since.nil?
         query.reorder('SUM(punches.hits) DESC').limit(limit)
       end
 
       # Note: this method will return all items with 0 or more hits
       def sort_by_popularity(dir='DESC')
-        query = self.scoped.joins("LEFT OUTER JOIN punches ON punches.punchable_id = #{self.to_s.tableize}.id AND punches.punchable_type = '#{self.to_s}'")
-        query = query.group(:id)
+        query = self.scoped.joins(arel_table.join(Punch.arel_table, Arel::Nodes::OuterJoin).on(Punch.arel_table[:punchable_id].eq(arel_table.primary_key).and(Punch.arel_table[:punchable_type].eq(self.name))).join_sources.first)
+        query = query.group(arel_table.primary_key)
         query.reorder("SUM(punches.hits) #{dir}")
       end
     end

data/lib/punching_bag/version.rb

@@ -1,5 +1,3 @@
 module PunchingBag
-
-  VERSION = '0.3.1'
-
+  VERSION = '0.3.2'
 end

metadata

@@ -1,70 +1,88 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: punching_bag
-version: !ruby/object:Gem::Version
-  version: 0.3.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
-authors:
+authors: 
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-06-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: voight_kampff
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-description: PunchingBag is a hit counting and simple trending engine for Ruby on
-  Rails
+  type: :runtime
+  version_requirements: *id001
+description: PunchingBag is a hit counting and simple trending engine for Ruby on Rails
 email: adam@obledesign.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - app/models/punch.rb
-- lib/punching_bag/acts_as_punchable.rb
 - lib/punching_bag/version.rb
 - lib/punching_bag/engine.rb
 - lib/punching_bag/acts_as_taggable_on.rb
+- lib/punching_bag/acts_as_punchable.rb
 - lib/generators/punching_bag/punching_bag_generator.rb
 - lib/generators/punching_bag/templates/create_punches_table.rb
 - lib/punching_bag.rb
 - lib/tasks/punching_bag.rake
 homepage: https://github.com/biola/punching_bag
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: PunchingBag hit conter and trending plugin
 test_files: []
+