tumblr_draftking 0.7.0.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5182d265c74140d67669beb53b1e85482eba5f92
-  data.tar.gz: 7579be0019d2ea2828343ee8c9a7b522268cf97f
+  metadata.gz: c93a9633bd0ae2cfd31d6791298f44bffaf345da
+  data.tar.gz: 1441e5671dd6325a9bfc7a05669d1bf879b02ad5
 SHA512:
-  metadata.gz: a6c03b38f127db39e81670d67502028d968285c081bcdb3a8953802682ee720c07fd364c552d2ad4943138f7666657293060ff5b4963efa7e2261de0ef343c42
-  data.tar.gz: f82d3a48f36e6d39c8d81d291d522f15360e8b68ea5836b2dbe9d027459d2216c266386b64d1a8400baf899a6213fe8375bec5cf152ab40c4bd7738e17f262c8
+  metadata.gz: 80db75ddb4b552d75f8ecbd64055fd8e2655c31a1ce2038908e9642ab55ba715cbb13db040212e6509d27850eda7697c482c3a2f17a7475d026744c37b4e5413
+  data.tar.gz: a5569f9c6fc6aa2254792ed5f30c211e16b7d6332bc6a7399d61ad904411652c9a5db95501401618420d497a5308fc7518f33690586ac3311c308b81c7d49e9d

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog :: tumblr_draftking
+## Version 0.8.0
++ DK#post_operation now returns both modified count and modified posts. Use `post_operation(opts)[0]` for previous behavior.
++ Access all Tumblr Post data via DK::Post. i.e. `DK::Post.new(post_data).photos.first.original_size.url`
++ Post.image (first photo, original size), Post.alt_sizes, Post.photos (array of Photo structs)
+
 ## Version 0.7.0
 + New! (CLI) Store [custom commands](#custom-commands) in .dkconfig then view/execute them using DK ($> dk custom)
 + New! (Posts) #post_operation Reporter dependency injected via options[:reporter], allowing custom report formats.

data/README.md

@@ -12,15 +12,10 @@ DraftKing for Tumblr takes the hassle out of managing your draft queue!
 + **Randomize post order to add variety.**
 + **Manage multiple accounts.**
 
-Version 0.7.0
-+ New! (CLI) Store [custom commands](#custom-commands) in .dkconfig then view/execute them using DK ($> dk custom)
-+ New! (Posts) #post_operation Reporter dependency injected via options[:reporter], allowing custom report formats.
-+ New! (CLI) Manually check for updates using `dk update` (no more auto-notifications)
-+ New! (CLI) Updated UI
-+ New! (Config) Restructured .dkconfig file format and DK::Config to accommodate new functionality.
-+ New! (CLI) Use Reporter for all content output
-+ New! (Posts) Support for dashboard access; opts={source: 'dashboard', limit: 50, offset: 0}
-+ Bugfix: 'bin/dk' not found error when no default config file is present
+Version 0.8.0
++ DK#post_operation now returns both modified count and modified posts. Use `post_operation(opts)[0]` for previous behavior.
++ Access all Tumblr Post data via DK::Post. i.e. `DK::Post.new(post_data).photos.first.original_size.url`
++ Post.image (first photo, original size), Post.alt_sizes, Post.photos (array of Photo structs)
 
 + Please report any [issues] you encounter!
 + [Change Log](./CHANGELOG.md)

data/lib/draftking/cli/commands/status.rb

@@ -8,17 +8,21 @@ module DK
       fields = %w(Blog Drafts Queued Q.Space)
       opts = process_options(options.dup.merge(blog: blog))
       dk   = get_dk_instance(opts)
-      rows = begin
-               dk.user.blogs.map do |b|
-                 next unless blog.nil? || b.name == blog
-                 [b.name, b.drafts, b.queue, 300 - b.queue.to_i]
-               end.compact
-             rescue
-               []
-             end
+      rows = build_rows(dk)
       report = Reporter.new(title: title, rows: rows, headers: fields)
-      report.show unless simulate
+      report.show unless dk.simulate
       report
     end
+
+    private
+
+    def build_rows(dk)
+      dk.user.blogs.map do |b|
+        next unless blog.nil? || b.name == blog
+        [b.name, b.drafts, b.queue, 300 - b.queue.to_i]
+      end.compact
+    rescue
+      []
+    end
   end
 end

data/lib/draftking/client.rb

@@ -45,6 +45,7 @@ module DK
       @before_id = options[:before_id] || 0
       @offset    = options[:offset]    || 0
       @limit     = options[:limit]
+      @type      = options[:type]
     end
 
     # Configure tumblr_client gem
@@ -76,6 +77,7 @@ module DK
       @client && @client.info['status'] != 401
     end
 
+    # Process options[:source]
     def process_source(src)
       return :draft unless src
       return src if src.is_a? Symbol

data/lib/draftking/drafts.rb

@@ -8,18 +8,16 @@ module DK
     # @return [int] Number of modified posts
     def strip_old_comments(options = {})
       options[:message] = 'Stripping previous comments: '
-      mod_count, _mod_posts = post_operation(options) do |post, _|
+      post_operation(options) do |post, _|
         post.changed = true
       end
-      mod_count
     end
 
     def strip_tags(options = {})
       options[:message] = 'Stripping previous comments: '
-      mod_count, _mod_posts = post_operation(options) do |post, _|
+      post_operation(options) do |post, _|
         post.clear_tags
       end
-      mod_count
     end
 
     # Move Drafts to Queue
@@ -37,17 +35,16 @@ module DK
       options[:shuffle] = true
       options[:state]   = DK::QUEUE
       options[:limit] ||= @q_space
-      mod_count, _mod_posts = post_operation(options) do |post, index|
+      post_operation(options) do |post, index|
         next false unless index_within_limit?(index, @q_space)
         next false unless post.has_key_text?(@key_text)
         post.replace_comment_with(@comment)
         post.change_state(@state)
         post.generate_tags(keep_tags: @keep_tags,
-                           add_tags: @tags,
-                           exclude: @comment,
-                           credit: @credit) if @auto_tag
+                           add_tags:  @tags,
+                           exclude:   @comment,
+                           credit:    @credit) if @auto_tag
       end
-      mod_count
     end
   end
 end

data/lib/draftking/posts/post.rb

@@ -4,32 +4,30 @@ include DK::Posts
 module DK
   # Tumblr Post
   class Post
-    attr_accessor :id, :state, :tags, :comment, :summary, :reblog_key
-    attr_accessor :keep_tree, :changed, :saved, :blog_url
-    attr_accessor :image
-    attr_reader   :data
-
     # @param hash [Hash] Post Data
     # @param keep_tree [Bool] Attach Reblog Tree?
     def initialize(hash, keep_tree: nil)
       return if hash.nil?
-      # TODO: remove @data
-      # TODO add post type
-      # TODO add photoset images
-      # TODO add various photo sizes
-      data = JSON.parse(hash.to_json, object_class: OpenStruct)
-      @id         = data.id
-      @state      = process_state(data.state)
-      @tags       = data.tags
-      @comment    = data.reblog.comment
-      @summary    = data.summary
-      @blog_url   = tumblr_url(data.blog_name)
-      @reblog_key = data.reblog_key
-      @image      = data.photos.first.original_size.url if data.photos
+      @data       = JSON.parse(hash.to_json, object_class: OpenStruct)
+
+      # Translate
+      @state      = process_state(@data.state)
+      @blog_url   = tumblr_url(@data.blog_name)
+      @image      = original_image_url
+      @photoset   = @data.photoset_layout
       @keep_tree  = keep_tree.nil? ? false : keep_tree
       @changed    = false
       @saved      = 0
-      data = nil
+      @comment    = @data.caption
+
+      # Direct map
+      @id         = @data.id
+      @reblog_key = @data.reblog_key
+      @state      = @data.state
+      @summary    = @data.summary
+      @tags       = @data.tags
+
+      make_accessors(instance_variables)
     end
 
     # String of post data
@@ -82,7 +80,7 @@ module DK
     # @param simulate [Bool] Simulate Action?
     def delete(client:, simulate: nil)
       return 1 if simulate
-      res = client.delete @blog_url, @id
+      res = client.delete @blog_url, id
       @changed = true if res['id']
       res['id'] ? 1 : 0
     end
@@ -93,7 +91,7 @@ module DK
     def reblog(client:, simulate: nil)
       return 1 if simulate
       client.reblog @blog_url,
-                    id: @id,
+                    id: id,
                     reblog_key: @reblog_key,
                     comment: @comment
     end
@@ -105,7 +103,7 @@ module DK
       return 0 unless @changed
       return @saved = 1 if simulate
       res = client.edit @blog_url,
-                        id:                 @id,
+                        id:                 id,
                         reblog_key:         @reblog_key,
                         state:              @state,
                         attach_reblog_tree: @keep_tree,
@@ -145,6 +143,24 @@ module DK
 
     private
 
+    def make_accessors(keys)
+      for key in keys
+        singleton_class.class_eval { attr_accessor key.to_s.delete('@') }
+      end
+    end
+
+    def method_missing(method, *args)
+      if @data.respond_to?(method)
+        return @data.send(method) unless method.to_s.include?('=')
+        @data.send(method, args)
+      end
+    end
+
+    def original_image_url
+      return nil unless @data.photos
+      @data.photos.first.original_size.url unless @data.photos.empty?
+    end
+
     def process_state(state)
       return DK::DRAFT unless state
       return DK::QUEUE if state == 'queued'

data/lib/draftking/posts.rb

@@ -82,14 +82,13 @@ module DK
     def comment_posts(options = {})
       src = source_string(options[:source])
       options[:message] = "Adding #{src} comment \'#{comment}\': "
-      mod_count, _mod_posts = post_operation(options) do |post, _|
+      post_operation(options) do |post, _|
         post.replace_comment_with(@comment)
         post.generate_tags(keep_tags: @keep_tags,
                            add_tags:  @tags,
                            exclude:   @comment,
                            credit:    @credit) if @auto_tag
       end
-      mod_count
     end
 
     # @param options[:credit] [Bool] Give dk credit?
@@ -104,13 +103,12 @@ module DK
     def tag_posts(options)
       src = source_string(options[:source])
       options[:message] = "Tagging #{src} with #{options[:add_tags]}: "
-      mod_count, _mod_posts = post_operation(options) do |post, _|
+      post_operation(options) do |post, _|
         post.generate_tags(keep_tags: @keep_tags,
                            add_tags:  @tags,
                            exclude:   @comment,
                            credit:    @credit) if @auto_tag
       end
-      mod_count
     end
 
     # Determine draft data to use.
@@ -139,6 +137,7 @@ module DK
       options[:since_id] = since_id if since_id
       options[@source == :draft ? :before_id : :offset] =
         (@source == :draft ? before_id : offset) unless dashboard?
+      options[:type] = @type if @type
 
       result = call_source(options)
       result.is_a?(Integer) ? [] : result

data/lib/draftking/queue.rb

@@ -8,10 +8,9 @@ module DK
       options[:message] = 'Moving Queue ~> Drafts: '
       options[:shuffle] = false
       options[:state]   = DK::DRAFT
-      mod_count, _mod_posts = post_operation(options) do |post, _|
+      post_operation(options) do |post, _|
         post.changed = !post.has_key_text?(@key_text)
       end
-      mod_count
     end
   end
 end

data/lib/draftking/version.rb

@@ -1,3 +1,3 @@
 module DK
-  VERSION = '0.7.0.7'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_draftking
 version: !ruby/object:Gem::Version
-  version: 0.7.0.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Meissa Dia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tumblr_client
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '10.4'
 description: "\n  Automate a number of tasks for your Tumblr Drafts and Queue such
   as: tagging, stripping\n  previous comments and moving Drafts to your Queue.  Visit
   the homepage for information on\n  the latest release or to file a bug report!\n
@@ -167,4 +167,3 @@ signing_key:
 specification_version: 4
 summary: Take the hassle out of managing your Tumblr account!
 test_files: []
-has_rdoc: