pixelholder 1.2.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f0af092e87d716caf44085c98991119fab6b91
-  data.tar.gz: 922cf6c7119bdfab98afa05307525a9eb8d3c8c7
+  metadata.gz: 420138d75edecfce1cfd55e625ab142ed917b9ef
+  data.tar.gz: 09503b49fd4499af8570f588a8c39344d225218c
 SHA512:
-  metadata.gz: d83655eb5e1b121c025439e0882b0901fbd9f6c9c47b90273955bcd7fe23ab7c4700d70737544da75d17ac5d40316644dcefd4392cbb8e043c74ddf6fcb618d2
-  data.tar.gz: 61c9712b1e8dec37ddf92bf1859cd0c64a93c5c7593a021dd2e120b400817dfc97d952c106c4b1700cc6df5cd2bcdad18fd6800cf85a11ea7e93dc26e1fdd479
+  metadata.gz: eba31db1645f3b19da4d822850ca414ec69f62547e44793156101386fd06d5dce610c7479599e11910fac240a5a97bb07f484607790ec85a49ff908216e304bf
+  data.tar.gz: 2d4fbe873c8c1743cc21d887d3393b51bca01ab98144ae78883b3d61dbcaf79c78917b4fabaa8674c47f09a864c0f03da09b835f4ba7cb11cfc16f6fa794bac4

data/lib/pixelholder.rb

@@ -1,161 +1,8 @@
 # pixelholder.rb
 
-require 'rubygems'
-require 'flickr_fu'
-require 'RMagick'
+require "rubygems"
 
-class PixelHolder
-
-	# Initialize the object
-	def initialize(subject, dimensions, flickr_config_path = nil, extra_options = Hash.new(false))
-		# In case we ever decide to allow extra formats for whatever reason
-		@image_format = extra_options[:image_format] ? extra_options[:image_format] : 'jpg'
-
-		# Set image dimensions values
-		if is_numeric(dimensions)
-			@width = @height = dimensions.to_i
-		else
-			dimensions = dimensions.downcase.split('x')
-			default_dimension = 200
-
-			@width = dimensions[0].to_i
-
-			if dimensions[1].nil? then @height = @width
-			else
-				@height = dimensions[1].to_i
-				if(@height == 0) then @height = default_dimension end
-			end
-		end
-
-		# Create image with background
-		subject = subject.downcase.split(':')
-		background_type = subject[0] if subject.length > 1
-
-		case background_type
-		when 'color'
-			generate_canvas(subject[1])
-		when 'gradient'
-			gradient_colors = subject[1].split(',')
-
-			if gradient_colors[2].nil? || gradient_colors[2] == 'v'
-				end_x = @width
-				end_y = 0
-			else
-				end_x = 0
-				end_y = @height
-			end
-
-			fill_content = Magick::GradientFill.new(0, 0, end_x, end_y, get_hex(gradient_colors[0]), get_hex(gradient_colors[1])) 
-
-			generate_canvas('000', fill_content)
-		else
-			seed = extra_options[:seed] ? extra_options[:seed].to_i : 0
-			
-			flickr_config_path = flickr_config_path ? flickr_config_path : 'config/flickr.yml'
-
-			flickr = Flickr.new(flickr_config_path)
-
-			# Grab all images with Creative Commons licencing
-			photos = flickr.photos.search(:tags => subject[0], :tag_mode => 'all', :license => '4,5,6,7', :media => 'photo')
-			photo = photos[seed]
-
-			generate_canvas()
-
-			unless photo.nil?
-				image_background = Magick::ImageList.new
-				image_url = open(photo.url(:large))
-				image_format = @image_format
-		
-				# Read the Flickr image as a blob
-				image_background.from_blob(image_url.read) do
-					self.format = image_format
-					self.quality = 100
-				end
-
-				# Make the image meet the dimensions
-				image_background.resize_to_fill!(@width, @height)
-				@canvas.composite!(image_background, Magick::CenterGravity, Magick::CopyCompositeOp)
-			end
-		end
-		
-		# Text overlay
-		if extra_options[:text]
-			generate_overlay_text(extra_options[:text], extra_options[:text_color])
-		end
-
-	end
-
-	# Test if a value is numeric
-	def is_numeric(value)
-		true if Integer(value) rescue false
-	end
-
-	# Returns a blob string of the generated image
-	def get_blob
-		@canvas.to_blob
-	end
-
-	# Returns a hex color code
-	def get_hex(color)
-		"##{generate_color(color).downcase}"
-	end
-
-	# Returns the appropriate color code string
-	def generate_color(color)
-	    return color.ljust(6, color)            if (1..2).include?(color.length)
-	    return color.scan(/((.))/).flatten.join if color.length == 3
-	    return color.ljust(6, '0')              if (4..5).include?(color.length)
-	    return color[0..5]                      if color.length > 6
-	    return color
-	end
-
-	# Generates an Imagick canvas
-	def generate_canvas(background = '000', fill_content = nil)
-		background = get_hex(background)
-		image_format = @image_format
-
-		if fill_content.nil?
-			@canvas = Magick::Image.new(@width, @height) do 
-				self.background_color = background
-				self.format = image_format
-			end
-		else
-			@canvas = Magick::Image.new(@width, @height, fill_content) do
-				self.format = image_format
-			end
-		end
-	end
-
-	# Add a text overlay to the image
-	def generate_overlay_text(string, color = false)
-		if string == 'add_dimensions' then string = "#{@width} #{215.chr} #{@height}" end
-	
-		overlay_text = string
-		overlay = Magick::Draw.new
-
-		overlay.fill = color ? get_hex(color) : get_hex('fff')
-		overlay.stroke = "rgba(0,0,0,0.15)"
-		overlay.stroke_width = 20
-		overlay.font_weight = Magick::BoldWeight
-		overlay.pointsize = 500
-		overlay.gravity = Magick::CenterGravity
-		overlay.interline_spacing = -500
-
-		font_size = overlay.get_type_metrics(overlay_text)
-
-		overlay_canvas = Magick::Image.new(font_size.width, font_size.height) do
-			self.background_color = 'transparent'
-		end
-
-		overlay.annotate(overlay_canvas, 0, 0, 0, 0, overlay_text)
-
-		overlay_height = @height * 0.8
-
-		overlay_canvas.resize_to_fit!(@width * 0.8, overlay_height)
-
-		@canvas.composite!(overlay_canvas, Magick::CenterGravity, Magick::OverCompositeOp)
-	end
-
-	private :generate_canvas, :generate_overlay_text
-
-end
+require "pixelholder/base"
+require "pixelholder/fill"
+require "pixelholder/gradient"
+require "pixelholder/flickr"

data/lib/pixelholder/base.rb

@@ -0,0 +1,78 @@
+require "RMagick"
+
+module PixelHolder
+  def self.base
+    Base.new
+  end
+end
+
+class PixelHolder::Base
+
+  attr_reader :canvas, :width, :height, :image_format
+
+  def initialize(options = {})
+      @options = options
+      set_options
+  end
+
+  private
+
+  def set_options
+    @width = @options[:width].to_i || 800
+    @height = @options[:height].to_i || 600
+    @image_format = @options[:image_format] || "jpg"
+  end
+
+  def generate_canvas(fill = nil)
+    background_color = @options[:background_color] || "#ffffff"
+    image_format = @image_format
+
+    unless fill.nil?
+      @canvas = Magick::Image.new(@width, @height, fill) do
+        self.background_color = background_color
+        self.format = image_format
+      end
+    else
+      @canvas = Magick::Image.new(@width, @height) do
+        self.background_color = background_color
+        self.format = image_format
+      end
+    end
+
+    add_text_overlay
+  end
+
+  def add_text_overlay
+    unless @options[:text].nil?
+      if @options[:text] == "show_dimensions"
+        overlay_text = "#{@width} #{215.chr} #{@height}"
+      else
+        overlay_text = @options[:text]
+      end
+
+      overlay = Magick::Draw.new
+
+      overlay.fill = @options[:text_color] || '#ffffff'
+      overlay.stroke = "rgba(0,0,0,0.15)"
+      overlay.stroke_width = 20
+      overlay.font_weight = Magick::BoldWeight
+      overlay.pointsize = 500
+      overlay.gravity = Magick::CenterGravity
+      overlay.interline_spacing = -500
+
+      font_size = overlay.get_type_metrics(overlay_text)
+
+      overlay_canvas = Magick::Image.new(font_size.width, font_size.height) do
+        self.background_color = 'transparent'
+      end
+
+      overlay.annotate(overlay_canvas, 0, 0, 0, 0, overlay_text)
+
+      overlay_height = @height * 0.8
+
+      overlay_canvas.resize_to_fit!(@width * 0.8, overlay_height)
+
+      @canvas.composite!(overlay_canvas, Magick::CenterGravity, Magick::OverCompositeOp)
+    end
+  end
+end

data/lib/pixelholder/fill.rb

@@ -0,0 +1,6 @@
+class PixelHolder::Fill < PixelHolder::Base
+  def initialize(options = {})
+    super
+    generate_canvas
+  end
+end

data/lib/pixelholder/flickr.rb

@@ -0,0 +1,52 @@
+require 'flickraw'
+require 'open-uri'
+
+class PixelHolder::Flickr < PixelHolder::Base
+
+  private
+
+  def set_options
+    super
+    add_photo
+  end
+
+  def add_photo
+    seed = if @options[:seed] then @options[:seed].to_i else 0 end
+
+    FlickRaw.api_key = @options[:flickr_key]
+    FlickRaw.shared_secret = @options[:flickr_secret]
+
+    photos = flickr.photos.search(
+      tags: @options[:flickr_tags],
+      tag_mode: 'all'
+    )
+
+    photo_id = photos[seed].id
+    photo_sizes = flickr.photos.getSizes(photo_id: photo_id)
+
+    # Get the largest image
+    photo_original_url = photo_sizes[-1].source
+
+    unless photo_original_url.nil?
+      image_background = Magick::ImageList.new
+      image_url = open(photo_original_url)
+      image_format = @image_format
+
+      image_background.from_blob(image_url.read) do
+        self.format = image_format
+        self.quality = 100
+      end
+
+      image_background.resize_to_fill!(@width, @height)
+
+      generate_canvas
+
+      @canvas.composite!(image_background, Magick::CenterGravity, Magick::CopyCompositeOp)
+    end
+
+    if @options[:text]
+      add_text_overlay
+    end
+  end
+
+end

data/lib/pixelholder/gradient.rb

@@ -0,0 +1,22 @@
+class PixelHolder::Gradient < PixelHolder::Base
+
+  private
+
+  def set_options
+    super
+    add_gradient
+  end
+
+  def add_gradient
+    direction = @options[:direction] || "vertical"
+    start_color = @options[:start_color] || "#ffffff"
+    end_color = @options[:end_color] || "#0099cc"
+
+    end_x = if direction == "vertical" then @width else 0 end
+    end_y = if direction == "vertical" then 0 else @height end
+
+    fill = Magick::GradientFill.new(0, 0, end_x, end_y, start_color, end_color)
+
+    generate_canvas(fill)
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pixelholder
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Christopher Dingli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: flickr_fu
+  name: flickraw
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +45,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/pixelholder.rb
+- lib/pixelholder/base.rb
+- lib/pixelholder/fill.rb
+- lib/pixelholder/flickr.rb
+- lib/pixelholder/gradient.rb
 homepage: http://github.com/chrisdingli/pixelholder-rubygem
 licenses:
 - MIT