governor_livejournal 0.2.0 → 0.2.1

data/Gemfile

@@ -8,7 +8,7 @@ source "http://rubygems.org"
 
 gem 'livejournal'
 gem 'governor'
-gem 'governor_background'
+gem 'governor_background', '>= 0.3.0'
 
 group :development, :test do
   gem 'jeweler', '~> 1.5.2'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ./
   specs:
-    governor_livejournal (0.2.0)
+    governor_livejournal (0.2.1)
       governor
-      governor_background
+      governor_background (>= 0.3.0)
       livejournal
 
 GEM
@@ -60,7 +60,7 @@ GEM
     git (1.2.5)
     governor (0.3.1)
       rails (~> 3.0.5)
-    governor_background (0.1.0)
+    governor_background (0.3.0)
       governor
     i18n (0.5.0)
     jeweler (1.5.2)
@@ -100,7 +100,7 @@ GEM
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
       rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
+    rspec-core (2.5.2)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
@@ -129,7 +129,7 @@ DEPENDENCIES
   factory_girl (~> 2.0.0.beta)
   factory_girl_rails (~> 1.1.beta)
   governor
-  governor_background
+  governor_background (>= 0.3.0)
   governor_livejournal!
   jeweler (~> 1.5.2)
   livejournal

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/config/locales/en.yml

@@ -1,5 +1,5 @@
 en:
   governor_background:
-    post_to_livejournal_completed: '"%{resource}" was completed successfully.'
-    post_to_livejournal_failed: '"%{resource}" could not be created: %{message}.'
-    post_to_livejournal_killed: '"%{resource}" was interrupted: %{message}.'
+    livejournal_post_completed: 'Your article was successfully posted to LiveJournal.'
+    livejournal_post_failed: 'Unable to post to LiveJournal: %{message}.'
+    livejournal_post_killed: 'Your post to LiveJournal was interrupted: %{message}.'

data/governor_livejournal.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{governor_livejournal}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Liam Morley"]
-  s.date = %q{2011-04-25}
+  s.date = %q{2011-05-15}
   s.description = %q{A plugin for the Rails 3-based Governor blogging system that posts and updates articles to LiveJournal.com.}
   s.email = %q{liam@carpeliam.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/generators/governor/templates/migrations/add_livejournal.rb",
     "lib/governor_livejournal.rb",
     "lib/governor_livejournal/instance_methods.rb",
+    "lib/governor_livejournal/livejournal.rb",
     "lib/governor_livejournal/rails.rb",
     "spec/governor_livejournal_spec.rb",
     "spec/rails_app/.gitignore",
@@ -141,7 +142,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<livejournal>, [">= 0"])
       s.add_runtime_dependency(%q<governor>, [">= 0"])
-      s.add_runtime_dependency(%q<governor_background>, [">= 0"])
+      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"])
@@ -157,7 +158,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<livejournal>, [">= 0"])
       s.add_dependency(%q<governor>, [">= 0"])
-      s.add_dependency(%q<governor_background>, [">= 0"])
+      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"])
@@ -174,7 +175,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<livejournal>, [">= 0"])
     s.add_dependency(%q<governor>, [">= 0"])
-    s.add_dependency(%q<governor_background>, [">= 0"])
+    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"])

data/lib/governor_livejournal.rb

@@ -1,4 +1,5 @@
 require 'governor_livejournal/rails'
+require 'governor_livejournal/livejournal'
 require 'governor_livejournal/instance_methods'
 
 livejournal = Governor::Plugin.new('livejournal')
@@ -17,6 +18,21 @@ livejournal.register_partial :bottom_of_form, 'articles/livejournal_form'
 
 Governor::PluginManager.register livejournal
 
+GovernorBackground.register('livejournal_post') do |article|
+  lj = GovernorLivejournal::Livejournal.new(article)
+  id = if article.livejournal_id.blank?
+    lj.post
+  else
+    lj.put
+  end
+  article.reload.update_attribute :livejournal_id, id
+end
+
+GovernorBackground.register('livejournal_delete') do |livejournal_id|
+  lj = GovernorLivejournal::Livejournal.new(livejournal_id)
+  lj.delete
+end
+
 module GovernorLivejournal
   class Configuration
     cattr_accessor :username, :password

data/lib/governor_livejournal/instance_methods.rb

@@ -1,53 +1,11 @@
-require 'livejournal'
 module GovernorLivejournal
   module InstanceMethods
-    def post_to_livejournal
-      user = ljlogin
-      if livejournal_id.blank?
-        entry = populate_entry(LiveJournal::Entry.new)
-        post_event = LiveJournal::Request::PostEvent.new(user, entry)
-        post_event.run
-        
-        self.update_attribute :livejournal_id, entry.itemid
-      else
-        get_events = LiveJournal::Request::GetEvents.new(user, :itemid => livejournal_id)
-        entry = populate_entry(get_events.run)
-        edit_event = LiveJournal::Request::EditEvent.new(user, entry)
-        edit_event.run
-      end
-    end
-    
-    def remove_from_livejournal
-      user = ljlogin
-      get_events = LiveJournal::Request::GetEvents.new(user, :itemid => livejournal_id)
-      entry = get_events.run
-      delete_event = LiveJournal::Request::EditEvent.new(user, entry, :delete => true)
-      delete_event.run
-    end
-  
     def post_to_livejournal_in_background
-      run_in_background :post_to_livejournal
+      GovernorBackground.run('livejournal_post', self)
     end
     
     def remove_from_livejournal_in_background
-      run_in_background :remove_from_livejournal
-    end
-    
-    private
-    def ljlogin
-      user = LiveJournal::User.new(GovernorLivejournal.config.username, GovernorLivejournal.config.password)
-      login = LiveJournal::Request::Login.new(user)
-      login.run
-      user
-    end
-    
-    def populate_entry(entry)
-      entry.subject = self.title
-      entry.event = Governor::Formatters.format_article self
-      entry.time = LiveJournal::coerce_gmt(self.created_at.present? ? self.created_at : Time.now)
-      entry.preformatted = false
-      entry.security = livejournal_security.to_sym
-      entry
+      GovernorBackground.run('livejournal_delete', livejournal_id)
     end
   end
 end

data/lib/governor_livejournal/livejournal.rb

@@ -0,0 +1,50 @@
+require 'livejournal'
+module GovernorLivejournal
+  class Livejournal
+    include ::LiveJournal
+    def initialize(article_or_entry_id)
+      @article = article_or_entry_id
+      @user = User.new(GovernorLivejournal.config.username, GovernorLivejournal.config.password)
+      login = Request::Login.new(@user)
+      login.run
+    end
+  
+    def post
+      entry = populate_entry(Entry.new)
+      post_event = Request::PostEvent.new(@user, entry)
+      post_event.run
+      entry.itemid
+    end
+    
+    def get
+      get_events = Request::GetEvents.new(@user, :itemid => livejournal_id)
+      get_events.run
+    end
+    
+    def put
+      entry = populate_entry(get)
+      edit_event = Request::EditEvent.new(@user, entry)
+      edit_event.run
+      entry.itemid
+    end
+    
+    def delete
+      delete_event = Request::EditEvent.new(@user, get, :delete => true)
+      delete_event.run
+    end
+  
+    private
+    def livejournal_id
+      @article.respond_to?(:livejournal_id) ? @article.livejournal_id : @article
+    end
+    
+    def populate_entry(entry)
+      entry.subject = @article.title
+      entry.event = Governor::Formatters.format_article @article
+      entry.time = LiveJournal::coerce_gmt(@article.created_at.present? ? @article.created_at : Time.now)
+      entry.preformatted = false
+      entry.security = @article.livejournal_security.to_sym
+      entry
+    end
+  end
+end

data/spec/governor_livejournal_spec.rb

@@ -4,4 +4,38 @@ describe GovernorLivejournal do
   it "registers the plugin" do
     Governor::PluginManager.plugins.size == 1
   end
+  
+  it "registers a job with GovernorBackground" do
+    GovernorBackground.retrieve('livejournal_post').should_not be_blank
+  end
+  
+  it "can post to livejournal" do
+    article = get_article
+    article.livejournal_id.should == 12345
+  end
+  
+  it "can update livejournal" do
+    article = get_article
+    lj = mock()
+    GovernorLivejournal::Livejournal.expects(:new).with(article).returns lj
+    lj.expects(:put).returns 12345
+    article.update_attribute :title, "Some new title"
+  end
+  
+  it "can delete from livejournal" do
+    article = get_article
+    lj = mock()
+    GovernorLivejournal::Livejournal.expects(:new).with(12345).returns lj
+    lj.expects(:delete)
+    article.destroy
+  end
+  
+  def get_article
+    article = Factory.build(:article, :is_livejournal => true, :author => Factory(:user))
+    lj = mock()
+    GovernorLivejournal::Livejournal.expects(:new).with(article).returns lj
+    lj.expects(:post).returns 12345
+    article.save
+    article
+  end
 end

data/spec/rails_app/Gemfile

@@ -10,7 +10,7 @@ gem 'sqlite3'
 gem 'devise'
 gem 'delayed_job'
 gem 'governor'
-gem 'governor_background'
+gem 'governor_background', '0.3.0'
 gem 'governor_livejournal', :path => '../..'
 
 gem 'dynamic_form'

data/spec/rails_app/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ../..
   specs:
-    governor_livejournal (0.2.0)
+    governor_livejournal (0.2.1)
       governor
-      governor_background
+      governor_background (>= 0.3.0)
       livejournal
 
 GEM
@@ -52,7 +52,7 @@ GEM
       abstract (>= 1.0.0)
     governor (0.3.1)
       rails (~> 3.0.5)
-    governor_background (0.1.0)
+    governor_background (0.3.0)
       governor
     i18n (0.5.0)
     livejournal (0.3.4)
@@ -100,7 +100,7 @@ DEPENDENCIES
   devise
   dynamic_form
   governor
-  governor_background
+  governor_background (= 0.3.0)
   governor_livejournal!
   rails (= 3.0.5)
   sqlite3

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

@@ -1,2 +1,2 @@
-GovernorLivejournal.config.username = ''
-GovernorLivejournal.config.password = ''
+GovernorLivejournal.config.username = 'user'
+GovernorLivejournal.config.password = 'password'

data/spec/rails_app/db/migrate/20110425023749_governor_add_livejournal.rb

@@ -1,9 +1,17 @@
 class GovernorAddLivejournal < ActiveRecord::Migration
   def self.up
-    add_column :articles, :livejournal_id, :integer
+    change_table :articles do |t|
+      t.boolean :is_livejournal
+      t.string :livejournal_security, :default => 'public'
+      t.references :livejournal
+    end
   end
 
   def self.down
-    remove_column :articles, :livejournal_id
+    change_table :articles do |t|
+      t.remove :is_livejournal
+      t.remove :livejournal_security
+      t.remove :livejournal_id
+    end
   end
 end

data/spec/rails_app/db/schema.rb

@@ -15,12 +15,14 @@ ActiveRecord::Schema.define(:version => 20110425023749) do
   create_table "articles", :force => true do |t|
     t.string   "title"
     t.string   "description"
-    t.string   "format",         :default => "default"
+    t.string   "format",               :default => "default"
     t.text     "post"
     t.integer  "author_id"
     t.string   "author_type"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "is_livejournal"
+    t.string   "livejournal_security", :default => "public"
     t.integer  "livejournal_id"
   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_livejournal
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Liam Morley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -04:00
+date: 2011-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,10 +55,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
         - 0
-        version: "0"
+        - 3
+        - 0
+        version: 0.3.0
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -263,6 +265,7 @@ files:
 - lib/generators/governor/templates/migrations/add_livejournal.rb
 - lib/governor_livejournal.rb
 - lib/governor_livejournal/instance_methods.rb
+- lib/governor_livejournal/livejournal.rb
 - lib/governor_livejournal/rails.rb
 - spec/governor_livejournal_spec.rb
 - spec/rails_app/.gitignore