local_model 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32aaa0557b37154955a584e86ddafab8b7dc5dac3731f77edb0817beeb511739
-  data.tar.gz: 731283ec3e8f5577551247b006d29f919cc22dc5bbef5726ee60e008f19fe35b
+  metadata.gz: acc6c4975bec354dd97d2a2ef5c320a9525437153b405e484970aa4542e024a7
+  data.tar.gz: dc6a281ff86af1acf3ec1a414cc75342d13466393773efe90a705f30b175ae63
 SHA512:
-  metadata.gz: af60390ff697de0be4c0b873af689ce0ad9f8169a883fab25a5b2ff933ce56e3603fa602d76fae1c36f966c71392eb3844c117f6614d228bde7a0c9a5aebc073
-  data.tar.gz: d1e7e26d09cbd221f29ac75ba885577fa78ed01170aeaf1a9c09501b1046f2824a4a1ac807a2ff22373a8c39a584aba4f749795bdc5e7d5d8ba6f29bda1bbb4d
+  metadata.gz: 20d6be57b31cba2fa7f4c87a7f10235ae923e676d4a65ccc73fdf239c0c01fa757f219f3df138ffc68c41ecc6969ab266d5b8e92cd61e3b49ede6e20654c1881
+  data.tar.gz: 0ed5744beff0da65ad2aecff072d06ddf609d75203409d79c7ba934056c7d2508ae68628721bb26a5eda6ac43f76587c66fac1870ec5e10bb1b06e88947e010d

data/Gemfile.lock

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

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

@@ -5,19 +5,29 @@ class LocalModel::Model
     # yield(SchemaBuilder.new(self))
   end
 
-  def self.belongs_to(association)
-    association_class_name = LocalModel::Functions.snake_to_camel(association)
-    association_class_name[0] = association_class_name[0].upcase
-    association_class_name = namespace_classname(association_class_name)
-    association_class = Object.const_get(association_class_name)
+  def self.belongs_to(association, class_name: nil, foreign_key: nil)
+    if class_name.nil?
+      association_class_name = LocalModel::Functions.snake_to_camel(association)
+      association_class_name[0] = association_class_name[0].upcase
+      association_class_name = namespace_classname(association_class_name)
+    else
+      association_class_name = namespace_classname(class_name)
+    end
+
+    if foreign_key.nil?
+      keyname = "#{association}_id"
+    else
+      keyname = foreign_key
+    end
 
     define_method association do
-      id = self.send("#{association}_id")
+      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("#{association}_id=", association_obj.id)
+      self.send("#{keyname}=", association_obj.id)
     end
   end
 
@@ -28,37 +38,47 @@ 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
       define_method association do
         association_class = Object.const_get(association_classname)
         association_class.where(belongs_to_id_sym => self.id)
       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
       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)
+        self.send(through).map{|through_obj| association_class.find(through_obj.send(belongs_to_id_sym))}
       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.4"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: local_model
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Micah Shute
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler