pixelholder 1.2.1 → 1.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/pixelholder.rb +20 -10
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 19c785db2eb5d07cbba2c23ceb90debcce653c10
|
|
4
|
+
data.tar.gz: d1a880887aebb8e6dd2de927d7948ef42957a774
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
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
|
-
|
|
17
|
-
|
|
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
|
-
|
|
21
|
+
@width = dimensions[0].to_i
|
|
20
22
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
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
|
-
|
|
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
|