song_pro 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7926744caec7f509bb70754bda4dfb77ffa68dcd72566de3489162d9fd215ea
-  data.tar.gz: 8899b2137302c1e95862a0db9bae954bc7e055b1f45ef65c384984b82da5cfb2
+  metadata.gz: 994be76991ee4ae983a808d051d872c455a2264f3bf2b6d921283aca2d35e579
+  data.tar.gz: 3aece95c07d6bf27ffbef7f71f3e1e1cc1ef086a4e3ee5d0c5a4d2cd7a0c1a4c
 SHA512:
-  metadata.gz: 946d6c7f401224daafb65c57b1a9e33ba9a7b2c887a7149e02228d19c38a8d9c8f2bc511ec56a49f536e6ab1fb02338a45493ccfc2279ab710cbe11f30b7c4cb
-  data.tar.gz: ffcea2097a1e359d0ab8715059309dcd86775ce553211862bd95e0ef2d94f75bd4dcf389c3889c5e1f39ee02e569b7be78f395039c9a28a57bee0654bf5489d4
+  metadata.gz: 8754d732547c5e5ca22e85e8d9f3160849ead6f4e939c5e91a0ce54ebfa84258ea1bb27f8e26b7b153f0ce18dada2c08830a06f1ae2a9d4d6d51ab8fb6b7d293
+  data.tar.gz: 233c7229e06286a0e3f6a4766be8a1449bd2b56e38cd786c3ef1ef8a85f0deff09473a0890e160b960727d99b31a08d8769e6a4707fd2a51d3d500d05c1a616f

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    song_pro (0.1.1)
+    song_pro (0.1.2)
       markaby
 
 GEM
@@ -54,4 +54,4 @@ DEPENDENCIES
   song_pro!
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

data/README.md

@@ -1,10 +1,8 @@
-# SongPro [![Build Status](https://travis-ci.org/spilth/song_pro.svg?branch=master)](https://travis-ci.org/spilth/song_pro)
+# SongPro for Ruby [![Build Status](https://travis-ci.org/spilth/song_pro.svg?branch=master)](https://travis-ci.org/spilth/song_pro)
 
-SongPro is a text format for transcribing songs.
+[SongPro](https://songpro.org) is a text format for transcribing songs.
  
-This project is a Ruby Gem that converts the song into a data model that can then be converted into various output formats such as text or HTML.
-
-It is heavily inspired by [ChordPro](https://www.chordpro.org/).
+This project is a Ruby Gem that converts the song into a Song data model which can then be converted into various output formats such as text or HTML.
 
 ## Installation
 
@@ -60,40 +58,6 @@ puts song.sections[1].title
 # Verse 1
 
 ```
-## SongPro Format
-
-- Attributes are declared using: `@key=value`
-- Sections are declared using: `# Section Name`
-- Chords are declared using: `[Xy#]`
-
-```
-@title=Bad Moon Rising
-@artist=Cleedence Clearwater Revival
-
-# Intro
-
-[D][A][G][D]
-
-# Verse 1
-
-[D]I see a [A]bad [G]moon a-[D]rising
-[D]I see [A]trouble [G]on the [D]way
-[D]I see [A]earth-[G]quakes and [D]lightnin'
-[D]I see [A]bad [G]times to-[D]day
-```
-
-## Song Object
-
-- a **Song** can have a Title
-- a **Song** can have an Artist
-- a **Song** has zero or more **Sections**
-- a **Section** has zero or more **Lines**
-- a **Line** has one or more **Parts**
-- a **Part** has a **Chord** and **Lyric**
-- a **Chord** is the textual representation of a single chord
-  - this may be empty
-- a **Lyric** is the textual representation of lyrics
-  - this may be empty
 
 ## Development
 
@@ -103,8 +67,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at <https://github.com/spilth/song_pro>.
+Bug reports and pull requests are welcome on GitHub at <https://github.com/SongProOrg/songpro-ruby>.
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/song_pro/song.rb

@@ -11,10 +11,16 @@ class Song
                 :year,
                 :album,
                 :tuning,
-                :sections
+                :sections,
+                :custom
 
   def initialize
     @sections = []
+    @custom = {}
+  end
+
+  def set_custom(key, value)
+    @custom[key.to_sym] = value
   end
 
   def to_html

data/lib/song_pro/version.rb

@@ -1,3 +1,3 @@
 module SongPro
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/lib/song_pro.rb

@@ -9,6 +9,7 @@ require 'song_pro/part'
 module SongPro
   SECTION_REGEX = /#\s*([^$]*)/
   ATTRIBUTE_REGEX = /@(\w*)=([^%]*)/
+  CUSTOM_ATTRIBUTE_REGEX = /!(\w*)=([^%]*)/
   CHORDS_AND_LYRICS_REGEX = /(\[[\w#b\/]+\])?([\w\s',.!\(\)_\-"]*)/i
 
   def self.parse(lines)
@@ -18,6 +19,8 @@ module SongPro
     lines.split("\n").each do |text|
       if text.start_with?('@')
         process_attribute(song, text)
+      elsif text.start_with?('!')
+        process_custom_attribute(song, text)
       elsif text.start_with?('#')
         current_section = process_section(song, text)
       else
@@ -49,6 +52,15 @@ module SongPro
     end
   end
 
+  def self.process_custom_attribute(song, text)
+    matches = CUSTOM_ATTRIBUTE_REGEX.match(text)
+    key = matches[1]
+    value = matches[2].strip
+
+    song.set_custom(key, value)
+  end
+
+
   def self.process_lyrics_and_chords(song, current_section, text)
     return if text == ''
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: song_pro
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brian Kelly
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-30 00:00:00.000000000 Z
+date: 2019-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: markaby
@@ -125,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Converts SongPro files to HTML