softcover 1.0.beta16 → 1.0.beta17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8137c81992908717396867abb601cd2848c9b51
-  data.tar.gz: 9eab005f7c11be7b6891e6155a184297ac68298c
+  metadata.gz: a010fdc3be4c539bbd087a1ed42186c73fb387b3
+  data.tar.gz: 2b556afbc60c97517329cdf3b393bdcd2bf5b8d2
 SHA512:
-  metadata.gz: 887cd0da96df9dd87cd932fef09a4c2531bf2b6388fe1962269cefbb1e0026065807b20d6524e88d8ac504b62f2a3cf58a979836f32ea96fea958d830964ffba
-  data.tar.gz: eda12cf4e9470df7ec1d42a1cd03c4794d47019066636f3e8954423bc4a6c5642fd78c1b43c07d427c6a9a7242fd98e9a8f45da85cd33b664875039ecaaeb90d
+  metadata.gz: 92958158366fb7334c6539127201e8f44b1afcf53577bf2c454caca838db1b7475a6a138771cc68296624b89d8d45174b37bb637b180fc49dd8016a2cf133099
+  data.tar.gz: dc274c4143c6843b52bdf4b1fc8acf733c5a72e99e912246314ace871ffd19c10a119deff2e1295413d59ae108a497d28d1f5ed3e04ab5271e76272404363e01

data/lib/softcover/book.rb

@@ -115,7 +115,8 @@ class Softcover::Book
       authors: authors,
       ga_account: ga_account,
       repo_url: repo_url,
-      remove_unused_media_bundles: options[:remove_unused_media_bundles]
+      remove_unused_media_bundles: options[:remove_unused_media_bundles],
+      custom_math: custom_math
     }
 
     res = @client.create_or_update_book params
@@ -236,6 +237,10 @@ class Softcover::Book
     end
   end
 
+  def custom_math
+    Softcover::Mathjax.custom_macros
+  end
+
   private
     def method_missing(name, *args, &block)
       @manifest.send(name) || @marketing.send(name) || nil

data/lib/softcover/mathjax.rb

@@ -53,14 +53,13 @@ module Softcover
     AMS_HTML = '/' + MATHJAX + 'TeX-AMS_HTML'
     AMS_SVG  = MATHJAX + 'TeX-AMS-MML_SVG'
 
+    # Returns the custom macros as defined in the custom style file.
+    def self.custom_macros
+      extract_macros(Softcover.custom_styles)
+    end
 
     private
 
-      # Returns the custom macros as defined in the custom style file.
-      def self.custom_macros
-        extract_macros(Softcover.custom_styles)
-      end
-
       # Extracts and formats the macros from the given string of style commands.
       # The output format is compatible with the macro configuration described
       # at http://docs.mathjax.org/en/latest/tex.html.
@@ -71,13 +70,13 @@ module Softcover
         cmd_no_args = /^\s*\\newcommand\{\\(.*?)\}\{(.*)\}/
         cna = styles.scan(cmd_no_args).map do |name, definition|
           escaped_definition = definition.gsub('\\', '\\\\\\\\')
-          %(#{name}: "#{escaped_definition}")
+          %("#{name}": "#{escaped_definition}")
         end
         # Then grab the commands with arguments.
         cmd_with_args = /^\s*\\newcommand\{\\(.*?)\}\[(\d+)\]\{(.*)\}/
         cwa = styles.scan(cmd_with_args).map do |name, number, definition|
           escaped_definition = definition.gsub('\\', '\\\\\\\\')
-          %(#{name}: ["#{escaped_definition}", #{number}])
+          %("#{name}": ["#{escaped_definition}", #{number}])
         end
         (cna + cwa).join(",\n")
       end

data/lib/softcover/template/latex_styles/custom.sty

@@ -17,3 +17,5 @@
 % Include a command for the sake of the test suite.
 \newcommand{\softcover}{\texttt{softcover}}
 
+% Include custom math example.
+\newcommand{\unitvec}[1]{\ensuremath{\hat #1}}

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.0.beta16"
+  VERSION = "1.0.beta17"
 end

data/spec/book_spec.rb

@@ -36,6 +36,17 @@ describe Softcover::Book do
         its(:testimonials) { should_not be_empty }
         its(:marketing_content) { should be_empty }
       end
+
+      describe "custom math" do
+        let(:math) do
+          "\"softcover\": \"\\\\texttt{softcover}\"" +
+            ",\n\"unitvec\": [\"{\\\\hat #1}\", 1]"
+        end
+
+        its(:custom_math) do
+          should eq math
+        end
+      end
     end
   end
 end

data/spec/commands/publisher_spec.rb

@@ -1,140 +1,140 @@
-# require 'spec_helper'
-
-# describe Softcover::Commands::Publisher do
-#   let(:book) { Softcover::Utils.current_book }
-#   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
-#         chdir_to_non_book
-#       end
-
-#       it "rejects the publish" do
-#         expect(subject.publish!).to be_false
-#       end
-#     end
-
-#     context "publishing from book directory" do
-#       before do
-#         chdir_to_book
-#         stub_create_book book
-#         stub_media_upload book
-#       end
-
-#       it "publishes" do
-#         expect(subject.publish!(publish_options)).to be_true
-#       end
-#     end
-#   end
-
-#   describe "#unpublish" do
-#     context "unpublishing from non book directory" do
-#       before do
-#         chdir_to_non_book
-#       end
-
-#       it "rejects the unpublish" do
-#         expect(subject.unpublish!).to be_false
-#       end
-#     end
-
-#     context "unpublishing from book directory" do
-#       before do
-#         chdir_to_book
-#         stub_create_book book
-#         stub_media_upload book
-#         subject.publish! publish_options
-#         stub_destroy_book book
-#       end
-
-#       it "unpublishes" do
-#         expect(subject.unpublish!).to be_true
-#       end
-
-#       it "removes book config" do
-#         subject.unpublish!
-#         expect(Softcover::BookConfig.exists?).to be_false
-#       end
-#     end
-
-#     context "unpublishing from book directory with invalid ID" do
-#       before do
-#         chdir_to_book
-#         stub_create_book book
-#         stub_media_upload book
-#         subject.publish!(publish_options)
-#         Softcover::BookConfig['id'] = 0
-#         stub_destroy_book_not_found book
-#       end
-
-#       it "does not unpublish" do
-#         expect(subject.unpublish!).to be_false
-#       end
-#     end
-
-#     context "unpublishing outside book directory" do
-#       before do
-#         chdir_to_book
-#         stub_create_book book
-#         stub_media_upload book
-#         subject.publish! publish_options
-#         Dir.chdir(File.dirname(__FILE__))
-#       end
-
-#       context "with valid slug option" do
-#         before { stub_destroy_book_by_slug book }
-
-#         it "unpublishes" do
-#           expect(subject.unpublish!(book.slug)).to be_true
-#         end
-#       end
-
-#       context "with invalid slug option" do
-#         let(:slug) { "error" }
-#         before { stub_destroy_book_by_invalid_slug slug }
-
-#         it "does not unpublish" do
-#           expect(subject.unpublish!(slug)).to be_false
-#         end
-#       end
-#     end
-#   end
-
-#   describe "#publish_media" do
-#     before do
-#       chdir_to_book
-#       book.id = 1
-#       stub_media_upload book
-#     end
-
-#     # it "should start with 0 processed_media" do
-#     #   expect(book.processed_media.length).to eq 0
-#     # end
-
-#     # it "processes media" do
-#     #   subject.publish_media!
-#     #   expect(book.processed_media.length).to be > 0
-#     # end
-
-#     # it "daemonizes" do
-#     #   subject.should_receive(:fork) do |&blk|
-#     #     blk.call
-#     #   end
-#     #   subject.publish_media! daemon: true
-#     #   expect(book.processed_media.length).to be > 0
-#     # end
-
-#     # it "watches" do
-#     #   subject.should_receive(:loop) do |&blk|
-#     #     blk.call
-#     #   end
-#     #   subject.publish_media! watch: true
-#     #   expect(book.processed_media.length).to be > 0
-#     # end
-
-#   end
-# end
+require 'spec_helper'
+
+describe Softcover::Commands::Publisher do
+  let(:book) { Softcover::Utils.current_book }
+  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
+        chdir_to_non_book
+      end
+
+      it "rejects the publish" do
+        expect(subject.publish!).to be_false
+      end
+    end
+
+    context "publishing from book directory" do
+      before do
+        chdir_to_book
+        stub_create_book book
+        stub_media_upload book
+      end
+
+      it "publishes" do
+        expect(subject.publish!(publish_options)).to be_true
+      end
+    end
+  end
+
+  describe "#unpublish" do
+    context "unpublishing from non book directory" do
+      before do
+        chdir_to_non_book
+      end
+
+      it "rejects the unpublish" do
+        expect(subject.unpublish!).to be_false
+      end
+    end
+
+    context "unpublishing from book directory" do
+      before do
+        chdir_to_book
+        stub_create_book book
+        stub_media_upload book
+        subject.publish! publish_options
+        stub_destroy_book book
+      end
+
+      it "unpublishes" do
+        expect(subject.unpublish!).to be_true
+      end
+
+      it "removes book config" do
+        subject.unpublish!
+        expect(Softcover::BookConfig.exists?).to be_false
+      end
+    end
+
+    context "unpublishing from book directory with invalid ID" do
+      before do
+        chdir_to_book
+        stub_create_book book
+        stub_media_upload book
+        subject.publish!(publish_options)
+        Softcover::BookConfig['id'] = 0
+        stub_destroy_book_not_found book
+      end
+
+      it "does not unpublish" do
+        expect(subject.unpublish!).to be_false
+      end
+    end
+
+    context "unpublishing outside book directory" do
+      before do
+        chdir_to_book
+        stub_create_book book
+        stub_media_upload book
+        subject.publish! publish_options
+        Dir.chdir(File.dirname(__FILE__))
+      end
+
+      context "with valid slug option" do
+        before { stub_destroy_book_by_slug book }
+
+        it "unpublishes" do
+          expect(subject.unpublish!(book.slug)).to be_true
+        end
+      end
+
+      context "with invalid slug option" do
+        let(:slug) { "error" }
+        before { stub_destroy_book_by_invalid_slug slug }
+
+        it "does not unpublish" do
+          expect(subject.unpublish!(slug)).to be_false
+        end
+      end
+    end
+  end
+
+  describe "#publish_media" do
+    before do
+      chdir_to_book
+      book.id = 1
+      stub_media_upload book
+    end
+
+    # it "should start with 0 processed_media" do
+    #   expect(book.processed_media.length).to eq 0
+    # end
+
+    # it "processes media" do
+    #   subject.publish_media!
+    #   expect(book.processed_media.length).to be > 0
+    # end
+
+    # it "daemonizes" do
+    #   subject.should_receive(:fork) do |&blk|
+    #     blk.call
+    #   end
+    #   subject.publish_media! daemon: true
+    #   expect(book.processed_media.length).to be > 0
+    # end
+
+    # it "watches" do
+    #   subject.should_receive(:loop) do |&blk|
+    #     blk.call
+    #   end
+    #   subject.publish_media! watch: true
+    #   expect(book.processed_media.length).to be > 0
+    # end
+
+  end
+end

data/spec/mathjax_spec.rb

@@ -38,8 +38,8 @@ describe Softcover::Mathjax do
 
     let(:polytex)    { 'PolyTeX:    "Poly{\\\\TeX}"' }
     let(:polytexnic) { 'PolyTeXnic: "Poly{\\\\TeX}nic"' }
-    let(:foo)        { 'foo: "{x}"' }
-    let(:bar)        { 'bar: ["\\\\textbf{#1}", 1]' }
+    let(:foo)        { '"foo": "{x}"' }
+    let(:bar)        { '"bar": ["\\\\textbf{#1}", 1]' }
     let(:config)     { mathjax.config }
 
     it "should not raise an error" do
@@ -52,8 +52,8 @@ describe Softcover::Mathjax do
   context '#escaped_config' do
     let(:polytex)    { 'PolyTeX:    "Poly{\\\\\\\\TeX}"' }
     let(:polytexnic) { 'PolyTeXnic: "Poly{\\\\\\\\TeX}nic"' }
-    let(:foo)        { 'foo: "{x}"' }
-    let(:bar)        { 'bar: ["\\\\\\\\textbf{#1}", 1]' }
+    let(:foo)        { '"foo": "{x}"' }
+    let(:bar)        { '"bar": ["\\\\\\\\textbf{#1}", 1]' }
     let(:config)     { mathjax.escaped_config }
 
     it_should_behave_like "config"

data/spec/webmock_helpers.rb

@@ -70,7 +70,8 @@ module WebmockHelpers
            authors: book.authors,
            ga_account: book.ga_account,
            repo_url: book.repo_url,
-           remove_unused_media_bundles: true
+           remove_unused_media_bundles: true,
+           custom_math: book.custom_math
         }.to_json,
            :headers => headers).
       to_return(:status => 200, :body => return_body, :headers => {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.0.beta16
+  version: 1.0.beta17
 platform: ruby
 authors:
 - Michael Hartl
@@ -1071,7 +1071,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A typesetting system for technical authors