epuber 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af52b1d6873c8846c792bbe5efd95396128dd56e843786706d52c5bda38ccf51
-  data.tar.gz: 209c3daec98a872b4cf91f9b1da2e0ccdf52305e91cb0ecfb3750595567dda42
+  metadata.gz: fcab657cbef790188e95b1b238d68438e7f523e78be9c712209803c3808c3ca1
+  data.tar.gz: d36fe7e3f63eb459e9036a587adee857a5f9552524c35e8ef63ef0a867302eac
 SHA512:
-  metadata.gz: 9f268936a200ed6240cec25aaf0ed2aa5dec6894ce955847f37ad749ec18361edad9fa33d7ec555d07c1ea48c2da014c1860c75f1257609c80d97ea1432a40d1
-  data.tar.gz: 6e0a3672b32f57dc84b613de1169340fab3c0ac00a0dc6b4dace00785bcca45d93c9cad54abc3bc50dd8d36eccfd237222b3e284d4586dc037b7f0768f72c446
+  metadata.gz: 640ffc22f2584d5ce642a7c7e923b13734e66e9db7fed5c2094b874b69ff56e0feabd75951be7886ac05ff94aa661b0a44e047b7cea4358d6f9efce7747b8ae2
+  data.tar.gz: eff25321a3950ccfd005fcdc3fa12b2becb8d8f2a6e2f429afdb36569f940a0461ea0165a2436a963da5b7ee88aafb895a0a7d07e7c4d4c5aec56a78be1ef81d

data/lib/epuber/book/target.rb

@@ -161,7 +161,6 @@ module Epuber
       attribute :epub_version,
                 required:     true,
                 inherited:    true,
-                types:        [Version],
                 auto_convert: { [String, Integer, Float] => Version },
                 default_value: 3.0
 

data/lib/epuber/book/toc_item.rb

@@ -11,7 +11,6 @@ module Epuber
       # @return [Epuber::Book::FileRequest]
       #
       attribute :file_request,
-                types:        [FileRequest],
                 auto_convert: { String => FileRequest },
                 inherited:    true
 

data/lib/epuber/command/build.rb

@@ -45,7 +45,7 @@ module Epuber
         verify_one_bookspec_exists!
         verify_all_targets_exists!
 
-        Config.instance.warn_for_outdated_versions!
+        pre_build_checks
       end
 
       def run

data/lib/epuber/command/server.rb

@@ -30,7 +30,7 @@ module Epuber
         super
         verify_one_bookspec_exists!
 
-        Config.instance.warn_for_outdated_versions!
+        pre_build_checks
       end
 
       def run

data/lib/epuber/command.rb

@@ -74,5 +74,14 @@ module Epuber
         Epuber::Config.instance.save_lockfile
       end
     end
+
+    def pre_build_checks
+      Config.instance.warn_for_outdated_versions!
+
+      if !Config.instance.same_version_as_last_run? && File.exist?(Config.instance.working_path)
+        UI.warning('Using different version of Epuber or Bade, removing all build caches')
+        Config.instance.remove_build_caches
+      end
+    end
   end
 end

data/lib/epuber/compiler/opf_generator.rb

@@ -264,13 +264,23 @@ module Epuber
 
       # Creates proper mime-type for file
       #
-      # @param file [Epuber::Book::File]
+      # @param file [Epuber::Compiler::FileTypes::AbstractFile | String]
       #
       # @return [String]
       #
       def mime_type_for(file)
-        filename = file.destination_path
-        MIME::Types.of(filename).first.content_type
+        filename = if file.is_a?(String)
+                     file
+                   else
+                     file.destination_path
+                   end
+
+        case File.extname(filename)
+        when '.ttf', '.otf'
+          'application/vnd.ms-opentype'
+        else
+          MIME::Types.of(filename).first.content_type
+        end
       end
 
       # Creates hash of namespaces for root package element

data/lib/epuber/config.rb

@@ -131,6 +131,18 @@ module Epuber
       end
     end
 
+    def same_version_as_last_run?
+      !(bookspec_lockfile.epuber_version != Epuber::VERSION ||
+          bookspec_lockfile.bade_version.nil? ||
+          bookspec_lockfile.bade_version != Bade::VERSION)
+    end
+
+    def remove_build_caches
+      FileUtils.rm_rf(File.join(working_path, 'build_cache'))
+      FileUtils.rm_rf(File.join(working_path, 'build'))
+      FileUtils.rm_rf(File.join(working_path, 'metadata'))
+    end
+
     # ---------------------------------------------------------------------------------------------------------------- #
 
     class << self

data/lib/epuber/dsl/attribute.rb

@@ -47,8 +47,10 @@ module Epuber
         @auto_convert  = auto_convert
         @types         = if !types.nil?
                            types
-                         elsif @default_value
+                         elsif @default_value && @auto_convert.empty?
                            [@default_value.class]
+                         elsif !@auto_convert.empty?
+                           [@auto_convert.values.first]
                          else
                            [String]
                          end
@@ -234,6 +236,8 @@ module Epuber
             return dest_class.call(value)
           elsif dest_class.respond_to?(:parse)
             return dest_class.parse(value)
+          elsif dest_class <= String
+            return value.to_s
           elsif dest_class.respond_to?(:new)
             return dest_class.new(value)
           else

data/lib/epuber/dsl/attribute_support.rb

@@ -66,12 +66,8 @@ module Epuber
             parent.send(key)
 
           elsif !attr.default_value.nil?
-            # write default value on first access to root object
-            root_obj = self.class.find_root(self) || self
-            root_obj.send(attr.writer_name, attr.default_value)
-
-            # and return the default value
-            attr.default_value
+            # just return the default value
+            attr.converted_value(attr.default_value)
           end
         end
 

data/lib/epuber/dsl/object.rb

@@ -19,11 +19,6 @@ module Epuber
         super
         @attributes_values = {}
         @file_path = nil
-
-        # iterate over all attributes to write default values
-        self.class.dsl_attributes.each do |key, _attr|
-          self.send(key)
-        end
       end
 
       # @return [String]

data/lib/epuber/server/pages/book.bade

@@ -71,7 +71,7 @@ mixin iterate_spine(toc_item)
 
 
 		+section('Targets')
-			- book.all_targets.each do |b_target|
+			- book.buildable_targets.each do |b_target|
 				p(class: 'target_selected' if target == b_target): a(href: "/change_target/#{b_target.name}")= b_target.name
 			- end
 

data/lib/epuber/version.rb

@@ -1,6 +1,6 @@
 
 module Epuber
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 
   HOME_URL = 'https://github.com/epuber-io/epuber'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epuber
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Roman Kříž