Merge branch 'master' into special-characters-url

Author: violetviolinist

.github/workflows/test.yml

@@ -8,13 +8,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.6.x
-    - name: Build and test with Rake
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+      - uses: actions/checkout@v2
+      - name: Set up Ruby 2.6
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+      - name: Build and test with Rake
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rake
+      # - name: Upload code coverage reports to codecov
+      #   uses: codecov/codecov-action@v1
+      #   with:
+      #     token: 58fd7bff-e88e-4f23-b940-811b12f20dcf # not required for public repos
+      #     # file: ./coverage.xml # optional
+      #     # files: ./coverage1.xml,./coverage2.xml # optional
+      #     # flags: unittests # optional
+      #     # name: codecov-umbrella # optional
+      #     # fail_ci_if_error: true # optional (default = false)

.gitignore

@@ -1,6 +1,7 @@
 .bundle/
 log/*.log
 pkg/
+coverage/
 test/dummy/db/*.sqlite3
 test/dummy/db/*.sqlite3-journal
 test/dummy/db/*.sqlite3-*

DEVEMOPMENT.md DEVELOPMENT.mdDEVEMOPMENT.md renamed to DEVELOPMENT.md

@@ -17,4 +17,4 @@ bundle exec rake
 **3. To build gem**
 ```shell
 gem build imagekit.gemspec
-```
+```

Gemfile

@@ -17,4 +17,7 @@ gemspec
 gem "minitest", "~> 5.0"
 # gem "rake", "~> 12.0"
 # gem "rest-client", "~>2.1"
-gem "rspec"
+gem "rspec"
+
+gem 'codecov', require: false, group: 'test'
+gem 'webmock', require: false, group: 'test'

README.md

@@ -69,3 +69,9 @@
                        'help': "Please pass two pHash values",}
 UNEQUAL_STRING_LENGTH = {'message': "Unequal pHash string length",
                          'help': "For distance calculation, the two pHash strings must have equal length",}
+
+MISSING_PRIVATE_KEY = "ImageKit private key missing"
+
+MISSING_PUBLIC_KEY = "ImageKit public key missing"
+
+MISSING_URL_ENDPOINT = "ImageKit URL Endpoint missing. Default URL Endpoint: https://ik.imagekit.io/<YOUR_IMAGEKIT_ID>/"

lib/imagekit/constants/errors.rb

@@ -11,11 +11,18 @@
   'format': "f",
   'radius': "r",
   'background': "bg",
-  'border': "bo",
+  'border': "b",
   'rotation': "rt",
   'blur': "bl",
   'named': "n",
   'overlay_image': "oi",
+  'overlay_image_trim': "oit",
+  'overlay_image_cropping': "oic",
+  'overlay_image_quality': "oiq",
+  'overlay_image_DPR': "oidpr",
+  'overlay_image_border': "oib",
+  'overlay_image_background': "oibg",
+  'overlay_image_aspect_ratio': "oiar",
   'overlay_x': "ox",
   'overlay_y': "oy",
   'overlay_focus': "ofo",
@@ -24,11 +31,17 @@
   'overlay_text': "ot",
   'overlay_text_font_size': "ots",
   'overlay_text_font_family': "otf",
+  'overlay_text_encoded': "ote",
   'overlay_text_color': "otc",
+  'overlay_text_width': "otw",
+  'overlay_text_background': "otbg",
+  'overlay_text_padding': "otp",
+  'overlay_text_inner_alignment': "otia",
+  'overlay_text_transparency': "oa",
   'overlay_alpha': "oa",
+  'overlay_radius': "or",
   'overlay_text_typography': "ott",
   'overlay_background': "obg",
-  'overlay_image_trim': "oit",
   'progressive': "pr",
   'lossless': "lo",
   'trim': "t",

lib/imagekit/constants/supported_transformation.rb

@@ -130,4 +130,4 @@ def validate_upload_options(options)
     end
     request_formatter(options)
   end
-end
+end

lib/imagekit/file.rb

@@ -16,6 +16,17 @@ class ImageKitClient
     attr_reader :file
 
     def initialize(private_key, public_key, url_endpoint, transformation_pos = nil, options = nil)
+
+      unless(private_key.is_a?(String) && private_key.to_s.strip.length != 0)
+        raise ArgumentError, MISSING_PRIVATE_KEY
+      end
+      unless(public_key.is_a?(String) && public_key.to_s.strip.length != 0)
+        raise ArgumentError, MISSING_PUBLIC_KEY
+      end
+      unless(url_endpoint.is_a?(String) && url_endpoint.to_s.strip.length != 0)
+        raise ArgumentError, MISSING_URL_ENDPOINT
+      end
+
       @private_key = private_key
       @public_key = public_key
       @url_endpoint = url_endpoint
@@ -92,8 +103,7 @@ def get_remote_file_url_metadata(remote_file_url = "")
     def phash_distance(first, second)
       # Get hamming distance between two phash(image hash) to check
       # similarity between images
-
-      unless first && second
+      if first.to_s.strip == "" || second.to_s.strip == ""
         raise ArgumentError, Error::MISSING_PHASH_VALUE
       end
       hamming_distance(first, second)
@@ -104,5 +114,4 @@ def get_authentication_parameters(token = nil, expire = nil)
       get_authenticated_params(token, expire, @ik_req.private_key)
     end
   end
-end
-
+end

lib/imagekit/imagekit.rb

@@ -38,11 +38,12 @@ def request(method, url, headers = nil, payload = nil)
                                      headers: headers,
                                      payload: payload).execute
 
-
-      if resp.code == 404
-        raise RestClient::ExceptionWithResponse
-      elsif (resp.code >= 200) && (resp.code < 204)
-        response[:response] = JSON.parse(resp.body.to_s)
+      if (resp.code >= 200) && (resp.code < 204)
+        if (resp.headers[:content_type].include? "application/json")
+          response[:response] = JSON.parse(resp.body.to_s)
+        else
+          raise =RestClient::ExceptionWithResponse
+        end
       elsif resp.code == 204
         response[:response] = {'success': true}
       end