twitter-cache 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a03db03b589f8304f4ce262b26f5cff900c5b70f
-  data.tar.gz: be38e742d3e62c740d2971908056c4ef972f21ed
+  metadata.gz: 53f52e4e5923bdf1373a5f48e309024330c11425
+  data.tar.gz: ee0236c79d3546b1c268825b88064aa9397145ca
 SHA512:
-  metadata.gz: 5e4b09cabcc6ffb5c5588d8f1686886c6d276b9aba0a8aa97049cf76f1e850c5227d9a6c96bc3ff32117d5f0d70d8328ac7239afea2d8195716d155fd8694c6d
-  data.tar.gz: 6d8003faafe01489af06d7f0087925ef30d426b753b1e546283fcd9a4f3f5cbc4242c61ea2bc9280d44d42f63a9424450186fc9ede6a98d1db71bf5654e6012e
+  metadata.gz: 1b440bddd79af310ee078309ea32d1c873bea26cceece3b626867d0360d956a6421b90a57eb3762c48742f9f919161d1c65fd0a366680c6a79586e39cabc476e
+  data.tar.gz: 46ca11e318e2c7e51ad040c6e0ce68a5e3827a25fa529ad6017bedcb7296ec6732c2c9e5c01e342d9b2f13508697e9c239545f1959d62591ab3bfdb07085d9b4

data/lib/twitter/cache/helpers.rb

@@ -8,6 +8,14 @@ module Twitter
       def cache
         @cache ||= Twitter::Cache::Redis.new
       end
+
+      def user_cache
+        @user_cache ||= Twitter::Cache::Redis.new(:user)
+      end
+
+      def friends_cache
+        @friends_cache ||= Twitter::Cache::Redis.new(:friends)
+      end
     end
   end
 end

data/lib/twitter/cache/redis.rb

@@ -7,10 +7,11 @@ module Twitter
       include Twitter::Cache::Helpers
       attr_reader :client
 
-      def initialize
+      def initialize(prefix = nil)
         redis_url = ENV['REDIS_URL'] || config.redis
         redis = ::Redis.new(url: redis_url)
-        @client = ::Redis::Namespace.new(config.namespace, redis: redis)
+        namespace = [config.namespace, prefix].compact.join(':')
+        @client = ::Redis::Namespace.new(namespace, redis: redis)
       end
 
       def method_missing(name, *args)

data/lib/twitter/cache/version.rb

@@ -1,5 +1,5 @@
 module Twitter
   module Cache
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/lib/twitter/cache/wrapper.rb

@@ -9,13 +9,13 @@ module Twitter
       end
 
       def user(id = current_id)
-        cache.get(user_key(id), ttl: config.ttl) do
+        user_cache.get(id, ttl: config.ttl) do
           config.convert_user(twitter.user(id))
         end
       end
 
       def friend_ids(id = current_id)
-        cache.get(friends_key(id), ttl: config.ttl) do
+        friends_cache.get(id, ttl: config.ttl) do
           twitter.friend_ids(id).to_a
         end
       end
@@ -23,18 +23,19 @@ module Twitter
       def friends(id = current_id, per: 100, page: 0)
         ids = friend_ids(id)
         case page
-        when :rand, :random
-          users(ids.sample(per))
+        when :rand, :random, 'rand', 'random'
+          users(ids.sample(per.to_i))
         else
-          start = per * page
+          start = per.to_i * page.to_i
           users(ids[start, per])
         end
       end
 
       def users(ids)
-        users = ids.map { |id| cache.get(user_key(id)) }.compact
-        return users if ids.count == users.count
-        fetch_users(ids)
+        known_ids(ids).tap do |known_ids|
+          fetch_users(ids - known_ids) unless known_ids == ids
+        end
+        ids.map { |id| user_cache.get(id) }
       end
 
       def current_user
@@ -47,20 +48,15 @@ module Twitter
 
       protected
 
-      def user_key(id)
-        "user:#{id}"
-      end
-
-      def friends_key(id)
-        "friends:#{id}"
-      end
-
       def fetch_users(ids)
-        users = twitter.users(ids).map { |raw| config.convert_user(raw) }
-        users.each do |user|
-          cache.set(user_key(user.id), user, ttl: config.ttl)
+        twitter.users(ids).each do |raw|
+          user = config.convert_user(raw)
+          user_cache.set(raw.id, user, ttl: config.ttl)
         end
-        users
+      end
+
+      def known_ids(ids)
+        ids & user_cache.keys.map(&:to_i)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler