waxy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89aacf98d963b4e37d64245c278dc5c29254827b72b63222fa480d7cd9873ac
-  data.tar.gz: 2624d4371c49a06cd5b47c227e8cd3f9ee1882ccd2115c3c14b11fc27937cea3
+  metadata.gz: fffde1bf9aa66779c5a153d9b952d19b06cade18746cd85a783ffb3c47a471fb
+  data.tar.gz: 8e2013afbcd989b0329131855a70edd4814afe92a2efacf620a1c37456f12faf
 SHA512:
-  metadata.gz: 7a371d450d4f1bd5cabaa56a62435e5dc39261d80ab62f1c7ce479a3ed1d438ad56127f4eed042572180a2466f4e28ae5e7e83ea6474f97f3f4aba31806f4991
-  data.tar.gz: 650b6dfeda31f52b1b34d5fd7c699e4ca0e974b284176d2b0e63268de1a6622600517032a1463e3313413bc0720698ef7b0dcc2610f2eb2248eda3873b1fe965
+  metadata.gz: a22c1c2b3cb2a000c25e72fff44d315f59033eb3167a0b41d753f1e608d8859317e7d9f111d3d43a9f6b3aea5d2f8cdcea0cdfed41774bcc2d76190d96e78d35
+  data.tar.gz: 3427e4abf9315a95cf2cea7f46acdd5389c6ff6b2bf4488f4794e5bf9adddd4ed237b0c58777040ceb600390d71e722a450be63648f14bbfaa61e70dc5f0cde7

data/Gemfile.lock

@@ -2,29 +2,29 @@ PATH
   remote: .
   specs:
     waxy (0.1.0)
-      tilt (~> 2.0.9)
+      tilt (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    awesome_print (1.8.0)
-    byebug (11.0.1)
-    diff-lcs (1.3)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    awesome_print (1.9.2)
+    byebug (11.1.3)
+    diff-lcs (1.5.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    tilt (2.0.9)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    tilt (2.1.0)
 
 PLATFORMS
   ruby
@@ -33,9 +33,9 @@ DEPENDENCIES
   awesome_print
   bundler (~> 2.0)
   byebug (~> 11)
-  rake (~> 12.0)
-  rspec (~> 3.8)
+  rake (~> 13.0)
+  rspec (~> 3.9)
   waxy!
 
 BUNDLED WITH
-   2.0.1
+   2.4.6

data/lib/waxy/geometry/hex.rb

@@ -1,4 +1,4 @@
-module Waxy 
+module Waxy
   module Geometry
     class Hex
 
@@ -7,26 +7,26 @@ module Waxy
       # Vector of 6 x (0.0 - 1.0)
       # Used to scale the pie slices
       #   !! @size is typically set during render through a Waxy::Meta
- 
+
       attr_accessor :size
 
       # All params are Int
       def initialize(_q, _r, _s = nil)
         @q = _q
-        @r = _r 
-        @s = _s 
+        @r = _r
+        @s = _s
       end
 
       # @return [Array]
-     #   initialized here for foreseable geometry calculations, 
+      #   initialized here for foreseable geometry calculations,
       #   but in general this should be handled through a Meta
       def size
-        @size ||= [1.0, 1.0, 1.0, 1.0, 1.0, 1.0] 
-        @size 
+        @size ||= [1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
+        @size
       end
-        
+
       def == (b)
-        q == b.q && r == b.r && s == b.s 
+        q == b.q && r == b.r && s == b.s
       end
 
       def != (b)
@@ -45,7 +45,7 @@ module Waxy
       # @param k [Int]
       def * (k)
         Hex.new(q * k, r * k, (s ? s * k : nil))
-      end 
+      end
 
       def hex_length(hex)
         ((hex.q.abs + hex.r.abs + hex.s.abs) / 2).to_i
@@ -66,28 +66,28 @@ module Waxy
       end
     end
 
-    #TODO(mjy) fix 
+    #TODO(mjy) fix
     def self.point(center, size, i)
       angle_deg = 60.0 * i
       angle_rad = Math::PI / 180 * angle_deg
       Waxy::Geometry::Point.new(
-        ((center.x + size) * Math.cos(angle_rad)), 
+        ((center.x + size) * Math.cos(angle_rad)),
         ((center.y + size ) * Math.sin(angle_rad))
       )
     end
 
     def self.hexagon(center, size)
-      Hexagon.new(   
-                  outer_coords: (1..6).collect{|i| point(center, size, i)} 
-                 ) 
+      Hexagon.new(
+        outer_coords: (1..6).collect{|i| point(center, size, i)}
+      )
     end
 
     def self.triangle(center, size, i)
       points = [[0,0]]
       points.push point(center, size, i)
-      points.push point(center, size, (i + 1 == 7 ? 1 : i + 1)) 
+      points.push point(center, size, (i + 1 == 7 ? 1 : i + 1))
       points
     end
 
-  end 
-end 
+  end
+end

data/lib/waxy/render/svg.rb

@@ -86,7 +86,7 @@ module Waxy
         (0..h).each do |r|
           (0..h).each do |j|
             return str if metadata.size == 0
-            q = j - (r/2).floor
+            q = j - (r / 2).floor
             hex = Waxy::Geometry::Hex.new(q, r)
             str << Waxy::Render::Svg.hex_pie(layout, hex, metadata.pop)
           end
@@ -94,7 +94,6 @@ module Waxy
         str
       end
 
-
       def self.rectangle(layout, metadata, w = 10, h = 10)
         str = ''
 
@@ -112,6 +111,18 @@ module Waxy
         str
       end
 
+      def self.rectangle_coords(w, h)
+        a = []
+        (0..h).each do |r|
+          a[r] ||= []
+          (0..w).each do |j|
+            q = j - (r/2).floor
+            a[r][j] ||= []
+            a[r][j] = [q, r]
+          end
+        end
+        a
+      end
 
       # Interesting capped layout 
       # r = i

data/lib/waxy/version.rb

@@ -1,3 +1,3 @@
 module Waxy
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/waxy.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Matt Yoder"]
   spec.email         = ["diapriid@gmail.com"]
 
-  spec.summary       = %q{Waxy is an experimental tool to generate hexagonal SVG visualizations using Ruby.}
-  spec.description   = %q{Really, that's it.}
+  spec.summary       = %q{Waxy is a tool to generate hexagonal SVG visualizations using Ruby.}
+  spec.description   = %q{Waxy is a Ruby gem that draws SVG hexagon visualizations.}
   spec.homepage      = "https://github.com/SpeciesFileGroup/waxy"
   spec.license       = "NCSA"
 
@@ -32,15 +32,16 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "tilt", "~> 2.0.9"
+  spec.add_dependency "tilt", "~> 2.1"
 
   spec.add_development_dependency "byebug", "~> 11"
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3.8"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waxy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matt Yoder
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -72,29 +72,29 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
-description: Really, that's it.
+        version: '3.9'
+description: Waxy is a Ruby gem that draws SVG hexagon visualizations.
 email:
 - diapriid@gmail.com
 executables: []
@@ -139,7 +139,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/SpeciesFileGroup/waxy
   source_code_uri: https://github.com/SpeciesFileGroup/waxy
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,10 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
-summary: Waxy is an experimental tool to generate hexagonal SVG visualizations using
-  Ruby.
+summary: Waxy is a tool to generate hexagonal SVG visualizations using Ruby.
 test_files: []