ir_helper 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e10d8fb83d7346b07073b7fd54f27c48e769b70
-  data.tar.gz: 393df95bbd2b9fe1e2740a7b8cbe91a3fb19009b
+  metadata.gz: 6a4d7140747ce0fd13a2ac7ada02ddbb5ec65f72
+  data.tar.gz: 26f00987d59e1f968bda514cb3047c33c43484ba
 SHA512:
-  metadata.gz: e2548c6e1739347dc163191011b22692fc5233fd9e9df51b15c3e057c7b1025402a176740dc86aaf1ab8937598b8548ad1b618e8df7c902a07ebf20cb9e7ce7c
-  data.tar.gz: e4e9767006f1b435297b12bd588a37dd8eeafb5ad39e218ffae0ba130ef0016a793f4097d0a2f8d8134415ddee92e93ec2097c3546ad93aeabd63d335614fadc
+  metadata.gz: c89b42fdc67710de9731b235aa30b5f1822e4064da179fb8be0d43e8804527b223592f3b63da7befb997ea3bf9b9ae7227f61d65540844b6b6d2082fd2bd9941
+  data.tar.gz: f85378405c8d84fb71d0e393d12ecc8daa677a87280d142977a1637ee190293655b78ceb17cd8725c355f4cbe0d5a1f4638d0b909878aa98167265cdb8342c14

data/README.md

@@ -6,7 +6,7 @@ This gem includes helpers to build the appropriate URLs for images served via an
 
 Add this line to your application's Gemfile:
 
-    gem 'ir-helper'
+    gem 'ir_helper'
 
 And then execute:
 
@@ -14,7 +14,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install ir-helper
+    $ gem install ir_helper
 
 ## Configuration
 Configuring this gem is done via:

data/app/assets/javascripts/image_resizer.js.erb

@@ -76,6 +76,8 @@ Javascript helper for building `image-resizer` url endpoints
     if (uri && urlDomain(uri.hostname) === 'facebook'){
       modArr.push('efacebook');
     }
+    modArr = cdnModArr(uri, modArr);
+    modArr = modArr.sort();
     return modArr.length > 0 ? '/' + modArr.join('-') : '';
   };
 
@@ -103,9 +105,40 @@ Javascript helper for building `image-resizer` url endpoints
     return modArr;
   };
 
+  function cdnModArr(uri, modArr){
+    var modStr, mods, i;
+
+    if (uri && urlDomain(uri.host) === 'cdn'){
+      modStr = uri.pathname.split('/')[1];
+      if (hasModifierStr(modStr)){
+        mods = modStr.split('-');
+
+        // if no mods are specified then use those from the existing url
+        if (modArr.length === 0){
+          modArr = mods;
+        }
+
+        // if there are mods specified then only add any existing external
+        // source or filter modifiers
+        else {
+          for (i=0; i < mods.length; i++){
+            if (mods[i][0] === 'e' || mods[i][0] === 'f'){
+              modArr.push(mods[i]);
+            }
+          }
+        }
+      }
+    }
+
+    return modArr;
+  };
+
   function buildPath(uri, modifiers){
     if(uri){
       switch(urlDomain(uri.hostname)){
+        case 'cdn':
+          return cdnObject(uri);
+          break
         case 's3':
           return s3Object(uri);
           break;
@@ -125,7 +158,11 @@ Javascript helper for building `image-resizer` url endpoints
   };
 
   function urlDomain(host){
-    var domain = 'other';
+    var domain = 'other',
+        cdnRe = new RegExp(URI(IR.CDN).hostname, 'i');
+    if (cdnRe.test(host)){
+      domain = 'cdn';
+    }
     if (/s3.amazonaws.com/i.test(host)){
       domain = 's3';
     }
@@ -135,6 +172,44 @@ Javascript helper for building `image-resizer` url endpoints
     return domain;
   };
 
+  // Get the path of an already IR'd url, basically make sure we remove the
+  // modifier string if it is present
+  function cdnObject(uri){
+    var parts = uri.pathname.split('/');
+
+    // test to see if there is an existing modifier string in place
+    if (hasModifierStr(parts[1])){
+      return '/' + parts.slice(2).join('/');
+    }
+
+    return uri.pathname;
+  };
+
+  function hasModifierStr(part){
+    var items, i, item, key, value, flag, v;
+
+    items = part.split('-');
+    for (i in items){
+      item = items[i];
+      key = item[0];
+      value = item.slice(1);
+      flag = false;
+      v = modSet(key);
+      if (v){
+        if (v.values){
+          flag = true;
+        } else {
+          flag = 1 * value > 0;
+        }
+      }
+      if (flag){
+        return true;
+      }
+    }
+
+    return false;
+  };
+
   function s3Object(uri){
     if (uri.hostname === 's3.amazonaws.com'){
       return '/' + uri.pathname.split('/').slice(2).join('/');

data/lib/ir_helper/helper.rb

@@ -46,7 +46,7 @@ module IrHelper
 
     def mod_set(key)
       mods.each do |k, v|
-        return v if key == k || v[:alias] == key
+        return v if key.to_sym == k || v[:alias] == key
       end
       nil
     end
@@ -84,6 +84,8 @@ module IrHelper
       end
       mod_arr << 'efacebook' if uri && url_domain(uri.host) == :facebook
       mod_arr.compact
+      mod_arr = cdn_mod_arr(uri, mod_arr)
+      mod_arr = mod_arr.sort
       mod_arr.length > 0 ? "/#{mod_arr.join('-')}" : ''
     end
 
@@ -105,9 +107,33 @@ module IrHelper
       end
     end
 
+    def cdn_mod_arr(uri, mod_arr)
+      if uri && url_domain(uri.host) == :cdn
+        mod = uri.path.split('/')[1]
+        if has_modifier_str(mod)
+          mods = mod.split('-')
+          # if no mods are specified then use those from the existing url
+          if mod_arr.length == 0
+            mod_arr = mods
+
+          # if there are mods specified then only add any existing external
+          # source or filter modifiers
+          else
+            mods.each do |m|
+              mod_arr << m if ['e','f'].include?(m[0])
+            end
+          end
+        end
+      end
+
+      mod_arr
+    end
+
     def build_path(uri, modifiers)
       if uri
         case url_domain(uri.host)
+        when :cdn
+          cdn_object uri
         when :s3
           s3_object uri
         when :facebook
@@ -123,11 +149,44 @@ module IrHelper
     end
 
     def url_domain(host)
+      return :cdn if /#{URI(cdn).host}/i =~ host
       return :s3 if /s3.amazonaws.com/i =~ host
       return :facebook if /facebook.com/i =~ host
       :other
     end
 
+    # Get the path of an already IR'd url, basically make sure we remove the
+    # modifier string if it is present
+    def cdn_object(uri)
+      parts = uri.path.split('/')
+
+      # test to see if there is an existing modifier string in place
+      if has_modifier_str(parts[1])
+        "/#{parts[2..-1].join('/')}"
+      else
+        uri.path
+      end
+    end
+
+    def has_modifier_str(part)
+      part.split('-').each do |item|
+        key = item[0]
+        value = item[1..-1]
+        flag = if v = mod_set(key)
+          if v.include?(:values)
+            v[:values].include?(value)
+          else
+            value.to_i > 0
+          end
+        else
+          false
+        end
+        return true if flag
+      end
+
+      false
+    end
+
     def s3_object(uri)
       # test to see which type of s3 url we have
       if uri.host == 's3.amazonaws.com'

data/lib/ir_helper/version.rb

@@ -1,3 +1,3 @@
 module IrHelper
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 end

data/lib/ir_helper.rb

@@ -17,7 +17,7 @@ module IrHelper
       @ir_image_tag = nil
       @ir_background = nil
       @ir_url = nil
-      @js_class = 'ImageResizer'
+      @js_class = 'IR'
       @js_image_tag = nil
       @js_background = nil
       @js_url = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ir_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Nicol