middleman-image-uploader-tag 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362ef8e1b744f133c54355093a958ed4d1445ac1
-  data.tar.gz: a2a0114837e730164b9927b952907f6a88b8b734
+  metadata.gz: e09ba1cd1ec0c3bb7494f10d3193573dec5c3a89
+  data.tar.gz: e76f501dd36d68c2be1ca359852f1581abf6eda1
 SHA512:
-  metadata.gz: bd13ca115c108becb86f3e6c71c8b55cd56b7089bd5f1caa76904778ad5675ea73d4805692fbd0435e4eb3837af2d8b9c9b4328ecc698b994707cc0f6b928ad1
-  data.tar.gz: 34c26fa912fc9bc2265e079c862fb6d1d52ec056930d41cbdadbf81b66ec793550483389103b1b7b9ed6aa2a9dab8af48a45f00d6386e1545b2f55b408bcb756
+  metadata.gz: 872f682fd1a9e2abc211598d27cabba775d1a018e6d22547e1625e0e9a2dc4430aa16e2ba4ac22d72b0f0314ce6085fca5d75e3c82520cc0cc7954d0e16aa53d
+  data.tar.gz: 94838cbd8cf5a81ced39ac281d8c855a8f50e555ed8c65ffde6fde68a7d19e43659d2ad033d2d01731ab6ec8ebccae09805a9ab4308a9a4aeb9fbcb6b190a575

data/.gitignore

@@ -5,4 +5,4 @@
 /pkg
 
 # Ignore temporary remote images folder
-test/fixtures/test/source/remote_images/
+test/fixtures/test/source/images/remote_images/

data/README.md

@@ -41,7 +41,9 @@ Also you can install the latest code directly from repository with:
 
 ## Configuration
 
-Activate extension in your `config.rb`, providing credentials for remote provider:
+In you `config.rb`:
+
+Activate extension, providing credentials for remote provider:
 
 ```ruby
 activate :image_uploader_tag do |e|
@@ -58,9 +60,21 @@ activate :image_uploader_tag do |e|
 end
 ```
 
-Note: the `remote_images_dir` sets the only folder images being uploaded.
+Add ignore option to prevent remote images uploading during deploy:
+
+```ruby
+ignore '/images/remote_images/*'
+```
+
+Also you could add a line in your `.gitignore` file, to prevent uploading images during development too:
+
+```
+source/images/remote_images
+```
+
+Note: the `remote_images_dir` sets the only folder images would remote uploaded.
 
-It is optional and by default has the value `'remote_images'`. You can change it but be sure to place it NOT within the images directory of the Middleman, just somewhere in the application root folder.
+It is optional and by default has the value `'remote_images'`. You can change it but be sure to place it within the images directory of the Middleman.
 
 ## Usage
 

data/lib/middleman/image-uploader-tag/cdns/cloudinary.rb

@@ -14,10 +14,11 @@ module Middleman
         end
       end
 
-      def get_remote_link(image_path)
+      def get_remote_link(image_path, secure = false)
         raise NotFound if !image_path || !File.exist?(image_path.to_s)
 
-        upload_to_cloud(image_path)[:secure_url]
+        image_attributes = upload_to_cloud(image_path)
+        secure ? image_attributes[:secure_url] : image_attributes[:url]
       end
 
       def upload_to_cloud(file, options = {})

data/lib/middleman/image-uploader-tag/extension.rb

@@ -25,19 +25,19 @@ module Middleman
       end
 
       helpers do
-        def remote_image_tag(image_name, params = {})
-          image_tag remote_image_tag_link(image_name), params
+        def remote_image_tag(image_name, secure = false, params = {})
+          image_tag remote_image_tag_link(image_name, secure), params
         end
 
-        def remote_image_tag_link(image_name)
+        def remote_image_tag_link(image_name, secure = false)
           klass = ::Middleman::ImageUploaderTag::Extension
 
-          klass.get_remote_path image_name
+          klass.get_remote_path image_name, secure
         end
       end
 
       def self.image_location(image_path)
-        File.join(app.root, 'source', remote_images_dir, image_path)
+        File.join(app.root, 'source', app.images_dir, remote_images_dir, image_path)
       end
 
       def self.provider
@@ -49,14 +49,18 @@ module Middleman
         ).new(provider_options.provider_config)
       end
 
-      def self.get_remote_path(image_name)
+      def self.get_remote_path(image_name, secure = false)
         image_path = image_location(image_name)
         raise NotFound unless File.exist?(image_path)
 
         if app.config.environment == :build
-          provider.get_remote_link(image_path)
+          if provider.instance_of? ::Middleman::ImageUploaderTag::CloudinaryCDN
+            provider.get_remote_link image_path, secure
+          else
+            provider.get_remote_link image_path
+          end
         else
-          image_name
+          File.join('/', app.images_dir, remote_images_dir, image_name)
         end
       end
 
@@ -73,7 +77,7 @@ module Middleman
       end
 
       def self.create_images_dir!
-        img_dir = File.join(app.root, 'source', remote_images_dir)
+        img_dir = File.join(app.root, 'source', app.images_dir, remote_images_dir)
 
         Dir.mkdir(img_dir) unless Dir.exist?(img_dir)
       end

data/lib/middleman/image-uploader-tag/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module ImageUploaderTag
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/test/lib/middleman/image-uploader-tag/cdns/cloudinary_test.rb

@@ -101,11 +101,12 @@ class CloudinaryCDNTest < Minitest::Test
 
     Cloudinary::Uploader.instance_eval do
       def upload(file, options)
-        { 'secure_url': 'http://cdn.com/test.jpg' }
+        { 'secure_url': 'https://cdn.com/test.jpg', 'url': 'http://cdn.com/test.jpg' }
       end
     end
 
-    assert_equal 'http://cdn.com/test.jpg', cdn.new(config).get_remote_link(image_path)
+    assert_equal 'https://cdn.com/test.jpg', cdn.new(config).get_remote_link(image_path, true)
+    assert_equal 'http://cdn.com/test.jpg', cdn.new(config).get_remote_link(image_path, false)
   end
 
   private
@@ -126,7 +127,9 @@ class CloudinaryCDNTest < Minitest::Test
   end
 
   def extension
-    Middleman::ImageUploaderTag::Extension.new(Class.new(Middleman::Application)).class
+    app = Class.new(Middleman::Application)
+    app.config.images_dir = 'images'
+    Middleman::ImageUploaderTag::Extension.new(app).class
   end
 end
 

data/test/lib/middleman/image-uploader-tag/extension_test.rb

@@ -7,6 +7,7 @@ class ExtensionTest < Minitest::Test
 
   def setup
     @application = Class.new(Middleman::Application)
+    set_app_config({ images_dir: 'images' })
     @ext_instance = Middleman::ImageUploaderTag::Extension.new(@application)
     @ext_instance.app = @application
     @ext_class = @ext_instance.class
@@ -33,7 +34,7 @@ class ExtensionTest < Minitest::Test
   end
 
   def test_create_images_dir!
-    remote_images_dir = File.join(application.root, 'source', ext_class.remote_images_dir)
+    remote_images_dir = File.join(application.root, 'source', application.images_dir, ext_class.remote_images_dir)
 
     assert Dir.exists?(remote_images_dir)
 
@@ -71,6 +72,13 @@ class ExtensionTest < Minitest::Test
 
     assert_equal true, called
     assert_equal image, name_called
+
+    called = false
+    application.stub :remote_image_tag_link, image do
+      application.remote_image_tag 'test.jpg', true, alt: 'hello'
+    end
+
+    assert_equal true, called
   end
 
   def test_remote_image_tag_link_helper
@@ -78,17 +86,27 @@ class ExtensionTest < Minitest::Test
     image = ext_class.image_location('test.jpg')
 
     mock = Minitest::Mock.new
-    mock.expect :get_remote_path, image, ['test.jpg']
+    mock.expect :get_remote_path, image, ['test.jpg', false]
 
     ::Middleman::ImageUploaderTag.stub_const(:Extension, mock) do
       application.remote_image_tag_link 'test.jpg'
     end
 
     mock.verify
+
+    mock = Minitest::Mock.new
+    mock.expect :get_remote_path, image, ['test.jpg', true]
+
+    ::Middleman::ImageUploaderTag.stub_const(:Extension, mock) do
+      application.remote_image_tag_link 'test.jpg', true
+    end
+
+    mock.verify
   end
 
   def test_image_location
-    remote_images_dir = File.join(application.root, 'source', ext_class.remote_images_dir)
+    remote_images_dir = File.join(application.root, 'source',
+                                  application.images_dir, ext_class.remote_images_dir)
 
     assert_equal remote_images_dir + '/test.jpg', ext_class.image_location('test.jpg')
     assert_equal remote_images_dir + '/test.jpg', ext_class.image_location('/test.jpg')
@@ -102,14 +120,15 @@ class ExtensionTest < Minitest::Test
   end
 
   def test_get_remote_path_during_development
+    remote_images_dir = File.join(application.images_dir, ext_class.remote_images_dir)
     create_fake_image!('test.jpg')
     create_fake_image!('test/test.jpg')
 
     set_app_config environment: :development
 
-    assert_equal 'test.jpg', ext_class.get_remote_path('test.jpg')
-    assert_equal '/test.jpg', ext_class.get_remote_path('/test.jpg')
-    assert_equal 'test/test.jpg', ext_class.get_remote_path('test/test.jpg')
+    assert_equal File.join('/', remote_images_dir, 'test.jpg'), ext_class.get_remote_path('test.jpg')
+    assert_equal File.join('/', remote_images_dir, '/test.jpg'), ext_class.get_remote_path('/test.jpg')
+    assert_equal File.join('/', remote_images_dir, 'test/test.jpg'), ext_class.get_remote_path('test/test.jpg')
   end
 
   def test_get_remote_path_raises_exception_for_absent_image
@@ -127,12 +146,31 @@ class ExtensionTest < Minitest::Test
     image = ext_class.image_location('test.jpg')
 
     mock = Minitest::Mock.new
-    mock.expect :get_remote_link, image, [image]
+    mock.expect :instance_of?, true, [::Middleman::ImageUploaderTag::CloudinaryCDN]
+    mock.expect :get_remote_link, image, [image, false]
 
     ext_class.stub :provider, mock do
       ext_class.get_remote_path 'test.jpg'
     end
     mock.verify
+
+    mock = Minitest::Mock.new
+    mock.expect :instance_of?, true, [::Middleman::ImageUploaderTag::CloudinaryCDN]
+    mock.expect :get_remote_link, image, [image, true]
+
+    ext_class.stub :provider, mock do
+      ext_class.get_remote_path 'test.jpg', true
+    end
+    mock.verify
+
+    mock = Minitest::Mock.new
+    mock.expect :instance_of?, false, [::Middleman::ImageUploaderTag::CloudinaryCDN]
+    mock.expect :get_remote_link, image, [image]
+
+    ext_class.stub :provider, mock do
+      ext_class.get_remote_path 'test.jpg', true
+    end
+    mock.verify
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-image-uploader-tag
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Aliaksandr Buhayeu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core