mill 0.7.3 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7942623dab3ece3423b22a91ba579ba0c0508ea1af4160602a5b1568ea741356
-  data.tar.gz: 705b20386722f6a4c92cfaacabd4753b3cde5e00436e7241e995f90665a7916e
+  metadata.gz: 5ae395020f4fd9ce9c4d1f053f8dd2a4c7b5406d29a3724ffab300014aefad48
+  data.tar.gz: d4b9980adee0e3d92421e094db607db2f2caf251f63b98e5b7378614ecb75e15
 SHA512:
-  metadata.gz: 8a0626553ecb9a44d82cf4e4acc81d0ba3a5cdf8ba519710ed259fff68fbf47fc157ecaf26cde7a1523ae53717147cf65e813a2e14a42e0bbee65a7fa74693a7
-  data.tar.gz: 01ede86fca301427cbaeaca13559ca594714d87998b09bf83bcd989ff7782bf1ba307fa62a67aef36ba2a034e061c818847842ab8c36de2849d89a919973c86f
+  metadata.gz: 880d30ef81989670d560491a64ea40e7546a5624a2369c83f2fdbb7159d38547f839a28d95491e4af07cc08f1b8111fbfe8975e4faf5cab60ab9a701f49008f3
+  data.tar.gz: 56322ec6a0d47677dec50e2418e0e3cd1c02901c5ef6f0baa930b6c0bc76ffb59592009c0bef088de3352b1a98440569b84e4b67e1cfd41ba462bc185915b337

data/lib/mill/resource.rb

@@ -6,7 +6,6 @@ module Mill
 
     attr_accessor :input_file
     attr_accessor :output_file
-    attr_accessor :type
     attr_accessor :date
     attr_accessor :public
     attr_accessor :content
@@ -14,7 +13,6 @@ module Mill
 
     def initialize(input_file: nil,
                    output_file: nil,
-                   type: nil,
                    date: nil,
                    public: false,
                    content: nil,
@@ -26,7 +24,6 @@ module Mill
         @date = DateTime.now
       end
       @output_file = Path.new(output_file) if output_file
-      @type = type
       self.date = date if date
       self.public = public
       @content = content
@@ -60,11 +57,10 @@ module Mill
     end
 
     def inspect
-      "<%p> input_file: %p, output_file: %p, type: %p, date: %s, public: %p, content: <%p>" % [
+      "<%p> input_file: %p, output_file: %p, date: %s, public: %p, content: <%p>" % [
         self.class,
         @input_file ? @input_file.relative_to(@site.input_dir).to_s : nil,
         @output_file ? @output_file.relative_to(@site.output_dir).to_s : nil,
-        @type.to_s,
         @date.to_s,
         @public,
         @content && @content.class,

data/lib/mill/resources/image.rb

@@ -12,8 +12,6 @@ module Mill
         image/png
         image/tiff
         image/vnd.microsoft.icon
-        image/x-icon
-        image/svg
         image/svg+xml
       }
 

data/lib/mill/site.rb

@@ -265,12 +265,12 @@ module Mill
     private
 
     def resource_class_for_file(file)
-      MIME::Types.of(file.to_s).each do |type|
-        if (klass = @file_types[type.content_type])
-          return [klass, type]
-        end
+      type = MIME::Types.of(file.to_s).first
+      if type && (klass = @file_types[type.content_type])
+        klass
+      else
+        Resource
       end
-      nil
     end
 
     def add_files
@@ -280,14 +280,11 @@ module Mill
           Find.prune
         elsif input_file.directory?
           # skip
-        elsif (klass, type = resource_class_for_file(input_file))
+        else (klass = resource_class_for_file(input_file))
           resource = klass.new(
             input_file: input_file,
-            output_file: @output_dir / input_file.relative_to(@input_dir),
-            type: type)
+            output_file: @output_dir / input_file.relative_to(@input_dir))
           add_resource(resource)
-        else
-          warn "Warning: can't determine resource of file: #{input_file} (#{MIME::Types.of(input_file.to_s).join(', ').inspect})"
         end
       end
     end
@@ -330,7 +327,7 @@ module Mill
     end
 
     def add_htpasswd
-      resource = Resource::Other.new(
+      resource = Resource.new(
         input_file: @htpasswd_file,
         output_file: @output_dir / '.htpasswd')
       add_resource(resource)

data/lib/mill/version.rb

@@ -1,5 +1,5 @@
 module Mill
 
-  VERSION = '0.7.3'
+  VERSION = '0.8'
 
 end

data/lib/mill.rb

@@ -18,7 +18,6 @@ require 'mill/resource'
 require 'mill/resources/feed'
 require 'mill/resources/google_site_verification'
 require 'mill/resources/image'
-require 'mill/resources/other'
 require 'mill/resources/redirect'
 require 'mill/resources/robots'
 require 'mill/resources/sitemap'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mill
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: '0.8'
 platform: ruby
 authors:
 - John Labovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -200,7 +200,6 @@ files:
 - lib/mill/resources/feed.rb
 - lib/mill/resources/google_site_verification.rb
 - lib/mill/resources/image.rb
-- lib/mill/resources/other.rb
 - lib/mill/resources/redirect.rb
 - lib/mill/resources/robots.rb
 - lib/mill/resources/sitemap.rb

data/lib/mill/resources/other.rb

@@ -1,29 +0,0 @@
-module Mill
-
-  class Resource
-
-    class Other < Resource
-
-      FileTypes = %w{
-        application/pdf
-
-        application/x-shockwave-flash
-
-        application/font-sfnt
-        application/x-font-opentype
-        application/x-font-otf
-        application/x-font-truetype
-        application/x-font-ttf
-
-        application/rtf
-
-        application/javascript
-        application/x-javascript
-        text/javascript
-      }
-
-    end
-
-  end
-
-end