local_model 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e778e1ced2f3d028e36ac5363e110343ee1f290fe97f23fcf2005ee3a38cfdb
-  data.tar.gz: b5d80e4c968830806dfc33e23f7bd72000c1382c59bb22dc96b952cf9a949766
+  metadata.gz: 52fd36165c3ec49f275a899b9c687e99e91942c64d603542f5295dfbd6b4070a
+  data.tar.gz: 26992202b57f21466187744566b20f1be8a2701d15a3cb6975dcd4f5f389d902
 SHA512:
-  metadata.gz: cc73cfe46da4e2fd03918604b0a80dba92d678a7ab8101671b777855b31a16fc07c20469fa7a5d01b9acc179f07c99448467d58193193ee7088d92c105999d70
-  data.tar.gz: 470ed0d894f193ea64e63cb2bea0a06949769080712a91454470315cceae74d9172f5fe3944daf4ac4186de563b05ac4acdc78f556d1f74baba7ec41314ee38e
+  metadata.gz: 34dfb6506d823c13ecbe82869a7a60d3047e3842df78af576e7cf8b463422736bd95e103ef38b5ce57373e03f3a9d957ba83235984caec258aa593b348206d39
+  data.tar.gz: 989578a3bab8d8bb7d60fc1556b2f28c0c0e718f9c2d0054b178c1e2a460857fba0108198ce9ed13c5c0b7adec08a9f3ce21eaf8e3cb46bca9d0f871f754a83f

data/Gemfile.lock

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

data/README.md

@@ -1,9 +1,5 @@
 # LocalModel
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/local_model`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,6 +18,36 @@ Or install it yourself as:
 
 ## Usage
 
+Use the generator:
+
+```bash
+bundle add local_model
+```
+```
+bundle exec local_model --namespace DesiredNamespace
+``` 
+Note: `--namespace` is optional and will default to `InMemory`
+This creates a rails initializer which sets some config options,
+and a `DataAccessor` class which you can use to switch between your `LocalModel` objects and your `ActiveRecord` objects.
+
+Recommend adding: 
+
+`config/application.rb`
+```ruby
+config.autoload_paths << config.root.join('lib')
+```
+
+so you get all of these files.
+
+You can set an environment variable `USE_LOCAL_MODELS` to `true` or `false` to globally decide what to use.
+
+
+You also now can use a rake task to generate your `LocalModel` models:
+`rake local_model:create_model\[User\]`
+(The `\`s should only be necessary in zsh, not bash)
+
+OR, you can manually: 
+
 Create your schema:
 
 ```rb

data/lib/local_model/adapters/float_adapter.rb

@@ -5,7 +5,8 @@ class LocalModel::FloatAdapter
   end
 
   def self.read(flstr)
-    flstr =~ /[^0-9\.]/ ? nil :  flstr.to_f
+    str = flstr.strip
+    str =~ /^[+-]?([1-9]\d*|0)(\.\d+)?$/ ? str.to_f : nil
   end
 
 end

data/lib/local_model/collection.rb

@@ -26,7 +26,7 @@ class LocalModel::Collection < Array
     end
 
     def where(**args)
-        self.filter do |el|
+        arr = self.filter do |el|
             found = true
             args.each do |k,v|
                 if el.send(k.to_s) != v
@@ -36,6 +36,24 @@ class LocalModel::Collection < Array
             end
             found
         end
+        self.class.create_from(
+            array: arr,
+            for_model: model,
+            for_collection_class: nil,
+            add_to_collection_proc: ->(a,b) { raise NoMethodError.new("Cannot add to this collection") }
+        )
+    end
+
+    def find_by(**args)
+        where(**args).first
+    end
+
+    def first
+        self[0]
+    end
+
+    def last
+        self[-1]
     end
 
 end

data/lib/local_model/csv.rb

@@ -37,6 +37,10 @@ class LocalModel::CSV < LocalModel::Model
       schema_data
     end
 
+    self.define_method :schema_defaults do 
+      builder.defaults
+    end
+
     if !File.file?(self.storage_path)
       CSV.open(self.storage_path, 'wb') do |csv|
         csv << cols.map(&:to_s)
@@ -63,7 +67,7 @@ class LocalModel::CSV < LocalModel::Model
   end
 
   def self.where(**args)
-    all_records do |row|
+    arr = all_records do |row|
       found = true
       args.each do |k,v|
         if row[k] != v
@@ -73,6 +77,12 @@ class LocalModel::CSV < LocalModel::Model
       end
       found
     end.map{|r| new_from_record(r) }
+    LocalModel::Collection.create_from(
+      array: arr,
+      for_model: self,
+      for_collection_class: nil,
+      add_to_collection_proc: ->(a,b) { raise NoMethodError.new("Cannot add to this collection") }
+    )
   end
 
   def self.find_by(**args)
@@ -108,11 +118,7 @@ class LocalModel::CSV < LocalModel::Model
   end
 
   def self.find(id)
-    return self.find_by(id: id)
-  end
-
-  def self.find!(id)
-    found_record = find(id)
+    found_record = self.find_by(id: id)
     if !found_record
       raise LocalModel::RecordNotFound.new
     else
@@ -120,6 +126,14 @@ class LocalModel::CSV < LocalModel::Model
     end
   end
 
+  def self.find_or_create_by(**args)
+    found_obj = find_by(**args)
+    return found_obj if found_obj
+    create(**args)
+  end
+
+  # TODO: Move necessary methods to model.rb
+
   def self.create(**args)
     inst = new(**args)
     inst.save
@@ -133,6 +147,9 @@ class LocalModel::CSV < LocalModel::Model
   end
 
   def initialize(**args)
+    self.schema_defaults.each do |property, value|
+      self.send("#{property}=", value)
+    end
     args.each do |k,v|
       self.send("#{k}=", v)
     end
@@ -145,7 +162,7 @@ class LocalModel::CSV < LocalModel::Model
   
   def reload
     raise LocalModel::RecordNotFound if !self.id
-    self.class.find!(self.id)
+    self.class.find(self.id)
   end
 
   def destroy

data/lib/local_model/model.rb

@@ -33,7 +33,7 @@ class LocalModel::Model
         association_class = Object.const_get(association_class_name)
       end
       id = self.send(keyname)
-      association_class.find(id)
+      association_class.find_by(id: id)
     end
 
     define_method "#{association}=" do |association_obj|
@@ -91,7 +91,7 @@ class LocalModel::Model
       define_method association do 
         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))},
+          array: self.send(through).map{|through_obj| association_class.find_by(id: through_obj.send(belongs_to_id_sym))},
           for_model: self,
           for_collection_class: association_class,
           add_to_collection_proc: add_to_collection
@@ -192,37 +192,47 @@ class LocalModel::Model
   class SchemaBuilder
 
     attr_reader :schema
+    attr_reader :defaults
 
     def initialize(model)
       @model = model
       @schema = { id: :integer }
       @model.attr_accessor :id
+      @defaults = {}
     end
 
-    def string(name)
+    def set_default(name, default)
+      @defaults[name] = default if !default.nil?
+    end
+
+    def string(name, default: nil)
       @model.attr_accessor name
       @schema[name] = :string
+      set_default(name, default)
     end
 
-    def integer(name)
+    def integer(name, default: nil)
       @model.attr_accessor name
       @schema[name] = :integer
+      set_default(name, default)
     end
 
-    def boolean(name)
+    def boolean(name, default: nil)
       @model.attr_accessor name
       @schema[name] = :boolean
+      set_default(name, default)
     end
 
-    def float(name)
+    def float(name, default: nil)
       @model.attr_accessor name
       @schema[name] = :float
+      set_default(name, default)
     end
 
-    def datetime(name)
+    def datetime(name, default: nil)
       @model.attr_accessor name
       @schema[name] = :datetime
+      set_default(name, default)
     end
-
   end
-end
+end

data/lib/local_model/version.rb

@@ -1,3 +1,3 @@
 module LocalModel
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: local_model
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Micah Shute
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler