squid 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3dc51ece86164cc4d867267f0c6a3b841203f6b
-  data.tar.gz: 145712670157ccbc63b0a29842e28ffb93bf1eb4
+  metadata.gz: d1956dd08f39f9d482a9d736b3e46e3fe2064003
+  data.tar.gz: aaccf14a1daccbc7ec3d23d635e9424f6154fd44
 SHA512:
-  metadata.gz: 767ad2393bbdd8f510fd34d3d54644d595458fbf2a607a44207bbee362db9ed4f79766230c1e21e815f963d7c67e6df413629b24864e1e322fda90884a830d82
-  data.tar.gz: ae90aabc59b92441042ed2c2da1865a670e6c4d87a62b3fc5184143646c34b1d0003bf940e9ce2e1d63717d3af10fca97771401ee23904edc4420298235f150a
+  metadata.gz: 7d317fa77a3afb5c1bb61f18454d72b8522dba23640eb988919a7455ffb5a46b733ae8b21a270061fa236f0285346f437db1e4220676011aea4551d3b45b23c9
+  data.tar.gz: 9b2c39eee1c4acb1453a6deb4a6ae3a4901531f0cd8108ffab7f856cf6bc3646c50f9edf1c730213bdb579e124255fc3c280bc4cdc9cea82882df59899fbf1a5

data/CHANGELOG.md

@@ -6,6 +6,10 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 1.3.0 - 2016.03.01
+
+* [ENHANCEMENT] When axis values are integer, ensure they are not truncated (see issue #48)
+
 ## 1.2.0 - 2016.01.24
 
 * [ENHANCEMENT] Do not titleize the chart labels (see issue #39)

data/README.md

@@ -43,7 +43,7 @@ How to install
 Squid requires **Ruby 2.1 or higher**.
 If used in a Rails project, requires **Rails 4.0 or higher**.
 
-To include in your project, add `gem 'squid', ~> '1.2'` to the `Gemfile` file of your Ruby project.
+To include in your project, add `gem 'squid', '~> 1.2'` to the `Gemfile` file of your Ruby project.
 
 How to generate the manual
 ==========================

data/examples/squid/two_axis.rb

@@ -3,8 +3,8 @@
 # You can use ..
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  data = {'Earnings' => {2013 => 104_323, 2014 => 27_234, 2015 => 34_123},
-             'Views' => {2013 => 182, 2014 => 46, 2015 => 88},
-           'Uniques' => {2013 => 104, 2014 => 27, 2015 => 14}}
-  chart data, type: :two_axis, height: 150, labels: [true, false, false], formats: [:currency], line_width: 0.5, colors: ['6f3d79', '7d807f']
+  data = {'Earnings' => {'2011' => 52, '2012' => 71, '2013' => 93, '2014' => 74},
+             'Views' => {'2011' => 0, '2012' => 4, '2013' => 3, '2014' => 5},
+           'Uniques' => {'2011' => 1, '2012' => 3, '2013' => 0, '2014' => 1}}
+  chart data, type: :two_axis, height: 150, labels: [true, false, false], formats: [:currency, :integer], line_width: 0.5, colors: ['6f3d79', '7d807f']
 end

data/lib/squid/axis.rb

@@ -46,7 +46,16 @@ module Squid
 
     def max
       if @data.any? && values.last && values.last.any?
-        [values.last.max, @steps].max
+        closest_step_to values.last.max
+      end
+    end
+
+    def closest_step_to(value)
+      if @format == :integer
+        p "VALUE: #{((value - min) / @steps + 1) * @steps + min}"
+        ((value - min) / @steps + 1) * @steps + min
+      else
+        [value, @steps].max
       end
     end
 

data/lib/squid/version.rb

@@ -1,3 +1,3 @@
 module Squid
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/squid.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'prawn-manual_builder', '~> 0.2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.3'
-  spec.add_development_dependency 'coveralls', '~> 0.8.2'
+  spec.add_development_dependency 'coveralls', '~> 0.8.10'
   spec.add_development_dependency 'pry-nav', '~> 0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squid
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - claudiob
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.10
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement