curate_tumblr 1.0.5 → 1.0.6

data/README.md

@@ -4,10 +4,6 @@ Reblog and follow in your Tumblr from a file of links.
 
 Grow you Tumblr audience by automating the boring tasks !
 
-### v1.0.5 ###
-* Stop if Tumblr error "Not Authorized" (bad oauth)
-* Better error messages if problem with directories or config file
-
 
 ### Installation
 
@@ -206,13 +202,19 @@ If strange things happen :
 
 To reblog a post you need its reblog key.
 
-You have to send a request to tumblr with the post tumblr and id.
+To have it you have to send a request to tumblr with the post tumblr and id.
+In infos hash post from Tumblr you'll have the reblog key
 
 You can use :
 
+*get_hash_post* in CurateTumblr::Publish::Client
+to have the reblog key 
+
+or
 *CurateTumblr::Tumblr::ExtractLinks.get_reblog_key_from_reblog_url*
+if the url contains the reblog key (www.tumblr.com/reblog/...)
 
-and *reblog_post_key* in CurateTumblr::Publish.Reblog
+and *reblog_post_key* to reblog it in CurateTumblr::Publish::Reblog
 
 
 ## Todo
@@ -221,6 +223,18 @@ and *reblog_post_key* in CurateTumblr::Publish.Reblog
 * hidden oauth (are you enough paranoid ?)
 
 
+## Versions ##
+
+### v1.0.6 ###
+* Better error messages if no oauth in config file
+
+### v1.0.5 ###
+* Stop if Tumblr error "Not Authorized" (bad oauth)
+
+### v1.0.4 ###
+* Better error messages if problem with directories or config file
+
+
 ## Copyright
 
 The Curate Tumblr gem is Copyright (c) 2013 David Tysman and is licensed under the MIT License.

data/curate_tumblr.gemspec

@@ -2,9 +2,9 @@ Gem::Specification.new do |gem|
 	gem.add_dependency 'tumblr_client'
 	gem.add_dependency 'logger'
 	gem.name = 'curate_tumblr'
-	gem.version = '1.0.5'
+	gem.version = '1.0.6'
 	gem.authors = ['David Tysman']
-	gem.description = 'CurateTumblr - reblog and follow Tumblr links'
+	gem.description = 'CurateTumblr - reblog and follow Tumblr links, extract infos from the posts, add tags and links'
 	gem.summary = 'Reblog and follow Tumblr'
 	gem.email = 'web@davidtysman.com'
 	gem.files = `git ls-files`.split("\n")

data/lib/curate_tumblr/curator.rb

@@ -89,38 +89,56 @@ module CurateTumblr
 
     def check_config_files
       if !Dir.exists?( @directory )
-        puts "\nOups! The directory #{@directory} doesn't exist. \nYou need it for your tumblrs subdirectories. \nPlease create it or change the path."
-        @is_stop = true
-        return false
+        return error_config( "The directory #{@directory} doesn't exist", "You need it for your tumblrs subdirectories. \nPlease create it or change the path." )
       end
       if !Dir.exists?( get_path_tumblr )
-        puts "\nOups! The directory #{get_path_tumblr} doesn't exist. \nYou need it for your tumblr links and config. \nPlease create it or change the path."
-        @is_stop = true
-        return false
+        return error_config( "The directory #{get_path_tumblr} doesn't exist", "You need it for your tumblr links and config. \nPlease create it or change the path." )
       end    
       if !Dir.exists?( get_path_links )
-        puts "\nOups! The directory #{get_path_links} doesn't exist. \nYou need it for set the links to follow and reblog. \nPlease create it or change the path."
-        @is_stop = true
-        return false
+        return error_config( "The directory #{get_path_links} doesn't exist", "You need it for set the links to follow and reblog. \nPlease create it or change the path." )
       end    
       if !Dir.exists?( get_path_logs )
