lca 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c465bce714b41f2b8ac878d9ba5df4f6d4797fd29005ce325bc4d415354a144
-  data.tar.gz: 7d5e3cb3aefaa080899483e3031f0d93a81b2907fadac1f43c27cdc819f5a87b
+  metadata.gz: 771b69813b99e5d0f92e8b69acd1a6c4b30014c8b1e6b6d253d60870bcf8b719
+  data.tar.gz: fe2d5c4335ea33f83d42d2997725b543c3c7fcb9d8e7c9057f023be92dea9264
 SHA512:
-  metadata.gz: ea29b421a25379cc4891d94113a49fbd73c8f4ee7dbc0bb5e3cffb6d80a0841e7bd9aca05dc1c2fb09d7091f863b9a888b8980770ede5369baf2bff993e9e331
-  data.tar.gz: f4124579adc16d992dddfca9740e3212bb91098d06095f965ef2704a7a0a66a90ecd71cbe0d574a98cf8c1e7fe294bee1f654e4f1c1531cdfbc8cbcab000ed72
+  metadata.gz: 0b96260e9b0e79ca1b6add7b838adeb138d7ba0809271dd913f06759132a21145993cff3d30c55866f271160006d613b51d812417f8697d0550cd38a96f74009
+  data.tar.gz: e555dc61a62267987635e46bba1758134a8177d3fbf74ff769f746cc27d7b8ec175a8adc34b901d024a9cf8106c6051d4709fab09dfb81f423604f184372d259

data/Gemfile

@@ -9,4 +9,7 @@ gem "rspec", "~> 3.0"
 
 gem "activerecord", "~> 6.0"
 gem "activestorage", "~> 6.0"
-gem "actiontext", "~> 6.0"
+gem "actiontext", "~> 6.0"
+
+gem "jwt"
+gem "pg_ltree"

data/lib/generators/lca/templates/migration.rb.tt

@@ -22,8 +22,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
 	type text,
 	name text,
 
-	parent_id integer,
-    parent_type text,
+	parent_entity_id integer,
+	parent_entity_type text,
 
 	path ltree,
     	path_slug text,
@@ -44,7 +44,7 @@ SQL
     add_index LCA_OPTIONS[:table_name], :id
     add_index LCA_OPTIONS[:table_name], :owner_id
     add_index LCA_OPTIONS[:table_name], :type
-    add_index LCA_OPTIONS[:table_name], :parent_id
+    add_index LCA_OPTIONS[:table_name], :parent_entity_id
 
     # next two indexes unfortunately can't be unique since a cycle can appear several times under an owner
     add_index LCA_OPTIONS[:table_name], :path, using: :gist

data/lib/lca/models/cycle.rb

@@ -1,6 +1,6 @@
 class Lca::Cycle < Lca::Model
 
-    has_many :stages, class_name: "::Lca::Stage", foreign_key: :parent_id, dependent: :destroy
+    has_many :stages, class_name: "::Lca::Stage", foreign_key: :parent_entity_id, dependent: :destroy
 
     def subcycles
         ::Lca::Cycle.match_path("#{path}.*")

data/lib/lca/models/exchange.rb

@@ -1,4 +1,4 @@
 class Lca::Exchange < Lca::Model
-    belongs_to :process, class_name: "::Lca::Process", foreign_key: :parent_id
-    has_many :impacts, class_name: "::Lca::Impact", foreign_key: :parent_id, dependent: :destroy
+    belongs_to :process, class_name: "::Lca::Process", foreign_key: :parent_entity_id, required: true
+    has_many :impacts, class_name: "::Lca::Impact", foreign_key: :parent_entity_id, dependent: :destroy
 end

data/lib/lca/models/impact.rb

@@ -1,6 +1,6 @@
 class Lca::Impact < Lca::Model
-    belongs_to :exchange, class_name: "::Lca::Exchange", foreign_key: :parent_id
-    
+    belongs_to :exchange, class_name: "::Lca::Exchange", foreign_key: :parent_entity_id, required: true
+
     validates_presence_of :impact_amount
     validates_presence_of :impact_amount_unit, allow_blank: false
     validates_presence_of :impact_factor

data/lib/lca/models/model.rb

@@ -9,7 +9,7 @@ class Lca::Model < ActiveRecord::Base
         return "lca_models"
     end
 
-    belongs_to :owner, polymorphic: :true
+    belongs_to :owner, polymorphic: :true, required: true
 
     scope :match_path, -> (some_path) { where("path ~ ?", "#{some_path}") }
 
@@ -21,8 +21,8 @@ class Lca::Model < ActiveRecord::Base
 
     before_validation :set_defaults
     def set_defaults
-        self.path ||= name.parameterize.gsub("-", ".")
-        self.path_slug = path.parameterize
+        self.path ||= name.parameterize.gsub("-", ".") if name
+        self.path_slug = path.parameterize if path
     end
 
 
@@ -57,6 +57,10 @@ class Lca::Model < ActiveRecord::Base
             class_name
         end
 
+	model_class.define_singleton_method(:sti_name) do
+	    original_class_name
+	end
+
         # override the STI name lmfao
         model_class.define_singleton_method(:find_sti_class) do |p|
             original_class_name.constantize

data/lib/lca/models/process.rb

@@ -1,10 +1,9 @@
 class Lca::Process < Lca::Model
 
-    has_many :exchanges, class_name: "::Lca::Exchange", foreign_key: :parent_id, dependent: :destroy
+    has_many :exchanges, class_name: "::Lca::Exchange", foreign_key: :parent_entity_id, dependent: :destroy
     has_many :impacts, through: :exchanges
-    belongs_to :stage, class_name: "::Lca::Stage", foreign_key: :parent_id
 
-    def subprocesses
-        ::Lca::Process.where("path ~ ?", "#{path}.*")
-    end
+    has_many :subprocesses, class_name: "::Lca::Process", foreign_key: :parent_entity_id, dependent: :destroy, as: :parent_entity
+    belongs_to :parent_entity, polymorphic: true, required: true
+
 end

data/lib/lca/models/stage.rb

@@ -1,6 +1,6 @@
 class Lca::Stage < Lca::Model
 
-    belongs_to :cycle, class_name: "::Lca::Cycle", foreign_key: :parent_id
-    has_many :processes, class_name: "::Lca::Process", foreign_key: :parent_id
+    belongs_to :cycle, class_name: "::Lca::Cycle", foreign_key: :parent_entity_id, required: true
+    has_many :processes, class_name: "::Lca::Process", foreign_key: :parent_entity_id
 
 end

data/lib/lca/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lca
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lca
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Nick @ Earthster