incomplete-twitter4j4r 0.3.4-java → 1.0.0-java

data/.gitignore

@@ -15,3 +15,12 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+.vagrant/
+Berksfile
+Berksfile.lock
+cookbooks/
+Vagrantfile
+
+twitter4j4r.sublime-project
+twitter4j4r.sublime-workspace

data/README.md

@@ -1,66 +1,62 @@
-# Twitter4j4r
-
-A thin, woefully inadequate wrapper around [twitter4j](http://twitter4j.org/)
-forked from [tobias](https://github.com/tobias/twitter4j4r). It will only work
-under JRuby.
-
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'incomplete-twitter4j4r'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install incomplete-twitter4j4r
-
-
-## Usage
-
-Create a configuration object:
-
-    @config = Twitter4j4r::Config.new
-    @config.username = 'username'
-    @config.password = 'password'
-    
-    @client = Twitter4j4r::Client.new @config
-
-Or with OAuth:
-
-    @config = Twitter4j4r::Config.new
-    @config.consumer_key         = 'ABC456'
-    @config.consumer_secret      = 'ABC456'
-    @config.access_token         = 'ABC456'
-    @config.access_token_secret  = 'ABC456'
-    
-    @client = Twitter4j4r::Client.new @config 
-
-To access the sample stream:
-
-    @client.sample do |tweet|
-      puts "#{tweet.user.screen_name} says \"#{tweet.text}\""
-    end
-
-Tracking a keyword:
-    
-    @client.track('bieber') do |tweet|
-      puts "#{tweet.user.screen_name} says #{tweet.text}"
-    end
-
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-
-
-Thanks to [Tobias Crawley](https://github.com/tobias) for the original codebase.
+# Twitter4j4r
+
+A thin, woefully inadequate wrapper around [twitter4j](http://twitter4j.org/)
+forked from [tobias](https://github.com/tobias/twitter4j4r). It will only work
+under JRuby.
+
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'incomplete-twitter4j4r'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install incomplete-twitter4j4r
+
+
+## Usage
+
+Create a configuration object and a client:
+
+    config = Twitter4j4r::Config.new
+    config.consumer_key         = 'ABC456'
+    config.consumer_secret      = 'ABC456'
+    config.access_token         = 'ABC456'
+    config.access_token_secret  = 'ABC456'
+    
+    client = Twitter4j4r::Client.new config 
+
+To access the sample stream:
+
+    stream = client.add_stream :insert_stream_name_here
+
+    stream.sample do |tweet|
+      puts "#{tweet.user.screen_name} says \"#{tweet.text}\""
+    end
+
+Tracking a keyword:
+    
+    stream = client.add_stream :insert_stream_name_here
+
+    stream.track('bieber') do |tweet|
+      puts "#{tweet.user.screen_name} says #{tweet.text}"
+    end
+
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+
+
+Thanks to [Tobias Crawley](https://github.com/tobias) for the original codebase.

data/lib/twitter4j4r.rb

@@ -1,6 +1,6 @@
 require 'twitter4j4r/client'
 require 'twitter4j4r/config'
-require 'jar/twitter4j-core-2.2.6.jar'
+require 'jar/twitter4j-core-3.0.3.jar'
 require 'json'
 
 

data/lib/twitter4j4r/client.rb

@@ -1,63 +1,34 @@
-require 'jar/twitter4j-core-2.2.6.jar'
-require 'jar/twitter4j-stream-2.2.6.jar'
-require 'jar/twitter4j-async-2.2.6.jar'
-
-require 'twitter4j4r/listener'
-require 'twitter4j4r/config'
-
-module Twitter4j4r
-  class Client
-    def initialize(config)
-      unless config.is_a? Config
-        auth_map                    = config
-        config                      = Twitter4j4r::Config.new
-        config.consumer_key         = auth_map[:consumer_key]
-        config.consumer_secret      = auth_map[:consumer_secret]
-        config.access_token         = auth_map[:access_token]
-        config.access_token_secret  = auth_map[:access_secret]
-      end
-
-      @stream = Java::Twitter4j::TwitterStreamFactory.new(config.build).instance
-    end
-
-    def on_exception(&block)
-      @exception_block = block
-      self
-    end
-
-    def on_limitation(&block)
-      @limitation_block = block
-      self
-    end
-
-    def on_status(&block)
-      @status_block = block
-      self
-    end
-
-    def on_deletion(&block)
-      @deletion_block = block
-      self
-    end
-
-    def track(*terms, &block)
-      add_listener(&block)
-      @stream.filter(Java::Twitter4j::FilterQuery.new(0, nil, search_terms.to_java(:string)))
-    end
-    
-    def sample(&block)
-      add_listener(&block)
-      @stream.sample
-    end
-
-    def add_listener(&block)
-      on_status(&block)
-      @stream.addListener(Listener.new(self, @status_block, @exception_block, @limitation_block, @deletion_block))
-    end
-
-    def stop
-      @stream.cleanUp
-      @stream.shutdown
-    end
-  end
-end
+require 'jar/twitter4j-core-3.0.3.jar'
+require 'jar/twitter4j-stream-3.0.3.jar'
+require 'jar/twitter4j-async-3.0.3.jar'
+
+require 'twitter4j4r/stream'
+require 'twitter4j4r/config'
+
+module Twitter4j4r
+  class Client
+    def initialize(config)
+      unless config.is_a? Config
+        auth_map                    = config
+        config                      = Twitter4j4r::Config.new
+        config.consumer_key         = auth_map[:consumer_key]
+        config.consumer_secret      = auth_map[:consumer_secret]
+        config.access_token         = auth_map[:access_token]
+        config.access_token_secret  = auth_map[:access_secret]
+      end
+
+      @config = config.build
+      @streams = { }
+    end
+
+    def add_stream name
+      stream = Twitter4j4r::Stream.new @config
+      @streams[name] = stream
+      stream
+    end
+
+    def stream name
+      @streams[name]
+    end
+  end
+end

data/lib/twitter4j4r/config.rb

@@ -1,4 +1,4 @@
-require 'jar/twitter4j-core-2.2.6.jar'
+require 'jar/twitter4j-core-3.0.3.jar'
 
 module Twitter4j4r
   class Config
@@ -25,11 +25,11 @@ module Twitter4j4r
     end
 
     def username= username
-      @config.setUser username
+      raise "As of API v1.1, authorizing using username/password is not longer an option."
     end
 
     def password= password
-      @config.setPassword password
+      raise "As of API v1.1, authorizing using username/password is not longer an option."
     end
 
     def build

data/lib/twitter4j4r/stream.rb

@@ -0,0 +1,58 @@
+require 'jar/twitter4j-core-3.0.3.jar'
+require 'jar/twitter4j-stream-3.0.3.jar'
+require 'jar/twitter4j-async-3.0.3.jar'
+
+require 'twitter4j4r/stream/public-listener'
+require 'twitter4j4r/stream/user-listener'
+
+module Twitter4j4r
+  class Stream
+
+    def initialize(config)
+      @stream = Java::Twitter4j::TwitterStreamFactory.new(config).instance 
+      @blocks = { }
+    end
+
+    def on_exception(&block)
+      on_notice(:exception, block)
+    end
+
+    def on_favorite(&block)
+      on_notice(:favorite, block)
+    end
+
+    def on_limitation(&block)
+      on_notice(:limitation, block)
+    end
+
+    def on_status(&block)
+      on_notice(:status, block)
+    end
+
+    def on_deletion(&block)
+      on_notice(:delete, block)
+    end
+
+    def on_notice(block_name, block)
+      @blocks[block_name] = block
+      self
+    end
+
+    def track(*terms, &block)
+      on_status(&block)  
+      @stream.addListener(PublicListener.new(self, @blocks))
+      @stream.filter(Java::Twitter4j::FilterQuery.new(0, nil, search_terms.to_java(:string)))
+    end
+    
+    def sample(&block)
+      on_status(&block)  
+      @stream.addListener(PublicListener.new(self, @blocks))
+      @stream.sample
+    end
+
+    def stop
+      @stream.cleanUp
+      @stream.shutdown
+    end
+  end
+end

data/lib/twitter4j4r/stream/listener.rb

@@ -0,0 +1,14 @@
+module Twitter4j4r
+  class Listener
+
+    def initialize(client, blocks)
+      @client = client
+      @blocks = blocks
+    end
+
+    protected
+    def call_block_with_client(block_key, *args)
+      @blocks[block_key].call(*((args + [@client])[0, @blocks[block_key].arity])) if @blocks[block_key]
+    end
+  end
+end

data/lib/twitter4j4r/stream/public-listener.rb

@@ -0,0 +1,23 @@
+require 'jar/twitter4j-stream-3.0.3.jar'
+require 'jruby/core_ext'
+
+
+require 'twitter4j4r/stream/listener'
+
+module Twitter4j4r
+  class PublicListener < Listener
+    include Java::Twitter4j::StatusListener
+
+    [[ :onStatus,                 :status ],
+     [ :onException,              :exception ],
+     [ :onTrackLimitationNotice,  :limitation ],
+     [ :onDeletionNotice,         :delete ]
+    ].each do |method|
+      define_method(method[0]) do |*args|
+        call_block_with_client(method[1], *args)
+      end
+    end
+  end
+end
+
+Twitter4j4r::PublicListener.become_java!

data/lib/twitter4j4r/stream/user-listener.rb

@@ -0,0 +1,36 @@
+require 'jar/twitter4j-stream-3.0.3.jar'
+require 'jruby/core_ext'
+
+require 'twitter4j4r/stream/listener'
+
+module Twitter4j4r
+  class UserListener < Listener
+    include Java::Twitter4j::UserStreamListener
+
+    [[ :onException,               :exception ],
+     [ :onDeletionNotice,          :delete ],
+     [ :onBlock,                   :block ],
+     [ :onDirectMessage,           :dm ],
+     [ :onFriendList,              :friend_list ],
+     [ :onFavorite,                :favorite ],
+     [ :onStatus,                  :status ],
+     [ :onFollow,                  :follow ],
+     [ :onUnblock,                 :unblock ],
+     [ :onUnfavorite,              :unfavorite ],
+     [ :onUserListCreation,        :user_list_creation ],
+     [ :onUserListDeletion,        :user_list_deletion ],
+     [ :onUserListMemberAddition,  :user_list_member_addition ],
+     [ :onUserListMemberDeletion,  :user_list_member_deletion ],
+     [ :onUserListSubscription,    :user_list_subscription ],
+     [ :onUserListUnsubscription,  :user_list_unsubscription ],
+     [ :onUserListUpdate,          :user_list_update ],
+     [ :onUserProfileUpdate,       :user_profile_update ]
+    ].each do |method|
+      define_method(method[0]) do |*args|
+        call_block_with_client(method[1], *args)
+      end
+    end
+  end
+end
+
+Twitter4j4r::UserListener.become_java!

data/lib/twitter4j4r/version.rb

@@ -1,3 +1,3 @@
-module Twitter4j4r
-  VERSION = "0.3.4"
-end
+module Twitter4j4r
+  VERSION = "1.0.0"
+end

metadata

@@ -2,7 +2,7 @@
 name: incomplete-twitter4j4r
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.4
+  version: 1.0.0
 platform: java
 authors:
 - Tobias Crawley
@@ -11,19 +11,19 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
     none: false
@@ -38,18 +38,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- lib/jar/twitter4j-async-2.2.6.jar
-- lib/jar/twitter4j-core-2.2.6.jar
-- lib/jar/twitter4j-stream-2.2.6.jar
+- lib/jar/twitter4j-async-3.0.3.jar
+- lib/jar/twitter4j-core-3.0.3.jar
+- lib/jar/twitter4j-stream-3.0.3.jar
 - lib/twitter4j4r.rb
 - lib/twitter4j4r/client.rb
 - lib/twitter4j4r/config.rb
-- lib/twitter4j4r/listener.rb
+- lib/twitter4j4r/stream.rb
+- lib/twitter4j4r/stream/listener.rb
+- lib/twitter4j4r/stream/public-listener.rb
+- lib/twitter4j4r/stream/user-listener.rb
 - lib/twitter4j4r/version.rb
 - twitter4j4r.gemspec
 homepage: https://github.com/incompletepackets/twitter4j4r
@@ -61,17 +64,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project:

data/lib/twitter4j4r/listener.rb

@@ -1,39 +0,0 @@
-require 'jar/twitter4j-stream-2.2.6.jar'
-require 'jruby/core_ext'
-
-module Twitter4j4r
-    class Listener
-    include Java::Twitter4j::StatusListener
-
-    def initialize(client, status_block, exception_block, limitation_block, deletion_block)
-      @client           = client
-      @status_block     = status_block
-      @exception_block  = exception_block
-      @limitation_block = limitation_block
-      @deletion_block   = deletion_block
-    end
-    
-    def onStatus(status)
-      call_block_with_client(@status_block, status)
-    end
-
-    def onException(exception)
-      call_block_with_client(@exception_block, exception)
-    end
-
-    def onTrackLimitationNotice(limited_count)
-      call_block_with_client(@limitation_block, limited_count)
-    end
-
-    def onDeletionNotice(notice)
-      call_block_with_client(@deletion_block, notice)
-    end
-
-    protected
-    def call_block_with_client(block, *args)
-      block.call(*((args + [@client])[0, block.arity])) if block
-    end
-  end
-end
-
-Twitter4j4r::Listener.become_java!