weeter 0.13.0 → 0.14.0

data/lib/weeter.rb

@@ -11,6 +11,7 @@ module Weeter
   autoload 'Twitter', 'weeter/twitter'
   autoload 'Limitator', 'weeter/limitator'
   autoload 'Configuration', 'weeter/configuration'
+  autoload 'TweetItem', 'weeter/tweet_item'
 
   def configure
     yield Configuration.instance

data/lib/weeter/configuration.rb

@@ -4,7 +4,7 @@ module Weeter
 
   class Configuration
     include Singleton
-    attr_accessor :log_path, :subscriptions_limit
+    attr_accessor :log_path
 
     autoload :ClientAppConfig, 'weeter/configuration/client_app_config'
     autoload :TwitterConfig,   'weeter/configuration/twitter_config'

data/lib/weeter/runner.rb

@@ -45,7 +45,7 @@ module Weeter
     end
 
     def tweet_consumer
-      @tweet_consumer ||= Weeter::Twitter::TweetConsumer.new(@config.twitter, notification_plugin, limiter, @config.subscriptions_limit)
+      @tweet_consumer ||= Weeter::Twitter::TweetConsumer.new(@config.twitter, notification_plugin, limiter)
     end
   end
 end

data/lib/weeter/twitter.rb

@@ -1,2 +1 @@
 require 'weeter/twitter/tweet_consumer'
-require 'weeter/twitter/tweet_item'

data/lib/weeter/twitter/tweet_consumer.rb

@@ -5,6 +5,8 @@ module Weeter
   module Twitter
     class TweetConsumer
       extend ::Forwardable
+      TRACK_LIMIT = 400
+      FOLLOW_LIMIT = 5000
 
       attr_reader :limiter, :notifier
       def_delegators :@notifier, :notify_missed_tweets,
@@ -12,15 +14,14 @@ module Weeter
                                  :delete_tweet,
                                  :publish_tweet
 
-      def initialize(twitter_config, notifier, limiter, subscriptions_limit = nil)
+      def initialize(twitter_config, notifier, limiter)
         @config = twitter_config
         @notifier = notifier
         @limiter = limiter
-        @subscriptions_limit = subscriptions_limit
       end
 
       def connect(filter_params)
-        filter_params = limit_filter_params(filter_params) if @subscriptions_limit
+        filter_params = limit_filter_params(filter_params)
         filter_params = clean_filter_params(filter_params)
 
 
@@ -75,27 +76,16 @@ module Weeter
         follow_count = result['follow'].length
         track_count = result['track'].length
 
-        total = follow_count + track_count
-
-        if total > @subscriptions_limit
-          Weeter.logger.error("Twitter Subscriptions are #{total}, but limited to #{@subscriptions_limit} subscriptions")
+        if follow_count > FOLLOW_LIMIT
+          Weeter.logger.error("Twitter Subscriptions include #{follow_count} follows, but are limited to #{FOLLOW_LIMIT}")
+          result['follow']  = result['follow'][0...FOLLOW_LIMIT]
         end
 
-        while total > 1000
-          if follow_count > track_count
-            follow_count -= 1
-          elsif track_count > follow_count
-            track_count -= 1
-          else
-            track_count -= 1
-          end
-
-          total = follow_count + track_count
+        if track_count > TRACK_LIMIT
+          Weeter.logger.error("Twitter Subscriptions include #{track_count} tracks, but are limited to #{TRACK_LIMIT}")
+          result['track']  = result['track'][0...TRACK_LIMIT]
         end
 
-        result['track']  = result['track'][0...track_count]
-        result['follow'] = result['follow'][0...follow_count]
-
         result
       end
 

data/lib/weeter/version.rb

@@ -1,3 +1,3 @@
 module Weeter
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/spec/weeter/twitter/tweet_consumer_spec.rb

@@ -24,7 +24,7 @@ describe Weeter::Twitter::TweetConsumer do
 
     let(:client_proxy) { mock('NotificationPlugin', :publish_tweet => nil) }
     let(:consumer) do
-      Weeter::Twitter::TweetConsumer.new(Weeter::Configuration::TwitterConfig.instance, client_proxy, limiter, 1000)
+      Weeter::Twitter::TweetConsumer.new(Weeter::Configuration::TwitterConfig.instance, client_proxy, limiter)
     end
 
     let(:track) {[]}
@@ -46,45 +46,34 @@ describe Weeter::Twitter::TweetConsumer do
     end
 
     context 'follow above' do
-      let(:follow) { (1..1001).to_a }
+      let(:follow) { (1..5001).to_a }
 
       it 'it limits follows, but not tracks' do
         result = consumer.send(:limit_filter_params, params)
-        result.fetch('follow').length.should == 1000
+        result.fetch('follow').length.should == 5000
         result.fetch('track').length.should == 0
       end
     end
 
     context 'track above' do
-      let(:track) { (1..1001).to_a }
+      let(:track) { (1..401).to_a }
 
       it 'limits tracks, but not follows' do
         result = consumer.send(:limit_filter_params, params)
-        result.fetch('track').length.should == 1000
+        result.fetch('track').length.should == 400
         result.fetch('follow').length.should == 0
       end
     end
 
-    context 'they are equally over' do
-      let(:track)  { (1..600).to_a }
-      let(:follow) { (1..600).to_a }
+    context 'they are both over' do
+      let(:track)  { (1..401).to_a }
+      let(:follow) { (1..5001).to_a }
 
-      it 'limits tracks, but not follows' do
+      it 'limits both' do
 
         result = consumer.send(:limit_filter_params, params)
-        result.fetch('track').length.should == 500
-        result.fetch('follow').length.should == 500
-      end
-    end
-
-    context 'track is more over' do
-      let(:track)  { (1..800).to_a }
-      let(:follow) { (1..300).to_a }
-
-      it 'limits tracks, but not follows' do
-        result = consumer.send(:limit_filter_params, params)
-        result.fetch('track').length.should == 700
-        result.fetch('follow').length.should == 300
+        result.fetch('track').length.should == 400
+        result.fetch('follow').length.should == 5000
       end
     end
   end
@@ -132,7 +121,7 @@ describe Weeter::Twitter::TweetConsumer do
     end
 
     it "should not publish unpublishable tweets" do
-      mock_tweet = mock('tweet', :deletion? => false, :publishable? => false, :limit_notice? => false, :[] => '', :limiting_facets => [])
+      mock_tweet = mock('tweet', :deletion? => false, :publishable? => false, :limit_notice? => false, :[] => '', :limiting_facets => [], :disconnect_notice? => false)
       Weeter::TweetItem.stub!(:new).and_return mock_tweet
       @client_proxy.should_not_receive(:publish_tweet).with(mock_tweet)
     end

data/weeter.conf.example

@@ -9,18 +9,6 @@ Weeter.configure do |conf|
   # To disable logging:
   # conf.log_path = false
 
-  # To hard limits number of subscriptions.
-  # If the limit has been reached it will log and error, and fairly truncate
-  # subscriptions.
-  #
-  #   default: nolimit = nil
-  #
-  # ** Please Note **
-  #   -  by default, twitter will reject connection attempts
-  #      with greater then 1000 subscriptions
-  #
-  # conf.subscriptions_limit = 1000
-
   conf.twitter do |twitter|
     # For basic auth
     # twitter.basic_auth = {:username => 'johnny', :password => 'secret'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weeter
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,140 +11,200 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2161838440 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161838440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
-  requirement: &2161836940 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.1
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161836940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+    none: false
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &2161835100 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161835100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2161833640 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161833640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    none: false
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2161832500 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161832500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &2161832040 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161832040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2161831220 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161831220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161830060 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161830060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+    none: false
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &2161829240 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.5
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161829240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+    none: false
 - !ruby/object:Gem::Dependency
   name: lukemelia-twitter-stream
-  requirement: &2161828460 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.15
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161828460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.15
+    none: false
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161827700 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2161827700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2161826960 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2161826960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: Weeter subscribes to a set of twitter users or search terms using Twitter's
   streaming API, and notifies your app with each new tweet.
 email:
@@ -182,9 +242,9 @@ files:
 - lib/weeter/plugins/subscription_plugin.rb
 - lib/weeter/runner.rb
 - lib/weeter/tasks.rb
+- lib/weeter/tweet_item.rb
 - lib/weeter/twitter.rb
 - lib/weeter/twitter/tweet_consumer.rb
-- lib/weeter/twitter/tweet_item.rb
 - lib/weeter/version.rb
 - log/.gitignore
 - spec/.DS_Store
@@ -208,20 +268,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: weeter
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Consume the Twitter stream and notify your app