image_server 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4e2dabc23df77549e15530494663bfe8debb848
-  data.tar.gz: 8fb675eecb59d6c280a451945cc21dd12dcdf9dd
+  metadata.gz: 9147befb6357ed6c9e3b160794ebc46b535a4ee2
+  data.tar.gz: 8be91bbfa024ee310ce5286129b9c07275491eb7
 SHA512:
-  metadata.gz: 72cf34e5d620b3bfa83d86ec4bcb019af5458d4f0750820f9a8366d7e9570de2eea36a1769e5e67a36d04a4cf4a5c11103993d038ce677d59a725d6118e8345e
-  data.tar.gz: dcf61e940894e44c2bcd94c46bad7579890600489103ae5c5b1df5b6d6556311ed305e0c8a306b3dbd577568c58cbf5bfc85e1007a245391c6080734131d41d9
+  metadata.gz: f13101ae69fc6dbc1c2d80cc608d37ef38d79f901b0cce96fdb2bcd2f86f415585df3c094d75f68d08c38b747594c4d288117e0aadf1ed0b0961c99b87bbbb95
+  data.tar.gz: 62d26cd64e71734efa59f17201e2fc9ff55439c8ef8be5871e3b66a5616c235f3b0b35ed7bd087f5324c7f213dc8b7f24577bfe8cc967af9d4ceb69b3c683cb5

data/lib/image_server/active_record.rb

@@ -1,14 +1,15 @@
 module ImageServer
   module ActiveRecord
-    def image_server(column, namespace: 'img', versions: nil, processing_formats: [:jpg], default_size: 'full_size', default_format: 'jpg', sharded_cdn_template: nil)
-      sizes   = versions.values.sort.uniq
+    def image_server(column, namespace: 'img', versions: nil, processing: nil, processing_formats: [:jpg], default_size: 'full_size', default_format: 'jpg', sharded_cdn_template: nil)
       keys = versions.keys.sort.uniq
       processing_formats = processing_formats.map(&:to_s).sort.uniq
-      outputs = sizes.flat_map { |s| processing_formats.map { |f| "#{s}.#{f}" } }
+      processing_versions = processing[:versions].sort.uniq if processing
+      processing_versions ||= versions.values.sort.uniq
+      outputs = processing_versions.flat_map { |s| processing_formats.map { |f| "#{s}.#{f}" } }
       outputs_str = outputs.join(',')
-
       namespace_constant = "#{column.to_s.upcase}_NAMESPACE"
       outputs_constant = "#{column.to_s.upcase}_OUTPUTS_STR"
+      processing_versions_constant = "#{column.to_s.upcase}_PROCESSING_VERSIONS"
       keys_constant = "#{column.to_s.upcase}_KEYS"
 
       sharded_cdn_template_constant = "#{column.to_s.upcase}_SHARDED_CDN_TEMPLATE"
@@ -18,6 +19,7 @@ module ImageServer
         #{namespace_constant} = '#{namespace}'
         #{outputs_constant} = '#{outputs_str}'
         #{keys_constant} = #{keys}
+        #{processing_versions_constant} = #{processing_versions}
         #{sharded_cdn_template_constant} = #{sharded_cdn_template}
 
         def remote_#{column}_url=(url)
@@ -27,12 +29,11 @@ module ImageServer
         end
 
         def #{column}(options={})
-          processing = #{column}_hash.blank?
           default_options = { protocol: #{column}_cdn_protocol,
                       domain: #{column}_cdn_domain,
                       default_size: '#{default_size}',
                       format: '#{default_format}',
-                      processing: processing,
+                      processing: #{column}_processing?,
                       object: self }
           ImageServer::Image.new(#{namespace_constant}, #{column}_hash, default_options.merge(options))
         end
@@ -48,12 +49,16 @@ module ImageServer
 
         private
 
+        def #{column}_processing?
+          #{column}_hash == nil || #{column}_hash == ''
+        end
+
         def #{column}_cdn_protocol
           ImageServer.configuration.cdn_protocol
         end
 
         def #{column}_cdn_domain
-          return #{column}_host if #{column}_hash.blank?
+          return #{column}_host if #{column}_processing?
           return #{column}_host unless #{sharded_cdn_template_constant}
           shard = #{column}_hash[0].hex % #{column}_sharded_host_count
           #{sharded_cdn_template_constant} % shard

data/lib/image_server/adapters/http.rb

@@ -18,9 +18,10 @@ module ImageServer
         logger.info "ImageServer::Adapters::Http --> uploading to image server: [#{upload_uri}]"
 
         response = Net::HTTP.start(upload_uri.host, upload_uri.port) do |http|
-
-          http.read_timeout = 60
-          body = if source_is_url?
+          request = Net::HTTP::Post.new(upload_uri.request_uri)
+          request['Accept'] = "application/json"
+          request['Content-Type'] = "application/json"
+          request.body = if source_is_url?
             '{}' # blank body
           elsif @source.is_a?(File)
             @source
@@ -30,7 +31,8 @@ module ImageServer
             raise('Not supported')
           end
 
-          http.post("#{upload_uri.path}?#{upload_uri.query}", body)
+          http.read_timeout = 60
+          http.request(request)
         end
 
         ErrorHandler.new(response).handle_errors!

data/lib/image_server/installer.rb

@@ -37,7 +37,7 @@ module ImageServer
     end
 
     def current_version
-      '1.16.1'
+      '1.17.0'
     end
 
     def executable_name

data/lib/image_server/version.rb

@@ -1,3 +1,3 @@
 module ImageServer
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_server
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Richard Millan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry