lca 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a16c5260b03c32b7338e2afc954b3b7e81cdac0d70281b381572cef31c4e2100
-  data.tar.gz: fb743e4d069c4768b3cb75fd8bd38774a5600148078e1d84bd7dc26e6686c351
+  metadata.gz: ae08a160b647985c85ef3181992f091ac978411c2409bc23de69daf97a95e1a3
+  data.tar.gz: 735cbda1c8bbde69c6b015d5d09f97fee07d7830de21978c40086910810e7d1f
 SHA512:
-  metadata.gz: d0cb142ada744da2836415053fd8e5aa246463d2921dea9ad3b0f92aa1a6c88fe5e50fefdae34189ca6cee87a0bd664fdad47447737d364b1f39018518c3c517
-  data.tar.gz: 28bfb9f87f16d36ed059db06a4aa91de7d8b3390b2f49c3f69e74519958d093b64fbdfebb753e26fead95f8fe49aec7352742545f17559bed53e652ffe311316
+  metadata.gz: 794b1b5deb3ed8ed9e44d0bf0252ddb7144e9dab733ec0ae6c28bb39d933317b1c28463c74d4a556dda9d91fbcc77ae1466a020bda7ba09aa15eb96a3336a451
+  data.tar.gz: b7aa19cf60dfe5c510b206a9e00f4afbaee46168fe1e82860d3c82b39e966dc02613e4a49c9a2f2356a19c432e01eedd99ed82fa054ec5c771bc1402426a3725

data/Gemfile

@@ -8,8 +8,6 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "activerecord", "~> 6.0"
-gem "activestorage", "~> 6.0"
-gem "actiontext", "~> 6.0"
-
+gem "active_tree", "~> 0.2.8"
 gem "jwt"
 gem "pg_ltree"

data/Gemfile.lock

@@ -1,87 +1,40 @@
 PATH
   remote: .
   specs:
-    lca (0.1.18)
-      actiontext (~> 6.0)
+    lca (0.2.8)
+      active_tree (~> 0.2.8)
       activerecord (~> 6.0)
