lorem-image-ware 0.0.1 → 0.1.0

data/README.md

@@ -1,4 +1,4 @@
-# Lorem::Image::Ware
+# LoremImageWare
 
 Rack middleware for proxying requests to [lorempixel.com](http://lorempixel.com)
 
@@ -10,7 +10,7 @@ that after a few page loads, images should load much faster.  Without such local
 caching you will be stuck hammering their server on every page load, and waiting a
 few seconds for images to fill in.
 
-It is recommended to only load the middleware in development environtments.
+It is recommended to only load the middleware in development environments.
 
 ## Installation
 
@@ -53,6 +53,10 @@ lorem_image_tag(:height => 400, :width => 200, :tag => "sports", :class => "some
 The helper will add a class of `lorem-image` to tags for you, as well as populate the dimensions
 and set inline height and width styling on the image.
 
+## Todo
+
+Use cache-control and ETag support for browser caching
+
 ## Contributing
 
 1. Fork it

data/lib/lorem-image-ware.rb

@@ -9,10 +9,14 @@ module LoremImageWare
     end
 
     def url(params)
-      tag = params[:tag] || "abstract"
-      url = ["http://lorempixel.com", @grayscale ? "g" : nil, params[:width], params[:height], tag].compact.join("/")
-      url += "/?r=#{rand(20)}"
-      url
+      type = params[:type] || "abstract"
+
+      [
+        "http://lorempixel.com",
+        @grayscale ? "g" : nil,
+        params[:width], params[:height], type,
+        "?r=#{rand(20)}"
+      ].compact.join("/")
     end
   end
 
@@ -21,20 +25,30 @@ module LoremImageWare
       "/lorem"
     end
 
+    def default_lorem_image_height
+      200
+    end
+
+    def default_lorem_image_width
+      400
+    end
+
     def lorem_image_path(options = {})
-      height = options.fetch(:height, 200)
-      width  = options.fetch(:width, 400)
-      tag    = options.fetch(:tag, "abstract")
+      height = options.fetch(:height, default_lorem_image_height)
+      width  = options.fetch(:width, default_lorem_image_width)
+      type   = options.fetch(:type, "abstract")
 
-      "#{lorem_image_root}/image/#{width}/#{height}/#{tag}?r=#{rand(99)}"
+      "#{lorem_image_root}/image/#{width}/#{height}/#{type}?r=#{rand(99)}"
     end
 
     def lorem_image_tag(options = {})
-      height     = options.fetch(:height, 200)
-      width      = options.fetch(:width, 400)
+      height     = options.fetch(:height, default_lorem_image_height)
+      width      = options.fetch(:width, default_lorem_image_width)
       html_class = [options[:class], "lorem-image"].compact.join(" ")
 
-      %Q{<img src="#{lorem_image_path(options)}" class="#{html_class}" width="#{width}" height="#{height}" style="height: #{height}px; width: #{width}px;" />}
+      html = %Q{<img src="#{lorem_image_path(options)}"}
+      html += %Q{ class="#{html_class}" width="#{width}" height="#{height}"}
+      html += %Q{ style="height: #{height}px; width: #{width}px;" />}
     end
   end
 
@@ -51,8 +65,8 @@ module LoremImageWare
     def _call(env)
       request = Rack::Request.new(env)
 
-      if request.fullpath =~ %r{^#{root}/image/(\d+)/(\d+)/?(/(\S+))?}i
-        url = provider.url(width: $1, height: $2, tag: $4)
+      if request.fullpath =~ %r{^#{root}/image/(\d+)/(\d+)/?(/?([a-z]+))?}i
+        url = provider.url(width: $1, height: $2, type: $4)
         serve_image(url)
       else
         @app.call(env)

data/lib/lorem-image-ware/version.rb

@@ -1,3 +1,3 @@
 module LoremImageWare
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/test/helpers_test.rb

@@ -13,12 +13,12 @@ class TestHelpers < MiniTest::Unit::TestCase
   end
 
   def test_image_path
-    path = lorem_image_path(:height => 50, :width => 100, :tag => "sports")
+    path = lorem_image_path(:height => 50, :width => 100, :type => "sports")
     assert_match %r{^/lorem/image/100/50/sports\?r=\d+$}, path
   end
 
   def test_image_tag
-    image_tag = lorem_image_tag(:height => 50, :width => 100, :tag => "sports", :class => "klass")
+    image_tag = lorem_image_tag(:height => 50, :width => 100, :type => "sports", :class => "klass")
     assert_match %r{<img src="/lorem/image/100/50/sports\?r=\d+" class="klass lorem-image" width="100" height="50" style="height: 50px; width: 100px;" />}, image_tag
   end
 end

data/test/middleware_test.rb

@@ -1,11 +1,9 @@
 require_relative "./test_helper"
 require "ostruct"
 
-class TestCase < MiniTest::Unit::TestCase
+class TestMiddleware < MiniTest::Unit::TestCase
   include Rack::Test::Methods
-end
 
-class TestPassThru < TestCase
   def app
     Rack::Builder.new do
       use LoremImageWare::Middleware
@@ -22,19 +20,6 @@ class TestPassThru < TestCase
     get "/hello"
     assert_equal "path = /hello", last_response.body
   end
-end
-
-class TestSimpleLorem < TestCase
-  def setup
-    @provider = MiniTest::Mock.new
-  end
-
-  def app
-    Rack::Builder.new do
-      use LoremImageWare::Middleware
-      run lambda { |env| [200, { 'Content-Type' => "text/plain" }, ["path = #{env['PATH_INFO']}"]] }
-    end
-  end
 
   def test_width_and_height
     get "/lorem/image/400/200"
@@ -44,7 +29,7 @@ class TestSimpleLorem < TestCase
     assert last_response.headers["Content-Length"].to_i > 0
   end
 
-  def test_tag_param
+  def test_type_param
     get "/lorem/image/400/200/sports"
     assert_equal 200, last_response.status
     assert_equal "image/jpeg", last_response.headers["Content-Type"]

data/test/providers_test.rb

@@ -7,9 +7,9 @@ class TestLoremPixelProvider < MiniTest::Unit::TestCase
     assert_match %r{http://lorempixel.com/400/200/abstract/\?r=\d+$}, url
   end
 
-  def test_optional_tag
+  def test_optional_type
     provider = LoremImageWare::LoremPixelProvider.new
-    url = provider.url(width: 200, height: 100, tag: "sports")
+    url = provider.url(width: 200, height: 100, type: "sports")
     assert_match %r{http://lorempixel.com/200/100/sports/\?r=\d+$}, url
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lorem-image-ware
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2156488720 !ruby/object:Gem::Requirement
+  requirement: &2165773000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156488720
+  version_requirements: *2165773000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156488300 !ruby/object:Gem::Requirement
+  requirement: &2165772580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156488300
+  version_requirements: *2165772580
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2156487880 !ruby/object:Gem::Requirement
+  requirement: &2165772160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156487880
+  version_requirements: *2165772160
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156487460 !ruby/object:Gem::Requirement
+  requirement: &2165788120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156487460
+  version_requirements: *2165788120
 description: rack middleware for proxying requests to lorempixel.com
 email:
 - xternal1+github@gmail.com
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1682226714333622018
+      hash: 393796808403588033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1682226714333622018
+      hash: 393796808403588033
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15