cahdmaker 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f67fef384dee6694cf49ea9398844fba5447fa
-  data.tar.gz: b62963cadf21282d2dfc170b732e286d64afc233
+  metadata.gz: c903bd8df0db8f3a4587d0111abb6b43dc5b625f
+  data.tar.gz: 7e2c23c86faf29b4149f97513041deb4af723ad9
 SHA512:
-  metadata.gz: de4d4fc30d9541b1221b278921b1808d97f7b57e2e29a47555032356d527fad742744f7373680f51eece8bf00bf52e797a8380ba511aa0153934cc17a51e56ab
-  data.tar.gz: be5e8ff5be76ff21c05bea465727a93b8cbb854f5f1b94e6ebc48d22d84d9edebb362155d112a27262cc71443031c0fa18efcc3dd7d50e72894d253b0a93654f
+  metadata.gz: bcb72bf5ab7ce2dbeb7c27dd999de19d3595634cc5ea033e9ab9d72bfb57f8e49b11ef61a38321a52c855016792f7e373c5549dddea76e13f80939a8d6363622
+  data.tar.gz: 6f21f322242f360739005f7422db9df3e4540c1f4899dee76f83936558666529266f416457a101e17cbb7fb5ac1758282048473baa51529711099df2086ff037

data/lib/cahdmaker.rb

@@ -7,11 +7,11 @@ module Cahdmaker
     attr_reader :opts
     
     def initialize(opts={})
-      @opts = { text_size: 60, blank_size: 10, font: 'Helvetica-Bold' }.merge(opts)
+      @opts = { text_size: 60, blank_size: 10, bleed: 0, resolution: 300, font: 'Helvetica-Bold' }.merge(opts)
     end
     
     def black(text, pick=1, &block)
-      make_card(text, "Black#{pick}", &block)
+      make_card(text, "black#{pick}".to_sym, &block)
     end
     
     def black2(text, &block)
@@ -23,27 +23,71 @@ module Cahdmaker
     end
     
     def white(text, &block)
-      make_card(text, "White", &block)
+      make_card(text, :white, &block)
+    end
+    
+    def px(ins, bleed=nil)
+      bleed ||= opts[:bleed]/2
+      (ins * opts[:resolution]) + bleed
+    end
+    
+    def logo(black_card)
+      logo = Magick::Draw.new
+      logo.stroke_color('black')
+      logo.stroke_opacity(0.8)
+      logo.stroke_linecap('round')
+      logo.stroke_linejoin('round')
+      logo.stroke_width((0.75/72)*opts[:resolution])
+      
+      fan_x = px(0.03,0)
+      fan_y = px(0.01,0)
+      
+      logo.translate(px(0.40),px(3.20))
+      
+      logo.translate(-fan_x,fan_y)
+      logo.rotate(-15)
+      logo.fill(black_card ? 'grey49' : 'black')
+      logo.rectangle(px(-0.075,0), px(-0.150,0), px(0.075,0), 0)
+      
+      logo.rotate(15)
+      logo.translate(fan_x,-fan_y)
+      logo.fill(black_card ? 'grey69' : 'grey49')
+      logo.rectangle(px(-0.075,0), px(-0.150,0), px(0.075,0), 0)
+
+      logo.translate(fan_x,fan_y)
+      logo.rotate(15)
+      logo.fill('white')
+      logo.rectangle(px(-0.075,0), px(-0.150,0), px(0.075,0), 0)
     end
     
     def make_card(text, source_card)
+      bleed = opts[:bleed].to_i
+      resolution = opts[:resolution].to_i
       text_size = opts[:text_size].to_i
-      color = source_card =~ /White/i ? 'black' : 'white'
+      black_card = source_card == :white ? false : true
+      background_color = black_card ? 'black' : 'white'
+      color = black_card ? 'white' : 'black'
       font = opts[:font]
       text.gsub! /\b_+\b/, ('_' * opts[:blank_size])
-
+      card_width = px(2.0, bleed);
+      multiplier = resolution / 300
+      
       cap = Magick::Image.read(%{caption:#{text}}) do
-        self.size = '600x'
+        self.size = "#{card_width}x"
         self.background_color = 'transparent'
-        self.pointsize = text_size.to_f
-        self['interline-spacing'] = (text_size/3).to_f
+        self.pointsize = text_size.to_f * multiplier
+        self['interline-spacing'] = (text_size/3).to_f * multiplier
         self.font = font
         self.fill = color
       end.first
+      cap.x_resolution = cap.y_resolution = resolution
 
-      img = Magick::Image.read(File.expand_path("../../cards/CAH_#{source_card}.png",__FILE__)).first
-      img.x_resolution = img.y_resolution = 300
-      img.composite!(cap, 75, 75, Magick::OverCompositeOp)
+      img = Magick::Image.new(px(2.5,bleed),px(3.5,bleed)) do
+        self.background_color = background_color
+      end
+      img.x_resolution = img.y_resolution = resolution
+      logo(black_card).draw(img)
+      img.composite!(cap, px(0.25), px(0.25), Magick::OverCompositeOp)
       if block_given?
         yield(img)
       else

data/lib/cahdmaker/version.rb

@@ -1,3 +1,3 @@
 module Cahdmaker
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cahdmaker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -67,10 +67,6 @@ files:
 - Rakefile
 - bin/cahdmaker
 - cahdmaker.gemspec
-- cards/CAH_Black1.png
-- cards/CAH_Black2.png
-- cards/CAH_Black3.png
-- cards/CAH_White.png
 - lib/cahdmaker.rb
 - lib/cahdmaker/version.rb
 homepage: ''