curate_tumblr 1.0.4 → 1.0.5

data/README.md

@@ -4,7 +4,10 @@ Reblog and follow in your Tumblr from a file of links.
 
 Grow you Tumblr audience by automating the boring tasks !
 
-**v1.0.3**
+### v1.0.5 ###
+* Stop if Tumblr error "Not Authorized" (bad oauth)
+* Better error messages if problem with directories or config file
+
 
 ### Installation
 
@@ -36,7 +39,7 @@ and **config (with oauth)** is in
 
 Please note before all **you have to config oauth** for your tumblr (and put the codes in the config file, see below).
 
-You can see an example of reblog and follow for a kubrick tumblr in the *example* folder.
+You can see an example of reblog and follow for a kubrick tumblr in the *example* directory.
 
 
 ## Usage
@@ -70,19 +73,19 @@ At the end you must have this codes :
 
 ### Config
 
-Curate Tumblr uses the name of your tumblr to find the folder for links (to reblog and follow) and config file
+Curate Tumblr uses the name of your tumblr to find the directory for links (to reblog and follow) and config file
 
-#### Create folders
+#### Create directories
 
-Create a folder where you will have your config and links files :
+Create a directory where you will have your config and links files :
 
 ex : /home/tumblr
 
-Create in this folder another folder with your test tumblr name :
+Create in this directory another directory with your test tumblr name :
 
 ex : /home/tumblr/mytumblrtest
 
-In this folder create a folder links and a folder logs
+In this directory create a directory links and a directory logs
 
 ex :
 
@@ -93,7 +96,7 @@ ex :
 
 #### Create config file
 
-Create a config file in this folder. 
+Create a config file in this directory. 
 
 You can copy *kubricklove_config.yaml* from the example and rename it with your tumblr name :
 
@@ -171,6 +174,7 @@ in the config file set oauth
 
 The application manage these tumblr errors :
 * *Rate limit exceeded* : too much requests, try to incread the sleep time in config file **=> the application stop**
+* *No authorized* : problem with oauth in the config file, tokens may be bad **=> the application stop**
 * *Bad request* : perhaps the link has been deleted
 * *Too much bad requests* : there is no enough place in the queue, or there is a problem with your tumblr **=> the application stop**
 

data/curate_tumblr.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |gem|
 	gem.add_dependency 'tumblr_client'
 	gem.add_dependency 'logger'
 	gem.name = 'curate_tumblr'
-	gem.version = '1.0.4'
+	gem.version = '1.0.5'
 	gem.authors = ['David Tysman']
 	gem.description = 'CurateTumblr - reblog and follow Tumblr links'
 	gem.summary = 'Reblog and follow Tumblr'

data/lib/curate_tumblr/curator.rb

@@ -53,23 +53,36 @@ module CurateTumblr
  		def init_tumblr!( hash_config={} )
       @is_stop = false   
       check_config_files 
+      return false if !check_init_ok
       hash_config = get_config_from_yaml if hash_config.empty? && !is_stop
-      if @is_stop
-        puts "\nError : the application can't init. Please check the paths and the config file"
-        return false
-      end
+      return false if !check_init_ok
       set_log
+      return false if !check_init_ok
 			init_client!( hash_config )
+      return false if !check_init_ok
       init_infos!( hash_config )
+      return false if !check_init_ok
       init_extract_links!( hash_config )
+      return false if !check_init_ok
       init_follow!( hash_config )
+      return false if !check_init_ok
       init_reblog!( hash_config )
+      return false if !check_init_ok
       init_post!( hash_config )
+      return false if !check_init_ok
       true
  		end
 
+    def check_init_ok
+      return return_error( __method__, "the application can't init. Please check the paths and the config file", {}, true ) if @is_stop
+      true
+    end
+
     def config_from_yaml
       hash_config = get_config_from_yaml
+      return false if !check_init_ok
+      raise "can't get config from file #{get_filename_config}" if !hash_config
+      raise "config is empty from file #{get_filename_config}" if hash_config.empty?
       config_client( hash_config )
       config_infos( hash_config )
     end      
@@ -109,7 +122,10 @@ module CurateTumblr
     end
 
     def get_config_from_yaml
-      return false if @is_stop
+      if @is_stop
+        @log_tumblr.error( "don't get config because must stop" )
+        return false
+      end
       file_yaml = get_filename_config
       raise "config file YAML #{file_yaml} doesn't exist" if !File.exist?( file_yaml )
       begin
@@ -147,6 +163,8 @@ module CurateTumblr
     # --- files ---
 
     def add_tofollow_tofile( is_delete_tofollow=true )
+      raise "no urls to follow" if !@all_tofollow_urls
+      return false if @all_tofollow_urls.empty?
       @all_tofollow_urls = CurateTumblr.get_format_tumblr_urls( @all_tofollow_urls )
       return false if !CurateTumblr.add_set_tofile_without_repeat( get_filename_tofollow, @all_tofollow_urls  ) 
       @all_tofollow_urls = Set.new if is_delete_tofollow
