tumblr_autofixer 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dc965b3871e2579c7bce04740856c529f770e9e
-  data.tar.gz: 2e8db8131862e98242a4992cb7039a22de0b831f
+  metadata.gz: 78babced78ceb2710811757881225b103d94eeed
+  data.tar.gz: fb77a09e95ac5aeb4c85ee33c3a98e5437f5d1d6
 SHA512:
-  metadata.gz: a7994886283bf16acffcc4ee019210061f4c7601e53fea87775da79840ada2ebce745bc25c2e6f858dbfdc34405452e1010fd6a0b20cbf4e98d252b4d7b211bc
-  data.tar.gz: '0096975af9698b872ee57572590b879bf6d9198588c16a94a5e32130ed65004d4c69a26c29018efb050beca2def4dfa845adb9eca432f431ccae970ebc0890fd'
+  metadata.gz: a6c2f0b5c7941307976ab267904738b044a845b5acd9e33682ad7fd52b863f94359823f9f711f317ee30b59128fe717d05efbd6ffe0dad9ff33f0d89d173fff7
+  data.tar.gz: 0334ba951d9c8a4bf7cdcfa60ad626019d38368a1ae398df94354771141246117a0a28990b207b9cc305a27e8802cf5d71ac6af7f42f2fb586a3b919889cde1c

data/README.md

@@ -1,30 +1,77 @@
 # About  
 \- tumblr_autofix is a configurable comment generator for Tumblr.  
-\- Two configuration files are created in your home directory: taf_data.yml & taf_summary.yml  
+\- Generated files are stored in ~/config_md/taf/  
 \- Careful when editing configuration files, as with all YAML files, indentation is crucial!   
 
+# Version 0.1.0
+- New: [Tag Matcher](#using-the-tag-matcher)! Use a whitelist of tags to improve Autofixer's ability to
+- Ability to include DK::Autofixer in your programs
+- Started building out the test suite
+- Extensive refactoring
+- Please report any [issues](https://github.com/meissadia/tumblr_autofix/issues)
+
+# Using the Tag Matcher
+In order to utilize the Tag Matcher we'll need to generate a list of acceptable tags. To do this, we'll collect the tags of your last 1,000 posts as a starting point.
+
+## Basic
+`taf g:tags`
+
+This will generate a file in your home directory '~/config_md/taf/tags.yml'
+You can edit this file and delete any lines which contain tags you do not want used to automatically generate post comments.
+
+## Advanced
+You can specify a few options for the g:tags command   
+
+| Option | Description |  
+| :--- | :--- |  
+| `-l [LIMIT]` | Maximum number of posts to scan. |  
+| `-b [BLOG]` | Blog name to scan. Only required if scanning a secondary blog. |  
+| `--source [SOURCE]` | draft, queue, or publish.|  
+| `--config [CONFIG]` | Autofixer uses DraftKing to connect to tumblr, specify your saved config here. |   
+
+
+Example:  
+`taf -l 200 -b secondary-blog-name --source queue`
+
 # Using ~/config_md/taf/data.yml
-no_names [Array]   - Blogs listed here will be ignored during processing  
-summary  [Array]   - Will apply capitalization, add prefix and postfix strings  
-last_tag [Array]   - Use the last available tag as your comment  
-tag_idx  [[Array]] - Indicated which tag to use as the new comment  
-  - Blogs listed in the first tag_idx[0] will use the first tag  
-  - Blogs listed in tag_idx[1] will use the second  
+data.yml allows you to configure, on a blog-by-blog basis, the source of the data used to generate new comments.  You may use a specific tag index, the last tag, or simply reuse the existing summary.  
+
+| Field | Type | Description |
+| :--- | :---: | :--- |
+| `ignore` | Array | Blogs listed here will only be processed with the Tag Matcher
+| `last_tag` | Array | Use the last available tag as your comment  
+| `summary` | Array | Use full text of existing post.summary
+| `tag_idx` | [Array] | Indicates which tag index to use as the new comment  
+| | |  - Blogs listed in tag_idx[0] will use the first tag  
+| | |  - Blogs listed in tag_idx[1] will use the second  
 
 
 # Using ~/config_md/taf/summary.yml  
-## Available variables  
-  \- `summary` - the plain text of the current post's caption  
-  \- `res`     - lower case version of summary, useful for simplified text searching  
-  \- `from`    - the blog name of the user you reblogged the post from  
-  \- `lines`   - original summary text, split into lines  
+The summary.yml configuration allows you to code the processing steps needed
+to extract the information you want from a post's comment.  This can be set up on
+a blog-by-blog basis.  
+
+## Available variables
+| Variable | Description |
+| :--- | :--- |
+| `summary` | the plain text of the current post's caption  
+| `res` | lower case version of summary, useful for simplified text searching  
+| `from` | the blog name of the user you reblogged the post from  
+| `lines` | original summary text, split into lines  
+
+## Available methods
+| Method | Description |
+| :--- | :---: |
+| `normalize(string)` | Applies capitalization, adds configured prefix/postfix strings
 
 ## Returning  
-  \- using `return <value>` in your summary.yml will make that string your new comment  
-  \- storing your new comment in the `res` variable, without explicitly returning it, will subject it to a couple more modifications:  
-  1. capitalization - each word in the string will be capitalized  
-  2. prefix  - a string passed via the `-p <PREFIX>` option will be prepended to `res`  
-  3. postfix - a string passed via the `-P <POSTFIX>` option will be appended to `res`  
+| Method | Description |
+| :--- | :--- |
+| `return <value> `| Use the <value> string as the comment for this post
+| `res = 'your value'` | storing your new comment in the `res` variable, without explicitly returning it, will subject it to a couple more modifications:
+| | 1. capitalization - each word in the string will be capitalized  
+| | 2. prefix  - a string passed via the `-p <PREFIX>` option will be prepended to `res`  
+| | 3. postfix - a string passed via the `-P <POSTFIX>` option will be appended to `res`  
 
 ## Summary Example  
 

data/bin/taf

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'tumblr_draftking'
-require_relative '../lib/tumblr_autofixer'
-# require File.join(Dir.home, '/coding/ruby/tumblr_autofixer/lib/tumblr_autofixer') # DEV ONLY - Run development source using system installed cli
+if ENV['DEV_ENV']
+  # DEV ONLY - Run development source using system installed cli
+  require File.join(Dir.home, "#{ENV['DIR_RUBY']}/tumblr_autofixer/lib/tumblr_autofixer")
+else
+  require_relative '../lib/tumblr_autofixer'
+end
 
-DK::Idable.new(ARGV)
+DK::Autofixer.new(ARGV).run

data/lib/autofixer/autofixer.rb

@@ -0,0 +1,294 @@
+module DK
+ class Autofixer
+    ERROR     = '**'
+    POSTS     = '/Users/meis/coding/rails/autofixer/db/test.posts'
+    CONFIGDIR = '/config_md/taf/'
+    INFO = 'info'
+    WARN = 'warning'
+    ERRO = 'error'
+
+    attr_accessor :dk                           # DraftKing for Tumblr
+    attr_accessor :simulate, :limit             # DraftKing Settings
+    attr_accessor :config_dir                   # Autofixer Required Structure
+    attr_accessor :last_tag, :summary, :tag_idx # Autofixer Tagging Config
+    attr_accessor :spliter, :prefix, :postfix   # Autofixer Tagging Options
+    attr_accessor :clear, :use_test, :reprocess # Autofixer Processing Options
+    attr_accessor :show_results, :hide_pics     # Autofixer Result Options
+    attr_accessor :processed, :review, :updated # Autofixer Results
+
+    def initialize(opts = {})
+      set_instance_vars(opts)
+      installed_test_configuration?
+      read_configuration
+    end
+
+    # Automated Processing
+    def run
+      perform_command? # Commands will exit(#)
+      process(get_filtered_posts)
+      @review = apply_tag_matcher_to(@review)
+      @review = clear(@review)
+      show_results
+    end
+
+    # Execute Command
+    def perform_command?
+      show_help
+      show_config
+      show_version
+      open_results
+      generate_tags_yml
+      if @options.first && !@options.first[0].eql?('-')
+        puts "\nCommand '#{@options.first}' not found.\n\n"
+        exit(1)
+      end
+    end
+
+    # Load data and filter out processed or seemingly unprocessible posts
+    def get_filtered_posts
+      drafts = @usetestdata ? load_test_data : @dk.get_posts
+      @total = drafts.size
+      drafts.map do |draft|
+        draft = DK::Post.new draft
+        next if filter_processed? draft
+        next if filter_by_info?   draft
+        next if filter_by_trail?  draft
+        draft
+      end.compact
+    end
+
+    # Construct new post comments based on available configurations
+    def process(posts)
+      posts.each_with_index do |post, idx|
+        tags    = post.tags
+        blog    = post.trail.first.blog.name
+        summary = post.summary
+
+        next if ignore? blog, post
+        # Scan for configured tag-index
+        comment = use_tag_index blog, post
+        # Use coded configuration
+        comment ||= use_commands blog, summary
+        # Use full summary text
+        comment ||= use_summary blog, summary
+        # Use last tag
+        comment ||= use_tag_index blog, post, @last_tag.include?(blog)
+        # No automated processing
+        comment ||= ERROR
+
+        success = update_post_comment(post, comment)
+        (success ? @updated : @review) << post
+      end
+    end
+
+    # Contruct a comment using any whitelisted tags
+    # return: [String] Normalized Comment
+    def tag_matcher(tags)
+      return ERROR if tags.empty?
+      joiner = ' | '
+      matches = tags.select{ |tag| @gtags.include? tag.downcase }
+      return ERROR if matches.empty?
+      new_comment = matches.join(joiner)
+      normalize(new_comment)
+    end
+
+    # Mass processing based on whitelisted tags
+    # return: [Array] Unmatched Posts
+    def apply_tag_matcher_to(posts)
+      return posts unless @gtags
+      return posts if @gtags.empty?
+      not_matched = []
+      while (post = posts.shift)
+        next if post.tags.empty?
+        new_comment = tag_matcher(post.tags)
+        if new_comment.eql?(ERROR)
+          not_matched << post
+          next
+        end
+        success = update_post_comment(post, new_comment)
+        (success ? @updated : not_matched) << post
+      end
+      not_matched
+    end
+
+    private
+
+    # **************************************************************************
+    # Processing Methods
+    # **************************************************************************
+    # Use the user coded processing for this blog
+    def use_commands(blog, summary)
+      commands = restore(@sstore, blog.to_sym)
+      special_summary(summary, blog, commands)
+    end
+
+    # Normalize and use the full summary text
+    def use_summary(blog, summary)
+      return nil unless @summary.include?(blog)
+      special_summary(summary, blog, [])
+    end
+
+    # Use the tag at the configured index, if available
+    # return: [boolean] Success?
+    def use_tag_index(blog_name, post, last=nil)
+      return normalize post.tags.last if last
+      @tag_idx.each_with_index do |names, idx|
+        next unless names.include?(blog_name)
+        return normalize(post.tags[idx])
+      end
+      nil
+    end
+
+    def update_post_comment(post, comment)
+      return false if comment.eql? ERROR
+      post.replace_comment_with(comment)
+      post.save(client: @dk.client, simulate: @dk.simulate)
+    end
+
+    def special_summary(summary, from, commands)
+      return nil if summary.nil? || from.nil?
+      return nil unless commands
+      lines = summary.split("\n")
+      res   = summary.downcase
+      b     = binding
+      commands.each{ |x| eval(x, b) }
+      normalize(res)
+    endormalize(res)
+    end
+
+    def clear(posts)
+      return posts unless @clear
+      error = []
+      posts.each do |post|
+        success = update_post_comment(post, @prefix)
+        (success ? @updated : error) << post
+      end
+      error
+    end
+
+    def affix(s)
+      result = ''
+      result += "#{@prefix}" if @prefix
+      result += "#{' ' + @spliter + ' '}"
+      result += "#{s}"
+      if @postfix
+        result += "#{' ' + @spliter + ' '}"
+        result += "#{@postfix}"
+      end
+      result
+    end
+
+    def log(type, msg)
+      @messages << "#{type.capitalize}: #{msg}"
+    end    
+
+    # **************************************************************************
+    # Filtration Methods
+    # **************************************************************************
+    def filter_processed?(draft)
+      if draft.processed?(skip: @reprocess, prefix: @prefix)
+        @processed << draft
+        return true
+      end
+      false
+    end
+
+    def filter_by_info?(draft)
+      unless draft.has_info?
+        @review << draft
+        return true
+      end
+      false
+    end
+
+    def filter_by_trail?(draft)
+      unless draft.has_trail?
+        @review << draft
+        return true
+      end
+      false
+    end
+
+    def ignore?(blog, post)
+      return false unless @ignore.include? blog
+      @review << post
+      true
+    end
+
+    # **************************************************************************
+    # Configuration Methods
+    # **************************************************************************
+    def dk_opts
+      { simulate: @simulate, limit: @limit }
+    end
+
+    def home_file(file)
+      DK::Config.home_path_file(file)
+    end
+
+    def confile(fname)
+      @config_dir + fname
+    end
+
+    def set_instance_vars(opts)
+      @options  = opts
+      @simulate = @options.include?('-s')
+      @limit    = @options[@options.find_index('-l') + 1].to_i rescue nil
+      @spliter  = @options[@options.find_index('-S') + 1] rescue ' '
+      @prefix   = @options[@options.find_index('-p') + 1] rescue nil
+      @postfix  = @options[@options.find_index('-P') + 1] rescue nil
+      @clear    = @options.find_index('--clear')
+      @reprocess    = @options.find_index('--reprocess')
+      @hide_pics    = @options.find_index('--no-pics')
+      @usetestdata  = @options.find_index('--test')
+      @show_results = @options.find_index('--show')
+      @config_dir   = home_file(CONFIGDIR)
+      @dk = DK::Client.new(dk_opts)
+      @messages  = []
+      @processed = []
+      @updated   = []
+      @review    = []
+    end
+
+    def read_configuration
+      # Ensure directory structure exists
+      FileUtils::makedirs @config_dir unless Dir.exist?(@config_dir)
+
+      # Ensure configuration files are present
+      @ystore   = YAML::Store.new("#{confile('data.yml')}")
+      @sstore   = YAML::Store.new("#{confile('summary.yml')}")
+      @tstore   = YAML::Store.new("#{confile('tags.yml')}")
+      prep_user_data_files
+
+      # Cache config data
+      @last_tag = restore(@ystore, :last_tag)
+      @tag_idx  = restore(@ystore, :tag_idx)
+      @summary  = restore(@ystore, :summary)
+      @ignore   = restore(@ystore, :ignore)
+      @gtags    = restore(@tstore, :good)
+    end
+
+    def load_test_data
+      return eval(File.open(POSTS, 'r').read) if File.exist? POSTS
+      log INFO, "Saved post data to #{POSTS}"
+      posts = @dk.get_posts
+      File.open(POSTS, 'w') { |f| f.write posts }
+      posts
+    end
+
+    def installed_test_configuration?(result=nil)
+      data_yml    = home_file('/coding/ruby/tumblr_autofixer/data.yml.bak')
+      summary_yml = home_file('/coding/ruby/tumblr_autofixer/summary.yml')
+      if File.exist? data_yml
+        `cp #{data_yml} #{confile('data.yml')}`
+        result = true
+      end
+      if File.exist? summary_yml
+        `cp #{summary_yml} #{confile('summary.yml')}`
+        result = true
+      end
+      result
+    end
+
+  end # end of DK::Autofixer
+end # end of DK

data/lib/autofixer/commands/generate_tags_yml.rb

@@ -0,0 +1,69 @@
+module DK
+  class Autofixer
+    # Command
+    def generate_tags_yml
+      return unless @options.include?('g:tags')
+      GenerateTagsYml.new(ARGV)
+      exit(0)
+    end
+
+    # Generate tags.yml using DK
+    class GenerateTagsYml
+      def initialize(opts)
+        options = {}
+        options[:limit]   = opt_val('-l') || 50
+        options[:blog]    = opt_val('-b')
+        options[:config]  = opt_val('--config')
+        options[:source]  = opt_val('--source') || DK::PUBLISH
+        # Get Posts
+        dk    = DK::Client.new(options)
+        posts = dk.get_posts.map { |post| DK::Post.new post  }
+        posts = posts.select { |post| !post.tags.empty? }
+        # Collect Tags
+        @tags = []
+        posts.each { |post| @tags += post.tags }
+        @tstore  = YAML::Store.new("#{confile('tags.yml')}")
+        # Preserve existing
+        existing = restore(@tstore, :good)
+        puts "Found #{existing.size} tags." if existing
+        @tags += existing if existing
+        @tags  = @tags.map(&:downcase)
+        @tags.uniq!
+        @tags.sort!
+        # Save
+        puts "Saving #{@tags.size} tags"
+        store(@tstore, :good, @tags)
+
+      end
+
+      def opt_val(opt, default=nil)
+        ARGV[ARGV.find_index(opt) + 1] rescue default
+      end
+
+      def home_file(file)
+        DK::Config.home_path_file(file)
+      end
+
+      def confile(fname)
+        home_file('/config_md/taf/') + fname
+      end
+
+      # Code to extract from summary
+      # unless @split = opt_val('-S')
+      #   puts "Please provide at least one delimiter"
+      #   puts "eg. taf g:tags -S |"
+      #   puts "eg. taf g:tags -S ,|/\\"
+      #   exit(1)
+      # end
+      # posts.each do |post|
+      #   comment = post.comment
+      #   result = nil
+      #   @split.each do |str|
+      #     result ||= comment.split str
+      #     result = result.map { |str2| str2.split str }.flatten
+      #   end
+      #   @tags += result
+      # end
+    end  # of GenerateTagsYml
+  end # of Autofixer
+end # of DK

data/lib/autofixer/commands/open_results.rb

@@ -1,8 +1,8 @@
 module DK
-  class Idable
-    def open_results(args)
-      return unless args.include?('open')
-      file = confile('need_review.html')
+ class Autofixer
+    def open_results
+      return unless @options.include?('open')
+      file = confile('updated.html')
       `open #{file}` && exit(0) if File.exist?(file)
       puts
       puts 'Error:'

data/lib/autofixer/commands/show_config.rb

@@ -0,0 +1,9 @@
+module DK
+ class Autofixer
+    def show_config
+      return unless @options.include?('config')
+      `open #{@config_dir + 'view_config.html'}`
+      exit(0)
+    end
+  end
+end

data/lib/autofixer/commands/show_help.rb

@@ -1,13 +1,14 @@
 module DK
-  class Idable
-    def show_help(args, opts)
-      return unless (args.include?('help') || opts.find_index('-h'))
+ class Autofixer
+    def show_help
+      return unless (@options.include?('help') || @options.find_index('-h'))
       puts 'Usage: '
       puts '  $ taf <command?> [options?]'
       puts
       puts ' Commands:'
       puts '    help   Show this menu.'
       puts '    open   Open a webpage with the latest taf results.'
+      puts '  g:tags <command> [options]  Generate a list of tags from your latest posts to serve as a whitelist for the Tag Matcher.'
       puts
       puts ' Options:'
       puts '    -s             Simulate Run (no changes saved)'

data/lib/autofixer/commands/show_version.rb

@@ -1,7 +1,7 @@
 module DK
-  class Idable
-    def show_version(opts)
-      return unless opts.include?('-v')
+ class Autofixer
+    def show_version
+      return unless @options.include?('-v') || @options.include?('--version')
       puts "\ntumblr_autofixer v#{VERSION}"
       puts
       exit(0)

data/lib/autofixer/config/view_config.html.erb

@@ -0,0 +1,40 @@
+<html>
+<head>
+  <title><%= fname %></title>
+  <%= style %>
+</head>
+<body>
+  <h1>Ignore</h1>
+  <ul>
+    <% @ignore.each do |i| %>
+    <li><%= i %></li>
+    <% end %>
+  </ul>
+
+  <h1>Last Tag</h1>
+  <ul>
+    <% @last_tag.each do |i| %>
+    <li><%= i %></li>
+    <% end %>
+  </ul>
+
+  <h1>Summary</h1>
+  <ul>
+    <% @summary.each do |i| %>
+    <li><%= i %></li>
+    <% end %>
+  </ul>
+
+  <h1>Tag Index</h1>
+  <% @tag_idx.each_with_index do |blog_list, idx| %>
+  <h2>Tag <%= idx %></h2>
+  <ul>
+    <% blog_list.each do |blog| %>
+    <li><%= blog %></li>
+    <% end %>
+  </ul>
+  <% end %>
+
+  <footer>Updated at <%= Time.now.strftime('%d/%m/%Y') %></footer>
+</body>
+</html>

data/lib/autofixer/config/view_config.rb

@@ -0,0 +1,60 @@
+require 'tumblr_draftking'
+require 'yaml/store'
+require 'fileutils'
+require 'erb'
+
+def store(dstore, key, value)
+  dstore.transaction do
+    dstore[key] = value
+  end
+end
+
+def restore(dstore, key, default=nil)
+  dstore.transaction do
+    dstore[key] || default
+  end
+end
+
+def style
+  %q(
+    <style>
+      h1,h2 { width: 100%; background-color: rgb(140, 129, 38); color: white; text-align: center; }
+      ul, li { width: 100%; text-align: center; vertical-align: middle; padding: 0; margin: 0 auto;}
+      ul li { list-style: none; padding: 0; margin: 0 auto; }
+      ul li:hover { background-color: rgb(200, 200, 102); }
+      a, a:visited { color: white; vertical-align: middle; line-height: 100px; }
+    </style>
+  )
+end
+
+def script
+  %q(
+    <script>
+
+    </script>
+  )
+end
+
+if $0 == __FILE__
+data_yml = YAML::Store.new(DK::Config.home_path_file('/config_md/taf/data.yml'))
+# special_yml = YAML::Store.new(DK::Config.home_path_file('summary.yml'))
+
+# Cache config data
+@last_tag = restore(data_yml, :last_tag)
+@tag_idx  = restore(data_yml, :tag_idx)
+@summary  = restore(data_yml, :summary)
+@ignore   = restore(data_yml, :ignore)
+
+template = '.html.erb'
+fname = File.basename(__FILE__, '.rb')
+tname = fname + template
+tdata = File.open(tname, 'rb', &:read)
+result = ERB.new(tdata).result(binding)
+
+out_file = DK::Config.home_path_file('/config_md/taf/view_config.html')
+File.open(out_file, 'w') do |f|
+  f << result
+end
+
+`open #{out_file}`
+end

data/lib/autofixer/data_store.rb

@@ -1,5 +1,5 @@
 module DK
-  class Idable
+ class Autofixer
     private
 
     def store(dstore, key, value)

data/lib/autofixer/helpers.rb

@@ -1,9 +1,8 @@
 module DK
-  class Idable
-    private
-
-    def dk_opts
-      { simulate: @simulate, limit: @limit }
+ class Autofixer
+    def normalize(tag, from='')
+      return ERROR if tag.nil?
+      affix(capitalize(tag))
     end
 
     def capitalize(s)
@@ -13,12 +12,7 @@ module DK
       res.join(' ')
     end
 
-    def prefix(s)
-      "#{@prefix}#{' ' + @spliter + ' ' if @spliter}#{s}#{@postfix}"
-    end
-
-    def link_to_edit(post)
-      id = post.id rescue post['id']
+    def link_to_edit(id)
       "https://www.tumblr.com/edit/#{id}"
     end
 
@@ -33,9 +27,5 @@ module DK
       s
     end
 
-    def home_file(file)
-      DK::Config.home_path_file(file)
-    end
-
   end
 end

data/lib/autofixer/patches/DK_Post.rb

@@ -0,0 +1,25 @@
+module DK
+  class Post
+    # Post has a summary or tags?
+    def has_info?
+      has_summary? || !tags.empty?
+    end
+
+    # Do we know where it was reblogged from?
+    def has_trail?
+      !trail.empty?
+    end
+
+    # Post already has prefix?
+    def processed?(skip: false, prefix: '')
+      return false if skip
+      return false if prefix.empty?
+      l_comment = Sanitize.fragment(comment).strip
+      l_comment.start_with?(prefix) || summary.strip.start_with?(prefix)
+    end
+
+    def has_summary?
+      summary.strip.empty?
+    end
+  end
+end

data/lib/autofixer/results.rb

@@ -1,5 +1,5 @@
 module DK
-  class Idable
+ class Autofixer
     private
 
     def bfrom(post)
@@ -9,44 +9,45 @@ module DK
     def show_results
       cli_header
 
-      fname1 = confile('already_processed.html')
-      fname2 = confile('need_review.html')
+      fname1 = confile('processed.html')
+      fname2 = confile('review.html')
       fname3 = confile('updated.html')
 
       @file_index = [
-        ["Needs Review (#{@need_review.size})", fname2],
-        ["Updated (#{@updated.size})", fname3],
-        ["Already Processed (#{@already_processed.size})", fname1]
+        ["Review (#{@review.size})",          fname2],
+        ["Updated (#{@updated.size})",        fname3],
+        ["Preprocessed (#{@processed.size})", fname1]
       ]
 
-      msg1  = "(#{@already_processed.size}) Drafts are ready to be queued."
-      msg2  = "(#{@need_review.size}) Drafts need visual review."
+      msg1  = "(#{@processed.size}) Drafts are ready to be queued."
+      msg2  = "(#{@review.size}) Drafts need visual review."
       msg3  = "(#{@updated.size}) Drafts were Autofixed."
 
 
       # Already Processed
-      @already_processed.sort_by!{ |x| x.id }
-      generate_review_webpage(@already_processed, fname1, msg1)
+      @processed.sort_by!{ |x| x.id }
+      generate_review_webpage(@processed, fname1, msg1)
 
       # Need Review
-      @need_review.sort_by! do |x|
+      @review.sort_by! do |x|
         bname = bfrom(x)
         [bname, x.id]
       end
-      generate_review_webpage(@need_review, fname2, msg2)
+      generate_review_webpage(@review, fname2, msg2)
 
-      # updated
+      # Updated
       @updated.sort_by!{ |x| bfrom(x)}
       generate_review_webpage(@updated, fname3, msg3)
 
       puts
       puts
-      `open #{@file_index.first.last}` if @showres
+      `open #{@file_index.first.last}` if @show_results
     end
 
     def generate_review_webpage(post_info, fname, msg1='')
       page = "<html><head>#{style}</head><body>"
       page += page_nav
+      page += messages_html unless @messages.empty?
       page += '<table>'
       page += '<caption>'
       page += "<p>***** SIMULATION RUN *****</p>" if @simulate
@@ -63,19 +64,28 @@ module DK
       page += "</body></html>"
 
       # Create directory structure and file if it doesn't exist
-      # FileUtils::mkdir_p File.dirname(fname) unless File.exist?(fname)
       File.open(fname, 'w'){|f| f.puts page}
       puts "** Updated file: #{fname} **:\n"
     end
 
+    def messages_html
+      msgs = @messages.map { |msg| "<p class='log'>#{msg}</p>"  }
+      "<div>#{msgs}</div>"
+    end
+
     def post_image_code(post)
       # Alt Sizes (0 - 6) Large to Small
       count = post.photos.size
-      photo = count > 0 ? post.photos.first.alt_sizes[4].url : image_missing
-      res  = "<td><a target='_blank' href='#{link_to_edit(post)}'>"
+      photo = post.photos.first.alt_sizes[4].url rescue image_missing
+      photo = image_missing if @hide_pics
+      from = bfrom(post)
+      url = 'http://' + tumblr_url(from)
+      # byebug unless url
+      res  = "<td><a target='_blank' href='#{link_to_edit(post.id)}'>"
       res += "<img src='#{photo}'>#{'  (' + count.to_s + ')' if count > 1}</a></td>"
-      res += "<td><p>#{bfrom(post)}</p></td>"
-      res += "<td><p>#{post.comment.empty? ? '-no comment-' : post.comment}</p></td>"
+      res += "<td><p><a class='blog_link' href='#{url}' target='_blank'>#{from}</a></p></td>"
+      res += "<td><p>#{post.comment.empty? ? '' : post.comment}</p></td>"
+      res += "<td><p>#{post.summary.empty? ? '' : post.summary}</p></td>"
       res += "<td><p>#{post.tags.empty? ? '-no tags-' : post.tags.join(', ')}</p></td>"
     end
 
@@ -91,8 +101,8 @@ module DK
       puts
       puts "#{@total} drafts were retrieved."
       puts "#{pad(@updated.size, @total, 1)} drafts were Autofixed."
-      puts "#{pad(@already_processed.size, @total, 1)} drafts were marked 'already processed'."
-      puts "#{pad(@need_review.size, @total, 1)} drafts require visual review."
+      puts "#{pad(@processed.size, @total, 1)} drafts were marked 'already processed'."
+      puts "#{pad(@review.size, @total, 1)} drafts require visual review."
       puts '_'*40
       puts
     end
@@ -109,7 +119,8 @@ module DK
       res = '<thead><tr>'
       res += '<th>Photo</th>'
       res += '<th>Source</th>'
-      res += '<th>Caption</th>'
+      res += '<th>Comment</th>'
+      res += '<th>Summary</th>'
       res += '<th>Tags</th>'
       res += '</tr></thead>'
     end
@@ -126,12 +137,14 @@ module DK
           nav ul li a { display: inline-block; width: 100%; }
           nav ul li:hover { background-color: rgb(43, 171, 171); }
           a, a:visited { color: white; vertical-align: middle; line-height: 100px; }
+          a.blog_link { color: black; }
+          p.log { width: 100%; background-color: rgb(56, 103, 103); color: white; text-align: center; }
         </style>
       )
     end
 
     def image_missing
-      'https://us-east-1.tchyn.io/snopes-production/uploads/2018/03/rating-false.png'
+      'https://image.freepik.com/free-icon/male-user-shadow_318-34042.jpg'
     end
 
   end

data/lib/autofixer/version.rb

@@ -1,5 +1,5 @@
 module DK
-  class Idable
-    VERSION = '0.0.2'
+ class Autofixer
+    VERSION = '0.1.0'
   end
 end

data/lib/tumblr_autofixer.rb

@@ -2,179 +2,9 @@ require 'tumblr_draftking'
 require 'yaml/store'
 require 'sanitize'
 require 'fileutils'
+require 'byebug'
 Dir[File.join(__dir__, 'autofixer', '**', '*.rb')].each {|file| require file }
-require 'pry'
-
-module DK
-  class Idable
-    C_LEN = 25
-    ERROR_STRING = '**'
-    def initialize(opts)
-      @config_dir = home_file('/config_md/taf/')
-
-      check_for_command(ARGV, opts)
-      extract_opts(opts)
-
-      @dk = DK::Client.new(dk_opts)
-
-      # Ensure my latest config files are in place.
-      `cp data.yml.bak #{confile('data.yml')}`   if File.exist?('data.yml.bak')
-      `cp summary.yml #{confile('summary.yml')}` if File.exist?('summary.yml')
-
-      read_configuration
-      @already_processed, @need_review, @updated = [], [], []
-
-      autofixer(get_informative_posts)
-      @need_review = clear(@need_review) if @clear
-      show_results
-    end
-
-    private
-
-    def read_configuration
-      # Ensure directory structure exists
-      FileUtils::makedirs @config_dir unless Dir.exist?(@config_dir)
-
-      # Ensure configuration files are present
-      @ystore   = YAML::Store.new("#{confile('data.yml')}")
-      @sstore   = YAML::Store.new("#{confile('summary.yml')}")
-      prep_user_data_files
-
-      # Cache config data
-      @last_tag = restore(@ystore, :last_tag)
-      @tag_idx  = restore(@ystore, :tag_idx)
-      @summary  = restore(@ystore, :summary)
-      @ignore   = restore(@ystore, :ignore)
-    end
-
-    def check_for_command(args, opts)
-      show_help(args, opts)
-      show_version(opts)
-      open_results(args)
-    end
-
-    def confile(fname)
-      @config_dir + fname
-    end
-
-    def extract_opts(opts)
-      @simulate = opts.include?('-s')
-      @limit    = opts[opts.find_index('-l') + 1].to_i rescue nil
-      @spliter  = opts[opts.find_index('-S') + 1] rescue ' '
-      @prefix   = opts[opts.find_index('-p') + 1] rescue ''
-      @postfix  = opts[opts.find_index('-P') + 1] rescue ''
-      @showres  = opts.find_index('--show')
-      @clear    = opts.find_index('--clear')
-    end
-
-    def get_informative_posts
-      drafts = @dk.get_posts.map{|post| DK::Post.new(post)}
-      @total = drafts.size
-      drafts.select do |draft|
-        ((@already_processed << draft) && next) if post_already_processed?(draft)
-        ((@need_review << draft) && next) unless post_has_info?(draft)
-        ((@need_review << draft) && next) unless post_has_trail?(draft)
-        true
-      end
-    end
-
-    # Post already has prefix?
-    def post_already_processed?(post)
-      summary = post.summary.chomp.strip
-      user_c  = Sanitize.fragment(post.comment).strip
-
-      user_c.start_with?(@prefix) || summary.start_with?(@prefix)
-    end
-
-    # Post has a summary or tags?
-    def post_has_info?(post)
-      summary = post.summary.chomp.strip
-      !summary.empty? || !post.tags.empty?
-    end
-
-    # Do we know where it was reblogged from?
-    def post_has_trail?(post)
-      !post.trail.empty?
-    end
-
-
-    def autofixer(posts)
-      posts.each_with_index do |post, idx|
-        tags = post.tags
-        trail_name   = post.trail.first.blog.name
-        post_summary = post.summary
-
-        ((@need_review << post) && next) if @ignore.include?(trail_name)
-        if fix_from_tag(post, trail_name)
-          next # Successfully used a tag-index to process post
-        elsif commands = restore(@sstore, trail_name.to_sym)
-          # Has custom processing of post.summary data defined
-          new_comment = special_summary(post_summary, trail_name, commands)
-        elsif @summary.include?(trail_name)
-          # Use default processing of post.summary data
-          new_comment = special_summary(post_summary, trail_name, [])
-        elsif @last_tag.include?(trail_name)
-          # Use the last available post.tags
-          new_comment = autofix(tags.last, trail_name)
-        else
-          # Don't know what to do with it.
-          new_comment = ERROR_STRING
-        end
-
-        ((@need_review << post) && next) if new_comment.eql?(ERROR_STRING)
-
-        success = update_post_comment(post, new_comment)
-        (success ? @updated : @need_review) << post
-      end
-    end
-
-    def fix_from_tag(post, blog_name)
-      @tag_idx.each_with_index do |names, idx|
-        next unless names.include?(blog_name)
-        new_comment = autofix(post.tags[idx])
-        if new_comment.eql?(ERROR_STRING)
-          # No tag at the expected tag-index
-          @need_review << post
-          return false
-        end
-        success = update_post_comment(post, new_comment)
-        (success ? @updated : @need_review) << post
-        return true
-      end
-      false
-    end
-
-    def autofix(tag, from='')
-      return ERROR_STRING if tag.nil?
-      prefix(capitalize(tag))
-    end
-
-    def update_post_comment(post, comment)
-      post.replace_comment_with(comment)
-      post.save(client: @dk.client, simulate: @dk.simulate)
-    end
-
-    def special_summary(summary, from, commands)
-      return '' if summary.nil? || from.nil?
-      lines = summary.split("\n")
-      res   = summary.downcase
-      b     = binding
-      commands.each{ |x| eval(x, b) }
-      prefix(capitalize(res))
-    end
-
-    def clear(posts)
-      error = []
-      posts.each do |post|
-        success = update_post_comment(post, @prefix)
-        (success ? @updated : error) << post
-      end
-      error
-    end
-
-  end # end of DK::Idable
-end # end of DK
 
 if __FILE__ == $0
-  DK::Idable.new(ARGV)
+  DK::Autofixer.new(ARGV)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_autofixer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Meissa Dia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-31 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tumblr_draftking
@@ -48,11 +48,17 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/taf
+- lib/autofixer/autofixer.rb
+- lib/autofixer/commands/generate_tags_yml.rb
 - lib/autofixer/commands/open_results.rb
+- lib/autofixer/commands/show_config.rb
 - lib/autofixer/commands/show_help.rb
 - lib/autofixer/commands/show_version.rb
+- lib/autofixer/config/view_config.html.erb
+- lib/autofixer/config/view_config.rb
 - lib/autofixer/data_store.rb
 - lib/autofixer/helpers.rb
+- lib/autofixer/patches/DK_Post.rb
 - lib/autofixer/results.rb
 - lib/autofixer/version.rb
 - lib/tumblr_autofixer.rb