shopify_theme 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e1b5d933905a18bf4497561a5c88afe6da8c6bd
-  data.tar.gz: d413dd12ee0d7bc488f9aca40f95c61ba5f3cf1b
+  metadata.gz: 0abb771c83e424ef8b45f044e15d1a158aa36637
+  data.tar.gz: 418b006ba4a64f64a7928ba8ef2b06e752284c3f
 SHA512:
-  metadata.gz: 29208b7826fb1895b399d3fd20805c63daa9f0fbd82c65a8aaffa6a46691a3a4ee11898a102c5143b8c4522a436d198398ffd793cc0bdce378dd32682b8e043c
-  data.tar.gz: c323befe94bf7c8e1360603adc8d5ec1a48b66e57bc8a41f595db802870f49eb8316d41d77e1c3b642e8ead4aab983d0acae230f807fb28998b1a5c8488a6849
+  metadata.gz: 03d44021f69846911011df9b30a78d78e75ad74af16db991b2086d647c4d8d02867fee7f087c47dda42870103cd377febc73fe7fc8a9e4ffd9f2ed7ee90f806c
+  data.tar.gz: 3935759c7d23c873ae0ba30cdc5c56a6895c72a47817cf5161512f2640261ff9682823cf02b006640db51a47029beb07aeb04a1dbb83e81828d8c0404d4800dc

data/CHANGELOG.md

@@ -1,4 +1,9 @@
+# v0.0.20
+
+* Fixes issue with unknown types raising exceptions -- csaunders
+
 # v0.0.19
+
 * Fixes issue with incorrectly detecting binary assets -- csaunders
 * Properly handle unknown event types -- 
 

data/lib/shopify_theme/cli.rb

@@ -9,9 +9,21 @@ require 'filewatcher'
 require 'launchy'
 require 'mimemagic'
 
-MimeMagic.add('application/x-liquid', extensions: %w(liquid), parents: 'text/plain')
-
 module ShopifyTheme
+  EXTENSIONS = [
+    {mimetype: 'application/x-liquid', extensions: %w(liquid), parents: 'text/plain'},
+    {mimetype: 'application/json', extensions: %w(json), parents: 'text/plain'},
+    {mimetype: 'application/js', extensions: %w(map), parents: 'text/plain'},
+    {mimetype: 'application/vnd.ms-fontobject', extensions: %w(eot)},
+    {mimetype: 'image/svg+xml', extensions: %w(svg svgz)}
+  ]
+
+  def self.configureMimeMagic
+    ShopifyTheme::EXTENSIONS.each do |extension|
+      MimeMagic.add(extension.delete(:mimetype), extension)
+    end
+  end
+
   class Cli < Thor
     include Thor::Actions
 
@@ -250,7 +262,9 @@ module ShopifyTheme
     end
 
     def binary_file?(path)
-      !MimeMagic.by_path(path).text?
+      mime = MimeMagic.by_path(path)
+      say("'#{path}' is an unknown file-type, uploading asset as binary", :yellow) if mime.nil? && ENV['TEST'] != 'true'
+      mime.nil? || !mime.text?
     end
 
     def report_error(time, message, response)
@@ -287,3 +301,4 @@ module ShopifyTheme
     end
   end
 end
+ShopifyTheme.configureMimeMagic

data/lib/shopify_theme/version.rb

@@ -1,3 +1,3 @@
 module ShopifyTheme
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+ENV['TEST'] = 'true'
 require 'minitest/autorun'
 require 'pry'
 require 'pry-debugger'

data/spec/unit/cli_spec.rb

@@ -63,8 +63,14 @@ module ShopifyTheme
     end
 
     it "should report binary files as such" do
-      assert @cli.binary_file?('hello.pdf'), "PDFs are binary files"
-      assert @cli.binary_file?('hello.png'), "PNGs are binary files"
+      extensions = %w(png gif jpg jpeg eot svg ttf woff otf swf ico pdf)
+      extensions.each do |ext|
+        assert @cli.binary_file?("hello.#{ext}"), "#{ext.upcase}s are binary files"
+      end
+    end
+
+    it "should report unknown files as binary files" do
+      assert @cli.binary_file?('omg.wut'), "Unknown filetypes are assumed to be binary"
     end
 
     it "should not report text based files as binary" do
@@ -72,6 +78,8 @@ module ShopifyTheme
       refute @cli.binary_file?('style.sass.liquid'), "sass.liquid files are not binary"
       refute @cli.binary_file?('style.css'), 'CSS files are not binary'
       refute @cli.binary_file?('application.js'), 'Javascript files are not binary'
+      refute @cli.binary_file?('settings_data.json'), 'JSON files are not binary'
+      refute @cli.binary_file?('applicaton.js.map'), 'Javascript Map files are not binary'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_theme
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - John Duff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor