pixelholder 1.2.1 → 1.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/pixelholder.rb +20 -10
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e866d7e6ec967b2d10e2d66c271fb30f71346da1
4
- data.tar.gz: d400e93d8bf8b6fc553b4a76ce321d2bb6474e38
3
+ metadata.gz: 19c785db2eb5d07cbba2c23ceb90debcce653c10
4
+ data.tar.gz: d1a880887aebb8e6dd2de927d7948ef42957a774
5
5
  SHA512:
6
- metadata.gz: 535eb88b79e16b6d06f98a7523074d7c506160a75ace54dd242a7e58e5e1ed25ca2854433805bb55779659dab7e1048b4e2e40e8a642549eb86c27a719e21803
7
- data.tar.gz: a407826f1e62bb4c138ae65988ab9e88dcb2cb90a032fcd62a2deb04ba8218457b2b8845d2e7a02b916e6749c832fa70b8197483204ca3a7b632428991ea28db
6
+ metadata.gz: 5142d0034b87c68152317cadd4a962897dfd3ddab78635955478219e3e28a614f40fdc166f695ebba246981bd9e149ace3e738cbe8613f987a0787a5e9671c38
7
+ data.tar.gz: b44fa3f2c5860a738adad0721b968b69667a993aa380000de3a1fdad488b39853064c9aaec7439ddc5eb7786600bd12ba2fd621a80ae15fdc7e9afc13d92561e
data/lib/pixelholder.rb CHANGED
@@ -1,27 +1,30 @@
1
1
  # pixelholder.rb
2
2
 
3
3
  require 'rubygems'
4
- require 'bundler'
5
4
  require 'flickr_fu'
6
5
  require 'RMagick'
7
6
 
8
7
  class PixelHolder
9
8
 
10
9
  # Initialize the object
11
- def initialize(subject, dimensions, extra_options)
10
+ def initialize(subject, dimensions, extra_options, flickr_config_path = nil)
12
11
  # In case we ever decide to allow extra formats for whatever reason
13
12
  @image_format = extra_options[:image_format] ? extra_options[:image_format] : 'jpg'
14
13
 
15
14
  # Set image dimensions values
16
- dimensions = dimensions.downcase.split('x')
17
- default_dimension = 200
15
+ if is_numeric(dimensions)
16
+ @width = @height = dimensions.to_i
17
+ else
18
+ dimensions = dimensions.downcase.split('x')
19
+ default_dimension = 200
18
20
 
19
- @width = dimensions[0].to_i
21
+ @width = dimensions[0].to_i
20
22
 
21
- if dimensions[1].nil? then @height = @width
22
- else
23
- @height = dimensions[1].to_i
24
- if(@height == 0) then @height = default_dimension end
23
+ if dimensions[1].nil? then @height = @width
24
+ else
25
+ @height = dimensions[1].to_i
26
+ if(@height == 0) then @height = default_dimension end
27
+ end
25
28
  end
26
29
 
27
30
  # Create image with background
@@ -48,7 +51,9 @@ class PixelHolder
48
51
  else
49
52
  seed = extra_options[:seed] ? extra_options[:seed].to_i : 0
50
53
 
51
- flickr = Flickr.new('config/flickr.yml')
54
+ flickr_config_path = flickr_config_path ? flickr_config_path : 'config/flickr.yml'
55
+
56
+ flickr = Flickr.new(flickr_config_path)
52
57
 
53
58
  # Grab all images with Creative Commons licencing
54
59
  photos = flickr.photos.search(:tags => subject[0], :tag_mode => 'all', :license => '4,5,6,7', :media => 'photo')
@@ -80,6 +85,11 @@ class PixelHolder
80
85
 
81
86
  end
82
87
 
88
+ # Test if a value is numeric
89
+ def is_numeric(value)
90
+ true if Integer(value) rescue false
91
+ end
92
+
83
93
  # Returns a blob string of the generated image
84
94
  def get_blob
85
95
  @canvas.to_blob
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pixelholder
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christopher Dingli