-      activestorage (~> 6.0)
       jwt (~> 2.2.3)
       pg_ltree (~> 1.1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      rack (~> 2.0, >= 2.0.9)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
-      globalid (>= 0.3.6)
+    active_tree (0.2.9)
+      activerecord (~> 6.0)
+      jwt (~> 2.2.3)
+      pg_ltree (~> 1.1.8)
     activemodel (6.1.4.1)
       activesupport (= 6.1.4.1)
     activerecord (6.1.4.1)
       activemodel (= 6.1.4.1)
       activesupport (= 6.1.4.1)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      marcel (~> 1.0.0)
-      mini_mime (>= 1.1.0)
     activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    builder (3.2.4)
     concurrent-ruby (1.1.9)
-    crass (1.0.6)
     diff-lcs (1.4.4)
-    erubi (1.10.0)
-    globalid (0.5.2)
-      activesupport (>= 5.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jwt (2.2.3)
-    loofah (2.12.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    marcel (1.0.1)
-    mini_mime (1.1.1)
     minitest (5.14.4)
-    nokogiri (1.12.4-x86_64-linux)
-      racc (~> 1.4)
     pg (1.2.3)
     pg_ltree (1.1.8)
       activerecord (>= 4.0.0, <= 7.0.0.rc1)
       pg (>= 0.17.0, < 2)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
     rake (13.0.6)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -104,10 +57,11 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  actiontext (~> 6.0)
+  active_tree (~> 0.2.8)
   activerecord (~> 6.0)
-  activestorage (~> 6.0)
+  jwt
   lca!
+  pg_ltree
   rake (~> 13.0)
   rspec (~> 3.0)
 

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/lca.svg)](https://badge.fury.io/rb/lca)
+[![Tests](https://github.com/nicksterious/lca/actions/workflows/ci.yml/badge.svg)](https://github.com/nicksterious/lca/actions/workflows/ci.yml) [![Ruby Gem](https://github.com/nicksterious/lca/actions/workflows/rubygems.yml/badge.svg)](https://github.com/nicksterious/lca/actions/workflows/rubygems.yml) [![Gem Version](https://badge.fury.io/rb/lca.svg)](https://badge.fury.io/rb/lca) 
 
 # LCA
 
@@ -24,15 +24,15 @@ Or install it yourself as:
 
     $ gem install lca
     
-Upon installing the gem you must run the install process in your Rails application's root:
+Upon installing the gem you must run the ActiveTree install process in your Rails application's root:
 
-    $ rails g lca:install
+    $ rails g active_tree:install
     
-This will generate a `config/lca.yml` which you may customize to your needs, an initializer and a migration file which you can also customize to add any database columns your models will require.
+This will generate a `config/active_tree.yml` which you may customize to your needs, an initializer and a migration file which you can also customize to add any database columns your models will require.
 
 ## Usage
 
-Include the LCA concern into one of your models which will own lifecycle trees (owner model):
+Include the ActiveTree concern into one of your models which will own lifecycle trees (owner model):
 
 ```ruby
     class User < ApplicationRecord
@@ -45,16 +45,16 @@ This will extend your model and enable the following functionality:
 
 ```ruby
 # query with ActiveRecord syntax
-User.last.lca_cycles
+User.last.active_trees
 User.find_by(name: "Acme").lca_cycles.impacts.select("impact_unit, sum(impact_amount) as total_impact").group(:impact_unit)
-User.last.lca_cycles.where(...)
-User.last.lca_cycles.where(...).group(...)
-User.last.lca_cycles.where(...).limit(...).offset(...)
+User.last.active_trees.where(...)
+User.last.active_trees.where(...).group(...)
+User.last.active_trees.where(...).limit(...).offset(...)
     
 # AR query with ltree syntax
-User.last.lca_cycles.disabled.match_path("*.CustomProcess.*")
-User.last.lca_cycles.match_path("*{5,10}.CustomProcess.*.Ecosphere.*")
-User.last.lca_cycles.active.match_path("*.WhateverProcess.*.Ecosphere.*.CO2Emission.*").where( impact_amount: [100..150]).sum(:impact_amount)
+User.last.active_trees.disabled.match_path("*.CustomProcess.*")
+User.last.active_trees.match_path("*{5,10}.CustomProcess.*.Ecosphere.*")
+User.last.active_trees.active.match_path("*.WhateverProcess.*.Ecosphere.*.CO2Emission.*").where( impact_amount: [100..150]).sum(:impact_amount)
 
 Lca::Cycle.match_path("Top.Electric Vehicle.*").impacts.match_path("*.CO2*").where( impact_amount: [ 1000..10000 ]).average(:impact_amount)
 Lca::Cycle::Product.where(name: "Electric Vehicle Battery").impacts.match_path("*.Cobalt.*").sum(:impact_amount)
@@ -64,11 +64,11 @@ Lca::Exchange.match_path("*.Oil.*.Ecosphere.*").impacts.sum(:impact_amount)
 Lca::Product.match_path("*.ElectricVehicle.*").processes.match_path("*.Processing.*").where(location: "EU").impacts.match_path("*.Lithium.*").where(location: ["CN", "Africa"]).sum(:impact_amount)
         
 # pg_ltree queries
-User.last.lca_cycles.last.parent
+User.last.active_trees.last.parent
 Lca::Process.match_path("*.Manual assembly.*").children
     
 # pg_ltree combined with AR syntax
-User.last.lca_cycles(type: "Lca::Product").children.match_path("*.Retail").children.exchanges
+User.last.active_trees(type: "Lca::Product").children.match_path("*.Retail").children.exchanges
     
 # all queries can be directed to a specific partition:
 Lca::Process.owned_by( owner_id ).match_path("*.Recycling.*").where(impact_unit: "tons CO2/year").impacts.sum(:impact_amount)
@@ -83,13 +83,10 @@ Lca::Impact::Ecosphere::Fauna.match_path("*.ResourceExtraction.*").where(impact_
 ```
 
 To see what syntax to use for path traversal please check out the following resources:
+* active_tree gem https://github.com/nicksterious/active_tree
 * pg_ltree gem https://github.com/sjke/pg_ltree
 * Postgres ltree extension documentation https://www.postgresql.org/docs/9.1/ltree.html
 
-The LCA gem is designed to be compatible with PostgREST. PostgREST is an amazing tool that generates a CRUD REST API for your Postgres database, read more about it here: https://postgrest.org
-
-If the `create_postgrest_roles` setting is on each new owner will be assigned a Postgres role allowing them to access data within their partition using PostgREST. Your owner model will be extended with a `.generate_jwt` method you can use to generate the PostgREST authentication token.
-
 ## Caveats
 
 `pg_ltree` .child / .parent queries do not work across different models due to an ActiveRecord limitation that requires results to be related via inheritance. 
@@ -110,7 +107,6 @@ Lca::Process.last.children.unscope(where: :type).impacts.where(impact_amount: 50
 * .child / .parent query support across models unrelated through inheritance 
 * more model templates for various LCA cycles, processes and impacts
 * model validations
-* query objects
 * postgres RECURSIVE queries
 * builders
 * seeds/fixtures
@@ -120,10 +116,6 @@ Lca::Process.last.children.unscope(where: :type).impacts.where(impact_amount: 50
 
 Bug reports, pull requests and feature suggestions are welcome on GitHub at https://github.com/nicksterious/lca 
 
-## Sponsors
-
-We welcome any sponsorship through Github Sponsors. All corporate sponsors' logo and URL of choice shall show up within this section.
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/generators/lca/install_generator.rb

@@ -10,17 +10,6 @@ module Lca
         migration_template "migration.rb.tt", "db/migrate/install_lca.rb", migration_version: migration_version
       end
 
-      def copy_initializer
-	    copy_file 'initializer.rb.tt', 'config/initializers/lca.rb'
-      end
-
-      def copy_config
-        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
         "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
       end

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

@@ -7,75 +7,19 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
     rescue
 	p "LTREE was already enabled"
     end
-    
-
-    # create the main table as set up within LCA_OPTIONS[:table_name]
-    execute <<-SQL
-    create table #{ LCA_OPTIONS[:table_name] } (
-	id serial,
-
-	owner_id integer,
-	owner_type character varying,
-	
-	status integer,
-
-	data_external_id character varying,
-	data_provider character varying,
-
-	type character varying,
-	name text,
-
-	parent_entity_id integer,
-	parent_entity_type character varying,
-
-	path ltree,
-    	path_slug text,
-    	
-    	metadata_inline jsonb,
-
-	impact_amount decimal,
-	impact_amount_previous decimal,
-	impact_amount_unit text,
-	impact_factor decimal,
-	impact_precision decimal,
-	
-	created_at timestamp(6) without time zone not null,
-	updated_at timestamp(6) without time zone not null,
-	
-
-	primary key (id, owner_id)
-    ) partition by list(owner_id)
-SQL
-
-    # create an "others" partition for when the owner is undefined/unknown? just in case / may help in some edge cases
-    execute "CREATE TABLE #{LCA_OPTIONS[:table_name]}_others PARTITION OF #{LCA_OPTIONS[:table_name]} DEFAULT"
 
-
-    # add indexes
-    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_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
-    add_index LCA_OPTIONS[:table_name], [:data_provider, :data_external_id]
-
-
-    # when postgrest is enabled...
-    if LCA_OPTIONS[:create_postgrest_roles]
-    	# create postgrest anon user with no privs
-    	# postgrest may pass an user's role using JWT
-    	execute "drop role if exists postgrest_anon"
-    	execute "create role postgrest_anon nologin"
-    	execute "grant postgrest_anon to #{ LCA_OPTIONS[:database_user] }"
-    end
+    # add any columns required by your business model
+    add_column ACTIVE_TREE_OPTIONS[:table_name], :impact_amount, :decimal
+    add_column ACTIVE_TREE_OPTIONS[:table_name], :impact_amount_previous, :decimal
+    add_column ACTIVE_TREE_OPTIONS[:table_name], :impact_amount_unit, :text
+    add_column ACTIVE_TREE_OPTIONS[:table_name], :impact_factor, :decimal
+    add_column ACTIVE_TREE_OPTIONS[:table_name], :impact_precision, :decimal
 
 
     # snapshots table
     # maybe this should only store the impacts?
     execute <<-SQL
-    create table #{ LCA_OPTIONS[:table_name] }_snapshots (
+    create table #{ ACTIVE_TREE_OPTIONS[:table_name] }_snapshots (
 	id serial,
 
 	impact_id integer,
@@ -97,22 +41,10 @@ SQL
 SQL
 
     # index the snapshots table
-    add_index "#{LCA_OPTIONS[:table_name]}_snapshots", :id
-    add_index "#{LCA_OPTIONS[:table_name]}_snapshots", :owner_id
-    add_index "#{LCA_OPTIONS[:table_name]}_snapshots", :impact_id
-    add_index "#{LCA_OPTIONS[:table_name]}_snapshots", :created_at
-
+    add_index "#{ACTIVE_TREE_OPTIONS[:table_name]}_snapshots", :id
+    add_index "#{ACTIVE_TREE_OPTIONS[:table_name]}_snapshots", :owner_id
+    add_index "#{ACTIVE_TREE_OPTIONS[:table_name]}_snapshots", :impact_id
+    add_index "#{ACTIVE_TREE_OPTIONS[:table_name]}_snapshots", :created_at
 
-    # metadata table
-    create_table "#{ LCA_OPTIONS[:table_name] }_metadata" do |t|
-	t.string :model_type
-	t.integer :model_id
-	t.string :key
-	t.text :value
-	
-	t.timestamps
-    end
-    add_index "#{ LCA_OPTIONS[:table_name] }_metadata", [ :model_type, :model_id ]
-    add_index "#{ LCA_OPTIONS[:table_name] }_metadata", [ :key ]
   end
 end

data/lib/lca/models/concerns/lcable.rb

@@ -7,82 +7,54 @@ module Lca
     	extend ActiveSupport::Concern
 
         included do
+	    before_destroy :lca_delete_storage
 
-    	    has_many :lca_cycles, class_name: "::Lca::Model", foreign_key: :owner_id, as: :owner
-    	    after_create :lca_create_storage
-    	    before_destroy :lca_delete_storage
+	    #
+    	    include ActiveTree::ActiveTreeAble
+	    after_create :lca_create_storage
 
-            # instance methods
-        	def lca_role
-        	    "lca_owner_#{id}_#{ LCA_OPTIONS[:owner_role_suffix] }"
-        	end # role
+	    has_many :lca_cycles, class_name: "::Lca::Model", foreign_key: :owner_id, as: :owner
 
-            # Generates a JWT token the client (SPA) can pass to PostgREST for privilege escalation
-        	def generate_jwt
-        	    payload = { role: self.lca_role }
-        	    ::JWT.encode payload, LCA_OPTIONS[:jwt_secret], LCA_OPTIONS[:jwt_encryption]
-        	end # .generate_jwt
 
+	    def lca_role
+    	    	"active_tree_owner_#{id}_#{ ACTIVE_TREE_OPTIONS[:owner_role_suffix] }"
+    	    end # role
 
-            # Returns the LCA table name as configured within config/lca.yml
-        	def lca_table_name
-        	    LCA_OPTIONS[:table_name]
-        	end # .lca_table_name
 
+	    def lca_table_name
+		ACTIVE_TREE_OPTIONS[:table_name]
+	    end
 
-            # Creates LCA table partition and role for owner
-        	def lca_create_storage
 
-        	    # create data partition
-        	    lca_sql "create table if not exists #{lca_table_name}_#{id} partition of #{lca_table_name} for values in (#{id})"
-        	    # TODO create partition indexes
+	    def lca_create_storage
+		# create snapshots partition
+		lca_sql "create table if not exists #{lca_table_name}_snapshots_#{id} partition of #{lca_table_name}_snapshots for values in (#{id})"
+		
+		# if roles are enabled, grant privileges
+		if ACTIVE_TREE_OPTIONS[:create_postgrest_roles]
+		    lca_sql "grant all privileges on #{lca_table_name}_snapshots_#{id} to #{ lca_role }"
+		end
+	    end
 
-        	    # create snapshots partition
-        	    lca_sql "create table if not exists #{lca_table_name}_snapshots_#{id} partition of #{lca_table_name}_snapshots for values in (#{id})"
-        	    # TODO create partition indexes
 
-            	    if LCA_OPTIONS[:create_postgrest_roles]
-            		# drop role if it exists
-                	lca_sql "drop role if exists #{ lca_role }"
+	    def lca_delete_storage
+		# remove privs
+		if ACTIVE_TREE_OPTIONS[:create_postgrest_roles]
+		    lca_sql "REVOKE ALL PRIVILEGES ON #{lca_table_name}_snapshots_#{id} FROM #{ lca_role }"
+		end
 
-                	# create role
-            		lca_sql "create role #{ lca_role }"
+		if ACTIVE_TREE_OPTIONS[:destroy_partition_on_owner_destroy]
+		    lca_sql "drop table if exists #{lca_table_name}_snapshots_#{id}"
+		else
+		    lca_sql "alter table #{lca_table_name}_snapshots detach partition #{ lca_role }"
+		end
+		
+	    end
 
-        		# grant privs
-        		lca_sql "grant all privileges on #{lca_table_name}_#{id} to #{ lca_role }"
-        		lca_sql "grant all privileges on #{lca_table_name}_snapshots_#{id} to #{ lca_role }"
-            	    end
-
-        	end # create_storage
-
-
-            # Deletes or detaches the partition and removes the role for this owner
-        	def lca_delete_storage
-
-            	    if LCA_OPTIONS[:create_postgrest_roles]
-        	        # revoke privs
-        	        lca_sql "REVOKE ALL PRIVILEGES ON #{lca_table_name}_#{id} FROM #{ lca_role }"
-        	        lca_sql "REVOKE ALL PRIVILEGES ON #{lca_table_name}_snapshots_#{id} FROM #{ lca_role }"
-
-        	        # delete role
-        	        lca_sql "drop role #{ lca_role }"
-            	    end
-
-            	    if LCA_OPTIONS[:destroy_partition_on_owner_destroy]
-        	        # delete partition
-        	        lca_sql "drop table if exists #{lca_table_name}_#{id}"
-        	        lca_sql "drop table if exists #{lca_table_name}_snapshots_#{id}"
-            	    else
-                	# detach and forget about it
-                	lca_sql "alter table #{lca_table_name} detach partition #{ lca_role }"
-                	lca_sql "alter table #{lca_table_name}_snapshots detach partition #{ lca_role }"
-            	    end
-        	end # delete_storage
-
-            def lca_sql sql
-                ActiveRecord::Base.connection.execute sql
-            end # lca_sql
 
+	    def lca_sql(q)
+		ActiveRecord::Base.connection.execute q
+	    end
     	end # ClassMethods
     end
 end

data/lib/lca/models/cycle/product.rb

@@ -1,6 +1,7 @@
 class Lca::Cycle::Product < Lca::Cycle
     # price?
     # quantity?
+    # quantity unit?
     # life time?
     # life time unit?
 end

data/lib/lca/models/cycle/service.rb

@@ -1,4 +1,5 @@
 class Lca::Cycle::Service < Lca::Cycle
     # duration?
+    # duration unit?
     # price?
 end

data/lib/lca/models/impact_snapshot.rb

@@ -3,8 +3,8 @@ class Lca::ImpactSnapshot < ActiveRecord::Base
     self.primary_key = :id
 
     def self.table_name
-        return "#{::LCA_OPTIONS[:table_name]}_snapshots" if defined? ::LCA_OPTIONS
-        return "lca_models_snapshots"
+        return "#{::ACTIVE_TREE_OPTIONS[:table_name]}_snapshots" if defined? ::ACTIVE_TREE_OPTIONS
+        return "active_tree_snapshots"
     end
 
 

data/lib/lca/models/model.rb

@@ -1,78 +1,5 @@
-class Lca::Model < ActiveRecord::Base
+class Lca::Model < ActiveTree::Model
 
-    include Lca::Statusable
 
-    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, required: true
-
-    scope :match_path, -> (some_path) { where("path ~ ?", "#{some_path}") }
-
-    #has_one_attached :picture
-    #has_rich_text :description
-
-    validates_presence_of :name, allow_blank: false
-    validates_presence_of :path, allow_blank: false
-
-    has_many :metadata, class_name: "::Lca::Metadata", dependent: :destroy, as: :model
-
-    before_validation :set_defaults
-    def set_defaults
-        self.path ||= name.delete(" ").gsub(/[^0-9a-z ]/i, '') if name
-        self.path_slug = path.parameterize if path
-        self.metadata_inline ||= {}
-    end
-
-
-    # Scoping by owner in order to select the partition
-    #
-    # @param owner_id [Integer] the partition owner
-    def self.owned_by(owner_id)
-        # if we're looking for anything else but an integer, revert to the base class
-        return self if !owner_id.is_a? Integer
-
-        partition_suffix = "_#{owner_id}"
-
-        table = "#{ self.table_name }#{ partition_suffix }"
-
-        ApplicationRecord.connection.schema_cache.clear!
-        return self if !ApplicationRecord.connection.schema_cache.data_source_exists? table
-
-        # duplicate the class
-        model_class = Class.new self
-        original_class_name = self.name
-
-        # ...for this owner
-        class_name = "#{name}#{partition_suffix}"
-
-        # specify the table
-        model_class.define_singleton_method(:table_name) do
-            table
-        end
-
-        # specify the name
-        model_class.define_singleton_method(:name) do
-            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
-        end
-
-        # proceed
-        model_class
-    end # .owned_by
 
 end

data/lib/lca/models/process/transport.rb

@@ -1,2 +1,6 @@
 class Lca::Process::Transport < Lca::Process
-end
+  # distance?
+  # distance unit?
+  # duration?
+  # duration unit?
+end

data/lib/lca/models/stage.rb

@@ -3,4 +3,9 @@ class Lca::Stage < Lca::Model
     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
 
+    # duration?
+    # duration unit?
+    
+    # quantity?
+    # quantity unit?
 end

data/lib/lca/queries/query.rb

@@ -1,8 +1,3 @@
-class Lca::Queries::Query
-
-    def valid_input?(v)
-	return false if [ [], "", "0", 0, nil, [""], [0], ["0"], [nil], "all" ].include?(v)
-        return true
-    end
+class Lca::Queries::Query < ActiveTree::Query
 
 end

data/lib/lca/version.rb

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

data/lib/lca.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
-require "active_support/all"
 
+require "active_support/all"
 require "active_record"
-
 require "pg_ltree"
+require "active_tree"
 
 require_relative "lca/version"
 
-require_relative "lca/models/concerns/statusable"
-require_relative "lca/models/metadata"
+require_relative "lca/models/concerns/lcable"
 require_relative "lca/models/model"
 require_relative "lca/models/cycle"
 require_relative "lca/models/stage"
@@ -39,39 +38,12 @@ require_relative "lca/models/impact/ecosphere/flora"
 require_relative "lca/models/impact/human_health/cancer"
 require_relative "lca/models/impact/technosphere/resource_availability"
 
-require_relative "lca/models/concerns/lcable"
 require_relative "lca/active_record"
 
-# TODO add query objects and builders
-#require "lca/queries/"
-#require "lca/builders/"
 
 module Lca
     class Error < StandardError; end
 
-    # Your code goes here...
-
-    class << self
-    	attr_accessor :lca_models
-    	attr_accessor :options
-    end
-
-    self.lca_models = []
-
-    def self.lca_options
-	    @options ||= begin
-    	    path = Rails.root.join("config", "lca.yml").to_s
-    	    if File.exist?(path)
-    		    YAML.load(ERB.new(File.read(path)).result)
-    	    else
-        		{
-        		    table_name: "lca_models",
-        		    jwt_secret: "",
-        		    jwt_encryption: "HS256"
-        		}
-    	    end
-    	end
-    end
 
     def self.env
         @env ||= ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lca
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Nick @ Earthster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,33 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: activestorage
+  name: active_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: actiontext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: pg_ltree
   requirement: !ruby/object:Gem::Requirement
@@ -97,14 +83,10 @@ files:
 - bin/console
 - bin/setup
 - lib/generators/lca/install_generator.rb
-- lib/generators/lca/templates/config.yml.tt
-- lib/generators/lca/templates/initializer.rb.tt
 - lib/generators/lca/templates/migration.rb.tt
 - lib/lca.rb
 - lib/lca/active_record.rb
-- lib/lca/builders/builder.rb
 - lib/lca/models/concerns/lcable.rb
-- lib/lca/models/concerns/statusable.rb
 - lib/lca/models/cycle.rb
 - lib/lca/models/cycle/activity.rb
 - lib/lca/models/cycle/product.rb
@@ -119,7 +101,6 @@ files:
 - lib/lca/models/impact/technosphere.rb
 - lib/lca/models/impact/technosphere/resource_availability.rb
 - lib/lca/models/impact_snapshot.rb
-- lib/lca/models/metadata.rb
 - lib/lca/models/model.rb
 - lib/lca/models/process.rb
 - lib/lca/models/process/raw_resource.rb

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

@@ -1,18 +0,0 @@
-# the main table will be called "lca_models"
-# partitions will be called "lca_models_X" where X is the owner object ID
-table_name: "lca_models"
-
-# create PG roles for postgrest: anon and owner-specific roles
-create_postgrest_roles: true
-
-# on owner removal, detach the partition but preserve the table and data, or destroy the partition and data
-# if you choose to detach and preserve, in order to avoid table name collisions, make sure owner IDs are not reused
-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

@@ -1,17 +0,0 @@
-LCA_OPTIONS ||= begin
-    path = Rails.root.join("config", "lca.yml").to_s
-    if File.exist?(path)
-        YAML.load( ERB.new(File.read(path)).result ).deep_symbolize_keys
-    else
-        {
-            table_name: "lca_models",
-            create_postgrest_roles: true,
-            jwt_secret: "supersecret",
-            jwt_encryption: "HS256",
-            destroy_partition_on_owner_destroy: true,
-            owner_role_suffix: "changeme"
-        }
-    end
-end.merge({
-    database_user: Rails.application.config.database_configuration[ Rails.env ].deep_symbolize_keys[:username]
-})

data/lib/lca/builders/builder.rb

@@ -1,3 +0,0 @@
-class Lca::Builder
-
-end

data/lib/lca/models/concerns/statusable.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-module Lca::Statusable
-
-    extend ActiveSupport::Concern
-
-    included do
-        scope :active, -> { where(status: 1) }
-        scope :inactive, -> { where(status: 0) }
-	alias_method :enabled?, :active?
-	alias_method :enable!, :active!
-	alias_method :on!, :active!
-	alias_method :disabled?, :inactive?
-	alias_method :disable!, :inactive!
-	alias_method :off!, :inactive!
-	alias_method :toggle?, :toggle_status!
-	
-	before_create :set_default_status
-    end
-
-    def set_default_status
-	self.status ||= 1
-    end
-
-    def toggle_status!
-        if active?
-            inactive!
-        else
-            active!
-        end
-    end
-
-    def status?
-	    [:inactive, :active][ status ]
-    end
-
-    def active?
-        status == 1
-    end
-    def inactive?
-        status == 0
-    end
-
-    def active!
-        self.update(status: 1)
-    end
-    def inactive!
-        self.update(status: 0)
-    end
-end

data/lib/lca/models/metadata.rb

@@ -1,12 +0,0 @@
-class Lca::Metadata < ActiveRecord::Base
-
-    belongs_to :model, polymorphic: true, required: true
-
-    def self.table_name
-	return "#{ ::LCA_OPTIONS[:table_name] }_metadata" if defined? ::LCA_OPTIONS
-	return "lca_models_metadata"
-    end
-    
-    validates_presence_of :key
-
-end