caracal 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad435a7228e3d48426661c2fbebd7df0db88628b
-  data.tar.gz: f4016cb90243760f4751fdb7cfa918295bb040c3
+  metadata.gz: 6b30278ea80ad76f441a2ea9f6c593882dd949a3
+  data.tar.gz: ba375c68ca17a0d4a02c1a6bd94014d981c9ad71
 SHA512:
-  metadata.gz: f9f52217eef965b931bfe4d200cddf17149b963f1fb0c56d50f7a0421d30aae9e640ab130d4a9be43dd93748895a517aa50e5d9d4d4b74a4c93a321177af9c2a
-  data.tar.gz: 7653f32b1cb7eafb75acfc44020ac7fe9be7c112db1060b5777a732a4a032c6dabf1a5a9c9ead3e6694cfb3506f487ed8e90181b9e7eeb6f63177deb1c08e8ad
+  metadata.gz: aeeaa43517f427a98e241a16e630a8a7382679322064dea47a044043960a2ed05cc8ffcc9e1a3a53e9d6d94d9584c719e37ea643866aa9c1de5b4ccfb0a36b2b
+  data.tar.gz: 36f3e961946d533924e25a0b3f32470762f16e51d33ef3b679c242a55594e1d112e55125dae26ec0bb1e6432832a39eb3c0743873e578a1171c2e6d121320361

data/lib/caracal/core/models/image_model.rb

@@ -14,6 +14,7 @@ module Caracal
         #-------------------------------------------------------------
         
         # constants
+        const_set(:DEFAULT_IMAGE_PPI,     72)       # pixels per inch
         const_set(:DEFAULT_IMAGE_WIDTH,   0)        # units in pixels. (will cause error)
         const_set(:DEFAULT_IMAGE_HEIGHT,  0)        # units in pixels. (will cause error)
         const_set(:DEFAULT_IMAGE_ALIGN,   :left) 
@@ -25,6 +26,7 @@ module Caracal
         # accessors
         attr_reader :image_url
         attr_reader :image_data
+        attr_reader :image_ppi
         attr_reader :image_width
         attr_reader :image_height
         attr_reader :image_align
@@ -36,6 +38,7 @@ module Caracal
         
         # initialization
         def initialize(options={}, &block)
+          @image_ppi    = DEFAULT_IMAGE_PPI
           @image_width  = DEFAULT_IMAGE_WIDTH
           @image_height = DEFAULT_IMAGE_HEIGHT
           @image_align  = DEFAULT_IMAGE_ALIGN
@@ -54,10 +57,17 @@ module Caracal
         
         #=============== GETTERS ==============================
         
-        [:width, :height, :top, :bottom, :left, :right].each do |m|
+        [:width, :height].each do |m|
           define_method "formatted_#{ m }" do
             value = send("image_#{ m }")
-            pixels_to_emus(value)
+            pixels_to_emus(value, image_ppi)
+          end
+        end
+        
+        [:top, :bottom, :left, :right].each do |m|
+          define_method "formatted_#{ m }" do
+            value = send("image_#{ m }")
+            pixels_to_emus(value, 72)
           end
         end
         
@@ -69,7 +79,7 @@ module Caracal
         #=============== SETTERS ==============================
         
         # integers
-        [:width, :height, :top, :bottom, :left, :right].each do |m|
+        [:ppi, :width, :height, :top, :bottom, :left, :right].each do |m|
           define_method "#{ m }" do |value|
             instance_variable_set("@image_#{ m }", value.to_i)
           end
@@ -93,7 +103,7 @@ module Caracal
         #=============== VALIDATION ==============================
         
         def valid?
-          dims = [:width, :height, :top, :bottom, :left, :right].map { |m| send("image_#{ m }") }
+          dims = [:ppi, :width, :height, :top, :bottom, :left, :right].map { |m| send("image_#{ m }") }
           dims.all? { |d| d > 0 }
         end
         
@@ -108,9 +118,9 @@ module Caracal
           [:url, :width, :height, :align, :top, :bottom, :left, :right]
         end
         
-        def pixels_to_emus(value)
+        def pixels_to_emus(value, ppi)
           pixels        = value.to_i
-          inches        = pixels / 72.0
+          inches        = pixels / ppi.to_f
           emus_per_inch = 914400
         
           emus = (inches * emus_per_inch).to_i 

data/lib/caracal/version.rb

@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/lib/caracal/core/models/image_model_spec.rb

@@ -4,6 +4,7 @@ describe Caracal::Core::Models::ImageModel do
   subject do 
     described_class.new do
       url    'https://www.google.com/images/srpr/logo11w.png'
+      ppi     96
       width   250
       height  200
       align   :right
@@ -24,6 +25,7 @@ describe Caracal::Core::Models::ImageModel do
     
     # constants
     describe 'constants' do
+      it { expect(described_class::DEFAULT_IMAGE_PPI).to eq 72 }
       it { expect(described_class::DEFAULT_IMAGE_WIDTH).to eq 0 }
       it { expect(described_class::DEFAULT_IMAGE_HEIGHT).to eq 0 }
       it { expect(described_class::DEFAULT_IMAGE_ALIGN).to eq :left }
@@ -37,6 +39,7 @@ describe Caracal::Core::Models::ImageModel do
     describe 'accessors' do
       it { expect(subject.image_url).to    eq 'https://www.google.com/images/srpr/logo11w.png' }
       it { expect(subject.image_data).to   eq nil }
+      it { expect(subject.image_ppi).to    eq 96 }
       it { expect(subject.image_width).to  eq 250 }
       it { expect(subject.image_height).to eq 200 }
       it { expect(subject.image_align).to  eq :right }
@@ -57,8 +60,22 @@ describe Caracal::Core::Models::ImageModel do
   
     #=============== GETTERS ==========================
     
-    # emu conversions
-    [:width, :height, :top, :bottom, :left, :right].each do |m|
+    # emu conversions (dimensions)
+    [:width, :height].each do |m|
+      describe ".formatted_#{ m }" do
+        let(:actual) { subject.send("formatted_#{ m }") }
+        
+        before do
+          allow(subject).to receive("image_#{ m }").and_return(540)
+          allow(subject).to receive("image_ppi").and_return(96)
+        end
+        
+        it { expect(actual).to eq 5143500 }
+      end
+    end
+    
+    # emu conversions (margins)
+    [:top, :bottom, :left, :right].each do |m|
       describe ".formatted_#{ m }" do
         let(:actual) { subject.send("formatted_#{ m }") }
         
@@ -68,6 +85,9 @@ describe Caracal::Core::Models::ImageModel do
       end
     end
     
+    # .relationship_target
+    
+    
     
     #=============== SETTERS ==========================
     
@@ -85,6 +105,13 @@ describe Caracal::Core::Models::ImageModel do
       it { expect(subject.image_data).to eq 'PNG Data follows here' }
     end
     
+    # .ppi
+    describe '.ppi' do
+      before { subject.ppi(108) }
+      
+      it { expect(subject.image_ppi).to eq 108 }
+    end
+    
     # .width
     describe '.width' do
       before { subject.width(300) }
@@ -171,7 +198,7 @@ describe Caracal::Core::Models::ImageModel do
     
     # .pixels_to_emus
     describe '.pixels_to_emus' do
-      let(:actual) { subject.send(:pixels_to_emus, value) }
+      let(:actual) { subject.send(:pixels_to_emus, value, 72) }
       
       describe 'when argument is nil' do
         let(:value) { nil }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caracal
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Trade Infomatics
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri