lca 0.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff437267879f30b1fdf073964e93eaf6be5c580a8baefa2fd308b1b7d38de1f
-  data.tar.gz: 6ffcf161a6bd74b41f3ca07ae7ce78e41e8e9fa68f1ff1c5350a1bab5193c9d0
+  metadata.gz: fc53882ad2b8c5c34b869be0546546973dd829b25aa39f354e9be9da63a44fae
+  data.tar.gz: 57c65eeadf05e7e6f160ea1c2ca3db8a025614578ecb6242d9f1404002651766
 SHA512:
-  metadata.gz: a2133b1c9680cb1cfb78b26335d449a86b04871fac6357f2a1741dc57434398c40156af1613a691485b168d0cfb62ee41f0c8299829b5594ba6eebfe218499c4
-  data.tar.gz: 65a355dd57bdaf6deffcdffbb567247b6d28a6ac1dd7100631205e4d1337cf123c110aeeb517372ade19f13f166c85c9ee837d25c7441a692942d988cd946b8e
+  metadata.gz: 2a1542ddf863b9461fb3ceb67e45f59599608c40e98994203918b7aeb4fb87ef2e4b1f73bd7fa3a837a0cd9cbd691cf72648505f38f156c64b84b6ee097d0dd6
+  data.tar.gz: e7989620c9b0a81249e741b41bcbe8fd1854b24650d66e4963ce940ab593d8ea2340403f06f467d8e280cea3dfed99d1c5067407771557403bf2d049cf792b0c

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/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/lca.svg)](https://badge.fury.io/rb/lca)
+
 # LCA
 
 Storing, processing and working with life-cycle assessment data has always been challenging. A multitude of data models and implementations exist already but every one of them makes huge compromises or lacks functionality. 
@@ -88,12 +90,13 @@ If the `create_postgrest_roles` setting is on each new owner will be assigned a
 
 ## Roadmap
 
-* more models for various LCA cycles, processes and impacts
+* .child / .parent query support across models unrelated through inheritance 
+* more model templates for various LCA cycles, processes and impacts
 * model validations
-* query objects, including postgres RECURSIVE queries
+* query objects
+* postgres RECURSIVE queries
 * builders
 * seeds/fixtures
-* automated tests
 
 
 ## Contributing

data/lib/generators/lca/install_generator.rb

@@ -15,7 +15,10 @@ module Lca
       end
 
       def copy_config
-        copy_file "config.yml.tt", "config/lca.yml"
+        conf_file = "config/lca.yml"
+        copy_file "config.yml.tt", conf_file
+        contents = File.read( conf_file ).gsub("changeme", ('a'..'z').to_a.shuffle.first(4).join )
+        File.open(conf_file, 'wb') { |file| file.write(contents) }
       end
 
       def migration_version

data/lib/generators/lca/templates/config.yml.tt

@@ -12,3 +12,7 @@ destroy_partition_on_owner_destroy: true
 # jwt secret required for postgrest role switching
 jwt_secret: "supersecret"
 jwt_encryption: "HS256"
+
+# suffix postgres roles with a random string 
+# to avoid collisions between other LCA installations in other apps using same db server
+owner_role_suffix: "changeme"

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

@@ -8,7 +8,8 @@ LCA_OPTIONS ||= begin
             create_postgrest_roles: true,
             jwt_secret: "supersecret",
             jwt_encryption: "HS256",
-            destroy_partition_on_owner_destroy: true
+            destroy_partition_on_owner_destroy: true,
+            owner_role_suffix: "changeme"
         }
     end
 end.merge({

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/concerns/lcable.rb

@@ -12,13 +12,13 @@ module Lca
 
         included do
 
-    	    has_many :lca_cycles, class_name: "::Lca::Cycle", foreign_key: :owner_id, as: :owner
+    	    has_many :lca_cycles, class_name: "::Lca::Model", foreign_key: :owner_id, as: :owner
     	    after_create :lca_create_storage
     	    before_destroy :lca_delete_storage
 
             # instance methods
         	def lca_role
-        	    "lca_owner_#{id}"
+        	    "lca_owner_#{id}_#{ LCA_OPTIONS[:owner_role_suffix] }"
         	end # role
 
             # Generates a JWT token the client (SPA) can pass to PostgREST for privilege escalation
@@ -43,13 +43,13 @@ module Lca
 
                 if LCA_OPTIONS[:create_postgrest_roles]
             	    # drop role if it exists
-                    lca_sql "drop role if exists lca_owner_#{id}"
+                    lca_sql "drop role if exists #{ lca_role }"
 
                     # create role
-            	    lca_sql "create role lca_owner_#{id}"
+            	    lca_sql "create role #{ lca_role }"
 
         	        # grant privs
-        	        lca_sql "grant all privileges on #{lca_table_name}_#{id} to lca_owner_#{id}"
+        	        lca_sql "grant all privileges on #{lca_table_name}_#{id} to #{ lca_role }"
                 end
 
         	end # create_storage
@@ -60,10 +60,10 @@ module Lca
 
                 if LCA_OPTIONS[:create_postgrest_roles]
         	        # revoke privs
-        	        lca_sql "REVOKE ALL PRIVILEGES ON #{lca_table_name}_#{id} FROM lca_owner_#{id}"
+        	        lca_sql "REVOKE ALL PRIVILEGES ON #{lca_table_name}_#{id} FROM #{ lca_role }"
 
         	        # delete role
-        	        lca_sql "drop role lca_owner_#{id}"
+        	        lca_sql "drop role #{ lca_role }"
                 end
 
                 if LCA_OPTIONS[:destroy_partition_on_owner_destroy]
@@ -71,7 +71,7 @@ module Lca
         	        lca_sql "drop table if exists #{lca_table_name}_#{id}"
                 else
                     # detach and forget about it
-                    lca_sql "alter table #{lca_table_name} detach partition lca_owner_#{id}"
+                    lca_sql "alter table #{lca_table_name} detach partition #{ lca_role }"
                 end
         	end # delete_storage
 

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

@@ -4,12 +4,14 @@ class Lca::Model < ActiveRecord::Base
 
     self.primary_key = :id
 
+    ltree :path
+
     def self.table_name
         return ::LCA_OPTIONS[:table_name] if defined? ::LCA_OPTIONS
         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}") }
 
@@ -19,10 +21,10 @@ class Lca::Model < ActiveRecord::Base
     validates_presence_of :name, allow_blank: false
     validates_presence_of :path, allow_blank: false
 
-    before_save :set_defaults
+    before_validation :set_defaults
     def set_defaults
-        self.path ||= name.parameterize.gsub("-", ".")
-        self.path_slug = path.parameterize
+        self.path ||= name.delete(" ").gsub(/[^0-9a-z ]/i, '') if name
+        self.path_slug = path.parameterize if path
     end
 
 
@@ -57,6 +59,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"
+  VERSION = "0.2.4"
 end

data/lib/lca.rb

@@ -3,6 +3,8 @@ require "active_support/all"
 
 require "active_record"
 
+require "pg_ltree"
+
 require_relative "lca/version"
 
 require_relative "lca/models/concerns/statusable"

metadata

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