softcover 0.9.20 → 0.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a22430fd5cbd6ccad5cb2a8da6d03d824bfb1c30
-  data.tar.gz: 8e39fddd23d70c6b898b158bedf75c40df60dd18
+  metadata.gz: d210ced6bcc18e24fe23d035a92a6074cb43629e
+  data.tar.gz: cf3325e7cee471b7b8cc87e7c69559f093bf9efa
 SHA512:
-  metadata.gz: 08ff0b100eba7d95e43ec29f983990e8ee64876c742ddd4349503fd8e43ddb9384c78473088e4b7ea77b3d4d4fde92180bfd287556e9979da86a0ca60aad4f4a
-  data.tar.gz: c584d4365292eb39c3d1c4226c797cbe1675d4cde333a551302e2ebcb1b4276911b45c3a5cfe75116e9d3397c16704111d181a7316e2cca4efed3c91efac6132
+  metadata.gz: fb154e5033aae56bc40f1d8a1f88f792d81d704761257532e49da97b8bb4ec8af37138eb20ac82c915f330a3940b0d695e03861e5a098ea72dbcc584c5458a28
+  data.tar.gz: a85e372c6041b1e5780e9b4866e88df9310dac4da76344347cd2437b602cdbfff9af126097c24d5c381861fceeb6d5ec7d25f115b32a5a20367a959e1c910f63

data/Gemfile

@@ -14,11 +14,11 @@ gemspec
 
 group :test do
   gem 'rspec'
-  gem 'debugger2' unless ENV['CI'] || RUBY_VERSION == '1.9.3'
   gem 'webmock',   require: false
   gem 'coveralls', require: false
   gem 'rack-test'
   gem 'ruby-prof'
+  gem 'pry'
 end
 
 group :development do

data/lib/softcover/book.rb

@@ -1,5 +1,6 @@
 class Softcover::Book
   include Softcover::Utils
+  include Softcover::Output
 
   DEFAULT_MEDIA_DIR = "media"
 
@@ -174,14 +175,12 @@ class Softcover::Book
   # Media handling
   # ============================================================================
 
-  # 1. iterate over /ebooks, /media/*
+  # 1. iterate over /media/*
   # => use directory name as path parameter
   # => get checksums for all included files
   # => send each to /media API endpoint and then upload
 
   def process_media
-    process_media_directory "ebooks"
-
     Dir["media/*"].each do |media_dir|
       next unless File.directory?(media_dir) && !(media_dir =~ /^\./)
       process_media_directory media_dir

data/lib/softcover/commands/publisher.rb

@@ -14,7 +14,10 @@ module Softcover::Commands::Publisher
         puts "Uploading #{current_book.uploader.file_count} files " \
              "(#{as_size current_book.uploader.total_size}):"
       end
+
       url = current_book.upload!(options)
+      current_book.process_media_directory "ebooks"
+
       unless options[:quiet] || options[:silent]
         puts "Published! #{url}"
       end

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "0.9.20"
+  VERSION = "0.9.21"
 end

data/spec/commands/publisher_spec.rb

@@ -20,6 +20,7 @@ describe Softcover::Commands::Publisher do
       before do
         chdir_to_book
         stub_create_book book
+        stub_media_upload book
       end
 
       it "publishes" do
@@ -43,6 +44,7 @@ describe Softcover::Commands::Publisher do
       before do
         chdir_to_book
         stub_create_book book
+        stub_media_upload book
         subject.publish!
         stub_destroy_book book
       end
@@ -61,6 +63,7 @@ describe Softcover::Commands::Publisher do
       before do
         chdir_to_book
         stub_create_book book
+        stub_media_upload book
         subject.publish!
         Softcover::BookConfig['id'] = 0
         stub_destroy_book_not_found book
@@ -75,6 +78,7 @@ describe Softcover::Commands::Publisher do
       before do
         chdir_to_book
         stub_create_book book
+        stub_media_upload book
         subject.publish!
         Dir.chdir(File.dirname(__FILE__))
       end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'bundler/setup'
 require 'webmock/rspec'
 require 'webmock_helpers'
 require 'ostruct'
+require 'pry'
 
 require 'json'
 require 'softcover'

data/spec/webmock_helpers.rb

@@ -122,14 +122,17 @@ module WebmockHelpers
                  to_return(:status => 200, :body => "", :headers => {})
   end
 
-  def stub_media_upload(book)
+  def stub_media_upload(book, dir='ebooks')
     stub_s3_post
     stub_create_book(book)
 
-    files = book.find_screencasts
+    files = book.get_book_files(dir)
     stub_request(:post,
-                 "#{api_base_url}/books/#{book.id}/media").
-                  with(:body => {files: files }.to_json,
+                 /\/books\/#{book.id || '.+'}\/media/).
+                  with(:body => {
+                                  path: dir,
+                                  files: files,
+                                  manifest: nil}.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: 0.9.20
+  version: 0.9.21
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic