twitter_with_auto_pagination 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed91eaf1cf67bef358dda37cdd3886003fa80c0c
-  data.tar.gz: e91e410326935bb838a8c9c7d29f678d129b2417
+  metadata.gz: 85eecd1e9b697a9d479e8397e86180fdffe7f4c4
+  data.tar.gz: 37fe4226e75aa04c5e0618254143263a337bb18b
 SHA512:
-  metadata.gz: 97ad05cdd642560bb57e5ef28f2d1b7fdbb492e9112dfdd0af8688fd7a3735f799a0d99957d97a28e7699d158724a14dccd57c3424b9b5964e68ead8990af020
-  data.tar.gz: f342f1131df4b7fe0410e5ad9b61879bb88a07077d08a4414e07828dea0fcb1a3ba6cec6ee9c638de382fb36b72dce4d36344e99d7a94562dfdf9d7c1eba3197
+  metadata.gz: 89ab8908cc586738a97d59c021b24127e200e8b3bc6c93504f8374dd1e86829fc98a0326a272b945ddd7f9bec84a69bcf04b14119c3a6be1cb736eeae10e24c0
+  data.tar.gz: f059e8a50b88b808fa8575be9053640b60353982b774ce23355cfbd0643002532b4dfbaf4a546f31ba2a5e37ac22334b6a84646a38009eb554bfb7623c84fbe6

data/lib/twitter_with_auto_pagination/cache.rb

@@ -7,13 +7,11 @@ module TwitterWithAutoPagination
   class Cache
     extend Forwardable
 
-    attr_reader :serializer, :client
+    attr_reader :client
 
     def_delegators :@client, :clear, :cleanup
 
     def initialize
-      @serializer = Serializer
-
       path = File.join('tmp', 'twitter_cache')
       Dir.mkdir(path) unless File.exists?(path)
       @client = ActiveSupport::Cache::FileStore.new(path, expires_in: 1.hour, race_condition_ttl: 5.minutes)
@@ -26,10 +24,10 @@ module TwitterWithAutoPagination
       fetch_result =
         @client.fetch(key) do
           block_result = yield
-          serializer.encode(block_result, args: options[:args])
+          Serializer.encode(block_result, args: options[:args])
         end
 
-      block_result ? block_result : serializer.decode(fetch_result, args: options[:args])
+      block_result ? block_result : Serializer.decode(fetch_result, args: options[:args])
     end
 
     private

data/lib/twitter_with_auto_pagination/serializer.rb

@@ -1,20 +1,26 @@
 module TwitterWithAutoPagination
   class Serializer
-    CODER = JSON
-
     class << self
       def encode(obj, options = {})
         instrument(options) do
-          (!!obj == obj) ? obj : CODER.dump(obj)
+          (!!obj == obj) ? obj : coder.dump(obj)
         end
       end
 
       def decode(str, options = {})
         instrument(options) do
-          str.kind_of?(String) ? CODER.parse(str, symbolize_names: true) : str
+          str.kind_of?(String) ? coder.decode(str) : str
         end
       end
 
+      def coder
+        @@coder ||= JsonCoder.new(JSON)
+      end
+
+      def coder=(coder)
+        @@coder = Coder.instance(coder)
+      end
+
       private
 
       def instrument(options, &block)
@@ -23,5 +29,37 @@ module TwitterWithAutoPagination
         ActiveSupport::Notifications.instrument("#{payload[:operation]}.twitter", payload) { yield(payload) }
       end
     end
+
+    class Coder
+      def initialize(coder)
+        @coder = coder
+      end
+
+      def encode(obj)
+        @coder.dump(obj)
+      end
+
+      def self.instance(coder)
+        if coder == JSON
+          JsonCoder.new(coder)
+        elsif defined?(Oj) && coder == Oj
+          OjCoder.new(coder)
+        else
+          raise "Invalid coder #{coder}"
+        end
+      end
+    end
+
+    class JsonCoder < Coder
+      def decode(str)
+        @coder.parse(str, symbolize_names: true)
+      end
+    end
+
+    class OjCoder < Coder
+      def decode(str)
+        @coder.load(str, symbol_keys: true)
+      end
+    end
   end
 end

data/spec/twitter_with_auto_pagination/rest/users_spec.rb

@@ -113,7 +113,6 @@ describe TwitterWithAutoPagination::REST::Users do
     it_behaves_like 'cache: false is specified'
     it_behaves_like 'when options are changed'
     it_behaves_like 'when a client is changed, it does not share a cache'
-    it_behaves_like 'when one param is specified, it raises an exception'
 
     context 'when strange params are specified' do
       let(:params) { [1, 2, 3] }

data/twitter_with_auto_pagination.gemspec

@@ -2,7 +2,7 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'twitter'
+  spec.add_dependency 'twitter', '~> 6.0'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'hashie'
   spec.add_dependency 'parallel'
@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3'
   spec.summary = spec.description
   spec.test_files = Dir.glob('spec/**/*')
-  spec.version = '0.9.0'
+  spec.version = '0.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter_with_auto_pagination
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Shinohara Teruki
@@ -14,16 +14,16 @@ dependencies:
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement