epuber 0.5.0.beta.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37778a7f4faaa148518e3e6c27ef3040ebebb9e45633bca1862a87e7d5e2239b
-  data.tar.gz: 219e403caf0fcc9a3fa954d6d51c88dc47c730245d423107b34a34c67d8b676d
+  metadata.gz: 5bcf06496b9fa4f3dc3e979ff764a8ef40dcd2c925a8f6100d96b07d785d86b2
+  data.tar.gz: 7b92cc896492d689f5b69095ab608098e91dd9595e7ae1993327907a4bd925d5
 SHA512:
-  metadata.gz: df92556bba4458006e9e7717ea60570ddf789c20a42901425c978fbac4cc55821dc65d8f9ddc8b8837cbe1cc02966cd1859e493aebfb70e5e064259240b3a7e4
-  data.tar.gz: d842afcef1235ffc591aece3e74f8144ea7f645b1cd203f59649990a76744f1fc30022ccd4f041a37c6650a71ca977b15284683cd985a251e28f096fdc5b49a8
+  metadata.gz: b805dabd18ad6c8bf2f2f3a44b391726bf3a9766abb7668dd8fd7fb83b0173b076a04f765b041e8d405cf13ffba8e88a043c8ef39ee30e2b65197d8671f7eba2
+  data.tar.gz: 14cd6edfca175231d53f3883bd5dc18e178e02a1703907897492c9918b305e7826cb7a8b35fabb4d3b05aa943ab44b1370dfa837d97ee171c261bc23f2751d29

data/epuber.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.summary  = 'Epuber is simple tool to compile and pack source files into EPUB format.'
   spec.homepage = Epuber::HOME_URL
   spec.license  = 'MIT'
-  spec.required_ruby_version = '>= 2.2'
+  spec.required_ruby_version = '>= 2.3'
 
   spec.files         = Dir['bin/**/*'] + Dir['lib/**/*'] + %w(epuber.gemspec Gemfile LICENSE.txt README.md)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'rubocop', '~> 0.29'
+  spec.add_development_dependency 'rubocop', '~> 0.49'
   spec.add_development_dependency 'rake', '~> 12.2'
   spec.add_development_dependency 'fakefs', '~> 0.6'
 end

data/lib/epuber/command/init.rb

@@ -2,6 +2,7 @@
 
 require 'fileutils'
 
+require_relative '../templates'
 require_relative '../command'
 require_relative '../vendor/ruby_templater'
 
@@ -62,8 +63,7 @@ END
       # @return [void]
       #
       def write_bookspec(book_id)
-        template_path = File.expand_path(File.join('..', 'templates', 'template.bookspec'), File.dirname(__FILE__))
-        rendered = Epuber::RubyTemplater.from_file(template_path)
+        rendered = Epuber::RubyTemplater.from_file(Templates::TEMPLATE_BOOKSPEC)
                                         .with_locals(book_id: book_id)
                                         .render
 
@@ -96,23 +96,22 @@ END
       # @return [void]
       #
       def write_gitignore
-        write('.gitignore', <<-END
-# This is generated with `epuber init`
-*.epub
-*.mobi
-!.epuber/
-.epuber/build/
-.epuber/release_build/
-.epuber/build_cache/
-.epuber/metadata/
-
+        append_new_lines('.gitignore', <<~END
+          # This is generated with `epuber init`
+          *.epub
+          *.mobi
+          !.epuber/
+          .epuber/build/
+          .epuber/release_build/
+          .epuber/build_cache/
+          .epuber/metadata/
         END
         )
       end
 
       def write_default_style(book_id)
-        write("styles/#{book_id}.styl", <<-END
-// This is generated with `epuber init` script.
+        write("styles/#{book_id}.styl", <<~END
+          // This is generated with `epuber init` script.
         END
         )
       end
@@ -127,6 +126,30 @@ END
         puts "   #{'create'.ansi.green}  #{file_path}"
       end
 
+      # @param string [String] text to file
+      # @param file_path [String] path to file
+      #
+      # @return [void]
+      #
+      def append_new_lines(file_path, string)
+        unless File.exist?(file_path)
+          write(file_path, string)
+          return
+        end
+
+        existing_content = File.read(file_path)
+        string.split("\n").each do |line|
+          next if existing_content.include?(line)
+
+          existing_content << "\n#{line}"
+        end
+
+        existing_content << "\n"
+
+        File.write(file_path, existing_content)
+        puts "   #{'update'.ansi.green}  #{file_path}"
+      end
+
       # @param [String] dir_path path to dir
       #
       # @return [nil]

data/lib/epuber/compiler/file_types/bade_file.rb

@@ -30,7 +30,7 @@ module Epuber
             __const: Hash.new { |_hash, key| UI.warning("Undefined constant with key `#{key}`", location: caller_locations[0]) }.merge!(target.constants),
           }
 
-          should_load_from_precompiled = up_to_date && precompiled_exists && compilation_context.incremental_build?
+          should_load_from_precompiled = up_to_date && precompiled_exists && compilation_context.incremental_build? && (!compilation_context.should_write)
 
           precompiled = if should_load_from_precompiled
                           begin

data/lib/epuber/dsl/attribute.rb

@@ -164,7 +164,7 @@ module Epuber
       #
       def validate_type(value)
         return if value.nil?
-        return if supported_types.any? { |klass| value.class == klass }
+        return if supported_types.any? { |klass| value.class <= klass }
 
         raise StandardError, "Non acceptable type `#{value.class}` for #{self}. Allowed types: `#{types.inspect}`"
       end
@@ -223,7 +223,7 @@ module Epuber
 
           if dest_class.nil?
             array_keys           = @auto_convert.select { |k, _v| k.is_a?(Array) }
-            array_keys_with_type = array_keys.select { |k, _v| k.include?(value.class) }
+            array_keys_with_type = array_keys.select { |k, _v| k.any? { |klass| value.class <= klass } }
 
             if array_keys_with_type.count > 0
               dest_class = array_keys_with_type.values.first

data/lib/epuber/templates.rb

@@ -0,0 +1,8 @@
+
+module Epuber
+  module Templates
+    DIR = File.join(File.dirname(__FILE__), 'templates')
+
+    TEMPLATE_BOOKSPEC = File.join(DIR, "template.bookspec")
+  end
+end

data/lib/epuber/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epuber
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Roman Kříž
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -389,6 +389,7 @@ files:
 - lib/epuber/server/pages/files.bade
 - lib/epuber/server/pages/toc.bade
 - lib/epuber/server/support.coffee
+- lib/epuber/templates.rb
 - lib/epuber/templates/template.bookspec
 - lib/epuber/third_party/bower.rb
 - lib/epuber/third_party/bower/bower.json
@@ -533,12 +534,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7