cartoonist-twitter 0.0.16 → 0.0.17

data/app/controllers/admin/tweets_controller.rb

@@ -22,7 +22,11 @@ class Admin::TweetsController < AdminCartoonistController
 
   private
   def send_tweet_if_requested
-    @tweet.manual_tweet! if params[:tweet_now].present?
+    if params[:tweet_now].present?
+      @tweet.manual_tweet!
+    elsif params[:resend_tweet].present?
+      @tweet.resend_tweet!
+    end
   end
 
   def tweet_or_entity_redirect

data/app/models/tweet.rb

@@ -5,13 +5,19 @@ class Tweet < ActiveRecord::Base
   attr_accessible :entity_id, :entity_type, :tweet, :tweeted_at
 
   def allow_tweet_now?
+    allow_save? && !disabled? && entity_posted?
+  end
+
+  def allow_resend_tweet?
+    tweeted? && !disabled? && entity_posted?
+  end
+
+  def entity_posted?
     if entity.kind_of? Postable
       posted = entity.posted?
     else
       posted = true
     end
-
-    allow_save? && !disabled? && posted
   end
 
   def allow_save?
@@ -34,6 +40,13 @@ class Tweet < ActiveRecord::Base
     send_tweet!
   end
 
+  def resend_tweet!
+    raise "Tweeting is not allowed!" unless allow_resend_tweet?
+    return unless tweeted?
+    return if disabled?
+    send_tweet!
+  end
+
   def auto_tweet!
     return if tweeted?
     return unless expected_tweet_time
@@ -119,6 +132,7 @@ class Tweet < ActiveRecord::Base
   class << self
     def update_tweet(params)
       tweet = find params[:id].to_i
+      return tweet if params[:resend_tweet].present?
       raise "Saving is not allowed!" unless tweet.allow_save?
       tweet.tweet = params[:tweet]
       tweet.save!

data/app/views/admin/tweets/_entity_tweet.html.erb

@@ -18,5 +18,11 @@
     <p>
       <input type="submit" name="tweet_now" value="<%= t "admin.tweets.entity_tweet.tweet_now" %>" <%= 'disabled="disabled"'.html_safe unless tweet.allow_tweet_now? %> />
     </p>
+
+    <% if tweet.allow_resend_tweet? %>
+      <p>
+        <input type="submit" name="resend_tweet" value="<%= t "admin.tweets.entity_tweet.resend_tweet" %>" onclick="return confirm('Are you sure?')" />
+      </p>
+    <% end %>
   <% end %>
 <% end %>

data/app/views/admin/tweets/edit.html.erb

@@ -2,4 +2,4 @@
   <%= @tweet.description %>
 </p>
 
-<%= render :partial => "admin/tweets/entity_tweet", :locals => { :entity => @tweet.entity, :destination => :tweet } %>
+<%= partial "admin/tweets/entity_tweet", :entity => @tweet.entity, :destination => :tweet %>

data/config/locales/en.yml

@@ -8,6 +8,7 @@ en:
         save: Save
         tweet: "Tweet:"
         tweet_now: Tweet Now
+        resend_tweet: Resend Tweet
       index:
         not_tweeted: Not yet tweeted
         tweeted: Tweeted

data/lib/cartoonist-twitter/version.rb

@@ -2,7 +2,7 @@ module CartoonistTwitter
   class Version
     class << self
       def to_s
-        "0.0.16"
+        "0.0.17"
       end
     end
   end

metadata

@@ -1,48 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cartoonist-twitter
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.17
   prerelease: 
-  version: 0.0.16
 platform: ruby
-authors: 
+authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cartoonist
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.0.16
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.17
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: twitter
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.17
+- !ruby/object:Gem::Dependency
+  name: twitter
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 4.4.1
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.4.1
 description: Plugin to allow tweeting of cartoonist entities.
 email: reasonnumber@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/controllers/admin/tweets_controller.rb
 - app/models/tweet.rb
 - app/views/admin/tweets/_entity_tweet.html.erb
@@ -57,30 +63,26 @@ files:
 - lib/cartoonist-twitter/version.rb
 homepage: http://reasonnumber.com/cartoonist
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cartoonist Twitter
 test_files: []
-