softcover 1.0.beta1 → 1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07316c46b4a5618e9456de93af46e5bbb111ba9c
-  data.tar.gz: 915b545aaa9fdaf36207fb95d8a7671d8627939c
+  metadata.gz: 9ccab0f06964521c03fd7c56a996de31eabd757b
+  data.tar.gz: 643ddcb936aa0f665b58427f0be674872e411a9f
 SHA512:
-  metadata.gz: f02e3ee81191ad6d8731df6c1bcd6a94c134a7e0595a1039671e0f94bb2158dd581fa606127324e08db7a9c9e9fbfb2ad6cf64d4e2c3f172b580b23b97b780d8
-  data.tar.gz: d0770ea2d5d9c20f45ca27fef220431ea7f489b59976d1a4b1ef23557ae2a327856902aba861b7fcfe3e643920e51766f200c43ea757ef5f8c6fadda3689405f
+  metadata.gz: 2e23b52f39af0eee6b25bb2f6d7c45b9dc46ac492cc68234385dba25716df4731caea95ed49c0a4138532ea5d6d28a95a43006f0509962af06f63f8d3a0a17ef
+  data.tar.gz: 77452de4891b2a2df57c256030c224248a50d8d33d4626ade977658c6322ace645617b7ebf7c902df891a5a6a79fcf7bdcdbe44997ad6dc88a582eb1150825da

data/lib/softcover/book.rb

@@ -93,25 +93,29 @@ class Softcover::Book
     end
   end
 
-  def create_or_update
+  def create_or_update(options={})
     raise "HTML not built!" if Dir['html/*'].empty?
 
-    res = @client.create_or_update_book id: id,
-                                        files: files,
-                                        title: title,
-                                        slug: slug,
-                                        subtitle: subtitle,
-                                        description: description,
-                                        chapters: chapter_attributes,
-                                        prices: prices,
-                                        faq: faq,
-                                        testimonials: testimonials,
-                                        marketing_content: marketing_content,
-                                        contact_email: contact_email,
-                                        hide_softcover_footer:
-                                          hide_softcover_footer,
-                                        authors: authors,
-                                        ga_account: ga_account
+    params = {
+      id: id,
+      files: files,
+      title: title,
+      slug: slug,
+      subtitle: subtitle,
+      description: description,
+      chapters: chapter_attributes,
+      prices: prices,
+      faq: faq,
+      testimonials: testimonials,
+      marketing_content: marketing_content,
+      contact_email: contact_email,
+      hide_softcover_footer: hide_softcover_footer,
+      authors: authors,
+      ga_account: ga_account,
+      remove_unused_media_bundles: options[:remove_unused_media_bundles]
+    }
+
+    res = @client.create_or_update_book params
 
     if res['errors']
       @errors = res['errors']
@@ -180,14 +184,14 @@ class Softcover::Book
   # => get checksums for all included files
   # => send each to /media API endpoint and then upload
 
-  def process_media
+  def process_media(options={})
     Dir["media/*"].each do |media_dir|
       next unless File.directory?(media_dir) && !(media_dir =~ /^\./)
-      process_media_directory media_dir
+      process_media_directory media_dir, options
     end
   end
 
-  def process_media_directory(dir)
+  def process_media_directory(dir, options={})
     return false if @processed_media.include?(dir)
 
     puts "Processing #{dir} directory..."
@@ -196,7 +200,7 @@ class Softcover::Book
       file.ready?
     end
 
-    upload_media! dir, files_to_upload
+    upload_media! dir, files_to_upload, options
 
     @processed_media.push dir
   end
@@ -207,13 +211,13 @@ class Softcover::Book
     end.compact
   end
 
-  def upload_media!(path, files)
+  def upload_media!(path, files, options={})
     return if files.empty?
 
     manifest_path = File.join(path, "manifest.yml")
     manifest = File.exists?(manifest_path) ? File.read(manifest_path) : nil
 
-    res = @client.get_media_upload_params path, files, manifest
+    res = @client.get_media_upload_params path, files, manifest, options
 
     if res['upload_params']
       media_uploader = Softcover::Uploader.new res

data/lib/softcover/cli.rb

@@ -137,6 +137,8 @@ module Softcover
                           desc: "Quiet output", type: :boolean
     method_option :silent, aliases: '-s',
                            desc: "Silent output", type: :boolean
+    method_option :remove_unused_media_bundles, aliases: '-r',
+                           desc: "Remove unused media bundles", type: :boolean
     def publish
       require 'softcover/commands/publisher'
 
@@ -151,6 +153,8 @@ module Softcover
       desc: "Run as daemon", type: :boolean
     method_option :watch, aliases: '-w', type: :boolean,
       force: false, desc: "Watch a directory to auto upload."
+    method_option :remove_unused_media_files, aliases: '-r',
+                           desc: "Remove unused media files", type: :boolean
 
     # TODO: make screencasts dir .book configurable
     define_method "publish:media" do |dir=

data/lib/softcover/client.rb

@@ -66,11 +66,12 @@ module Softcover
     end
 
     # ============ Media ===========
-    def get_media_upload_params(path, files, manifest=nil)
+    def get_media_upload_params(path, files, manifest=nil, options={})
       JSON post path_for(:books, book.id, :media),
         path: path,
         files: files,
-        manifest: manifest
+        manifest: manifest,
+        remove_unused_media_files: options[:remove_unused_media_files]
       # TODO: handle errors
     end
 

data/lib/softcover/commands/publisher.rb

@@ -7,7 +7,7 @@ module Softcover::Commands::Publisher
   def publish!(options={})
     return false unless current_book
 
-    if current_book.create_or_update
+    if current_book.create_or_update(options)
       require 'ruby-progressbar'
       require 'curb'
       unless options[:quiet] || options[:silent]
@@ -47,18 +47,18 @@ module Softcover::Commands::Publisher
 
     if options[:daemon]
       pid = fork do
-        run_publish_media
+        run_publish_media(options)
       end
 
       puts "Daemonized, pid: #{pid}"
     else
-      run_publish_media
+      run_publish_media(options)
     end
 
     current_book
   end
 
-  def run_publish_media
+  def run_publish_media(options={})
     if @watch
       puts "Watching..."
 
@@ -69,7 +69,7 @@ module Softcover::Commands::Publisher
 
       begin
         loop do
-          process_media
+          process_media(options)
           sleep 1
         end
       rescue Interrupt
@@ -77,13 +77,13 @@ module Softcover::Commands::Publisher
         exit_with_message
       end
     else
-      process_media
+      process_media(options)
       exit_with_message
     end
   end
 
-  def process_media
-    current_book.process_media
+  def process_media(options={})
+    current_book.process_media(options)
   end
 
   def exit_with_message

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.0.beta1"
+  VERSION = "1.0.beta2"
 end

data/softcover.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'polytexnic', '~> 1.0.beta1'
+  gem.add_dependency 'polytexnic', '~> 1.0.beta2'
   gem.add_dependency 'msgpack', '~> 0.4.2'
   gem.add_dependency 'nokogiri', '~> 1.6.0'
   gem.add_dependency 'thor', '~> 0.18.1'

data/spec/commands/publisher_spec.rb

@@ -5,6 +5,8 @@ describe Softcover::Commands::Publisher do
   before(:all) { generate_book }
   after(:all)  { remove_book }
 
+  let(:publish_options) { { remove_unused_media_bundles: true } }
+
   describe "#publish" do
     context "publishing from non book directory" do
       before do
@@ -24,7 +26,7 @@ describe Softcover::Commands::Publisher do
       end
 
       it "publishes" do
-        expect(subject.publish!).to be_true
+        expect(subject.publish!(publish_options)).to be_true
       end
     end
   end
@@ -45,7 +47,7 @@ describe Softcover::Commands::Publisher do
         chdir_to_book
         stub_create_book book
         stub_media_upload book
-        subject.publish!
+        subject.publish! publish_options
         stub_destroy_book book
       end
 
@@ -64,7 +66,7 @@ describe Softcover::Commands::Publisher do
         chdir_to_book
         stub_create_book book
         stub_media_upload book
-        subject.publish!
+        subject.publish!(publish_options)
         Softcover::BookConfig['id'] = 0
         stub_destroy_book_not_found book
       end
@@ -79,7 +81,7 @@ describe Softcover::Commands::Publisher do
         chdir_to_book
         stub_create_book book
         stub_media_upload book
-        subject.publish!
+        subject.publish! publish_options
         Dir.chdir(File.dirname(__FILE__))
       end
 

data/spec/webmock_helpers.rb

@@ -67,7 +67,8 @@ module WebmockHelpers
            contact_email: book.contact_email,
            hide_softcover_footer: book.hide_custom_domain_footer,
            authors: book.authors,
-           ga_account: book.ga_account
+           ga_account: book.ga_account,
+           remove_unused_media_bundles: true
         }.to_json,
            :headers => headers).
       to_return(:status => 200, :body => return_body, :headers => {})
@@ -122,7 +123,7 @@ module WebmockHelpers
                  to_return(:status => 200, :body => "", :headers => {})
   end
 
-  def stub_media_upload(book, dir='ebooks')
+  def stub_media_upload(book, dir='ebooks', options={})
     stub_s3_post
     stub_create_book(book)
 
@@ -132,7 +133,10 @@ module WebmockHelpers
                   with(:body => {
                                   path: dir,
                                   files: files,
-                                  manifest: nil}.to_json,
+                                  manifest: nil,
+                                  remove_unused_media_files:
+                                    options[:remove_unused_media_files]
+                                }.to_json,
                        :headers => headers).
                   to_return(:status => 200, :body => {
                             upload_params: files.map { |file|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.0.beta1
+  version: 1.0.beta2
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.beta1
+        version: 1.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.beta1
+        version: 1.0.beta2
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement