acts_as_rrranking 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: fc2f6c1349ba756e777a24e5d8ca1d5721c38ff6
-  data.tar.gz: be7ecce8285070de6899ddecdfa77ec462acdfed
-SHA512:
-  metadata.gz: 07ec55ba8a410e1747c3a36295ad6bbc146e5e7fd304d847820002cad10a1e0869d58384c3e564a1389bada7692ab1bc95e44ef36a10c5158415c5056bfe8a62
-  data.tar.gz: df8b110ba2930ff6dfb294b230b1b5323f47b4433e3e43b6b58d5ad80091cb956636975fd5567edbeb64fcb3bf3e8460bff350930fbf5690390d0032472381b7
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDMyMDhlMDE1NWFlMmVmMmZmZWZkMTQ2Njg1NjU1YjdhZWIxZDJjYg==
+  data.tar.gz: !binary |-
+    YjA2NWY5NTM0NThkY2VhMjFlNWEyM2MxOWI4YmI2NWVkYWQwOWFiYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZjNmZWRhZGZhYWM2NmI4ZWZmMjA5NzVmYjc4OGU2YjVjMDBiZWQyNDFmNDNm
+    NGMwMzk2ZmJiZmNmYjg2OWQ3YjYyNmVlMzgzOTQ0YzE5NDc3OGFlMzdlOTY5
+    MTRhZTM5OTIxY2MyZmZjODM3MzIyMzc3ZjI2NjZjNTkzMWVkYTk=
+  data.tar.gz: !binary |-
+    NjI5NDQ4MDhlNzk4NDVmZjU5Y2E3ZDMzOTUwM2IxMTM5NWIxNjNiZDAwNDlk
+    ZTBlNDIzNmVhNzg5NzBmYjMyNDNlZDI2OTVjZDBlYmVmZDllNzliOTU0OGEw
+    NGIxNzgwZTIwNGZjYTkyYWE4ZDUxNWMwMGEwYTllNDIxNzgzYzY=

data/lib/acts_as_rrranking/version.rb

@@ -1,3 +1,3 @@
 module ActsAsRrranking
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/acts_as_rrranking.rb

@@ -29,12 +29,12 @@ module ActsAsRrranking
 
       instance_eval <<-STR
         def top_#{@ranking_key.to_s.pluralize}(limit = 10, offset = 0)
-          self.redis.zrange('#{@redis_ranking_key}', offset, limit)
+          self.redis.zrange('#{@redis_ranking_key}', -limit - offset, -1 - offset).reverse.map(&:to_i)
         end
 
         def top_#{@ranking_key}_#{self.name.demodulize.underscore.pluralize}(limit = 10, offset = 0)
           ids = self.top_#{@ranking_key.to_s.pluralize}(limit, offset)
-          self.where(#{@ranking_id}: ids)
+          self.where(#{@ranking_id}: ids).order(self.ranking_order_by_statement(ids))
         end
 
         def redis_ranking_key
@@ -43,6 +43,26 @@ module ActsAsRrranking
       STR
     end
 
+    def ranking_order_by_statement(ids)
+      case self.db_adapter
+      when /^mysql/
+        "FIELD(id, #{ids.join(',')})"
+      when /^sqlite/
+        stat = "CASE id"
+        ids.each_with_index do |id, index|
+          stat << " WHEN #{id} THEN #{index}"
+        end
+        stat << " END"
+        stat
+      else
+        raise "Database not supported"
+      end
+    end
+
+    def db_adapter
+      @db_name ||= ActiveRecord::Base.connection_config[:adapter]
+    end
+
     def redis
       @redis ||= Redis.new
     end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_rrranking
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Weihu Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A rails plugin use redis to sort models on real time.
@@ -102,17 +102,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Redis Realtime Ranking