fretboards 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDBhZmZlM2VkZWIzMWNmY2VhZGY1YWFkMDY2MGE3ZmM4MjZkYzkzYg==
-  data.tar.gz: !binary |-
-    ZGRmYzc2NDc3ZTgxN2QxZGFhNjA1YmM1YWZjYjZmMzdiYTAwOGQyMg==
+SHA1:
+  metadata.gz: 9838c847b5421215855b81ac39942b75d8757129
+  data.tar.gz: 28fd5ffbeda27ceeaa869d909b9856160e3b180c
 SHA512:
-  metadata.gz: !binary |-
-    NWRkNGEzZTI4Y2NmODQyZDE5MjczMTczOTE3NjRmM2FkMmFjYjQ4OWM3MjM5
-    MTE2MjY5MTM4M2FiZjIyNjdhNzY4NWI1NGJmMzRmODI0M2I0ZjgwYzkyOWQw
-    NTg0OTVkYmY1YWY2N2E1YmJhNzM4ZmFmZDhmOTY4YmI5ZjEwZTQ=
-  data.tar.gz: !binary |-
-    OWViNjc0NmVmZjYzODFiMmUyOTdhMmU5ODc2ZDE4MDQxZmFhY2FiM2E4M2Zi
-    ZTYyZjFhOTI1YWRmNTU2Y2U1YWZlOTI1MjY3MjQ0MzJmODI2YmM2MjkyMzUw
-    YjdmZWQ5Y2ZjYmNjNjcyMDU1MDgxNmMyM2NhOTU3MTM5MTA5MTQ=
+  metadata.gz: 176c645245285856a5470ad8c739ec24eb7a2b8e037da8b34a52e71ae0150444ee3b9405ab9d89d5b4687d6a0d438eb84352a257bbe14ceedd3cb8ae4a406262
+  data.tar.gz: 6405780b186c442e4459c74c649cffffe77efb2b53f12c65ac1441c043eb64c1ad5c3f00d95817925081eaedd3ddc30b354fc8086c9bf40119cd185e6f45be47

data/lib/fretboards/fretboard.rb

@@ -3,7 +3,7 @@ require "fretboards/pitch"
 module Fretboards
   class Fretboard
 
-    attr_reader :marks, :labels, :barres, :conf, :opens, :mutes
+    attr_reader :marks, :labels, :barres, :conf, :opens, :mutes, :label_offset, :offset
 
     attr_accessor :title
 
@@ -17,6 +17,8 @@ module Fretboards
       }
       @mutes = []
       @opens = []
+      @offset = 0
+      @label_offset = 0
       configure(conf)
       self.instance_eval block if block_given?
     end
@@ -69,7 +71,16 @@ module Fretboards
       self
     end
 
-
+    def set_offset(n)
+      @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
@@ -193,7 +204,7 @@ module Fretboards
           # puts "#{self.title} pasa por el segundo hilo"
           min = 1 if min == 0
           max = (min + size) if (size > (max - min) )
-          [min, max]
+          [min + offset, max + offset]
         end
       end
     end

data/lib/fretboards/renderer/svg.rb

@@ -39,7 +39,7 @@ module Fretboards
           :string_ext_top => 5,
           :fret_ext_left => 2,
           :fret_ext_right => 2,
-          :string_widths => [ 2, 2, 2, 2 ], # TODO calculate on demand if not passed
+          :string_widths => [ 2, 2, 2, 2, 2, 2 ], # TODO calculate on demand if not passed
           :fret_reduction_factor => 0.95,
           :rectangular_frets => true,
           :fret_count => 4,
@@ -99,7 +99,7 @@ module Fretboards
       end
       
       def string_spacing
-        (@opts[:width] - @opts[:padding_left] - @opts[:padding_right]) / (@fb.string_count - 1)
+        (@opts[:width] - @opts[:padding_left] - @opts[:padding_right]) / ((@fb.string_count - 1).to_f)
       end
       
       def draw_strings(svg)
@@ -145,10 +145,10 @@ module Fretboards
       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)[1] + @opts[:label_attrs][:"font-size"] * 0.4
+          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
           # TODO allow rotating
-          svg.text(fret_range.first, { :y => y, :x => x, :class => 'label' }.merge(@opts[:label_attrs]))
+          svg.text(fret_range.first + @fb.label_offset, { :y => y, :x => x, :class => 'label' }.merge(@opts[:label_attrs]))
         end
       end
       

data/lib/fretboards/renderer/text.rb

@@ -0,0 +1,19 @@
+require 'fretboards/renderer/base'
+
+module Fretboards
+  module Renderer
+    class Text < Base
+      
+      def render(fb)
+        @fb = fb
+        output_marks = []
+        @fb.string_count.downto(1).each do |n|
+          mark = fb.marks.find { |m| m[:string] == n && m[:symbol] != :phantom }
+          output_marks << (!mark.nil? ? mark[:fret] : "x" )
+        end
+        output = output_marks.join(" ")
+      end
+      
+    end
+  end
+end

data/lib/fretboards/version.rb

@@ -1,3 +1,3 @@
 module Fretboards
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test_text_renderer.rb

@@ -0,0 +1,44 @@
+require 'test/unit'
+require 'fretboards'
+require 'fretboards/renderer/text'
+
+include Fretboards
+
+class TextRendererTest < Test::Unit::TestCase
+  def test_string_count
+    fb = Fretboard.new
+    renderer = Fretboards::Renderer::Text.new
+    output = renderer.render(fb)
+    assert_equal(4, output.split(' ').size)
+  end
+
+  def test_one_mark_each_string
+    fb = Fretboard.new
+    fb.terse(%w{ 0 0 0 3 })
+    renderer = Fretboards::Renderer::Text.new
+    output = renderer.render(fb)
+    assert_equal("0 0 0 3", output)
+  end
+  
+  def test_some_strings_unfretted
+    fb = Fretboard.new
+    fb.terse(%w{ 3/1 })
+    renderer = Fretboards::Renderer::Text.new
+    output = renderer.render(fb)
+    assert_equal("x x x 3", output)
+  end
+  
+  def test_obliviate_phantom_notes
+    fb = Fretboard.new
+    renderer = Fretboards::Renderer::Text.new
+    fb.terse(%w{ 3/4 4/3 3/2 3/1? 5/1})
+    output = renderer.render(fb)
+    assert_equal("3 4 3 5", output)    
+
+    fb.terse(%w{ 3/4 4/3 3/2 3/1!? 5/1})
+    puts fb.marks.inspect
+    output = renderer.render(fb)
+    assert_equal("3 4 3 5", output)    
+  end
+
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fretboards
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Choan Galvez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Allows defining instrument fretboard structures and representing them
@@ -33,7 +33,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Rakefile
 - bin/fretboards_render
@@ -46,10 +46,12 @@ files:
 - lib/fretboards/pitch.rb
 - lib/fretboards/renderer/base.rb
 - lib/fretboards/renderer/svg.rb
+- lib/fretboards/renderer/text.rb
 - lib/fretboards/tuning.rb
 - lib/fretboards/version.rb
 - readme.mdown
 - test/test_fretboard.rb
+- test/test_text_renderer.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -59,19 +61,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fretboards
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Define and draw fretboards
 test_files:
 - test/test_fretboard.rb
+- test/test_text_renderer.rb