avatar_magick 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0116fa0760d83021b28806d0396bcf1a21d14092
-  data.tar.gz: bba762c915327a2e835e3ae3c4846dbf5810d9a7
+  metadata.gz: f90e37995f8bb3c9bccff8b9271a9f403ac676c1
+  data.tar.gz: c518b0c1f572f3cddc4e3bc3379042b69838783d
 SHA512:
-  metadata.gz: de284e1d3468560cecf4183309b8db9b70c524c5d576c6822a36439f0390d6c6547cbf2b21627c145e44ea9980109b5fde653113a2a4e637de12e11e16dafcff
-  data.tar.gz: 76b249f04b4627d6746d98934fa5f772a793b06730ce94989ed9a42b86f03603216e5372db703ff6896833bbb53fa702bf8898a0abfc899dcdd319dcf76d271e
+  metadata.gz: ad6fdc37b0d0cc4934bfc0cedf9d5d22a4de2a3584b201f49d0fab25d01b1e766ce962f54cfdc96fa001be2be470bfc73b35ce9bdb2cd957774153d9b1a88894
+  data.tar.gz: 99e0f96b06f80425cefabf3fdce8c934fbdb2babb8ebb4de640cc1e9ae83520b38c6d080e5fbb1ec25f7aba8af92fa8cc2bbd2e91fbbdee02a4d436080e38de7

data/README.md

@@ -28,10 +28,15 @@ Once installed, you'll need to register the AvatarMagick plugin along with the [
 
 #### Rails
 
-If you're using Dragonfly within your Rails application, you'll already have a `config/initializers/dragonfly.rb` file where your Dragonfly configuration settings are stored. Edit the file and add the following directly below the `plugin :imagemagick` line
+If you're using Dragonfly within your Rails application, you'll already have a `config/initializers/dragonfly.rb` file where your Dragonfly configuration settings are stored. Edit the file and add the plugin within the `configure` block
 
 ```ruby
-plugin :avatarmagick
+Dragonfly.app.configure do
+	plugin :imagemagick
+	plugin :avatarmagick
+	
+	# rest of settings...
+end
 ```
 
 #### Sinatra/Rack/Other
@@ -47,6 +52,39 @@ Dragonfly.app.configure do
 end
 ```
 
+## Configuration
+
+You can configure defaults for text color, background color, size, and font. If not specified, AvatarMagick will use the following defaults
+
+```
+color: FFFFFF
+background_color: 000000
+size: '120x120'
+font: 'Arial-Regular'
+```
+
+To overwrite, simply provide new values for any of the above within Dragonfly's `configure` block. For example, if you wanted the default background to be red (FF0000) instead of black (000000) and the default size to be 200px by 200px
+
+```ruby
+Dragonfly.app.configure do
+	plugin :imagemagick
+	plugin :avatarmagick, background_color: 'FF0000', size: '200x200'
+end
+```
+
+Or, if you wanted to change the default font
+
+```ruby
+Dragonfly.app.configure do
+	plugin :imagemagick
+	plugin :avatarmagick, font: 'OpenSans'
+end
+```
+
+##### Choosing Fonts
+
+To see what fonts are available, open up the terminal and type `convert -list font`. You can select any font listed when configuring or when calling `generate`.
+
 ## Usage
 
 Once the plugin is installed and registered, you can use it like any of the other built-in generators (text, plain, etc.)
@@ -110,6 +148,10 @@ After checking out the repo, run `bash bin/setup` to install dependencies. Then,
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
+## Roadmap
+
+1. Add support for older versions (0.9.x) of Dragonfly
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/avatar_magick/fork )

data/avatar_magick.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{A Dragonfly Plugin for generating on-the-fly Gmail style avatars}
   spec.homepage      = "https://github.com/bjedrocha/avatar_magick"
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

data/lib/avatar_magick.rb

@@ -2,7 +2,9 @@ require "dragonfly"
 require "avatar_magick/version"
 require "avatar_magick/plugin"
 
-# registers AvatarMagick as a plugin using both notations to remain consistent
-# with the ImageMagick plugin
+# Register plugins so we can do e.g.
+# Dragonfly.app.configure do
+#   plugin :avatarmagick
+# end
 Dragonfly::App.register_plugin(:avatar_magick) { AvatarMagick::Plugin.new }
 Dragonfly::App.register_plugin(:avatarmagick) { AvatarMagick::Plugin.new }

data/lib/avatar_magick/generators/initial_avatar.rb

@@ -12,11 +12,11 @@ module AvatarMagick
         args = []
 
         # defaults
-        format      = opts[:format] || :png
-        background  = opts[:background_color] ? "##{opts[:background_color]}" : '#000000'
-        color       = opts[:color] ? "##{opts[:color]}" : '#FFFFFF'
-        size        = opts[:size] || '120x120'
-        font        = opts[:font] || 'Arial-Regular'
+        format      = opts[:format] || 'png'
+        background  = opts[:background_color] ? "##{opts[:background_color]}" : content.env[:avatar_magick][:background_color]
+        color       = opts[:color] ? "##{opts[:color]}" : content.env[:avatar_magick][:color]
+        size        = opts[:size] || content.env[:avatar_magick][:size]
+        font        = opts[:font] || content.env[:avatar_magick][:font]
 
         # extract the first letter of the first 3 words and capitalize
         text = (string.split(/\s/)- ["", nil]).map { |t| t[0].upcase }.slice(0, 3).join('')
@@ -45,7 +45,7 @@ module AvatarMagick
 
         content.generate!(:convert, args.join(' '), format)
 
-        content.add_meta('format' => format, 'name' => "text.#{format}")
+        content.add_meta('format' => format, 'name' => "avatar.#{format}")
       end
     end
   end

data/lib/avatar_magick/plugin.rb

@@ -5,6 +5,14 @@ module AvatarMagick
   # Registers the initial_avatar generator
   class Plugin
     def call(app, opts={})
+
+      # set global configuration options
+      app.env[:avatar_magick] = {}
+      app.env[:avatar_magick][:color]             = opts[:color] ? "##{opts[:color]}" : "#FFFFFF"
+      app.env[:avatar_magick][:background_color]  = opts[:background_color] ? "##{opts[:background_color]}" : "#000000"
+      app.env[:avatar_magick][:size]              = opts[:size] || "120x120"
+      app.env[:avatar_magick][:font]              = opts[:font] || "Arial-Regular"
+
       app.add_generator :initial_avatar, AvatarMagick::Generators::InitialAvatar.new
     end
   end

data/lib/avatar_magick/version.rb

@@ -1,3 +1,3 @@
 module AvatarMagick
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avatar_magick
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Bart Jedrocha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,8 @@ files:
 - lib/avatar_magick/plugin.rb
 - lib/avatar_magick/version.rb
 homepage: https://github.com/bjedrocha/avatar_magick
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []