gdshowsdb 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23522b0444d455827af0af333680c9a96953a1f7
-  data.tar.gz: 94ed5839c01cd2edf0343a60d0974cf14de69e4b
+  metadata.gz: ef95f25c35e7e228d34672c8cb972e7981eb4a20
+  data.tar.gz: 45532c6b9c72c7783d37cd9b5d8438e7c2e5e341
 SHA512:
-  metadata.gz: a59cd2cdcc0f589b9a2d67d66e2921491d073e8ab5fa44de7bee5b6a22a347c35b1c2dbc39c1e54cfd8e0cdbbaa17e8175b490cb9f174f231eb22a6693622b0c
-  data.tar.gz: e145fdc48503a06905f5515a1f346d2b0d714ff65135f9c032a38651af73a378a0c8654fadaecfe2b5f1008a7593f72efe6ada7f2e62814182b24c974d31f9ad
+  metadata.gz: 672eb6b003c460097d4e67dd108c44bf8e506fe8617ea22b8a5ec423b4d31ec58837cd9970829e957b8b3b9a626596fe4fe56b9b5d06c30de49d788b42a63a2a
+  data.tar.gz: 43333fc7d8812914733874e304caa624a90276dd397611ae8694b3632b4a54923d83de09c7479511b631f96f0c526d915c9bd6f49349439131cdcb3f5c490c5f

data/.rvmrc

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-rvm use --create --install ruby-1.9.3@gdshowsdb 
+rvm use --create --install ruby-2.4.2@gdshowsdb 
 bundle install

data/Gemfile

@@ -1,12 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'protected_attributes'
-
 # Specify your gem's dependencies in gdshowsdb.gemspec
 gemspec
 
 group :development do
-  gem "rake", "~> 0.9.2.2"	
+  gem "rake"
   gem "rspec"
+  gem "rspec-its"
   gem "sqlite3"
 end

data/Gemfile.lock

@@ -1,106 +1,143 @@
 PATH
   remote: .
   specs:
-    gdshowsdb (0.9.1)
-      friendly_id (= 5.0.0.beta4)
-      protected_attributes
-      rails (~> 4.0.0)
+    gdshowsdb (1.0.0)
+      friendly_id
+      rails (~> 5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.13)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
-    erubis (2.7.0)
-    friendly_id (5.0.0.beta4)
-      activerecord (~> 4.0.0)
-    hike (1.2.3)
-    i18n (0.6.5)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.24)
-    minitest (4.7.5)
-    multi_json (1.7.9)
-    polyglot (0.3.3)
-    protected_attributes (1.0.3)
-      activemodel (>= 4.0.0, < 5.0)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+    actioncable (5.1.4)
+      actionpack (= 5.1.4)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    crass (1.0.2)
+    diff-lcs (1.3)
+    erubi (1.6.1)
+    friendly_id (5.2.3)
+      activerecord (>= 4.0.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.6)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    nio4r (2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    rack (2.0.3)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.4)
+      actioncable (= 5.1.4)
+      actionmailer (= 5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      activemodel (= 5.1.4)
+      activerecord (= 5.1.4)
+      activesupport (= 5.1.4)
+      bundler (>= 1.3.0)
+      railties (= 5.1.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (0.9.2.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    sprockets (2.10.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.8)
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    rake (12.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   gdshowsdb!
-  protected_attributes
-  rake (~> 0.9.2.2)
+  rake
   rspec
+  rspec-its
   sqlite3
+
+BUNDLED WITH
+   1.15.4

data/README.md

@@ -1,3 +1,4 @@
+[![Stories in Ready](https://badge.waffle.io/jefmsmit/gdshowsdb.png?label=ready&title=Ready)](https://waffle.io/jefmsmit/gdshowsdb)
 # Gdshowsdb
 
 [ ![Codeship Status for jefmsmit/gdshowsdb](https://www.codeship.io/projects/b1f0f820-f314-0131-9281-66e36f054ecd/status)](https://www.codeship.io/projects/27798)

data/gdshowsdb.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency("rails", "~> 4.0.0")
-  gem.add_dependency("friendly_id", "5.0.0.beta4")
-  gem.add_dependency("protected_attributes")
+  gem.add_dependency("rails", "~> 5.1")
+  gem.add_dependency("friendly_id")
 end

data/lib/gdshowsdb.rb

@@ -1,6 +1,5 @@
 require "gdshowsdb/version"
 
-require 'protected_attributes'
 require 'rubygems'
 require 'active_record'
 require 'rails/generators'
@@ -27,7 +26,7 @@ module Gdshowsdb
 	end 
 
   def self.load_yaml(file_name)
-    YAML.load_file(Gem.datadir('gdshowsdb') + "/#{file_name}")
+    YAML.load_file(Gem.loaded_specs['gdshowsdb'].full_gem_path + "/data/gdshowsdb/#{file_name}")
   end 
 
   def self.load_yaml_for_year(year)

data/lib/gdshowsdb/db/migrations/001_create_song_ref_table.rb

@@ -1,4 +1,4 @@
-class CreateSongRefTable < ActiveRecord::Migration
+class CreateSongRefTable < ActiveRecord::Migration[5.0]
 	def up
 		create_table :song_refs, :id => false do |t|
 			t.string :uuid, :primary => true, :null => false

data/lib/gdshowsdb/db/migrations/002_import_song_refs.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 require 'gdshowsdb'
 
-class ImportSongRefs < ActiveRecord::Migration
+class ImportSongRefs < ActiveRecord::Migration[5.0]
 	def up		
 		Gdshowsdb::SongRefYAMLParser.from_yaml.parse.each do |song_ref_hash|
 			SongRef.create_from(song_ref_hash)

data/lib/gdshowsdb/db/migrations/003_create_show_table.rb

@@ -1,4 +1,4 @@
-class CreateShowTable < ActiveRecord::Migration
+class CreateShowTable < ActiveRecord::Migration[5.0]
 	
 	def up
 		create_table :shows, :id => false do |t|

data/lib/gdshowsdb/db/migrations/004_create_show_set_table.rb

@@ -1,4 +1,4 @@
-class CreateShowSetTable < ActiveRecord::Migration
+class CreateShowSetTable < ActiveRecord::Migration[5.0]
 	
 	def up
 		create_table :show_sets, :id => false do |t|

data/lib/gdshowsdb/db/migrations/005_create_song_table.rb

@@ -1,4 +1,4 @@
-class CreateSongTable < ActiveRecord::Migration
+class CreateSongTable < ActiveRecord::Migration[5.0]
 	
 	def up
 		create_table :songs, :id => false do |t|

data/lib/gdshowsdb/db/migrations/006_create_song_occurences_table.rb

@@ -1,4 +1,4 @@
-class CreateSongOccurencesTable < ActiveRecord::Migration
+class CreateSongOccurencesTable < ActiveRecord::Migration[5.0]
   
   def up
     create_table :song_occurences, :id => false do |t|

data/lib/gdshowsdb/db/migrations/008_add_count_to_song_ref_table.rb

@@ -1,4 +1,4 @@
-class AddCountToSongRefTable < ActiveRecord::Migration
+class AddCountToSongRefTable < ActiveRecord::Migration[5.0]
 
   def up
     add_column :song_refs, :song_occurences_count, :integer, :default => 0

data/lib/gdshowsdb/db/migrations/009_import_shows.rb

@@ -2,7 +2,7 @@ require 'yaml'
 require 'securerandom'
 require 'gdshowsdb'
 
-class ImportShows < ActiveRecord::Migration
+class ImportShows < ActiveRecord::Migration[5.0]
 	include Gdshowsdb
 	
 	def up

data/lib/gdshowsdb/models/show.rb

@@ -1,5 +1,3 @@
-require 'protected_attributes'
-
 class Show < ActiveRecord::Base
   include Extensions::UUID
 	
@@ -7,14 +5,18 @@ class Show < ActiveRecord::Base
   has_many :song_occurences, :foreign_key => :show_uuid, :primary_key => :uuid
   has_many :song_refs, :through => :song_occurences, :foreign_key => :show_uuid
 
-  attr_accessible :uuid, :year, :month, :day, :venue, :city, :state, :country, :position
-
   def self.create_from(spec)
-    Show.create(spec)
+    show = Show.new
+    set_spec(show, spec)
+    show.save
+    show
   end
 
   def self.update_from(spec)
-    Show.update(spec[:uuid], spec)
+    show = Show.find_by(uuid: spec[:uuid])
+    set_spec(show, spec)
+    show.save
+    show
   end
   
   def self.remove_from(spec)
@@ -52,6 +54,19 @@ class Show < ActiveRecord::Base
 
   private 
 
+  def self.set_spec(show, spec) 
+    show.uuid = spec[:uuid]
+    show.venue = spec[:venue]
+    show.city = spec[:city]
+    show.state = spec[:state]
+    show.country = spec[:country]
+    show.year = spec[:year]
+    show.month = spec[:month]
+    show.day = spec[:day]
+    show.position = spec[:position]
+    show
+  end
+
   def pad(int)
     "%02d" % int
   end

data/lib/gdshowsdb/models/show_set.rb

@@ -5,18 +5,18 @@ class ShowSet < ActiveRecord::Base
 	belongs_to :show, :foreign_key => :show_uuid, :primary_key => :uuid
   accepts_nested_attributes_for :songs
 	
-	attr_accessible :uuid, :show_uuid, :position, :encore
-  
-  def self.create_from(spec)
-    ShowSet.create(spec) do |show_set|
-      show_set.show = Show.find_by_uuid(spec[:show_uuid])
-    end
+	def self.create_from(spec)
+    show_set = ShowSet.new
+    set_spec(show_set, spec)
+    show_set.save
+    show_set
   end
 
   def self.update_from(spec)
-    ShowSet.update(spec[:uuid], spec) do |show_set|
-      show_set.show = Show.find_by_uuid(spec[:show_uuid])
-    end
+    show_set = ShowSet.find_by_uuid(spec[:uuid])
+    set_spec(show_set, spec)
+    show_set.save
+    show_set
   end
   
   def self.remove_from(spec)
@@ -37,4 +37,14 @@ class ShowSet < ActiveRecord::Base
   def encore?
     encore
   end
+
+  private
+
+  def self.set_spec(show_set, spec)
+    show_set.uuid = spec[:uuid]
+    show_set.show_uuid = spec[:show_uuid]
+    show_set.position = spec[:position]
+    show_set.encore = spec[:encore]
+    show_set.show = Show.find_by_uuid(spec[:show_uuid])
+  end
 end

data/lib/gdshowsdb/models/song.rb

@@ -4,12 +4,10 @@ class Song < ActiveRecord::Base
 	belongs_to :show_set, :foreign_key => :show_set_uuid, :primary_key => :uuid
 	belongs_to :song_ref, :foreign_key => :song_ref_uuid, :primary_key => :uuid
 	
-	attr_accessible :uuid, :song_ref_uuid, :show_set_uuid, :show_set, :position, :segued
-  
-  def self.create_from(spec)
-    Song.create(remove_name(spec)) do |song|
-      song.show_set = ShowSet.find_by_uuid(spec[:show_set_uuid])
-    end
+	def self.create_from(spec)
+    song = Song.new
+    set_spec(song, spec)
+    song.save
     create_song_relationships(spec)
     Song.find_by_uuid(spec[:uuid])
   end
@@ -17,17 +15,15 @@ class Song < ActiveRecord::Base
   def self.create_song_relationships(spec)
     song_ref = SongRef.find_by_name(spec[:name])
     song_ref.songs << Song.find_by_uuid(spec[:uuid])
-    
-    song_ref.song_occurences.create(uuid: SecureRandom.uuid, position: spec[:position]) do |occurence|
-      occurence.show = ShowSet.find_by_uuid(spec[:show_set_uuid]).show         
-    end
+    song_ref.song_occurences << SongOccurence.create_from(uuid: SecureRandom.uuid, position: spec[:position], show_set_uuid: spec[:show_set_uuid])
+    song_ref.save
   end
 
   def self.update_from(spec)
-    read_song = Song.find_by_uuid(spec[:uuid])
-    read_song.show_set = ShowSet.find_by_uuid(spec[:show_set_uuid])
-    read_song.update(remove_name(spec))
-    Song.find_by_uuid(spec[:uuid])
+    song = Song.find_by_uuid(spec[:uuid])
+    set_spec(song, spec)
+    song.save
+    song
   end
 
   def self.update_song_relationships(spec)
@@ -69,4 +65,15 @@ class Song < ActiveRecord::Base
   def self.remove_name(spec)
     spec.reject {|k,v| k == :name }
   end
+
+  def self.set_spec(song, spec)
+    song.uuid = spec[:uuid]
+    song.song_ref_uuid = spec[:song_ref_uuid]
+    song.show_set_uuid = spec[:show_set_uuid]
+    song.show_set = spec[:show_set]
+    song.position = spec[:position]
+    song.segued = spec[:segued]
+    song.show_set = ShowSet.find_by_uuid(spec[:show_set_uuid])
+    song
+  end
 end

data/lib/gdshowsdb/models/song_occurence.rb

@@ -5,5 +5,18 @@ class SongOccurence < ActiveRecord::Base
   belongs_to :song_ref, :foreign_key => :song_ref_uuid, :primary_key => :uuid, :counter_cache => true
   accepts_nested_attributes_for :show
 
-  attr_accessible :position, :uuid, :show
+  def self.create_from(spec)
+    occurence = SongOccurence.new
+    set_spec(occurence, spec)
+    occurence.save
+    occurence
+  end
+
+  private
+
+  def self.set_spec(occurence, spec)
+    occurence.uuid = spec[:uuid]
+    occurence.position = spec[:position]    
+    occurence.show = ShowSet.find_by_uuid(spec[:show_set_uuid]).show
+  end
 end

data/lib/gdshowsdb/models/song_ref.rb

@@ -12,21 +12,28 @@ class SongRef < ActiveRecord::Base
 
   accepts_nested_attributes_for :song_occurences
 
-	attr_accessible :uuid, :name, :slug
-
   def self.create_from(spec)
-    SongRef.create(
-      uuid: spec[:uuid],
-      name: spec[:name],
-      slug: spec[:name].parameterize.underscore
-    )
+    song_ref = SongRef.new
+    set_spec(song_ref, spec)
+    song_ref.save    
   end
 
-  def self.update_from(spec)    
-    SongRef.update(spec[:uuid], spec)
+  def self.update_from(spec) 
+    song_ref = SongRef.find_by_uuid(spec[:uuid])
+    set_spec(song_ref, spec)
+    song_ref.save
   end
 	
   def self.remove_from(spec)
     SongRef.find_by_uuid(spec[:uuid]).delete
   end
+
+  private
+
+  def self.set_spec(song_ref, spec)
+    song_ref.uuid = spec[:uuid]
+    song_ref.name = spec[:name]
+    song_ref.slug = spec[:name].parameterize.underscore
+    song_ref
+  end
 end

data/lib/gdshowsdb/version.rb

@@ -1,3 +1,3 @@
 module Gdshowsdb
-  VERSION = "0.9.1"
+  VERSION = "1.0.0"
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
 require 'bundler/setup'
+require 'rspec/its'
 
 require 'gdshowsdb'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdshowsdb
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jeff Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,30 +16,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta4
-- !ruby/object:Gem::Dependency
-  name: protected_attributes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -166,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: All Grateful Dead show information in a relational database.