local_model 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f853000f33467ac6f85e87035eecfcd676640fc6bbaf05457a61637604c9f005
-  data.tar.gz: f33774550c04178eb2083f9a1c008b1d6e548454a9134077a345a822c274fb27
+  metadata.gz: 8851a543d6b05aff962d00d160c7e38c5d770e880b38131bb7f417e51c7e1a35
+  data.tar.gz: 20e8e5b027a36a7e4a99d142a21a07797563ca024ec3e24be1c55e8b14b663e2
 SHA512:
-  metadata.gz: 7a66632adc5f6c61c0f4d2f9153df4af34427e03cb3dccdcef59c6f4f6fabcdada61e7071ec0b3f4a85679830f57f48f120863677d0077826cf1961ddd55d847
-  data.tar.gz: 0e38bf60d7b826a97b4b7f7db53740ad3b532cb054dc843eb58f1e4f770cd57b73c915f4ab252d7aeac5b2784192f3d3d32aabd34bce2e6b570ccd09ced43714
+  metadata.gz: c75fb02836ac60ec9f916fe545a8d1af7ba95895f94f217379ef9086e2140f7489b4ad879b5efcf7a183be666e2a0ec4beb38854556fff96e87eeb2423d79101
+  data.tar.gz: c9c72999f0f71fc98ba75563cbacf4114678dc4e9343cdbe49327db35564c2324633f1fc08edd348790e2df795fb7c3dbaaed41c876d49dcd2b9ccb73a1be9ba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    local_model (0.1.4)
+    local_model (0.1.9)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -81,7 +81,7 @@ As of now, supports:
 - #destroy, .find, .create, .new, .where, .first, .second, .last, relationships, updating,
 
 Does not support yet (notably): 
-- .build, .update, validations, #<< to add many relationships 
+- .build, .update, validations
 - object equivalence if gotten from source twice
 
 

data/lib/local_model.rb

@@ -1,6 +1,7 @@
 require_relative "./local_model/version"
 require 'csv'
 require_relative './local_model/sandbox'
+require_relative './local_model/collection'
 require_relative './local_model/adapters/boolean_adapter'
 require_relative './local_model/adapters/datetime_adapter'
 require_relative './local_model/adapters/float_adapter'

data/lib/local_model/collection.rb

@@ -0,0 +1,28 @@
+class LocalModel::Collection < Array
+
+    def self.create_from(array: , for_model: , for_collection_class:, add_to_collection_proc:)
+       new_obj = new(array)
+       new_obj.model = for_model 
+       new_obj.collection_class = for_collection_class
+       new_obj.add_to_collection = add_to_collection_proc
+       new_obj
+    end
+
+    attr_accessor :model, :collection_class, :add_to_collection
+
+    def <<(arg)
+        self.push(arg)
+    end
+
+    def push(arg)
+        self.[]=(self.length, arg)
+        raise ArgumentError.new("#{arg.class} inputted, expecting #{self.collection_class}") if !arg.is_a?(self.collection_class)
+        add_to_collection[arg, self.model]
+        arg.save && self.model.save
+    end
+
+    def build(arg)
+        self.push(arg)
+    end
+
+end

data/lib/local_model/helpers/functions.rb

@@ -11,7 +11,8 @@ class LocalModel::Functions
   end
 
   def self.singularize(word)
-    return PluralizedWords::IRREGULAR_SINGULARIZED_WORDS[word] if PluralizedWords::IRREGULAR_PLURALIZED_WORDS[word]
+    word = word.to_s
+    return LocalModel::PluralizedWords::IRREGULAR_SINGULARIZED_WORDS[word] if LocalModel::PluralizedWords::IRREGULAR_SINGULARIZED_WORDS[word]
     if word[-1] == "i"
       "#{word[0...-1]}us"
     elsif word[-1] == "a"
@@ -33,7 +34,8 @@ class LocalModel::Functions
   end
 
   def self.pluralize(word)
-    return PluralizedWords::IRREGULAR_PLURALIZED_WORDS[word] if PluralizedWords::IRREGULAR_PLURALIZED_WORDS[word]
+    word = word.to_s
+    return LocalModel::PluralizedWords::IRREGULAR_PLURALIZED_WORDS[word] if LocalModel::PluralizedWords::IRREGULAR_PLURALIZED_WORDS[word]
     if word[-2..-1] == "us"
       "#{word[0...-2]}i"
     elsif word[-2..-1] == "on"

data/lib/local_model/helpers/pluralized_words.rb

@@ -1,4 +1,4 @@
-class PluralizedWords
+class LocalModel::PluralizedWords
 
   IRREGULAR_SINGULARIZED_WORDS = {
     "children" => "child",
@@ -20,7 +20,11 @@ class PluralizedWords
     "beliefs" => "belief",
     "chefs" => "chef",
     "chiefs" => "chief",
-    "gasses" => "gas"
+    "gasses" => "gas",
+    "moves" => "move",
+    "groves" => "grove",
+    "stoves" => "stove",
+    "beliefs" => "belief"
   }
 
    IRREGULAR_PLURALIZED_WORDS = {
@@ -43,7 +47,7 @@ class PluralizedWords
     "belief" => "beliefs",
     "chef" => "chefs",
     "chief" => "chiefs",
-    "gas" => "gasses"
+    "gas" => "gasses",
   }
 
 end

data/lib/local_model/model.rb

@@ -13,7 +13,6 @@ class LocalModel::Model
     else
       association_class_name = namespace_classname(class_name)
     end
-    association_class = Object.const_get(association_class_name)
 
     if foreign_key.nil?
       keyname = "#{association}_id"
@@ -22,12 +21,13 @@ class LocalModel::Model
     end
 
     define_method association do
+      association_class = Object.const_get(association_class_name)
       id = self.send(keyname)
       association_class.find(id)
     end
 
     define_method "#{association}=" do |association_obj|
-      self.send("#{keyname}=", association_obj.id)
+      self.send("#{keyname}=", association_obj&.id)
     end
   end
 
@@ -38,37 +38,66 @@ class LocalModel::Model
       association_classname = namespace_classname(class_name)
     end
 
-    current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(denamespace_classname(self))}_id"
-    belongs_to_id_sym = current_class_id_methodname.to_sym
-
     if through.nil?
+      current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(denamespace_classname(self))}_id"
+      belongs_to_id_sym = current_class_id_methodname.to_sym
+      add_to_collection = Proc.new do |arg, model|
+        arg.send("#{belongs_to_id_sym}=", model.id)
+      end
       define_method association do
         association_class = Object.const_get(association_classname)
-        association_class.where(belongs_to_id_sym => self.id)
+        LocalModel::Collection.create_from(
+          array: association_class.where(belongs_to_id_sym => self.id),
+          for_model: self,
+          for_collection_class: association_class,
+          add_to_collection_proc: add_to_collection
+        )
       end
     else
-      through_classname = namespace_classname(get_classname_from_association(through))
+      current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(LocalModel::Functions.singularize(association))}_id"
+      belongs_to_id_sym = current_class_id_methodname.to_sym
+      add_to_collection = Proc.new do |arg, model|
+        through_collection = model.send(through)
+        through_classname = through_collection.collection_class
+        new_join = through_classname.new
+        new_join.send("#{belongs_to_id_sym}=", arg.id)
+        through_collection << new_join
+      end
       define_method association do 
-        through_class = Object.const_get(through_classname)
-        through_class.where(belongs_to_id_sym => self.id).map{|obj| obj.send(LocalModel::Functions.singularize(association))}
+        association_class = Object.const_get(association_classname)
+        LocalModel::Collection.create_from(
+          array: self.send(through).map{|through_obj| association_class.find(through_obj.send(belongs_to_id_sym))},
+          for_model: self,
+          for_collection_class: association_class,
+          add_to_collection_proc: add_to_collection
+        )
       end
     end
   end
 
-  def self.has_one(association, class_name: nil, foreign_key: nil)
+  def self.has_one(association, through: nil, class_name: nil, foreign_key: nil)
     if class_name.nil?
       association_classname = LocalModel::Functions.snake_to_camel(association)
       association_classname[0] = association_classname[0].upcase
       association_classname = namespace_classname(association_classname)
     else
-      association_classname = class_name
+      association_classname = namespace_classname(class_name)
     end
-    current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(denamespace_classname(self))}_id"
-    belongs_to_id_sym = current_class_id_methodname.to_sym
 
-    define_method association do 
-      association_class = Object.const_get(association_classname)
-      association_class.where(belongs_to_id_sym => self.id).first
+    if through.nil?
+      current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(denamespace_classname(self))}_id"
+      belongs_to_id_sym = current_class_id_methodname.to_sym
+      define_method association do 
+        association_class = Object.const_get(association_classname)
+        association_class.where(belongs_to_id_sym => self.id).first
+      end
+    else
+      current_class_id_methodname = foreign_key || "#{LocalModel::Functions.camel_to_snake(association)}_id"
+      belongs_to_id_sym = current_class_id_methodname.to_sym
+      define_method association do 
+        association_class = Object.const_get(association_classname)
+        association_class.where(id: self.send(through)&.send(belongs_to_id_sym)).first
+      end
     end
   end
 

data/lib/local_model/version.rb

@@ -1,3 +1,3 @@
 module LocalModel
-  VERSION = "0.1.5"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: local_model
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Micah Shute
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - lib/local_model/adapters/float_adapter.rb
 - lib/local_model/adapters/integer_adapter.rb
 - lib/local_model/adapters/string_adapter.rb
+- lib/local_model/collection.rb
 - lib/local_model/concerns/csv_interactable.rb
 - lib/local_model/csv.rb
 - lib/local_model/helpers/functions.rb