image-resizer-rails 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68d7c6328e28bae30b9189bfd0a5c60366bc77e7
-  data.tar.gz: 07ff7f37be822656665e9502804929b7c33274c8
+  metadata.gz: acc2c0bea99f9a078dafeef5d1e11c6f550a5a3f
+  data.tar.gz: b7f9b743d92715f8e0986d46641a1c928b9247e0
 SHA512:
-  metadata.gz: 6eb105bc11181e040c7a433429f07659da1e0a5aaf18f66a4c73dfd20cff1fff9e3ca4ac80798d578deb55e086ac6d6374b2d3e907d2a60e7e7688fa1e36beb0
-  data.tar.gz: 0c69082b4e8cbe195b48dd4c276a42114c7e0281717df0286238fd84cff59eeb5fdf9ce67d56ea2759da0ca74b7144e35a050ed420fc6864298c04e5f970434e
+  metadata.gz: 8132850457c9943e4420d9f34a70563bd7cc9517c00ce8e61f0bf58b8ed3f80817942cc93079829e92c26ffbd5b3796d4cb80a1548f31615ba33fe734b0eef3c
+  data.tar.gz: f0c74218e8402ae6e2be6e38032746ab152957c71d466861d8556afaafd0b4b9d7643dca516a34b08a9d3d28992ec08924b00fcadfc93cb46293e9f98b3d9d91

data/README.md

@@ -1,4 +1,4 @@
-# Image::Resizer::Rails
+# IrHelper
 
 This gem includes helpers to build the appropriate URLs for images served via an [image-resizer](https://github.com/jimmynicol/image-resizer) instance.
 
@@ -19,7 +19,7 @@ Or install it yourself as:
 ## Configuration
 Configuring this gem is done via:
 
-    Image::Resizer::Rails.configure do |config|
+    IrHelper.configure do |config|
       # add your configuration here...
     end
 
@@ -83,13 +83,13 @@ Or just return the url as needed
 
 The Javascript helper is generated from the config data as an `.erb` file on load. So all of the new modifiers or sources added will be reflected, as well as any aliases set.
 
-The JS helper (`image_resizer.js`) is either attached as a global, or can be loaded via AMD or CommonJS if you are using those techniques. It has the same helper methods as the ruby helper.  
+The JS helper (`image_resizer.js`) is either attached as a global, or can be loaded via AMD or CommonJS if you are using those techniques. It has the same helper methods as the ruby helper.
 
     <script>
       var imgUrl = 'https://s3.amazonaws.com/sample.bucket/path/to/image.jpg';
-      $('#image-tag').append(ImageResizer.irImageTag(imgUrl, {s:200}));
-      $('#image-bg').attr('style', ImageResizer.irBackground(imgUrl, {s:200}));
-      $('#image-url').text(ImageResizer.irImageTag(imgUrl, {s:200}));
+      $('#image-tag').append(IR.irImageTag(imgUrl, {s:200}));
+      $('#image-bg').attr('style', IR.irBackground(imgUrl, {s:200}));
+      $('#image-url').text(IR.irImageTag(imgUrl, {s:200}));
     </script>
     <div id="image-tag"></div>
     <div id="image-bg"></div>

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

@@ -18,7 +18,7 @@ Javascript helper for building `image-resizer` url endpoints
 
   // Finally, as a browser global.
   } else {
-    root.<%= Image::Resizer::Rails.js_class %> = factory(root);
+    root.<%= IrHelper.js_class %> = factory(root);
   }
 
 }(this, function(root){
@@ -180,21 +180,21 @@ Javascript helper for building `image-resizer` url endpoints
   };
 
   // Public constants
-  IR.modifiers = <%= Image::Resizer::Rails.modifiers.to_json %>;
+  IR.modifiers = <%= IrHelper.modifiers.to_json %>;
 
-  IR.CDN = <%= Image::Resizer::Rails.cdn.to_json %>;
+  IR.CDN = <%= IrHelper.cdn.to_json %>;
 
-  IR.VERSION = <%= Image::Resizer::Rails::VERSION.to_json %>;
+  IR.VERSION = <%= IrHelper::VERSION.to_json %>;
 
   // Alias any methods that have been listed in the config
-  <% unless Image::Resizer::Rails.js_image_tag.nil? %>
-  IR.<%= Image::Resizer::Rails.js_image_tag %> = IR.irImageTag;
+  <% unless IrHelper.js_image_tag.nil? %>
+  IR.<%= IrHelper.js_image_tag %> = IR.irImageTag;
   <% end %>
-  <% unless Image::Resizer::Rails.js_background.nil? %>
-  IR.<%= Image::Resizer::Rails.js_background %> = IR.irBackground;
+  <% unless IrHelper.js_background.nil? %>
+  IR.<%= IrHelper.js_background %> = IR.irBackground;
   <% end %>
-  <% unless Image::Resizer::Rails.js_url.nil? %>
-  IR.<%= Image::Resizer::Rails.js_url %> = IR.irUrl;
+  <% unless IrHelper.js_url.nil? %>
+  IR.<%= IrHelper.js_url %> = IR.irUrl;
   <% end %>
 
   return IR;

data/app/helpers/ir_helper/ir_helper.rb

@@ -0,0 +1,12 @@
+require 'ir_helper/helper'
+
+module IrHelper
+  # Series of view helpers building url strings for image-resizer endpoints
+  module IrHelper
+    def self.included(base)
+      base.class_eval do
+        include ::IrHelper::Helper
+      end
+    end
+  end
+end

data/lib/ir_helper.rb

@@ -0,0 +1,92 @@
+require 'ir_helper/version'
+require 'ir_helper/helper'
+require 'ir_helper/engine' if defined?(Rails)
+
+module IrHelper
+
+  class << self
+    attr_accessor :cdn
+    attr_reader :js_class, :js_image_tag, :js_background, :js_url
+
+    def configure(&block)
+      yield self
+    end
+
+    def reset_config
+      @cdn = nil
+      @ir_image_tag = nil
+      @ir_background = nil
+      @ir_url = nil
+      @js_class = 'ImageResizer'
+      @js_image_tag = nil
+      @js_background = nil
+      @js_url = nil
+      @modifiers = default_modifiers
+    end
+
+    def modifiers
+      @modifiers ||= default_modifiers
+    end
+
+    def add_modifier(key, img_tag = '', values = [])
+      @modifiers[key.to_sym] = { alias: img_tag, values: values }
+    end
+
+    def add_source(name, option)
+      @modifiers[:e][:values][name.to_sym] = option.to_sym
+    end
+
+    def js_class
+      @js_class ||= 'IR'
+    end
+
+    def add_alias(type, name)
+      Helper.class_eval do |base|
+        base.send(:alias_method, name.to_sym, type.to_sym)
+      end
+    end
+
+    def add_js_alias(type, name)
+      instance_variable_set "@#{type.to_s}", name
+    end
+
+    def to_hash
+      {
+        cdn: cdn,
+        ir_image_tag: ir_image_tag,
+        ir_background: ir_background,
+        ir_url: ir_url,
+        js_class: js_class,
+        js_image_tag: js_image_tag,
+        js_background: js_background,
+        js_url: js_url,
+        modifiers: modifiers
+      }
+    end
+
+    private
+
+    def default_modifiers
+      {
+        w: { alias: :width },  h: { alias: :height },
+        s: { alias: :square },
+        c: { alias: :crop, values: %w(fit fill cut scale) },
+        g: { alias: :gravity, values: %w(c n s e w ne nw se sw) },
+        y: { alias: :top }, x: { alias: :left },
+        e: { alias: :external, values: default_sources },
+        f: { alias: :filter }
+      }
+    end
+
+    def default_sources
+      {
+        facebook: :fb_uid,
+        twitter:  :tw_uid,
+        youtube:  :youtube_id,
+        vimeo:    :vimeo_id
+      }
+    end
+
+  end
+
+end

data/lib/ir_helper/engine.rb

@@ -0,0 +1,7 @@
+module IrHelper
+  class Engine < ::Rails::Engine
+    # initializer 'image-resizer-rails.assets.precompile' do |app|
+    #   app.config.assets.precompile << 'image_resizer'
+    # end
+  end
+end

data/lib/ir_helper/helper.rb

@@ -0,0 +1,149 @@
+require 'uri'
+
+module IrHelper
+  # Series of view helpers building url strings for image-resizer endpoints
+  module Helper
+    def ir_image_tag(*args)
+      src = generate_ir_endpoint(args)
+      return nil if src.nil?
+      if respond_to?(:image_tag)
+        image_tag src
+      else
+        "<img src='#{src}' />"
+      end
+    end
+
+    def ir_background(*args)
+      url = generate_ir_endpoint(args)
+      url ? "background-image:url(#{url})" : nil
+    end
+
+    def ir_url(*args)
+      generate_ir_endpoint(args)
+    end
+
+    private
+
+    def parse_arguments(args)
+      if args[0].is_a?(String) || args[0].nil?
+        [args[0], args[1..-1]]
+      else
+        [nil, args]
+      end
+    end
+
+    def cdn
+      ::IrHelper.cdn
+    end
+
+    def self.img_tag_name
+      ::IrHelper.image_tag_name
+    end
+
+    def mods
+      ::IrHelper.modifiers
+    end
+
+    def mod_set(key)
+      mods.each do |k, v|
+        return v if key == k || v[:alias] == key
+      end
+      nil
+    end
+
+    def sources
+      mods[:e][:values]
+    end
+
+    def source_option(key)
+      sources.each do |k, v|
+        return [k, v] if key == v
+      end
+      nil
+    end
+
+    def generate_ir_endpoint(args)
+      fail NoCDNException if cdn.nil?
+
+      source, modifiers = parse_arguments(args)
+      uri = source ? URI(source) : nil
+      modifier_str = mod_str(uri, modifiers)
+      path = build_path(uri, modifiers)
+
+      if path
+        "#{cdn.gsub(/\/$/, '')}#{modifier_str}#{path}"
+      else
+        nil
+      end
+    end
+
+    def mod_str(uri, modifiers)
+      mod_arr = []
+      unless modifiers.nil? || modifiers[0].nil?
+        mod_arr = build_mod_arr(modifiers)
+      end
+      mod_arr << 'efacebook' if uri && url_domain(uri.host) == :facebook
+      mod_arr.compact
+      mod_arr.length > 0 ? "/#{mod_arr.join('-')}" : ''
+    end
+
+    def build_mod_arr(modifiers)
+      modifiers[0].map do |k, v|
+        mset = mod_set(k)
+        src = source_option(k)
+        if mset
+          if mset.include? :values
+            mset[:values].include?(v) ? "#{k}#{v}" : nil
+          else
+            "#{k}#{v}"
+          end
+        elsif src
+          "e#{src.first}"
+        else
+          nil
+        end
+      end
+    end
+
+    def build_path(uri, modifiers)
+      if uri
+        case url_domain(uri.host)
+        when :s3
+          s3_object uri
+        when :facebook
+          "/#{fb_uid(uri)}.jpg"
+        else
+        end
+      else
+        modifiers[0].each do |k, v|
+          return "/#{v}.jpg" if source_option(k)
+        end
+        nil
+      end
+    end
+
+    def url_domain(host)
+      return :s3 if /s3.amazonaws.com/i =~ host
+      return :facebook if /facebook.com/i =~ host
+      :other
+    end
+
+    def s3_object(uri)
+      # test to see which type of s3 url we have
+      if uri.host == 's3.amazonaws.com'
+        # this version has the bucket at the first part of the path
+        "/#{uri.path.split('/')[2..-1].join('/')}"
+      else
+        # this version has the bucket included in the host
+        uri.path
+      end
+    end
+
+    def fb_uid(uri)
+      uri.path.split('/')[1]
+    end
+  end
+
+  class NoCDNException < Exception; end
+  class NotS3SourceException < Exception; end
+end

data/lib/ir_helper/version.rb

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

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: image-resizer-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Nicol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Helpers for use with image-resizer service
@@ -115,14 +115,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/image_resizer.js.erb
-- app/helpers/image/resizer/rails/ir_helper.rb
-- lib/image/resizer/rails/engine.rb
-- lib/image/resizer/rails/helper.rb
-- lib/image/resizer/rails/version.rb
-- lib/image/resizer/rails.rb
 - LICENSE.txt
 - README.md
+- app/assets/javascripts/image_resizer.js.erb
+- app/helpers/ir_helper/ir_helper.rb
+- lib/ir_helper.rb
+- lib/ir_helper/engine.rb
+- lib/ir_helper/helper.rb
+- lib/ir_helper/version.rb
 homepage: https://github.com/jimmynicol/image-resizer-rails
 licenses:
 - MIT
@@ -133,17 +133,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: View helpers and JS file

data/app/helpers/image/resizer/rails/ir_helper.rb

@@ -1,16 +0,0 @@
-require 'image/resizer/rails/helper'
-
-module Image
-  module Resizer
-    module Rails
-      # Series of view helpers building url strings for image-resizer endpoints
-      module IrHelper
-        def self.included(base)
-          base.class_eval do
-            include ::Image::Resizer::Rails::Helper
-          end
-        end
-      end
-    end
-  end
-end

data/lib/image/resizer/rails.rb

@@ -1,94 +0,0 @@
-require 'image/resizer/rails/version'
-require 'image/resizer/rails/helper'
-require 'image/resizer/rails/engine' if defined?(Rails)
-
-module Image
-  module Resizer
-    # Top-level module for the image-resizer code
-    module Rails
-      class << self
-        attr_accessor :cdn
-        attr_reader :js_class, :js_image_tag, :js_background, :js_url
-
-        def configure(&block)
-          yield self
-        end
-
-        def reset_config
-          @cdn = nil
-          @ir_image_tag = nil
-          @ir_background = nil
-          @ir_url = nil
-          @js_class = 'ImageResizer'
-          @js_image_tag = nil
-          @js_background = nil
-          @js_url = nil
-          @modifiers = default_modifiers
-        end
-
-        def modifiers
-          @modifiers ||= default_modifiers
-        end
-
-        def add_modifier(key, img_tag = '', values = [])
-          @modifiers[key.to_sym] = { alias: img_tag, values: values }
-        end
-
-        def add_source(name, option)
-          @modifiers[:e][:values][name.to_sym] = option.to_sym
-        end
-
-        def js_class
-          @js_class ||= 'ImageResizer'
-        end
-
-        def add_alias(type, name)
-          Helper.class_eval do |base|
-            base.send(:alias_method, name.to_sym, type.to_sym)
-          end
-        end
-
-        def add_js_alias(type, name)
-          instance_variable_set "@#{type.to_s}", name
-        end
-
-        def to_hash
-          {
-            cdn: cdn,
-            ir_image_tag: ir_image_tag,
-            ir_background: ir_background,
-            ir_url: ir_url,
-            js_class: js_class,
-            js_image_tag: js_image_tag,
-            js_background: js_background,
-            js_url: js_url,
-            modifiers: modifiers
-          }
-        end
-
-        private
-
-        def default_modifiers
-          {
-            w: { alias: :width },  h: { alias: :height },
-            s: { alias: :square },
-            c: { alias: :crop, values: %w(fit fill cut scale) },
-            g: { alias: :gravity, values: %w(c n s e w ne nw se sw) },
-            y: { alias: :top }, x: { alias: :left },
-            e: { alias: :external, values: default_sources },
-            f: { alias: :filter }
-          }
-        end
-
-        def default_sources
-          {
-            facebook: :fb_uid,
-            twitter:  :tw_uid,
-            youtube:  :youtube_id,
-            vimeo:    :vimeo_id
-          }
-        end
-      end
-    end
-  end
-end

data/lib/image/resizer/rails/engine.rb

@@ -1,11 +0,0 @@
-module Image
-  module Resizer
-    module Rails
-      class Engine < ::Rails::Engine
-        # initializer 'image-resizer-rails.assets.precompile' do |app|
-        #   app.config.assets.precompile << 'image_resizer'
-        # end
-      end
-    end
-  end
-end

data/lib/image/resizer/rails/helper.rb

@@ -1,153 +0,0 @@
-require 'uri'
-
-module Image
-  module Resizer
-    module Rails
-      # Series of view helpers building url strings for image-resizer endpoints
-      module Helper
-        def ir_image_tag(*args)
-          src = generate_ir_endpoint(args)
-          return nil if src.nil?
-          if respond_to?(:image_tag)
-            image_tag src
-          else
-            "<img src='#{src}' />"
-          end
-        end
-
-        def ir_background(*args)
-          url = generate_ir_endpoint(args)
-          url ? "background-image:url(#{url})" : nil
-        end
-
-        def ir_url(*args)
-          generate_ir_endpoint(args)
-        end
-
-        private
-
-        def parse_arguments(args)
-          if args[0].is_a?(String) || args[0].nil?
-            [args[0], args[1..-1]]
-          else
-            [nil, args]
-          end
-        end
-
-        def cdn
-          ::Image::Resizer::Rails.cdn
-        end
-
-        def self.img_tag_name
-          ::Image::Resizer::Rails.image_tag_name
-        end
-
-        def mods
-          ::Image::Resizer::Rails.modifiers
-        end
-
-        def mod_set(key)
-          mods.each do |k, v|
-            return v if key == k || v[:alias] == key
-          end
-          nil
-        end
-
-        def sources
-          mods[:e][:values]
-        end
-
-        def source_option(key)
-          sources.each do |k, v|
-            return [k, v] if key == v
-          end
-          nil
-        end
-
-        def generate_ir_endpoint(args)
-          fail NoCDNException if cdn.nil?
-
-          source, modifiers = parse_arguments(args)
-          uri = source ? URI(source) : nil
-          modifier_str = mod_str(uri, modifiers)
-          path = build_path(uri, modifiers)
-
-          if path
-            "#{cdn.gsub(/\/$/, '')}#{modifier_str}#{path}"
-          else
-            nil
-          end
-        end
-
-        def mod_str(uri, modifiers)
-          mod_arr = []
-          unless modifiers.nil? || modifiers[0].nil?
-            mod_arr = build_mod_arr(modifiers)
-          end
-          mod_arr << 'efacebook' if uri && url_domain(uri.host) == :facebook
-          mod_arr.compact
-          mod_arr.length > 0 ? "/#{mod_arr.join('-')}" : ''
-        end
-
-        def build_mod_arr(modifiers)
-          modifiers[0].map do |k, v|
-            mset = mod_set(k)
-            src = source_option(k)
-            if mset
-              if mset.include? :values
-                mset[:values].include?(v) ? "#{k}#{v}" : nil
-              else
-                "#{k}#{v}"
-              end
-            elsif src
-              "e#{src.first}"
-            else
-              nil
-            end
-          end
-        end
-
-        def build_path(uri, modifiers)
-          if uri
-            case url_domain(uri.host)
-            when :s3
-              s3_object uri
-            when :facebook
-              "/#{fb_uid(uri)}.jpg"
-            else
-            end
-          else
-            modifiers[0].each do |k, v|
-              return "/#{v}.jpg" if source_option(k)
-            end
-            nil
-          end
-        end
-
-        def url_domain(host)
-          return :s3 if /s3.amazonaws.com/i =~ host
-          return :facebook if /facebook.com/i =~ host
-          :other
-        end
-
-        def s3_object(uri)
-          # test to see which type of s3 url we have
-          if uri.host == 's3.amazonaws.com'
-            # this version has the bucket at the first part of the path
-            "/#{uri.path.split('/')[2..-1].join('/')}"
-          else
-            # this version has the bucket included in the host
-            uri.path
-          end
-        end
-
-        def fb_uid(uri)
-          uri.path.split('/')[1]
-        end
-      end
-
-      class NoCDNException < Exception; end
-      class NotS3SourceException < Exception; end
-    end
-  end
-end

data/lib/image/resizer/rails/version.rb

@@ -1,8 +0,0 @@
-module Image
-  module Resizer
-    # Set the version for the gem
-    module Rails
-      VERSION = '0.1.1'
-    end
-  end
-end