groovy 0.6.4 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a622cdd3453e0fee1feeebf798cbcec9f0ef9f68759aec64f65c3d4a500f52af
-  data.tar.gz: be1220642bf299a61ad5900bea1fffa3359725575def843ce233290e26a5b8e2
+  metadata.gz: d24298885415bc4acd243ec853d839187216d3f3bf8be758e309168fb3a4b4a6
+  data.tar.gz: c8a743dab8efe577290c91688e5107114bd5c0c7a7153f79db4d6985ce4467dd
 SHA512:
-  metadata.gz: 9943e2715a0099f8b1b2795ab66259cbb5b71d5a782e4669b503e61f30a8df56fa57332f88c3592e3b69c0c63638da5d1ea471b102e62511028178886cd5b968
-  data.tar.gz: fa02339637f33c69bb37301f63d8b14b77d61b185f0b3c23d78712fb26159d2d5594dc2bb9bba7bb225211c4ab6a5adef167ddade4ea5b5999dae8ce2d5e5f07
+  metadata.gz: 156828c23af648e267cee9a761183dd49b7d16d783fb993cee0653a449340c23bd25c03162da6666f30cc3989978c196d671198ac8da041bace897aa1bb0419d
+  data.tar.gz: 100290a07dabdd5da4dacd586ff5571c08c433b4f182a91530eb31bc6d5c78b21960d056190d73054952e614e21e428018ea2f8bad9b2637633739929d1216e7

data/lib/groovy/model.rb

@@ -62,6 +62,10 @@ module Groovy
         db_context[table_name]
       end
 
+      def underscore_name
+        name.gsub(/([A-Z])/) { |x| "_#{x.downcase}" }.sub(/^_/, '')
+      end
+
       def attribute_names
         @attribute_names ||= schema.attribute_columns
       end
@@ -349,10 +353,16 @@ module Groovy
       @attributes
     end
 
+    alias_method :attrs, :attributes
+
     def inspect
       "#<#{self.class.name} id:#{id.inspect} attributes:[#{self.class.attribute_names.join(', ')}]>"
     end
 
+    def dump
+      pp attributes; nil
+    end
+
     def new_record?
       id.nil?
       # _key.nil?
@@ -470,7 +480,6 @@ module Groovy
 
     private
 
-
     def get_record_attribute(key)
       return if record.nil?
       val = record[key]
@@ -507,7 +516,6 @@ module Groovy
       end
     end
 
-
     def set_ref(name, obj, from_foreign = false)
       # puts "Setting ref #{name} -> #{obj} (#{obj.class})"
 
@@ -565,7 +573,7 @@ module Groovy
         # puts "Updating #{key} from #{values[0]} to #{values[1]}"
         record[key] = values.last
       end
-      self.class.set_timestamp(record, :updated_at)
+      self.class.set_timestamp(record, :updated_at) unless changes[:updated_at]
       changes = {}
       update_foreign_refs
       fire_callbacks(:after_update)

data/lib/groovy/schema.rb

@@ -127,6 +127,14 @@ module Groovy
       @spec[name.to_sym] = { type: :reference, args: [table_name, options] }
     end
 
+    def one(name, table_name = nil, options = {})
+      reference(name, table_name, options)
+    end
+
+    def many(name, table_name = nil, options = {})
+      reference(name, table_name, options.merge(type: :vector))
+    end
+
     def timestamps(opts = {})
       column(:created_at, 'time')
       column(:updated_at, 'time')

data/lib/groovy/vector.rb

@@ -26,20 +26,6 @@ module Groovy
 
     alias_method :count, :size
 
-    # we redefine first and last to avoid having to perform a full query
-
-    def first
-      if obj = records.first
-        Model.initialize_from_record(obj)
-      end
-    end
-
-    def last
-      if obj = records.last
-        Model.initialize_from_record(obj)
-      end
-    end
-
     def each(&block)
       items.each { |r| block.call(r) }
     end
@@ -95,12 +81,30 @@ module Groovy
 
     alias_method :<<, :push
 
-    [:first, :last, :find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
+    [:new, :create, :create!].each do |relation_method|
+      define_method relation_method do |attrs|
+        vector_model.public_send(relation_method, attrs.merge(object_name => obj))
+      end
+    end
+
+    [:find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
       define_method scope_method do |*args, &block|
         query.public_send(scope_method, *args, &block)
       end
     end
 
+    def first
+      if obj = records.first
+        Model.initialize_from_record(obj)
+      end
+    end
+
+    def last
+      if obj = records.last
+        Model.initialize_from_record(obj)
+      end
+    end
+
     def ==(arr)
       to_a == arr
     end
@@ -108,21 +112,26 @@ module Groovy
     private
     attr_reader :obj, :key
 
-    def query
-      model = Model.model_from_table(key.capitalize)
-      obj_name = obj.class.name.downcase
-      model.query.where(obj_name => obj.id)
-    end
-
     def method_missing(name, *args, &block)
-      model = Model.model_from_table(key.capitalize)
-      if model.scopes.include?(name)
+      if vector_model.scopes.include?(name)
         query.send(name)
       else
         super
       end
     end
 
+    def query
+      vector_model.query.where({ object_name => obj.id })
+    end
+
+    def object_name
+      obj.class.underscore_name # eg "product_brand"
+    end
+
+    def vector_model
+      @vector_model ||= Model.model_from_table(key.capitalize)
+    end
+
     def remove_record(rec)
       recs = obj.record[key].delete_if { |r| r == rec }
       obj.record[key] = recs

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.6.4'.freeze
+  VERSION = '0.6.7'.freeze
 end

data/spec/model_spec.rb

@@ -123,6 +123,21 @@ describe Groovy::Model do
   end
 
   describe '#save' do
+
+    it 'sets created_at/updated_at timestamps when necesssary' do
+      time = Time.parse('2012-12-12')
+      allow(Time).to receive(:now).and_return(time)
+      prod = TestProduct.create!(name: 'A product', price: 100)
+      expect(prod.created_at).to eq(time)
+      expect(prod.updated_at).to eq(time)
+
+      another_time = Time.parse('2024-12-12')
+      prod.updated_at = another_time
+      prod.save
+
+      expect(prod.reload.created_at).to eq(time)
+      expect(prod.updated_at).to eq(another_time)
+    end
   end
 
   describe '#delete' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.7
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga