active_brainz 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de315d1362f515a08a4b332ca37cb680c1f7cc0b56631d267ca6d01dba86f064
-  data.tar.gz: 1b10dab84039dc27fc85e3180f1d31c280ff961bca4055600bbafa67cc929cde
+  metadata.gz: 0a1e585d51875bf9beedf59eeb0613f3975a129b56f2c83f37361a7280fe0246
+  data.tar.gz: 4992719023292e5e2c0cbfd0a285438ef9c1e1e49f29578c189c7c28a41e5eae
 SHA512:
-  metadata.gz: b81268c56a7c2ffa2f527c6c66d7bf766c7d1d39058df455d7116b667788bc40e244b9cef702564abbc627090b667c78f4f40d3288fbc22f5c9069b03b728174
-  data.tar.gz: 59378fea9c9b97441c95cdddd8d55e724cb011ec4b39de09801de7207eeadb22aa5de94c818e658a82c9dc3502de8d8da96e49a3bceb95b180e890fad15a06fc
+  metadata.gz: 493edeae2350c68c9b0ebe59eac8b1d96c3045ad5bf87be2d46b5d49b67736f6a0134cd9587ce5b6a358625910d4ccb4e1dd39a5cf08ec0bba207906ed3b2dd3
+  data.tar.gz: 13f0cc6c665d3ea16cb619224e8c9e136f658e440d14b1571b608f4251df2aacac36a88a03bd12376c225b4e75418876715059ef8cab7d26b12f1262be9a7343

data/config/inflections.rb

@@ -6,4 +6,5 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.acronym "GID"
   inflect.acronym "IPI"
   inflect.acronym "ISNI"
+  inflect.acronym "ISO"
 end

data/lib/active_brainz.rb

@@ -13,6 +13,7 @@ module ActiveBrainz
       @root ||= Pathname.new(File.expand_path(File.join("..", ".."), __FILE__))
     end
 
+    # rubocop:disable Metrics/AbcSize
     def setup
       @loader = Zeitwerk::Loader.for_gem
 
@@ -21,8 +22,15 @@ module ActiveBrainz
 
       # Set up code loader
       loader.enable_reloading if ENV["ACTIVE_BRAINZ_ENV"] == "development"
-      loader.collapse("lib/active_brainz/models")
-      loader.collapse("lib/active_brainz/models/*")
+
+      loader.collapse(root.join("lib/active_brainz/concerns"))
+      loader.collapse(root.join("lib/active_brainz/models"))
+      loader.collapse(root.join("lib/active_brainz/models/*"))
+
+      # Do not eager load models, because they will try and connect to the database
+      # This fails in Rails apps, because gems are loaded before the configuration
+      # is initialized.
+      loader.do_not_eager_load(root.join("lib/active_brainz/models"))
 
       loader.setup
       loader.eager_load
@@ -30,6 +38,7 @@ module ActiveBrainz
       # Load initializers
       Dir[root.join("config/initializers/*.rb")].sort.each { |f| require f }
     end
+    # rubocop:enable Metrics/AbcSize
   end
 end
 

data/lib/active_brainz/models/area/area.rb

@@ -60,17 +60,17 @@ module ActiveBrainz
     #          class_name: "Editor",
     #          foreign_key: "area"
 
-    # has_many :area_iso_3166_1s,
-    #          class_name: "Iso31661",
-    #          foreign_key: "area"
+    has_one :area_iso_3166_1,
+            class_name: "ISO31661",
+            foreign_key: "area"
 
-    # has_many :area_iso_3166_2s,
-    #          class_name: "Iso31662",
-    #          foreign_key: "area"
+    has_one :area_iso_3166_2,
+            class_name: "ISO31662",
+            foreign_key: "area"
 
-    # has_many :area_iso_3166_3s,
-    #          class_name: "Iso31663",
-    #          foreign_key: "area"
+    has_one :area_iso_3166_3,
+            class_name: "ISO31663",
+            foreign_key: "area"
 
     has_many :area_labels,
              class_name: "Label",

data/lib/active_brainz/models/iso/iso_3166_1.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ActiveBrainz
+  class ISO31661 < Base
+    self.table_name = "iso_3166_1"
+    self.primary_key = "code"
+
+    belongs_to :iso_3166_1_area,
+               class_name: "Area",
+               foreign_key: "area",
+               optional: true
+  end
+end
+
+# == Schema Information
+#
+# Table name: iso_3166_1
+#
+#  area :integer          not null
+#  code :string(2)        not null, primary key
+#
+# Indexes
+#
+#  iso_3166_1_idx_area  (area)
+#
+# Foreign Keys
+#
+#  iso_3166_1_fk_area  (area => area.id)
+#

data/lib/active_brainz/models/iso/iso_3166_2.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ActiveBrainz
+  class ISO31662 < Base
+    self.table_name = "iso_3166_2"
+    self.primary_key = "code"
+
+    belongs_to :iso_3166_2_area,
+               class_name: "Area",
+               foreign_key: "area",
+               optional: true
+  end
+end
+
+# == Schema Information
+#
+# Table name: iso_3166_2
+#
+#  area :integer          not null
+#  code :string(10)       not null, primary key
+#
+# Indexes
+#
+#  iso_3166_2_idx_area  (area)
+#
+# Foreign Keys
+#
+#  iso_3166_2_fk_area  (area => area.id)
+#

data/lib/active_brainz/models/iso/iso_3166_3.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ActiveBrainz
+  class ISO31663 < Base
+    self.table_name = "iso_3166_3"
+    self.primary_key = "code"
+
+    belongs_to :iso_3166_3_area,
+               class_name: "Area",
+               foreign_key: "area",
+               optional: true
+  end
+end
+
+# == Schema Information
+#
+# Table name: iso_3166_3
+#
+#  area :integer          not null
+#  code :string(4)        not null, primary key
+#
+# Indexes
+#
+#  iso_3166_3_idx_area  (area)
+#
+# Foreign Keys
+#
+#  iso_3166_3_fk_area  (area => area.id)
+#

data/lib/active_brainz/version.rb

@@ -5,7 +5,7 @@ require "date"
 module ActiveBrainz
   module Version
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     PRE   = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_brainz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Florian Dejonckheere
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -325,12 +325,12 @@ files:
 - lib/active_brainz/models/artist/artist_credit_name.rb
 - lib/active_brainz/models/artist/artist_type.rb
 - lib/active_brainz/models/base.rb
-- lib/active_brainz/models/concerns/has_begin_end_date.rb
-- lib/active_brainz/models/concerns/has_gid.rb
-- lib/active_brainz/models/concerns/has_parent_children.rb
 - lib/active_brainz/models/gender/gender.rb
 - lib/active_brainz/models/genre/genre.rb
 - lib/active_brainz/models/genre/genre_alias.rb
+- lib/active_brainz/models/iso/iso_3166_1.rb
+- lib/active_brainz/models/iso/iso_3166_2.rb
+- lib/active_brainz/models/iso/iso_3166_3.rb
 - lib/active_brainz/models/label/label.rb
 - lib/active_brainz/models/label/label_alias.rb
 - lib/active_brainz/models/label/label_alias_type.rb
@@ -365,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: MusicBrainz ActiveRecord integration

data/lib/active_brainz/models/concerns/has_begin_end_date.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveBrainz
-  module HasBeginEndDate
-    extend ActiveSupport::Concern
-
-    included do
-      attribute :begin_date_year, :integer
-      attribute :begin_date_month, :integer
-      attribute :begin_date_day, :integer
-
-      attribute :end_date_year, :integer
-      attribute :end_date_month, :integer
-      attribute :end_date_day, :integer
-
-      attribute :ended, :boolean
-
-      def begin_date
-        @begin_date ||= Date.new(*[begin_date_year, begin_date_month, begin_date_day].compact)
-      end
-
-      def end_date
-        @end_date ||= Date.new(*[end_date_year, end_date_month, end_date_day].compact)
-      end
-    end
-  end
-end

data/lib/active_brainz/models/concerns/has_gid.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveBrainz
-  module HasGID
-    extend ActiveSupport::Concern
-
-    included do
-      attribute :gid
-
-      validates :gid,
-                presence: true,
-                uniqueness: true
-    end
-  end
-end

data/lib/active_brainz/models/concerns/has_parent_children.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveBrainz
-  module HasParentChildren
-    extend ActiveSupport::Concern
-
-    included do
-      has_many :children,
-               class_name: name.demodulize,
-               foreign_key: "parent"
-
-      belongs_to :parent,
-                 class_name: name.demodulize,
-                 foreign_key: "parent",
-                 optional: true
-
-      attribute :child_order, :integer
-    end
-  end
-end