-        puts "\nOups! The directory #{get_path_logs} doesn't exist. \nThe application needs it for write logs. \nPlease create it or change the path."
-        @is_stop = true
-        return false
+        return error_config( "The directory #{get_path_logs} doesn't exist", "The application needs it for write logs. \nPlease create it or change the path." )
       end    
       if !File.exists?( get_filename_config )
-        puts "\nOups! The config file #{get_filename_config} doesn't exist. \nYou need it for set oauth tokens. \nPlease create it or change the path."
-        @is_stop = true
-        return false
+        return error_config( "The config file #{get_filename_config} doesn't exist", "You need it for set oauth tokens. \nPlease create it or change the path." )
       end 
       if !File.exists?( get_filename_links )
-        puts "\nOups! The file #{get_filename_links} doesn't exist. \nYou need it for set the links to reblog. \nPlease create it or change the path."
-        @is_stop = true
-        return false
-      end               
+        return error_config( "The file #{get_filename_links} doesn't exist", "You need it for set the links to reblog. \nPlease create it or change the path." )
+      end   
+      return false if !check_config_key( Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH, "you need to write it in config file to write inside the oauth tokens to send requests to Tumblr", false )
+      return false if !check_config_key( Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH_CONSUMER_KEY, "you need to write it inside '#{Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH}' in config file to send requests to Tumblr" )
+      return false if !check_config_key( Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH_CONSUMER_SECRET, "you need to write it inside '#{Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH}' in config file to send requests to Tumblr" )
+      return false if !check_config_key( Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH_TOKEN, "you need to write it inside '#{Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH}' in config file to send requests to Tumblr" )
+      return false if !check_config_key( Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH_TOKEN_SECRET, "you need to write it inside '#{Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH}' in config file to send requests to Tumblr" )
+      true      
+    end
+
+    def check_config_key( key, about, is_check_empty=true )
+      ar_key = []
+      File.open( get_filename_config, "r" ) do |file_config|
+        ar_key = file_config.grep( /#{key}:/ )
+        if ar_key.count <= 0 
+          return error_config( "There is no '#{key}' in #{get_filename_config}", about )
+        end
+      end
+      if is_check_empty
+        if ar_key[0].split(":").count <= 1
+          return error_config( "'#{key}' is empty in #{get_filename_config}", about )
+        end
+        if ar_key[0].split(":")[1].gsub( /\s+/, "" ).gsub( /"/, "" ).empty?
+          return error_config( "'#{key}' is empty in #{get_filename_config}", about )
+        end
+      end
       true
     end
 
+    def error_config( error, about )
+      puts "\nOups! #{error} \n#{about}"
+      @is_stop = true
+      false
+    end
+
     def get_config_from_yaml
       if @is_stop
         @log_tumblr.error( "don't get config because must stop" )
@@ -237,7 +255,7 @@ module CurateTumblr
     private
 
     def stop_and_alert(message, is_display=true, is_log=true )
-      @log_tumblr.error( message ) if is_log
+      @log_tumblr.error( message ) if is_log && @log_tumblr
       puts "\n*** Stop it ! #{message} ***" if is_display
       stop_it!
     end  

data/lib/curate_tumblr/utilities/monkey.rb

@@ -1,7 +1,7 @@
 class Hash
-	def check_key( key )
-    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?
+	def check_key( key, where='' )
+    raise "no key '#{key}' in Hash #{to_s} #{where}" if !self.has_key?( key )
+    raise "no key '#{key}' in Hash #{to_s} #{where}" if self[key].nil?
+		raise "key '#{key}' is empty in Hash #{to_s} #{where}" if self[key].empty?
 	end
 end

data/spec/factories.rb

@@ -1,7 +1,7 @@
 require 'factory_girl'
 
 def get_tumblr_name
-  "testitnowyeah13"
+  "testitnowyeah14"
 end
 
 def get_tumblr_directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curate_tumblr
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -43,7 +43,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: CurateTumblr - reblog and follow Tumblr links
+description: CurateTumblr - reblog and follow Tumblr links, extract infos from the
+  posts, add tags and links
 email: web@davidtysman.com
 executables: []
 extensions: []