@@ -224,17 +242,18 @@ module CurateTumblr
       stop_it!
     end  
 
-    def error( method, message, hash_infos={} )
+    def error( method, message, hash_infos={}, is_display=false )
       error = "#{@domain} : #{message} in #{method} "
       if !hash_infos.empty?
       error = error + " with" 
       hash_infos.each { |key, value| error = error + " [#{key} : #{value}]" }
       end
-      @log_tumblr.error( error )
+      @log_tumblr.error( error ) if !@log_tumblr.nil?
+      puts "\nError : #{message}" if is_display || @log_tumblr.nil?
      end
        
-    def return_error( method, message, hash_infos={} )
-      error( method, message, hash_infos )
+    def return_error( method, message, hash_infos={}, is_display=false )
+      error( method, message, hash_infos, is_display )
       false
     end    
   end

data/lib/curate_tumblr/publish/reblog.rb

@@ -24,11 +24,13 @@ module CurateTumblr
         if !CurateTumblr.post_id_valid?( post_id )
           return return_error( __method__, "post_id not valid", { post_id: post_id, reblog_url: reblog_url } ) 
         end
+        return false if @is_stop
         reblog_key = CurateTumblr::Tumblr::ExtractLinks.get_reblog_key_from_reblog_url( reblog_url )
         if !CurateTumblr.reblog_key_valid?( reblog_key )
           return return_error( __method__, "reblog_key not valid", { reblog_key: reblog_key, post_id: post_id, reblog_url: reblog_url } ) 
         end
         new_post_id = reblog_post_key( post_id, reblog_key )  
+        return false if @is_stop
         add_tofollow_source_from_post_id( @tumblr_name, new_post_id )
         new_post_id
       end

data/lib/curate_tumblr/render/render_links.rb

@@ -89,7 +89,7 @@ module CurateTumblr
       private
 
         def check_if_stop
-          @is_stop = true if get_count >= get_max
+          @is_stop = true if get_count && get_max && get_count >= get_max 
           @is_stop = @curator.is_stop if !@is_stop
           @is_stop
         end

data/lib/curate_tumblr/tumblr/client.rb

@@ -118,6 +118,7 @@ module CurateTumblr
 	    tumblr_url = get_tumblr_domain if tumblr_url.empty?
 
 	    hash_posts_multiple = client_get_posts( tumblr_url, post_id )
+      return false if hash_posts_multiple.has_key?( "status" ) && !check_hash_status( hash_posts_multiple)
 	    if !CurateTumblr.hash_multiple_posts_valid?( hash_posts_multiple )
 	      log_tumblr.error "#{__method__} hash_posts_multiple #{hash_posts_multiple} are not valid for tumblr_url=#{tumblr_url} and post_id=#{post_id}"
 	      return false 
@@ -228,12 +229,18 @@ module CurateTumblr
 	      @count_continuous_bad_requests = 0 
 	      return status_ok 
 	    end
-	    return bad_request( is_display, is_log ) if CurateTumblr.hash_status_bad_request?( hash_status )
-	    return rate_limit_exceeded( is_display, is_log ) if CurateTumblr.hash_status_rate_limit?( hash_status )
+      check_hash_status( hash_status, is_display, is_log )
 	    log_tumblr.error( "bad status result #{hash_status}" )
 	    false
 		end
 
+    def check_hash_status( hash_status, is_display=true, is_log=true )
+      return not_authorized( is_display, is_log ) if CurateTumblr.hash_status_not_authorized?( hash_status )
+      return rate_limit_exceeded( is_display, is_log ) if CurateTumblr.hash_status_rate_limit?( hash_status )
+      return bad_request( is_display, is_log ) if CurateTumblr.hash_status_bad_request?( hash_status )
+      true
+    end
+
 		def get_status_if_ok( hash_status )
 			return hash_status if !hash_status.is_a? Hash
 		  return hash_status if !hash_status.has_key?( "status" )
@@ -246,6 +253,11 @@ module CurateTumblr
 	    false
 		end    
 
+    def not_authorized( is_display=true, is_log=true )
+      stop_and_alert( "Not authorized by Tumblr, please check oauth in the config file #{get_filename_config}", is_display, is_log )
+      false
+    end   
+
 	  def bad_request( is_display=true, is_log=true )
 	    @count_continuous_bad_requests += 1
 	    if @count_continuous_bad_requests >= COUNT_ALERT_IF_TOO_MUCH_BAD_REQUESTS

data/lib/curate_tumblr/utilities/monkey.rb

@@ -1,5 +1,7 @@
 class Hash
 	def check_key( key )
-		raise "'#{key}' is empty in #{to_s}" if self[key].empty?
+    raise "no key '#{key}' in Hash #{to_s}" if !self.has_key?( key )
+    raise "no key '#{key}' in Hash #{to_s}" if self[key].nil?
+		raise "key '#{key}' is empty in Hash #{to_s}" if self[key].empty?
 	end
 end

data/lib/curate_tumblr/utilities/utilities_client.rb

@@ -52,6 +52,10 @@ module CurateTumblr
 	  hash_status?( hash_status, CLIENT_STATUS_BAD_REQUEST )
 	end
 
+  def self.hash_status_not_authorized?( hash_status )
+    hash_status?( hash_status, CLIENT_STATUS_NOT_AUTHORIZED )
+  end
+
 	def self.hash_status?( hash_status, status )
 	  return true if !hash_status.has_key?( "status" )
 	  return true if hash_status["status"] == status

data/lib/curate_tumblr/values.rb

@@ -6,6 +6,7 @@ module CurateTumblr
 
   CLIENT_STATUS_OK = 200
   CLIENT_STATUS_BAD_REQUEST = 400
+  CLIENT_STATUS_NOT_AUTHORIZED = 401
   CLIENT_STATUS_NOT_FOUND = 404
   CLIENT_STATUS_RATE_LIMIT = 429
   COUNT_ALERT_IF_TOO_MUCH_BAD_REQUESTS = 5 

data/spec/curate_tumblr/publish/follow_spec.rb

@@ -7,6 +7,10 @@ describe CurateTumblr::Publish::Follow do
   include_context "shared caption post"
   let(:curator) { FactoryGirl.build( :curator ) }
 
+  before do
+    File.open( curator.get_filename_links, 'w' ) { |file| file.puts "" }
+  end
+  
   describe "to follow after" do
   	it "should follow all links in caption when no source" do
       ar_links = curator.send( :add_tofollow_tumblr_links_from_caption, caption )

data/spec/curate_tumblr/publish/post_spec.rb

@@ -4,6 +4,10 @@ describe CurateTumblr::Publish::Post do
   include_context "shared targets"
   let(:curator) { FactoryGirl.build( :curator ) }
 
+  before do
+    File.open( curator.get_filename_links, 'w' ) { |file| file.puts "" }
+  end
+  
   describe "get infos post" do
     it "hash post from tumblr and id post" do
       hash_post = curator.get_hash_post( target_tumblr, target_post_id )      

data/spec/curate_tumblr/publish/reblog_spec.rb

@@ -6,6 +6,10 @@ describe CurateTumblr::Publish::Reblog do
   include_context "shared tags"
   let(:curator) { FactoryGirl.build( :curator ) }
 
+  before do
+    File.open( curator.get_filename_links, 'w' ) { |file| file.puts "" }
+  end
+  
   describe "reblog link" do
     let(:tumblr_url) { "youknow-thisistheend.tumblr.com" }
     let(:post_url) {  "http://youknow-thisistheend.tumblr.com/post/54773810226/facebook-auf-we-heart-it" }

data/spec/curate_tumblr/render/render_reblog_spec.rb

@@ -19,6 +19,7 @@ describe CurateTumblr::Render::RenderLinks do
     end    
   end
 
+
   describe "get reblog links from file" do
     it "read links" do
       ar_file = render_reblog.get_links_torender_from_file
@@ -52,10 +53,10 @@ describe CurateTumblr::Render::RenderLinks do
         render_reblog.links_to_render.count.should eq( links.count )
       end
     end
-  end
+end
 
-  describe "render" do
 
+  describe "render" do
     it "all links" do
      render_reblog.render_links_from_file.should be_true 
      render_reblog.get_count.should eq( count_reblogs )

data/spec/curate_tumblr/tumblr/client_spec.rb

@@ -6,6 +6,10 @@ describe CurateTumblr::Tumblr::Client do
 	include_context "shared targets"
 	include_context "shared links"
 
+  before do
+    File.open( curator.get_filename_links, 'w' ) { |file| file.puts "" }
+  end
+
 	describe "status" do
 	  it "when rate exceed" do
 	    hash_status = get_status_rate_exceed

data/spec/curate_tumblr/tumblr/extract_links_spec.rb

@@ -6,6 +6,10 @@ describe "Extract" do
 
   include_context "shared targets"
 
+  before do
+    File.open( curator.get_filename_links, 'w' ) { |file| file.puts "" }
+  end
+  
   describe "from post url" do
     it "is tumblr from post url" do
       CurateTumblr::Tumblr::ExtractLinks.tumblr_url?( target_post_url ).should be_true

data/spec/spec_helper.rb

@@ -75,7 +75,7 @@ def files_before( render, links='' )
 end  
 
 def files_after( render )
-  File.delete( render.filename_links ) if File.exists?( render.filename_links )
+ #File.delete( render.filename_links ) if File.exists?( render.filename_links )
 end
 
 def get_status_rate_exceed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curate_tumblr
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tumblr_client