esp-commons 0.1.5 → 0.1.6

data/app/models/esp_commons/image.rb

@@ -3,6 +3,7 @@ class EspCommons::Image < APISmith::Smash
   property :description
   property :thumbnail
 
+  property :vfs_url
   property :id,         :transformer => :to_i
   property :width,      :transformer => :to_i
   property :height,     :transformer => :to_i
@@ -13,15 +14,17 @@ class EspCommons::Image < APISmith::Smash
 
   def parse_url
     self.tap do | image |
-      matches = url.match(%r{files/(\d+)/(\d+)-(\d+)/(.*)})
-
-      image.id, image.width, image.height, image.filename = matches[1..-1] if matches
+      image.vfs_url, image.id, image.width, image.height, image.filename = url.match(%r{(.*)/files/(\d+)/(?:(\d+)-(\d+)/)?(.*)})[1..-1]
     end
   end
 
   def build_url
     self.tap do | image |
-      image.url = "#{Settings['vfs.url']}/files/#{image.id}/#{image.width}-#{image.height}/#{image.filename}"
+      if image?
+        image.url = "#{vfs_url}/files/#{image.id}/#{image.width}-#{image.height}/#{image.filename}"
+      else
+        image.url = "#{vfs_url}/files/#{image.id}/#{image.filename}"
+      end
     end
   end
 
@@ -68,7 +71,7 @@ class EspCommons::Image < APISmith::Smash
 
   def create_thumbnail(options)
     return unless image?
-    self.thumbnail = EspCommons::Image.new(options.merge(:id => id, :filename => filename, :description => description))
+    self.thumbnail = EspCommons::Image.new(options.merge(:vfs_url => vfs_url,  :id => id, :filename => filename, :description => description))
                                       .resize(aspect_ratio)
                                       .build_url
   end

data/lib/esp-commons/engine.rb

@@ -56,13 +56,19 @@ module EspCommons
 
     config.to_prepare do
       ActionController::Base.class_eval do
-        helper_method :image_tag_for
+        helper_method :image_tag_for, :thumbnail_tag
 
         protected
 
           def image_tag_for(image)
             view_context.image_tag(image.url, :width => image.width, :height => image.height, :alt => image.description) if image
           end
+
+          def thumbnail_tag(url, options={})
+            if url.is_a?(String)
+              image_tag_for EspCommons::Image.new(:url => url).parse_url.create_thumbnail(options)
+            end
+          end
       end
     end
   end

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
-  requirement: &10557360 !ruby/object:Gem::Requirement
+  requirement: &20883040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10557360
+  version_requirements: *20883040
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &10555820 !ruby/object:Gem::Requirement
+  requirement: &20880880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10555820
+  version_requirements: *20880880
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10554120 !ruby/object:Gem::Requirement
+  requirement: &20880000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10554120
+  version_requirements: *20880000
 - !ruby/object:Gem::Dependency
   name: api_smith
-  requirement: &10553080 !ruby/object:Gem::Requirement
+  requirement: &20878320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10553080
+  version_requirements: *20878320
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &10567720 !ruby/object:Gem::Requirement
+  requirement: &20892220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10567720
+  version_requirements: *20892220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &10565220 !ruby/object:Gem::Requirement
+  requirement: &20890760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10565220
+  version_requirements: *20890760
 description: Description of EspCommons.
 email:
 - mail@openteam.ru
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2750220947735390141
+      hash: -3363018066665106858
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2750220947735390141
+      hash: -3363018066665106858
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16