fretboards 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f38b4dde148fa6891ffe83e6013de5f53a405a5107bac0b0ede0c20fd4bc0d
-  data.tar.gz: 319ff9148fa863aeb67adceae38bc76287098919c85566e3b1e51276f5b2d7cf
+  metadata.gz: 90adc54d636c181a05f9a6ba3ba4705c3778cb4dd827165b0fe03b330c126f3e
+  data.tar.gz: e92bcfd36a655f3ef0839be73390625960ebe0e1be9f933634bc2202467dbead
 SHA512:
-  metadata.gz: 87ac886d83ec05402278f8377751e127d3c25948ae388131dac81e42664061e30a646a83cb80290c6c78179743f217a68393aaaf38425ca0eb257cc082ab22f7
-  data.tar.gz: 6d4b57ea5aceb769ef23a878818f89966ba03aa8ff0aa5352c9d62970321286c127b9cae9869b40934517e75ddb5fb125d9e70ad7a7c392bfbb16bec7ca3523e
+  metadata.gz: c94ffd1f79ad6c4b50a25e4d275b5413f8b68537fee21d5f3ea258a41eaa20c616361a5837e37849a994cfe9aadd56aba0f753f4b292be66c7d2b55f78a8cfee
+  data.tar.gz: e33c2aedbe85f7c85119f9f8a87bd5e794bc7c5f27c491be41b86bbab1b787baf151ca4f21566b87b103bd341f04b110c03763f51a4d598e8f662e0e90e8505a

data/bin/fretboards_render

@@ -18,6 +18,7 @@ Options:
   --width=<width>     Width of the fretboard [default: 108].
   --height=<height>   Height of the fretboard [default: 180].
   --fret-count=<fret-count>   Number of frets [default: 4].
+  --offset=<offset>   Offset of the fretboard [default: 0].
   --title=<title>     Title of the fretboard [default: ].
   -h --help           Show this screen.
   --version           Show version.
@@ -84,5 +85,12 @@ fret_count = arguments['--fret-count'].to_i
 fb = Fretboards::Fretboard.new(:tuning => tuning)
 fb.title = title unless title.empty?
 fb.terse(terse)
+
+if arguments['--offset']
+  fb.set_offset(arguments['--offset'].to_i)
+end
+
+
 renderer = Fretboards::Renderer::Svg.new(width: width, height: height, fret_count: fret_count)
+
 puts renderer.render(fb)

data/lib/fretboards/fretboard.rb

@@ -75,12 +75,12 @@ module Fretboards
       @offset = n
       self
     end
-    
+
     def set_label_offset(n)
       @label_offset = n
       self
     end
-    
+
 
     def mark(s, f = nil, settings = {})
       if !s.is_a? Hash
@@ -196,15 +196,17 @@ module Fretboards
       if marks.empty?
         [1, size]
       else
-        min = marks.inject { |sum, i| i[:fret] < sum[:fret] ? i : sum }[:fret]
+        min = marks.inject { |sum, i| (i[:fret] < sum[:fret]) ? i : sum }[:fret]
         max = marks.inject { |sum, i| i[:fret] > sum[:fret] ? i : sum }[:fret]
         if size >= max
           [1, size]
         else
-          # puts "#{self.title} pasa por el segundo hilo"
-          min = 1 if min == 0
-          max = (min + size) if (size > (max - min) )
-          [min + offset, max + offset]
+          if offset > 0
+            [ offset, offset + size - 1 ]
+          else
+            min = 1 if min == 0
+            [min, max]
+          end
         end
       end
     end
@@ -213,4 +215,4 @@ module Fretboards
 
 
   end
-end
+end

data/lib/fretboards/fretboard_collection.rb

@@ -10,7 +10,7 @@ module Fretboards
       @tuning = %w{ g' c' e' a' }
       @table = "default"
     end
-    
+
     def set_tuning(a)
       @tuning = a
     end
@@ -20,14 +20,14 @@ module Fretboards
       @col << fb
       fb
     end
