lady_josephine 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60a6a3687ea48331847dc71805138f3b6538caff
-  data.tar.gz: cc3f703f2ee2a6e7fdddc163a22802aa372b0442
+  metadata.gz: 311475881a67cedf75b8623723f7fc0cdfd5da33
+  data.tar.gz: 0dd20039fc936bd66dd66daa8368a7ba164d9ed5
 SHA512:
-  metadata.gz: 7a3ff2974e150f88c654102fbd83740f1d892044309be6f4afbf59f8d069e5384156233c273493a6eae6458167ab86af4f0e0e0d054c5c3d1c73ec1b71af395b
-  data.tar.gz: debb9ad919884f916f89537a27e5671ecbb4735f0f52eca743125d4943616d67559b754ca97498ab0f096932d8b8abd4878b093a6c6f87e10d4eab12097bd9e9
+  metadata.gz: 9ea074bbde1e4caaa604ccf74edadfa34e56858dbcdd7ad6c919a82737a629cd823759c2799c7772a63b09b75e4b43ad46bbdc829972910df149911a4c250b7d
+  data.tar.gz: 5ec432b9ceb41339aacfd834912c0ca121b99c165b08128afc94fbebc4f9cd5ab8f08cb4c108019ba4ba7b3811d695889e153c4ac9cc7eb4a8c2b0792192f249

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Bodo Tasche
+Copyright (c) 2016 by Bitcrowd GmbH - http://bitcrowd.net
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/lady_josephine/images_controller.rb

@@ -5,7 +5,7 @@ module LadyJosephine
       image = Image.from_params image_params
 
       if image && image.save
-        response = {file: {url: image.file.url}}
+        response = {file: {url: image.file.url}, versions: sizes_hash(image.file)}
         render json: response.as_json, status: 200
       elsif image
         render json: image.file.errors,  status: 500
@@ -25,5 +25,13 @@ module LadyJosephine
       params
     end
 
+    def sizes_hash(image)
+      result = {}
+      image.versions.each do |version, metadata|
+        result[version] = metadata.url
+      end
+      result
+    end
+
   end
 end

data/app/uploader/lady_josephine/base_uploader.rb

@@ -43,5 +43,25 @@ module LadyJosephine
         img
       end
     end
+
+    def compress_to_fill(width, height, percentage = 70)
+      manipulate! do |img|
+        img.resize "#{width}x#{height}^"
+        img.gravity "center"
+        img.crop "#{width}x#{height}+0+0!"
+
+        if img.mime_type.match(/(png|jpeg|jpg)\z/i)
+          img.combine_options do |c|
+            c.quality(percentage.to_s)
+            c.depth "8"
+            c.interlace "plane"
+          end
+        end
+
+        img = yield(img) if block_given?
+        add_metadata(img)
+        img
+      end
+    end
   end
 end

data/app/uploader/lady_josephine/image_uploader.rb

@@ -104,40 +104,16 @@ module LadyJosephine
       process :compress_to_fit => [2000, nil, 65]
     end
 
-    def large
-      w2000
-    end
-
-    def medium
-      w1000
-    end
-
-    def small
-      w300
-    end
-
-    def without_meta_data
-      w2000
-    end
-
-    def thumb
-      w300
-    end
-
-    def preview
-      w300
-    end
-
-    def preview_retina
-      w600
-    end
-
-    def main
-      w1000
+    LadyJosephine.image_sizes.each do |key, value|
+      version key do
+        process dynamic_version: key
+      end
     end
 
-    def main_retina
-      w2000
+    def dynamic_version(version)
+      LadyJosephine.image_sizes[version].each do |method, args|
+        self.send method, *args
+      end
     end
 
     def extension_white_list

data/lib/lady_josephine/version.rb

@@ -1,3 +1,3 @@
 module LadyJosephine
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/lady_josephine.rb

@@ -20,4 +20,23 @@ module LadyJosephine
   mattr_accessor :user_class_name
   @@user_class_name = "User"
 
+  mattr_accessor :image_sizes
+  @@image_sizes = {
+    thumbnail: {
+      compress_to_fill: [128, 128, 70],
+    },
+    w300: {
+      compress_to_fit: [300, nil, 70]
+    },
+    w600: {
+      compress_to_fit: [600, nil, 70]
+    },
+    w1000: {
+      compress_to_fit: [1000, nil, 65]
+    },
+    w2000: {
+      compress_to_fit: [2000, nil, 65]
+    }
+  }
+
 end

data/spec/controllers/lady_josephine/images_controller_spec.rb

@@ -30,6 +30,12 @@ describe LadyJosephine::ImagesController, type: :controller do
       expect(image.uploadable_attribute).to eq "content-data"
     end
 
+    it 'should return a hash with all image urls for all versions' do
+      post :create, attachment: { name: 'file.jpg', file: file}, "block-uuid" => "uuid-uuid-uuid", "article-uuid" => article.lady_josephine_server_uuid, "model-name" => "article", "column-name" => "content-data"
+      expect(response.status).to eq 200
+      expect(response.body).to eq '{"file":{"url":"/storage/test/lady_josephine/image/file/1/depressed-cat.jpg"},"versions":{"w300":"/storage/test/lady_josephine/image/file/1/w300_depressed-cat.jpg","w600":"/storage/test/lady_josephine/image/file/1/w600_depressed-cat.jpg","w1000":"/storage/test/lady_josephine/image/file/1/w1000_depressed-cat.jpg","w2000":"/storage/test/lady_josephine/image/file/1/w2000_depressed-cat.jpg","thumbnail":"/storage/test/lady_josephine/image/file/1/thumbnail_depressed-cat.jpg"}}'
+    end
+
   end
 
 end