gnip_api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 934f7c386beafd72012565bdf098cf5aeffd02cc
-  data.tar.gz: d8c9cb19d9be2588c2a4e778e6404fa0beefd70d
+  metadata.gz: 4a0f89ada9f7ec8c66ff45982702e37a0649e8ff
+  data.tar.gz: 65a52d03b722a14f6264c8d51086d3df9e24cdf9
 SHA512:
-  metadata.gz: d7b13598a821df13c084e8eff061b758eaaed773cd7839efac4a08c193fecc271f77fff06873659d594a11079fa918293624e824aa333d7925aefab086541a26
-  data.tar.gz: d2466cfe6c98b44e2f7efdcfe69b422e439671bbcd9d411145ca414ac8b5bd4240fb8e96be19968e4986c818d09fdb568b536d4dcfeddc21ab0cbe9b570bbe09
+  metadata.gz: 1560448fb7366e1422971587abb31fbfe16c121faaf28d37f7cdfcd7aa81019b05d789e053c4ce3be7f20bd67e23d15bc9d46bde9cd9e0ddd226b5f2805f887f
+  data.tar.gz: c4750dbfcae74f230df1b4a93099b1786715ce5a92fb1b60ad844ba221d7ec75549d37d43e5cf7f113f7e25db8e7a2fe7eb9e54d484b965011038f9dda1090b1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gnip_api (0.0.3)
+    gnip_api (0.0.5)
       activesupport
       addressable
       httparty

data/README.md

@@ -1,13 +1,23 @@
+### Important: Gnip will be ending support for v1 endpoints on December 1 of 2016. GnipApi will be updated to work with v2, backward compatibility won't be posible after the deadline.
+
 # GnipApi
 
 Connect with different Gnip APIs and get data from streams.
 
+## Recent Changes
+
+- Removed unused RateLimiter
+- Removed unused Mutex
+- Added source and label to config as default values
+- Added Search API
+- All APIs now default their parameters from config, you can still call an API with different label or source
+- More docs
+
 ## Notes
 
-- Can't access Search API currently
-- Rules endpoint are now rate limited.
-- A simple rate limiter was implemented.
-- You can configure the gem's mutex outside the gem if you plan to have concurrency. Very experimental for now.
+- Search api will be added for v2 endpoints
+- V2 endpoints for stream will be implemented before deadline
+- RateLimiter and Mutex dropped due to lack of usage
 
 ## Installation
 
@@ -36,7 +46,8 @@ GnipApi.configure |config|
   config.account = 'myGnipAccount' # Your accounts name
   config.adapter_class = SomeAdapter # You can define your own adapter, more in the following section
   config.logger = Logger.new('myLog.log') # You can also provide a custom logger
-  config.mutex = Mutex.new # Experimental thread safety, more below
+  config.source = 'twitter' # General source, if none defined when quering, this will be used
+  config.label = 'mystream' # General stream label, if none defined when quering, this will be used
 end
 ```
 
@@ -44,22 +55,101 @@ Put the avobe code in a initializer if you're using Rails, or somewhere else if
 
 Note that you'll need a source and a label. Source is the data source within Gnip, such as Twitter, and label is the identifier of your stream.
 
-### Adapters
+### Search API
 
-GnipApi is not dependent of a single adapter (there's a dependency with HTTParty, but shhh... it won't last too long). You can use one of the provided adapters, or you can make your own, using the BaseAdapter class. You only need to implement the desired connector POST, GET and DELETE methods. There's an extra stream_get method, but it's just a variant of GET.
+The Search API allows you to get counts or activities in a time period, with a maximum period size of 30 days per request. PowerTrack rules are used as query parameter, but be careful *PowerTrack operators may not be supporter on Search API or could behave differently*. Read the Gnip docs to make sure.
+To access the Search API you will need a rule first, you can use PowerTrack Rule object for it:
 
-The custom adapter does not require to live within the gem files, as long as GnipApi has access to your class, just put it in the config and you're ready to go. See the current adapters for reference.
+```ruby
+rule = GnipApi::Apis::PowerTrack::Rule.new :value => 'keyword1 OR keyword2'
+end
+```
 
-### Mutex and Thread Safety
+Then you can query the search endpoint. *Only counts are available currently*.
 
-GnipApi has this feature in experimental stage, using a simple mutex to interact with the RateLimiter. The limiters are very simple, and should prevent your code executing more requests than it should. Depending where you are defining the mutex, you can elevate the coverage. GnipApi only requires an instance of Mutex, which you can place somewhere else for it to use.
+```ruby
+results = GnipApi::Apis::Search.new.counts :rule => rule
+end
+```
 
-## WIP State
+You can set different parameters:
+
+```ruby
+results = GnipApi::Apis::Search.new.counts :rule => rule, :from_date => DateTime.parse('2016-01-01 00:00'), :to_date => DateTime.parse('2016-05-01 22:00'), :bucket => 'day'
+end
+```
+
+When you query for more than 30 days, the results will include a :next token to iterate over the remaining pages. You can instantly feed this token to a following request with same parameters:
+
+```ruby
+results = GnipApi::Apis::Search.new.counts :rule => rule, :from_date => DateTime.parse('2016-01-01 00:00'), :to_date => DateTime.parse('2016-05-01 22:00'), :bucket => 'day', :next_token => 'token_from_previous_request'
+end
+```
+
+### PowerTrack
+
+PowerTrack API has various functions. You can upload, delete and get rules and you can stream the activities. To create rules you need to create the rule objects:
+
+```ruby
+rules = [] 
+rules << GnipApi::Apis::PowerTrack::Rule.new :value => 'keyword1 OR keyword2', :tag => 'first_rule'
+rules << GnipApi::Apis::PowerTrack::Rule.new :value => 'keyword3 keyword4', :tag => 'second_rule'
+end
+```
+
+Once you have your rule objects set, you can put them into an array and feed them to the PowerTrack Rules API:
 
-GnipApi is still a WIP. Call it a beta, alpha, gem that has part of the features, whatever. Thing is, that it is currently usable. The custom adapter feature is there, and some of the APIs of Gnip were implemented. I'll be coding more things into this, such as other APIs, more limiters, request retries, error handling, different adapters for known connectors like RestClient or HTTP/net, etc.
+```ruby
+GnipApi::Apis::PowerTrack::Rules.new.create rules
+end
+```
+
+That will upload the rules to the stream. The endpoint doesn't return anything on success but it will validate rules before applying and any syntax error will be raised as an error.
+
+To get a list of rules defined in the stream:
+
+```ruby
+GnipApi::Apis::PowerTrack::Rules.new.list
+end
+```
+
+That will return an array of GnipRule::Apis::PowerTrack::Rule objects. In the same way as the upload the delete method removes 1 or more rules:
+
+```ruby
+GnipApi::Apis::PowerTrack::Rules.new.delete rules
+end
+```
 
+Same as upload, no response from Gnip when deleting.
+Finally, you can stream the activities and do something with them:
+
+```ruby
+GnipApi::Apis::PowerTrack::Stream.new.consume do |messages|
+  messages.select{|m| m.activity?}.each{|a| puts a.body}
+  messages.select{|m| m.system_message?}.each{|s| puts s.message}
+end
+```
+
+There are a few considerations to make when doing this:
+
+- Gnip closes stream sometimes, either for operational reasons or because you can't handle the volume of data
+- System messages include compliance notifications you should follow if you save the data locally
+- Be careful when putting this into a daemon, closing the stream can be tricky given how this was done
+- I've experience issues with a Zlib error that I currently couldn't debug and fix, if you build a daemon for this, be sure to code restart procedures
+
+### Adapters
+
+GnipApi is not dependent of a single adapter (there's a dependency with HTTParty, but shhh... it won't last too long). You can use one of the provided adapters, or you can make your own, using the BaseAdapter class. You only need to implement the desired connector POST, GET and DELETE methods. There's an extra stream_get method, but it's just a variant of GET. Keep in mind that Gnip uses compression, I found out that Excon doesn't decompress responses by default, just to name an example.
+The custom adapter does not require to live within the gem files, as long as GnipApi has access to your class, just put it in the config and you're ready to go. See the current adapters for reference.
+
+## WIP State
+
+GnipApi is a WIP. Call it a beta, alpha, gem that has part of the features, whatever. It is currently usable and it's being used by... well.. me. The custom adapter feature is there, and some of the APIs of Gnip were implemented. I'll be coding more things into this, such as other APIs, request retries, error handling, different adapters for known connectors like RestClient or HTTP/net, etc.
 In any case, you were warned about it. Feel free to fill my issues list on Github :)
 
+## Gnip documentation for reference
+
+[http://support.gnip.com/](http://support.gnip.com/)
 
 ## Contributing
 

data/lib/gnip_api/apis/power_track/rules.rb

@@ -13,13 +13,12 @@ module GnipApi
         # - source: which data source to use (I think only twitter is available)
         def initialize params={}
           @adapter = GnipApi::Adapter.new
-          @label = params[:label]
-          @source = params[:source]
+          @label = params[:label] || GnipApi.config.label
+          @source = params[:source] || GnipApi.config.source
         end
 
         # Returns an array of defined rules
         def list
-          request_allowed?
           request = create_get_request
           rules = adapter.get(request)
           parse_rules(rules)
@@ -29,7 +28,6 @@ module GnipApi
         # - rules: GnipApi::Apis::PowerTrack::Rule object
         def create rules
           raise GnipApi::Errors::PowerTrack::MissingRules.new if rules.nil? || rules.empty?
-          request_allowed?
           request = create_post_request(construct_rules(rules))
           adapter.post(request)
         end
@@ -38,7 +36,6 @@ module GnipApi
         # - rules: GnipApi::Apis::PowerTrack::Rule object
         def delete rules
           raise GnipApi::Errors::PowerTrack::MissingRules.new if rules.nil? || rules.empty?
-          request_allowed?
           request = create_delete_request(construct_rules(rules))
           adapter.delete(request)
         end
@@ -75,9 +72,6 @@ module GnipApi
           GnipApi::Request.new_delete(endpoint, payload)
         end
 
-        def request_allowed?
-          raise 'RateLimited' unless GnipApi.config.rate_limiter.rules_request_allowed?
-        end
       end
     end
   end

data/lib/gnip_api/apis/power_track/stream.rb

@@ -5,8 +5,8 @@ module GnipApi
         attr_reader :adapter
         
         def initialize params = {}
-          @stream = params[:stream]
-          @source = params[:source]
+          @stream = params[:stream] || GnipApi.config.label
+          @source = params[:source] || GnipApi.config.source
           set_config
         end
         

data/lib/gnip_api/apis/search.rb

@@ -0,0 +1,69 @@
+# Gnip Search Full Archive API
+#
+# Retrive counts with a provided rule
+
+module GnipApi
+  module Apis
+    class Search
+      attr_reader :adapter
+
+      def initialize params={}
+        @adapter = GnipApi::Adapter.new
+        @label = params[:label] || GnipApi.config.label
+      end
+
+      def counts options={}
+        required_options?(options)
+        payload = construct_counts_payload(options)
+        request = GnipApi::Request.new_post(count_endpoint, payload)
+        data = adapter.post(request)
+        return parse_counts_response(data)
+      end
+
+      private
+      def count_endpoint
+        GnipApi::Endpoints.search_counts(@label)
+      end
+
+      def required_options
+        [:rule]
+      end
+
+      def required_options? options
+        provided_options = required_options - options.keys
+        raise GnipApi::Errors::Search::MissingParameters.new(provided_options) if provided_options.any?
+      end
+
+      def parse_date date
+        return nil unless date
+        date.strftime('%Y%m%d%H%M')
+      end
+
+      def parse_counts_response data
+        parsed_data = JSON.parse(data)
+        result_set = parsed_data['results']
+        params = parsed_data['requestParameters']
+        result = {:results => [], :total_count => parsed_data['totalCount'], :next => parsed_data['next'], :request_parameters => {}}
+        result[:request_parameters][:bucket] = params['bucket'] if params['bucket']
+        result[:request_parameters][:from_date] = Time.parse("#{params['fromDate']}-0000") if params['fromDate']
+        result[:request_parameters][:to_date] = Time.parse("#{params['toDate']}-0000") if params['toDate']
+        result_set.each do |item|
+          result[:results] << {:time_period => Time.parse("#{item['timePeriod']}-0000"), :count => item['count']}
+        end
+        return result
+      end
+
+      def construct_counts_payload options
+        payload = {
+          :query => options[:rule].value,
+          :fromDate => parse_date(options[:from_date]),
+          :toDate => parse_date(options[:to_date]),
+          :bucket => options[:bucket],
+          :next => options[:next_token]
+        }
+        payload.delete_if{|k,v| v.nil?}
+        return payload.to_json
+      end
+    end
+  end
+end

data/lib/gnip_api/configuration.rb

@@ -1,13 +1,10 @@
 module GnipApi
   class Configuration
-    attr_accessor :user, :password, :adapter_class, :account, :logger, :mutex
-    attr_reader :rate_limiter
+    attr_accessor :user, :password, :adapter_class, :account, :logger, :source, :label
 
     def initialize
       @adapter_class = GnipApi::Adapters::HTTPartyAdapter
       @logger = Logger.new('tmp/gnip_api.log')
-      @mutex = Mutex.new
-      @rate_limiter = GnipApi::RateLimiter.new
     end
   end
 end

data/lib/gnip_api/endpoints.rb

@@ -9,12 +9,12 @@ module GnipApi
         URI("https://stream.gnip.com:443/accounts/#{account}/publishers/#{source}/streams/track/#{label}.json")
       end
 
-      def search_stream label
-        URI("https://search.gnip.com/accounts/#{account}/search/#{label}.json")
+      def search_activities label
+        URI("https://gnip-api.twitter.com/search/fullarchive/accounts/#{account}/#{label}")
       end
       
-      def search_count
-        URI("https://search.gnip.com/accounts/#{ CONFIG['account'] }/search/#{label}.json/counts")
+      def search_counts label
+        URI("https://gnip-api.twitter.com/search/fullarchive/accounts/#{account}/#{label}/counts.json")
       end
 
       private

data/lib/gnip_api/errors.rb

@@ -16,6 +16,14 @@ module GnipApi
       end
     end
 
+    module Search
+      class MissingParameters < StandardError
+        def initialize missing_params
+          @message = "Missing required parameters: #{missing_params}"
+        end
+      end
+    end
+
     class MissingCredentials < StandardError
       def initialize
         @message = 'No credentials provided'

data/lib/gnip_api/version.rb

@@ -1,3 +1,3 @@
 module GnipApi
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/gnip_api.rb

@@ -2,16 +2,11 @@ require "gnip_api/version"
 require "gnip_api/errors"
 require "gnip_api/configuration"
 require "gnip_api/endpoints"
-require "gnip_api/limiters/rules"
-require "gnip_api/rate_limiter"
 require "gnip_api/apis/power_track/stream"
 require "gnip_api/apis/power_track/rules"
 require "gnip_api/apis/power_track/buffer"
 require "gnip_api/apis/power_track/rule"
-require "gnip_api/apis/search/stream"
-require "gnip_api/apis/search/count"
-require "gnip_api/apis/search/query"
-require "gnip_api/apis/search/result"
+require "gnip_api/apis/search"
 require "gnip_api/gnip/message"
 require "gnip_api/gnip/system_message"
 require "gnip_api/gnip/actor"
@@ -48,10 +43,6 @@ module GnipApi
       self.configuration.logger
     end
 
-    def rate_limiter
-      self.configuration.rate_limiter
-    end
-    
     def config
       self.configuration
     end

data/spec/gnip_api/apis/search_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe GnipApi::Apis::Search do
+  describe '.new' do
+    it 'creates search instance' do
+      object = GnipApi::Apis::Search.new
+      expect(object).not_to eq(nil)
+      expect(object.class).to eq(GnipApi::Apis::Search)
+    end
+  end
+
+  describe '#counts' do
+    before do
+      @api = GnipApi::Apis::Search.new
+      allow(@api.adapter).to receive(:post).and_return("{\"results\":[{\"timePeriod\":\"201607200000\",\"count\":87},{\"timePeriod\":\"201607190000\",\"count\":188}],\"totalCount\":5949,\"requestParameters\":{\"bucket\":\"day\",\"fromDate\":\"201607190000\",\"toDate\":\"201608181340\"}}")
+    end
+
+    it 'raises error if missing params' do
+      expect(Proc.new{@api.counts}).to raise_error(GnipApi::Errors::Search::MissingParameters)
+    end
+
+    it 'performs request and parses response' do
+      rule = GnipApi::Apis::PowerTrack::Rule.new :value => 'lolcat OR madcat'
+      result = @api.counts :rule => rule
+      expect(result).not_to eq(nil)
+      expect(result.keys).to eq([:results, :total_count, :next, :request_parameters])
+    end
+  end
+end

data/spec/gnip_api/configuration_spec.rb

@@ -10,6 +10,8 @@ describe GnipApi::Configuration do
       expect(config.account).to eq(nil)
       expect(config.adapter_class).to eq(GnipApi::Adapters::HTTPartyAdapter)
       expect(config.logger).not_to eq(nil)
+      expect(config.source).to eq(nil)
+      expect(config.label).to eq(nil)
     end
   end
 

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ def configure_gem
     config.password = "lolcat"
     config.account = "something"
     config.adapter_class = TestAdapter
+    config.source = 'twitter'
+    config.label = 'prod'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnip_api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,10 +175,7 @@ files:
 - lib/gnip_api/apis/power_track/rule.rb
 - lib/gnip_api/apis/power_track/rules.rb
 - lib/gnip_api/apis/power_track/stream.rb
-- lib/gnip_api/apis/search/count.rb
-- lib/gnip_api/apis/search/query.rb
-- lib/gnip_api/apis/search/result.rb
-- lib/gnip_api/apis/search/stream.rb
+- lib/gnip_api/apis/search.rb
 - lib/gnip_api/configuration.rb
 - lib/gnip_api/endpoints.rb
 - lib/gnip_api/errors.rb
@@ -188,8 +185,6 @@ files:
 - lib/gnip_api/gnip/message.rb
 - lib/gnip_api/gnip/system_message.rb
 - lib/gnip_api/gnip/url.rb
-- lib/gnip_api/limiters/rules.rb
-- lib/gnip_api/rate_limiter.rb
 - lib/gnip_api/request.rb
 - lib/gnip_api/response.rb
 - lib/gnip_api/version.rb
@@ -223,12 +218,12 @@ files:
 - spec/gnip_api/apis/power_track/rule_spec.rb
 - spec/gnip_api/apis/power_track/rules_spec.rb
 - spec/gnip_api/apis/power_track/stream_spec.rb
+- spec/gnip_api/apis/search_spec.rb
 - spec/gnip_api/configuration_spec.rb
 - spec/gnip_api/endpoints_spec.rb
 - spec/gnip_api/gnip/activity_spec.rb
 - spec/gnip_api/gnip/gnip_data_spec.rb
 - spec/gnip_api/gnip/message_spec.rb
-- spec/gnip_api/limiters/rules_spec.rb
 - spec/gnip_api/request_spec.rb
 - spec/gnip_api/response_spec.rb
 - spec/lib/test_adapter.rb
@@ -289,12 +284,12 @@ test_files:
 - spec/gnip_api/apis/power_track/rule_spec.rb
 - spec/gnip_api/apis/power_track/rules_spec.rb
 - spec/gnip_api/apis/power_track/stream_spec.rb
+- spec/gnip_api/apis/search_spec.rb
 - spec/gnip_api/configuration_spec.rb
 - spec/gnip_api/endpoints_spec.rb
 - spec/gnip_api/gnip/activity_spec.rb
 - spec/gnip_api/gnip/gnip_data_spec.rb
 - spec/gnip_api/gnip/message_spec.rb
-- spec/gnip_api/limiters/rules_spec.rb
 - spec/gnip_api/request_spec.rb
 - spec/gnip_api/response_spec.rb
 - spec/lib/test_adapter.rb

data/lib/gnip_api/apis/search/query.rb

@@ -1,36 +0,0 @@
-module GnipApi
-  module Apis
-    module Search
-      class Query
-        attr_accessor :rules, :from_date, :to_date, :max_results, :next, :publisher
-        
-        def initialize params={}
-          @rules = params[:rules]
-          @from_date = params[:from_date]
-          @to_date = params[:to_date]
-          @max_results = params[:max_results]
-          @next = params[:next]
-          @publisher = params[:publisher]
-        end
-
-        def to_json
-          hash = {}
-          hash['query'] = @rules
-          hash['publisher'] = @publisher
-          hash['fromDate'] = @from_date.to_time.utc.strftime('%Y%m%d%H%M') if @from_date
-          hash['toDate'] = @to_date.to_time.utc.strftime('%Y%m%d%H%M') if @to_date
-          hash['next'] = @next if @next
-          hash['maxResults'] = @max_results if @max_results
-          hash.to_json
-        end
-
-        def valid?
-        end
-
-        private
-        def validate
-        end
-      end
-    end
-  end
-end

data/lib/gnip_api/apis/search/result.rb

@@ -1,17 +0,0 @@
-module GnipApi
-  module Apis
-    module Search
-      class Result
-        attr_reader :activities, :response
-        
-        def initialize response
-          @response = response
-        end
-        
-        def activities
-          @activities ||= response['results'].map { |activity| Activity.new(activity) }
-        end
-      end
-    end
-  end
-end

data/lib/gnip_api/apis/search/stream.rb

@@ -1,26 +0,0 @@
-module GnipApi
-  module Apis
-    module Search
-      class Stream
-        attr_accessor :query, :label
-
-        def initialize options={}
-          @query = options[:query]
-          @label = options[:label]
-          @adapter = GnipApi::Adapter.new
-        end
-
-        def perform
-          response = @adapter.post search_url, @query.to_json
-          Result.new response
-        end
-
-        private
-
-        def search_url
-          GnipApi::Endpoints.search_stream(@label)
-        end
-      end
-    end
-  end
-end

data/lib/gnip_api/limiters/rules.rb

@@ -1,56 +0,0 @@
-module GnipApi
-  module Limiters
-    module Rules
-
-      def rules_init
-        @rules_last_reset = Time.now
-        @rules_requests = 0
-      end
-      
-      def rules_request_allowed?
-        mutex.synchronize do
-          reset_rules_if_expired!
-          add_rules_request!
-          return true if @rules_requests <= rules_max_requests
-          return false
-        end
-      end
-      
-      def reset_rules_if_expired!
-        if seconds_since_last_rules_request >= rules_expire
-          reset_rules!
-        end
-      end
-      
-      def seconds_since_last_rules_request
-        Time.now.to_i - @rules_last_reset.to_i
-      end
-      
-      def add_rules_request!
-        @rules_requests += 1
-      end
-      
-      def reset_rules!
-        @rules_last_reset = Time.now
-        @rules_requests = 0
-      end
-      
-      def rules_last_reset
-        @rules_last_reset
-      end
-      
-      def rules_requests
-        @rules_requests
-      end
-      
-      def rules_max_requests
-        5
-      end
-      
-      def rules_expire
-        1
-      end
-
-    end
-  end
-end

data/lib/gnip_api/rate_limiter.rb

@@ -1,14 +0,0 @@
-module GnipApi
-  class RateLimiter
-    include GnipApi::Limiters::Rules
-    
-    def initialize
-      self.rules_init
-    end
-
-    private
-    def mutex
-      GnipApi.config.mutex
-    end
-  end
-end

data/spec/gnip_api/limiters/rules_spec.rb

@@ -1,74 +0,0 @@
-require 'spec_helper'
-
-describe GnipApi::Limiters::Rules do
-  before do
-    @limiter = Object.new
-    @limiter.extend(GnipApi::Limiters::Rules)
-    @limiter.rules_init
-    allow(@limiter).to receive(:mutex).and_return(Mutex.new)
-  end
-
-  describe '#rules_request_allowed?' do
-    before do
-      Timecop.freeze(Time.now)
-    end
-    
-    after do
-      Timecop.return
-    end
-    
-    it 'allows 5 requests' do
-      requests = []
-      5.times{requests << @limiter.rules_request_allowed?}
-      expect(requests.uniq).to eq([true])
-    end
-
-    it 'does not allow more than 5 requests' do
-      5.times{@limiter.rules_request_allowed?}
-      expect(@limiter.rules_request_allowed?).to eq(false)
-    end
-  end
-
-  describe '#reset_rules_if_expired' do
-    before do
-      Timecop.freeze(Time.now)
-    end
-    
-    after do
-      Timecop.return
-    end
-    
-    it 'does not reset if not expired' do
-      current_time = @limiter.rules_last_reset
-      current_count = @limiter.rules_requests
-      @limiter.reset_rules_if_expired!
-      expect(@limiter.rules_last_reset).to eq(current_time)
-      expect(@limiter.rules_requests).to eq(current_count)
-    end
-
-    it 'resets if expired' do 
-      @limiter.add_rules_request!
-      current_time = @limiter.rules_last_reset
-      current_count = @limiter.rules_requests
-      Timecop.travel(Time.at(Time.now.to_i + 1))
-      @limiter.reset_rules_if_expired!
-      expect(@limiter.rules_last_reset).not_to eq(current_time)
-      expect(@limiter.rules_requests).not_to eq(current_count)       
-    end
-  end
-
-  describe '#seconds_since_last_rules_reset' do
-    before do
-      Timecop.freeze(Time.now)
-    end
-    
-    after do
-      Timecop.return
-    end
-    
-    it 'returns number of seconds since last reset' do
-      Timecop.travel(Time.at(Time.now.to_i + 1))
-      expect(@limiter.seconds_since_last_rules_request).to eq(1)
-    end
-  end
-end