local_model 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a86bbe76f369c6f1b0a3984edbb58dcbc070dee5211afd9e50f22b1deb72f8bf
-  data.tar.gz: cdda97bc5fc77dd8b54a628b49f5a7724b01a1f12b37dcb3b570971689b99e10
+  metadata.gz: 46c92d2460b4c3db420fe0f4dcc289a07a7ba3320959c2bab48e9d086e96401e
+  data.tar.gz: b9bc068f6fc969c7d60424640a86934e25ea2f5d4ea1061f34e0d3bfa706216a
 SHA512:
-  metadata.gz: fe2ca903606f84595f7decd590d994a4c48885b7c0bd7a4a86d67603cda157b3ebede305e30368abdaa5db694bd688a6ecf08aacd351818e2f7ebfe02bb9f8cf
-  data.tar.gz: fa5d4d01e42968f74e0323c6173e95dc21e3a58d9d7e975740e7f082597c7d6728eacb78e84178298039dbe175448cd6cd4672c9a974a3f5124c762ba955ebfd
+  metadata.gz: 7965f12ad0e0a84acdb4c7e31c3f33b7f3f3635d9f1a296b34ba22383329837871967cada747fa149a4651e029ffda0136d559630c274079c838abb8a902dfc5
+  data.tar.gz: ac3c17e4fd413b4f3d45e441ad6888db5ab3a28c17ea645aecec21976f1742b4d0e5bf5d29583c14cafbba08578b9db100099323b700f7063c5ca89abc2d7e35

data/Gemfile.lock

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

data/README.md

@@ -84,6 +84,36 @@ Does not support yet (notably):
 - .build, .update, validations, #<< to add many relationships 
 - object equivalence if gotten from source twice
 
+
+### Namespace Methods
+
+```rb
+
+LocalModel.config do |c|
+    c.path = "/home/me/data/"
+    c.cleanup_on_start = true # delete ALL files in path on startup 
+    c.namespace = "InMemory" # Expect ALL LocalModels to be namespaced via this string
+end
+
+```
+
+```rb
+# in_memory/pokemon.rb
+
+class InMemory::Pokemon < LocalModel::CSV
+
+    schema do |t|
+        t.string :name
+        t.string :nickname
+        t.integer :hp
+        t.string :species
+    end
+
+end
+
+
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/local_model.rb

@@ -45,7 +45,7 @@ module LocalModel
     @@namespace = configuration.namespace
     Dir.mkdir(configuration.path) unless Dir.exist?(configuration.path)
     if configuration.cleanup_on_start
-      Dir.foreach do |f|
+      Dir.foreach(configuration.path) do |f|
         fn = File.join(configuration.path, f)
         File.delete(fn) if f != '.' && f != '..'
       end

data/lib/local_model/helpers/functions.rb

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

data/lib/local_model/helpers/pluralized_words.rb

@@ -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.3"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: local_model
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 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