-    
+
     def define(title, a, attrs = {})
       form_add(title, a, { :title => title }.merge(attrs))
     end
 
     def use(title)
       raise "#{title} form not available" unless @forms[title]
-      @forms[title] 
+      @forms[title]
     end
 
 
@@ -45,6 +45,9 @@ module Fretboards
         fb = Fretboard.new(:tuning => @tuning)
         fb.terse(dots, attrs)
       end
+      if attrs[:offset]
+        fb.set_offset(attrs[:offset])
+      end
       fb
     end
 
@@ -71,4 +74,4 @@ module Fretboards
 
   end
 
-end
+end

data/lib/fretboards/renderer/svg.rb

@@ -4,7 +4,7 @@ require "fretboards/ext/hash"
 module Fretboards
   module Renderer
     class Svg < Base
-      
+
       def initialize(opts = {})
         # TODO configuration should merge recursively
         @opts = {
@@ -48,7 +48,7 @@ module Fretboards
           :open_margin_bottom => 4,
         }.deep_merge(opts)
       end
-      
+
       def render(fb)
         @fb = fb
         require "builder"
@@ -75,7 +75,7 @@ module Fretboards
         # @svg
         # xml
       end
-      
+
       def landscape_attributes
         if @opts[:landscape]
           {
@@ -85,23 +85,23 @@ module Fretboards
           {}
         end
       end
-      
+
       def string_attrs
         @opts[:string_attrs]
       end
-      
+
       def fret_attrs
         @opts[:fret_attrs]
       end
-      
+
       def nut_attrs
         @opts[:nut_attrs]
       end
-      
+
       def string_spacing
         (@opts[:width] - @opts[:padding_left] - @opts[:padding_right]) / ((@fb.string_count - 1).to_f)
       end
-      
+
       def draw_strings(svg)
         (0..@fb.string_count-1).each do |sn|
           # x = @opts[:padding_left] + sn * string_spacing(fb)
@@ -109,24 +109,24 @@ module Fretboards
           y1 = @opts[:padding_top]
           y2 = @opts[:height] - @opts[:padding_bottom]
           attrs = string_attrs.merge(:x1 => x, :x2 => x, :y1 => y1, :y2 => y2, :class => 'string')
-          if (!@opts[:string_widths].empty?) 
+          if (!@opts[:string_widths].empty?)
             attrs = attrs.merge({ :"stroke-width" => @opts[:string_widths][sn] })
           end
           svg.line(attrs)
         end
       end
-      
+
       def draw_title(svg)
         # TODO calculate ideal gap
-        gap = @opts[:title_attrs][:"font-size"] 
+        gap = @opts[:title_attrs][:"font-size"]
         svg.text(@fb.title, { :x => @opts[:width] * 0.5 + ((@opts[:padding_left] - @opts[:padding_right])*0.5), :y => @opts[:padding_top] - gap, :class => 'title' }.merge(@opts[:title_attrs]))
       end
-      
+
       def get_string_x(sn)
         sn = @fb.string_number_to_index(sn)
         @opts[:padding_left] + sn * string_spacing
       end
-      
+
       def draw_frets(svg)
         fret_range = @fb.fret_range(@opts[:fret_count])
         total_frets = fret_range.last - fret_range.first + 1
@@ -141,17 +141,21 @@ module Fretboards
           draw_fret(svg, n+1)
         end
       end
-      
+
       def draw_labels(svg)
         fret_range = @fb.fret_range(@opts[:fret_count])
         if fret_range.first > 1
           y = get_dot_position(0, fret_range.first + @fb.label_offset)[1] + @opts[:label_attrs][:"font-size"] * 0.4
-          x = @opts[:padding_left] - @opts[:label_attrs][:"font-size"] * 1.25
+          x = if !@opts[:label_attrs][:'x-offset'].nil?
+                @opts[:padding_left] - @opts[:label_attrs][:'x-offset']
+              else
+                @opts[:padding_left] - @opts[:label_attrs][:"font-size"] * 1.25
+              end
           # TODO allow rotating
           svg.text(fret_range.first + @fb.label_offset, { :y => y, :x => x, :class => 'label' }.merge(@opts[:label_attrs]))
         end
       end
-      
+
       def draw_fret(svg, n)
         y = get_fret_y(n)
         if @opts[:rectangular_frets]
@@ -160,14 +164,14 @@ module Fretboards
           svg.line(fret_attrs.merge(:x1 => @opts[:padding_left], :x2 => @opts[:width] - @opts[:padding_right], :y1 => y, :y2 => y, :class => 'fret'))
         end
       end
-      
+
       def draw_nut(svg)
         y = @opts[:padding_top] - @opts[:nut_attrs][:"stroke-width"] * 0.5
         extra_first = 0 # @opts[:string_widths][0] * 0.5
         extra_last = 0 # @opts[:string_widths].last * 0.5
         svg.line(nut_attrs.merge(:x1 => @opts[:padding_left] - extra_first, :x2 => @opts[:width] - @opts[:padding_right] + extra_last, :y1 => y, :y2 => y, :class => 'nut'))
       end
-      
+
       def get_fret_y(fret_number)
         fret_range = @fb.fret_range(@opts[:fret_count])
         avail = @opts[:height] - @opts[:padding_top] - @opts[:padding_bottom] - @opts[:string_ext_bottom]
@@ -184,7 +188,7 @@ module Fretboards
         end
         y
       end
-      
+
       def get_first_fret_size(gaps, factor, avail)
         sum = 0
         (0..gaps-1).each do |t|
@@ -192,8 +196,8 @@ module Fretboards
         end
         avail.to_f/sum.to_f
       end
-      
-      
+
+
       def draw_marks(svg)
         @fb.marks.each do |m|
           if m[:fret] == 0
@@ -209,13 +213,13 @@ module Fretboards
           end
         end
       end
-      
+
       def draw_blue_note_symbol(svg, x, y, m)
         svg.rect(:x => x - 4, :y => y - 4, :width => 8, :height => 8, :fill => "#000", :stroke => "", :transform => "rotate(-45 #{x} #{y})")
         # svg.circle(:cx => x, :cy => y, :r => 3, :fill => "blue")
       end
-      
-      
+
+
       def draw_dot(svg, x, y, m)
         cnames = %w[dot]
         cnames << "dot-#{m[:symbol]}" if m[:symbol]
@@ -223,7 +227,7 @@ module Fretboards
         attrs = attrs.merge(@opts[(m[:symbol].to_s + "_symbol_attrs").to_sym]) if (m[:symbol] && @opts[(m[:symbol].to_s + "_symbol_attrs").to_sym])
         svg.circle(attrs)
       end
-      
+
       def get_dot_position(string, fret)
         fret_range = @fb.fret_range(@opts[:fret_count])
         diff = fret_range.first == 1 ? 0 : fret_range.first - 1
@@ -232,7 +236,7 @@ module Fretboards
         y = 0.5 * (get_fret_y(fret - 1) + get_fret_y(fret))
         [x, y]
       end
-      
+
       def draw_in_dots(svg, name)
         # TODO allow rotating dot text on rotated fretboards
         sym = name.to_sym
@@ -250,7 +254,7 @@ module Fretboards
           end
         end
       end
-      
+
       def draw_in_bottom(svg, name)
         # TODO allow rotating bottom text on rotated fretboards
         sym = name.to_sym
@@ -264,7 +268,7 @@ module Fretboards
           end
         end
       end
-      
+
       def draw_open(svg, m)
         margin_bottom = @opts[:open_margin_bottom]
         y = @opts[:padding_top] - @opts[:open_attrs][:r] - @opts[:nut_attrs][:"stroke-width"] - margin_bottom
@@ -274,7 +278,7 @@ module Fretboards
         attrs = attrs.merge(@opts[symbol_attrs]) if (m[:symbol] && @opts[symbol_attrs])
         svg.circle(attrs)
       end
-      
+
       def draw_mutes(svg)
         margin_bottom = @opts[:open_margin_bottom]
         cy = @opts[:padding_top] - @opts[:open_attrs][:r] - @opts[:nut_attrs][:"stroke-width"] - margin_bottom
@@ -286,7 +290,7 @@ module Fretboards
           # svg.text("x", { :x => cx, :y => cy })
         end
       end
-      
+
       def draw_barres(svg)
         barre_attrs = @opts[:barre_attrs]
         @fb.barres.each do |b|
@@ -297,8 +301,8 @@ module Fretboards
           svg.rect({:y => y, :x => x, :width => w, :class => :barre}.merge(barre_attrs))
         end
       end
-            
-      
+
+
     end
   end
-end
+end

data/lib/fretboards/version.rb

@@ -1,3 +1,3 @@
 module Fretboards
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/test/test_fretboard.rb

@@ -1,11 +1,11 @@
 require 'test/unit'
+$:<< File.dirname(__FILE__) + '/../lib'
 require 'fretboards'
-
 include Fretboards
 
 # TODO write useful tests
 class FretboardTest < Test::Unit::TestCase
-  
+
   def test_string_count
     uke = Fretboard.new()
     assert_equal(4, uke.string_count)
@@ -13,71 +13,71 @@ class FretboardTest < Test::Unit::TestCase
     guit = Fretboard.new(:tuning => Fretboards::Tuning::GUITAR)
     assert_equal(6, guit.string_count)
   end
-  
+
   def test_mark
     fb = Fretboard.new
     fb.mark :string => 1, :fret => 5
     assert_equal([{:string => 1, :fret => 5}], fb.marks)
   end
-  
+
   def test_barre
     fb = Fretboard.new(:tuning => %w{ g' c' e' a' })
     fb.barre 1
     assert_equal([{:fret => 1, :from => 4, :to => 1 }], fb.barres)
   end
-  
+
   def test_mute
     fb = Fretboard.new
     fb.mute(1)
     assert_equal([1], fb.mutes)
   end
-  
+
   def test_open
     fb = Fretboard.new
     fb.open(1)
     assert_equal([{:string => 1, :fret => 0}], fb.marks)
   end
-  
+
   def test_terse_full
     fb = Fretboard.new
     fb.terse %w{ 1/4-3(5) }
     assert_equal([{:string => 4, :finger => 3, :function => "5", :fret => 1}], fb.marks)
   end
-  
+
   def test_terse_minimal
     fb = Fretboard.new
     fb.terse %w{ 1 }
     assert_equal([{ :string => 4, :fret => 1 } ], fb.marks)
   end
-  
+
   def test_terse_barre
     fb = Fretboard.new
     fb.terse %w{ 3 1[ 1] 0 }
     assert_equal([{:fret => 1, :from => 3, :to => 2 }], fb.barres)
   end
-  
+
   def test_terse_unfinished_barre
     fb = Fretboard.new
     fb.terse %w{ 3 1[ 1 1 }
     assert_equal([{:fret => 1, :from => 3, :to => 1 }], fb.barres)
   end
-  
+
   def test_terse_symbols
     # puts "symbols"
     fb = Fretboard.new
     fb.terse %w{ 3! }
     assert_equal(:root, fb.marks.first[:symbol])
-    
+
     fb = Fretboard.new
     fb.terse %w{ 3? }
     assert_equal(:phantom, fb.marks.first[:symbol])
-    
+
     fb = Fretboard.new
     fb.terse %w{ 3!? }
     assert_equal(:phantom_root, fb.marks.first[:symbol])
-    
+
   end
-  
+
   def test_fret_range
     fb = Fretboard.new
     fb.terse %w{ 0 0 0 3 }
@@ -89,5 +89,12 @@ class FretboardTest < Test::Unit::TestCase
     fb.terse %w{ 7 6 5 9 }
     assert_equal([5, 9], fb.fret_range)
   end
-  
-end
+
+  def test_fret_range_with_offset
+    fb = Fretboard.new
+    fb.terse %w{ 0 5 7 7 }
+    fb.set_offset 5
+    assert_equal([5, 8], fb.fret_range)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fretboards
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Choan Galvez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2023-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder