letter_avatar 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3b849f44e2670439f8e2376988f5335c83b707a
-  data.tar.gz: bc4738796c5f67cadce646504e6813d92a73153f
+  metadata.gz: a23085c33db8856b2c47db111f78212c2026b24a
+  data.tar.gz: 5dc1880d4338652bc95b9c660a7b21eef98e22f0
 SHA512:
-  metadata.gz: 094ef5142742c6682c3c88f106b6ee7714e31a665c1836bd7a7df62d9a954a4f9ab368f4c9947ba6d4dfb45242f65baed1fadf381bdfc51484c80398c5644708
-  data.tar.gz: de3823851c9412247abb68a7249a961ff0d2d8afa09b264acc6fa92c11e2bb79dc181f9c479d37bc7307cbd2f1b2cdf681fea58f7d9949c429134850d12231bb
+  metadata.gz: da069e4393094434e4d5a899e56547bb2384f297b643df2ad7c244406986806c8f263d549206f67460cd010b8939552775f6baa360de084c158701343366728b
+  data.tar.gz: c40982c022892c56b00bbc8c93c8f6e83eeb4529a6607c72c2e8e4b8b0d5fd7c89bdbf643ff10d2dd6c4da4ed4bc641e6d598e4758efd0925dbcb47b89a32c57

data/CHANGELOG.md

@@ -1,5 +1,20 @@
+0.1.10
+-----
+
+- `LetterAvatar::AvatarHelper` module tweaks
+  - `letter_avatar_url` method, returning avatar proper url
+  - `letter_avatar_tag` doeas not require `ActionView::Helpers::AssetTagHelper`
+
+0.1.9
+-----
+
+- `LetterAvatar::Configuration` module, `mattr_accessor` (depending on `ActiveSupport`) removed
+
+  fixes [#7](https://github.com/ksz2k/letter_avatar/issues/7)
+
 0.1.5
 -----
 
 - Use [posix-spawn](https://github.com/rtomayko/posix-spawn) to instead of Kernel#exec to get better performance.
+
   > fork(2) calls slow down as the parent process uses more memory due to the need to copy page tables.

data/README.md

@@ -1,8 +1,8 @@
 # LetterAvatar
 
-Gem for creating letter avatar from user's name.
+Gem for creating letter avatar from user's name (or any other strong / character).
 
-Code extracted from discourse source (thanks guys!) - I needed this functionality in three projects, so here's the gem! :-)
+Code extracted from [discourse](https://www.discourse.org/) source (thanks guys!) - I needed this functionality in three projects, so here's the gem! :-)
 
 [![Code Climate](https://codeclimate.com/github/ksz2k/letter_avatar/badges/gpa.svg)](https://codeclimate.com/github/ksz2k/letter_avatar)
 
@@ -82,8 +82,13 @@ There's also helper for this. To use it, you need:
 
   ```ruby
   letter_avatar_for('ksz2k', 200)
+  => "public/system/letter_avatars/2/K/87_178_230/200.png"
+  # or
+  letter_avatar_url('ksz2k', 200)
+  => "/system/letter_avatars/2/K/87_178_230/200.png"
   # or even
   letter_avatar_tag('ksz2k', 200, class: 'av')
+  => "<img class=\"av\" alt=\"ksz2k\" src=\"/system/letter_avatars/2/K/87_178_230/200.png\" />"
   ```
 
 ### Way to support non [a-z0-9] charsets

data/lib/letter_avatar/avatar.rb

@@ -64,31 +64,22 @@ module LetterAvatar
       end
 
       def generate_fullsize(identity)
-        color = identity.color
-        letter = identity.letter
-
-
         filename = fullsize_path(identity)
 
-        command = %W(
-          convert
-          -size #{FULLSIZE}x#{FULLSIZE}
-          xc:#{to_rgb(color)}
-          -pointsize 140
-          -font #{FONT_FILENAME}
-          -weight #{LetterAvatar.weight}
-          -fill '#{FILL_COLOR}'
-          -gravity Center
-          -annotate #{LetterAvatar.annotate_position} '#{letter}'
-          '#{filename}'
-        ).join(' ')
-
-        pid, stdin, stdout, stderr = POSIX::Spawn.popen4(command)
-        Process.waitpid(pid)
-        err = stderr.read
-        if err != nil && err.length > 0
-          raise "letter_avatar error: #{err.strip}"
-        end
+        LetterAvatar.execute(
+          %W(
+            convert
+            -size #{FULLSIZE}x#{FULLSIZE}
+            xc:#{to_rgb(identity.color)}
+            -pointsize 140
+            -font #{FONT_FILENAME}
+            -weight #{LetterAvatar.weight}
+            -fill '#{FILL_COLOR}'
+            -gravity Center
+            -annotate #{LetterAvatar.annotate_position} '#{identity.letter}'
+            '#{filename}'
+          ).join(' ')
+        )
 
         filename
       end

data/lib/letter_avatar/avatar_helper.rb

@@ -10,8 +10,17 @@ module LetterAvatar
       avatar_path.to_s.sub('public/','/')
     end
 
+    def letter_avatar_url(name, size = 64)
+      letter_avatar_url_for(letter_avatar_for(name, size))
+    end
+
     def letter_avatar_tag(name, size = 64, options = {})
-      image_tag(letter_avatar_url_for(letter_avatar_for(name, size)), options)
+      if defined?(ActionView::Helpers::AssetTagHelper)
+        include ActionView::Helpers::AssetTagHelper
+        image_tag(letter_avatar_url(name, size), options.merge(alt: name))
+      else
+        "<img alt=\"#{name}\" class\"#{options.fetch(:class)}\" src=\"#{letter_avatar_url(name, size)}\" />"
+      end
     end
 
   end

data/lib/letter_avatar/colors.rb

@@ -4,7 +4,7 @@ module LetterAvatar
     PALETTES = [:google, :iwanthue]
 
     def self.for(username)
-      public_send("with_#{LetterAvatar.colors_palette}", username) rescue with_google(username)
+      public_send("with_#{LetterAvatar.colors_palette}", username)
     end
 
     def self.with_iwanthue(username)

data/lib/letter_avatar/version.rb

@@ -1,3 +1,3 @@
 module LetterAvatar
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/lib/letter_avatar.rb

@@ -6,29 +6,31 @@ require "letter_avatar/avatar_helper"
 module LetterAvatar
   extend LetterAvatar::Configuration
 
+  class ExecutionError < StandardError; end
+
   def self.setup(&block)
     yield(self)
   end
 
   def self.resize(from, to, width, height)
-    # NOTE: ORDER is important!
-    instructions = %W{
-      #{from}
-      -background transparent
-      -gravity center
-      -thumbnail #{width}x#{height}^
-      -extent #{width}x#{height}
-      -interpolate bicubic
-      -unsharp 2x0.5+0.7+0
-      -quality 98
-      #{to}
-    }.join(" ")
-
-    `convert #{instructions}`
-
-    if $?.exitstatus == 0
+    begin
+      execute(
+        # NOTE: ORDER is important!
+        %W{
+          convert
+          #{from}
+          -background transparent
+          -gravity center
+          -thumbnail #{width}x#{height}^
+          -extent #{width}x#{height}
+          -interpolate bicubic
+          -unsharp 2x0.5+0.7+0
+          -quality 98
+          #{to}
+        }.join(" ")
+      )
       true
-    else
+    rescue => e
       false
     end
   end
@@ -37,4 +39,16 @@ module LetterAvatar
     Avatar.generate(username, size)
   end
 
+  def self.execute(cmd)
+    cmd = cmd.join(' ') if cmd.is_a?(Array)
+    pid, stdin, stdout, stderr = POSIX::Spawn.popen4(cmd)
+    Process.waitpid(pid)
+    err = stderr.read
+    if err != nil && err.length > 0
+      raise ExecutionError.new("letter_avatar execution error (when calling '#{cmd}'): '#{err.strip}'")
+    else
+      true
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letter_avatar
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - discourse developers