governor_twitter 0.1.0 → 0.1.1

data/Gemfile

@@ -9,7 +9,7 @@ source "http://rubygems.org"
 gem 'twitter', '>= 1.1'
 gem 'shortie'
 gem 'governor', '>= 0.5.3'
-gem 'governor_background', '~> 0.2.2'
+gem 'governor_background', '>= 0.3.0'
 
 group :development, :test do
   gem 'jeweler', '~> 1.5.2'
@@ -24,5 +24,6 @@ group :development, :test do
   gem 'devise'
   gem 'governor_twitter', :path => './'
   gem 'delayed_job'
+  gem 'resque'
   gem 'dynamic_form'
 end

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ./
   specs:
-    governor_twitter (0.1.0)
+    governor_twitter (0.1.1)
       governor (>= 0.5.3)
-      governor_background (~> 0.2.2)
+      governor_background (>= 0.3.0)
       shortie
       twitter (>= 1.1)
 
@@ -66,9 +66,9 @@ GEM
     faraday_middleware (0.6.3)
       faraday (~> 0.6.0)
     git (1.2.5)
-    governor (0.5.3)
-      rails (~> 3.0.5)
-    governor_background (0.2.2)
+    governor (0.5.4)
+      rails (>= 3.0.5)
+    governor_background (0.3.0)
       governor
     hashie (1.0.0)
     i18n (0.5.0)
@@ -76,6 +76,7 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.4.6)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -109,6 +110,14 @@ GEM
     rake (0.8.7)
     rash (0.3.0)
       hashie (~> 1.0.0)
+    redis (2.2.0)
+    redis-namespace (0.10.0)
+      redis (< 3.0.0)
+    resque (1.15.0)
+      json (~> 1.4.6)
+      redis-namespace (>= 0.10.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -126,8 +135,12 @@ GEM
       simplehttp (>= 0.1.3)
     simple_oauth (0.1.5)
     simplehttp (0.1.3)
+    sinatra (1.2.3)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
     sqlite3 (1.3.3)
     thor (0.14.6)
+    tilt (1.3)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     twitter (1.4.1)
@@ -139,6 +152,8 @@ GEM
       rash (~> 0.3.0)
       simple_oauth (~> 0.1.4)
     tzinfo (0.3.27)
+    vegas (0.1.8)
+      rack (>= 1.0.0)
     warden (1.0.4)
       rack (>= 1.0)
     will_paginate (3.0.pre2)
@@ -154,10 +169,11 @@ DEPENDENCIES
   factory_girl (~> 2.0.0.beta)
   factory_girl_rails (~> 1.1.beta)
   governor (>= 0.5.3)
-  governor_background (~> 0.2.2)
+  governor_background (>= 0.3.0)
   governor_twitter!
   jeweler (~> 1.5.2)
   mocha
+  resque
   rspec-rails
   shortie
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  governor_background:
+    twitter_post_completed: 'Your article was successfully posted to Twitter.'
+    twitter_post_failed: 'Unable to tweet your article: %{message}.'
+    twitter_post_killed: 'Your tweet was interrupted: %{message}.'

data/governor_twitter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{governor_twitter}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Liam Morley"]
-  s.date = %q{2011-05-13}
+  s.date = %q{2011-05-15}
   s.description = %q{A plugin for the Rails 3-based Governor blogging system that posts your blog entries to Twitter for you.}
   s.email = %q{liam@carpeliam.com}
   s.extra_rdoc_files = [
@@ -26,13 +26,12 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/views/governor/articles/_twitter_form.html.erb",
+    "config/locales/en.yml",
     "governor_twitter.gemspec",
     "lib/governor_twitter.rb",
     "lib/governor_twitter/controllers/methods.rb",
-    "lib/governor_twitter/models/methods.rb",
     "lib/governor_twitter/rails.rb",
     "spec/governor_twitter_spec.rb",
-    "spec/models/article_spec.rb",
     "spec/rails_app/.gitignore",
     "spec/rails_app/Gemfile",
     "spec/rails_app/Gemfile.lock",
@@ -97,7 +96,6 @@ Gem::Specification.new do |s|
   s.summary = %q{A plugin that connects Governor with a Twitter account.}
   s.test_files = [
     "spec/governor_twitter_spec.rb",
-    "spec/models/article_spec.rb",
     "spec/rails_app/app/controllers/application_controller.rb",
     "spec/rails_app/app/controllers/home_controller.rb",
     "spec/rails_app/app/helpers/application_helper.rb",
@@ -136,7 +134,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<twitter>, [">= 1.1"])
       s.add_runtime_dependency(%q<shortie>, [">= 0"])
       s.add_runtime_dependency(%q<governor>, [">= 0.5.3"])
-      s.add_runtime_dependency(%q<governor_background>, ["~> 0.2.2"])
+      s.add_runtime_dependency(%q<governor_background>, [">= 0.3.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
@@ -148,12 +146,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<devise>, [">= 0"])
       s.add_development_dependency(%q<governor_twitter>, [">= 0"])
       s.add_development_dependency(%q<delayed_job>, [">= 0"])
+      s.add_development_dependency(%q<resque>, [">= 0"])
       s.add_development_dependency(%q<dynamic_form>, [">= 0"])
     else
       s.add_dependency(%q<twitter>, [">= 1.1"])
       s.add_dependency(%q<shortie>, [">= 0"])
       s.add_dependency(%q<governor>, [">= 0.5.3"])
-      s.add_dependency(%q<governor_background>, ["~> 0.2.2"])
+      s.add_dependency(%q<governor_background>, [">= 0.3.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
@@ -165,13 +164,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<devise>, [">= 0"])
       s.add_dependency(%q<governor_twitter>, [">= 0"])
       s.add_dependency(%q<delayed_job>, [">= 0"])
+      s.add_dependency(%q<resque>, [">= 0"])
       s.add_dependency(%q<dynamic_form>, [">= 0"])
     end
   else
     s.add_dependency(%q<twitter>, [">= 1.1"])
     s.add_dependency(%q<shortie>, [">= 0"])
     s.add_dependency(%q<governor>, [">= 0.5.3"])
-    s.add_dependency(%q<governor_background>, ["~> 0.2.2"])
+    s.add_dependency(%q<governor_background>, [">= 0.3.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
@@ -183,6 +183,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<devise>, [">= 0"])
     s.add_dependency(%q<governor_twitter>, [">= 0"])
     s.add_dependency(%q<delayed_job>, [">= 0"])
+    s.add_dependency(%q<resque>, [">= 0"])
     s.add_dependency(%q<dynamic_form>, [">= 0"])
   end
 end

data/lib/governor_twitter.rb

@@ -1,16 +1,17 @@
 require 'governor_twitter/rails'
-require 'governor_twitter/models/methods'
 require 'governor_twitter/controllers/methods'
 
 twitter = Governor::Plugin.new('twitter')
 
-twitter.register_model_callback do |base|
-  base.send :include, GovernorTwitter::Models::Methods
-  base.send :include, ActionView::Helpers::TextHelper
-end
 twitter.register_controller_callback do |controller|
   controller.send :include, GovernorTwitter::Controllers::Methods
 end
 twitter.register_partial :bottom_of_form, 'articles/twitter_form'
 
+GovernorBackground.register('twitter_post') do |content, url|
+  include ActionView::Helpers::TextHelper
+  shortened_url = Shortie::Service.find_by_key("bitly").shorten(url)
+  Twitter.update("#{truncate(content, :length => 139 - shortened_url.size)} #{shortened_url}")
+end
+
 Governor::PluginManager.register twitter

data/lib/governor_twitter/controllers/methods.rb

@@ -7,7 +7,9 @@ module GovernorTwitter
       
       def send_to_twitter
         if params[:post_to_twitter] && resource.errors.blank?
-          resource.post_to_twitter_in_background(params[:twitter_content], polymorphic_url(resource))
+          content, url = params[:twitter_content], polymorphic_url(resource)
+          logger.info 'posting to twitter in the background'
+          GovernorBackground.run('twitter_post', content, url)
         end
       end
     end

data/spec/governor_twitter_spec.rb

@@ -1,7 +1,20 @@
 require 'spec_helper'
 
 describe GovernorTwitter do
-  it "registers the plugin" do
+  it "registers the plugin with Governor" do
     Governor::PluginManager.plugins.size == 1
   end
+  
+  it "registers a job with GovernorBackground" do
+    GovernorBackground.retrieve('twitter_post').should_not be_blank
+  end
+  
+  it "can post to twitter" do
+    content = "Visit my site!"
+    url = 'http://blago.gov/money_please'
+    shortened_url = 'http://bit.ly/short'
+    Shortie::Service.find_by_key("bitly").expects(:shorten).with(url).returns(shortened_url)
+    Twitter.expects(:update).with("#{content} #{shortened_url}")
+    GovernorBackground.run('twitter.post', content, url)
+  end
 end

data/spec/rails_app/Gemfile

@@ -8,9 +8,9 @@ gem 'rails', '3.0.5'
 gem 'sqlite3'
 
 gem 'devise'
-gem 'delayed_job'
+gem 'resque'
 gem 'governor'
-gem 'governor_background'
+gem 'governor_background', '>= 0.3.0'
 gem 'governor_twitter', :path => '../..'
 
 gem 'dynamic_form'

data/spec/rails_app/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ../..
   specs:
-    governor_twitter (0.1.0)
-      governor
-      governor_background
+    governor_twitter (0.1.1)
+      governor (>= 0.5.3)
+      governor_background (>= 0.3.0)
       shortie
       twitter (>= 1.1)
 
@@ -41,10 +41,6 @@ GEM
     arel (2.0.9)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
-    daemons (1.1.3)
-    delayed_job (2.1.4)
-      activesupport (~> 3.0)
-      daemons
     devise (1.3.4)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
@@ -58,12 +54,13 @@ GEM
       rack (>= 1.1.0, < 2)
     faraday_middleware (0.6.3)
       faraday (~> 0.6.0)
-    governor (0.5.3)
-      rails (~> 3.0.5)
-    governor_background (0.2.2)
+    governor (0.5.4)
+      rails (>= 3.0.5)
+    governor_background (0.3.0)
       governor
     hashie (1.0.0)
     i18n (0.5.0)
+    json (1.4.6)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -72,7 +69,7 @@ GEM
     mime-types (1.16)
     multi_json (1.0.2)
     multi_xml (0.2.2)
-    multipart-post (1.1.0)
+    multipart-post (1.1.1)
     orm_adapter (0.0.5)
     polyglot (0.3.1)
     rack (1.2.2)
@@ -96,12 +93,24 @@ GEM
     rake (0.8.7)
     rash (0.3.0)
       hashie (~> 1.0.0)
+    redis (2.2.0)
+    redis-namespace (0.10.0)
+      redis (< 3.0.0)
+    resque (1.15.0)
+      json (~> 1.4.6)
+      redis-namespace (>= 0.10.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
     shortie (1.0.0)
       simplehttp (>= 0.1.3)
     simple_oauth (0.1.5)
     simplehttp (0.1.3)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
     sqlite3 (1.3.3)
     thor (0.14.6)
+    tilt (1.3)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     twitter (1.4.1)
@@ -113,6 +122,8 @@ GEM
       rash (~> 0.3.0)
       simple_oauth (~> 0.1.4)
     tzinfo (0.3.27)
+    vegas (0.1.8)
+      rack (>= 1.0.0)
     warden (1.0.4)
       rack (>= 1.0)
     will_paginate (3.0.pre2)
@@ -121,12 +132,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  delayed_job
   devise
   dynamic_form
   governor
-  governor_background
+  governor_background (>= 0.3.0)
   governor_twitter!
   rails (= 3.0.5)
+  resque
   sqlite3
   will_paginate (~> 3.0.beta)

data/spec/rails_app/Rakefile

@@ -5,3 +5,5 @@ require File.expand_path('../config/application', __FILE__)
 require 'rake'
 
 RailsApp::Application.load_tasks
+
+require 'resque/tasks'

data/spec/rails_app/config/initializers/twitter.rb

@@ -1,6 +1,6 @@
 Twitter.configure do |config|
-  config.consumer_key = ''
-  config.consumer_secret = ''
-  config.oauth_token = ''
-  config.oauth_token_secret = ''
+  config.consumer_key = 'x2kAIZqhVbB8aYBkbIhLA'
+  config.consumer_secret = 'N3m27LRWN6kglvJ2QIoqS6HKv0y1MBqFNMBUpEl8g'
+  config.oauth_token = '298776110-A4adk6Whxn6ROReYsNyx2Ate948qXS2hQpIGVAkg'
+  config.oauth_token_secret = 'C2eeyC3R28PjNlaXAZXmr9hKC1MvBZy0A3wawO4xI'
 end

data/spec/spec_helper.rb

@@ -33,4 +33,11 @@ module Governor
       end
     end
   end
+end
+
+# get GovernorBackground to run jobs directly
+module GovernorBackground
+  def self.run(job_name, *arguments)
+    retrieve(job_name).call(*arguments)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: governor_twitter
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Liam Morley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 -04:00
+date: 2011-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,14 +70,14 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
         - 0
-        - 2
-        - 2
-        version: 0.2.2
+        - 3
+        - 0
+        version: 0.3.0
   requirement: *id004
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -245,7 +245,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: dynamic_form
+  name: resque
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -256,6 +256,20 @@ dependencies:
         - 0
         version: "0"
   requirement: *id016
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: dynamic_form
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id017
 description: A plugin for the Rails 3-based Governor blogging system that posts your blog entries to Twitter for you.
 email: liam@carpeliam.com
 executables: []
@@ -275,13 +289,12 @@ files:
 - Rakefile
 - VERSION
 - app/views/governor/articles/_twitter_form.html.erb
+- config/locales/en.yml
 - governor_twitter.gemspec
 - lib/governor_twitter.rb
 - lib/governor_twitter/controllers/methods.rb
-- lib/governor_twitter/models/methods.rb
 - lib/governor_twitter/rails.rb
 - spec/governor_twitter_spec.rb
-- spec/models/article_spec.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Gemfile
 - spec/rails_app/Gemfile.lock
@@ -374,7 +387,6 @@ specification_version: 3
 summary: A plugin that connects Governor with a Twitter account.
 test_files: 
 - spec/governor_twitter_spec.rb
-- spec/models/article_spec.rb
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/controllers/home_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb

data/lib/governor_twitter/models/methods.rb

@@ -1,15 +0,0 @@
-require 'twitter'
-module GovernorTwitter
-  module Models
-    module Methods
-      def post_to_twitter(content, url)
-        shortened_url = Shortie::Service.find_by_key("bitly").shorten(url)
-        Twitter.update("#{truncate(content, :length => 139 - shortened_url.size)} #{shortened_url}")
-      end
-      
-      def post_to_twitter_in_background(content, url)
-        run_in_background :post_to_twitter, content, url
-      end
-    end
-  end
-end

data/spec/models/article_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe Article do
-  before do
-    @content = "Visit my site!"
-    @url = 'http://blago.gov/money_please'
-    @shortened_url = 'http://bit.ly/short'
-    @article = Factory(:article, :author => Factory(:user))
-  end
-  it "can post to twitter" do
-    Shortie::Service.find_by_key("bitly").expects(:shorten).with(@url).returns(@shortened_url)
-    Twitter.expects(:update).with("#{@content} #{@shortened_url}")
-    @article.post_to_twitter @content, @url
-  end
-end