groovy 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3e87c857a45ab045967ed1af60d619ec7340fc751c950032645657049bd1c68
-  data.tar.gz: 4886e8db94b7fa3627312f82842d141b9c24ea7954e59955f4840dab7f70f776
+  metadata.gz: bf0e3aa6e2c0d1e3d9e0245062e1b778e4da15e9130cc672d07eb1e474e25d0f
+  data.tar.gz: add6fe670e018efb4f5706b02d05154bdf525d5f2bb3f8ce378e60bb92471f59
 SHA512:
-  metadata.gz: df4c68551089cf9ade2f20ac70436962fff82c0a83db5caeb0208b107a1215443386ab429d644c939200fef844a70db315c502cfb4c901aff7c809f578a07b67
-  data.tar.gz: 8eb292ae1c4365040a62c4f9feb8e04b27119ae5b4d84b1adf0640cb7f1d46cbea29bafd57ad076ca0d0f593fae504f4bb6eb4afac392b530f725f82948b8ad1
+  metadata.gz: '0228c03673a0d86e3072c3f7a952a152c3799125f3c3a2998a219d6015a0c6ccea54bd10972996f17dab52b47298fdc3424fe9bff5de3343a3803748d22bbef1'
+  data.tar.gz: 8302d8af1e7940a878643f123760e5ae482b786c6c6857cf69306f8b2bb0e79a7364f05035659611102966a7b199aae7ce1eab869cdc9f2ab8055551cb5cdc42

data/lib/groovy/model.rb

@@ -26,7 +26,7 @@ module Groovy
     # end
 
     def self.model_from_table(table_name)
-      Kernel.const_get(table_name.to_s.sub(/ies$/, 'y').sub(/s$/, '').classify)
+      get_class(table_name.to_s.sub(/ies$/, 'y').sub(/s$/, ''))
     end
 
     def self.included(base)
@@ -35,6 +35,11 @@ module Groovy
       base.table_name = base.name.sub(/y$/, 'ie') + 's'
     end
 
+    def self.get_class(table_name)
+      classified = table_name.gsub(/([A-Z])/, '_\1').split('_').collect! { |w| w.capitalize }.join
+      Kernel.const_get(classified)
+    end
+
     module ClassMethods
       extend Forwardable
       attr_accessor :context_name, :table_name
@@ -86,6 +91,12 @@ module Groovy
         add_accessors_for(name)
       end
 
+      def add_reference(name, table_name, options = {})
+        schema.reference(name, table_name, options)
+        schema.sync
+        add_accessors_for(name)
+      end
+
       def add_accessors_for(col, s = schema)
         if s.attribute_columns.include?(col)
           add_attr_accessors(col)
@@ -378,7 +389,11 @@ module Groovy
 
     def save(options = {})
       return false if respond_to?(:invalid?) and invalid?
-      new_record? ? create : update
+      if new_record?
+        create && true
+      else
+        update
+      end
     end
 
     def save!(options = {})

data/lib/groovy/schema.rb

@@ -108,9 +108,11 @@ module Groovy
 
       ensure_created!
       remove_columns_not_in(@spec.keys)
+
       @spec.each do |col, spec|
         check_and_add_column(col, spec[:type], spec[:args])
       end
+
       @index_columns.each do |col|
         add_index_on(col)
       end
@@ -187,12 +189,12 @@ module Groovy
     end
 
     def create_table!
-      log "Creating table!"
+      log "Creating table #{table_name}!"
       Groonga::Schema.create_table(table_name, context: context)
     end
 
     def remove_table!
-      log "Removing table!"
+      log "Removing table #{table_name}!"
       Groonga::Schema.remove_table(table_name, context: context)
       @table = nil
     end
@@ -202,7 +204,7 @@ module Groovy
     end
 
     def log(str)
-      puts "[#{table_name}] #{str}" if ENV['DEBUG']
+      puts "[#{table_name}] #{str}" # if ENV['DEBUG']
     end
   end
 end

data/lib/groovy/vector.rb

@@ -80,6 +80,10 @@ module Groovy
       end
     end
 
+    def ==(arr)
+      to_a == arr
+    end
+
     private
     attr_reader :obj, :key
 

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/spec/vector_spec.rb

@@ -0,0 +1,56 @@
+require_relative './spec_helper'
+
+describe Groovy::Model do
+
+  before :all do
+    Groovy.open('tmp/vector', 'vector_spec')
+    load_schema! 'vector_spec'
+  end
+
+  after :all do
+    Groovy.close('vector_spec')
+  end
+
+  def load_vector_schema!
+    klass = Class.new
+    Object.const_set("Comment", klass)
+    Comment.class_eval do
+      include Groovy::Model
+      schema(context: 'vector_spec') do |t|
+        t.string :content
+        t.timestamps
+      end
+    end
+
+    klass = Class.new;
+    Object.const_set("User", klass)
+    User.class_eval do
+      include Groovy::Model
+      schema(context: 'vector_spec') do |t|
+        t.string :name
+        t.timestamps
+      end
+    end
+
+    Comment.add_reference :author, "Users"
+    User.add_reference :comments, "Comments", type: :vector
+  end
+
+  describe 'relations' do
+
+    before do
+      load_vector_schema!
+    end
+
+    it 'loads records and keeps relations' do
+      user = User.new(name: 'John')
+      expect(user.save).to eq(true)
+      comment = Comment.new(author: user, content: 'Hello there!')
+      expect(comment.save).to eq(true)
+      user.comments << comment
+      expect(user.reload.comments).to eq([comment])
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -102,6 +102,7 @@ files:
 - spec/query_spec.rb
 - spec/search_spec.rb
 - spec/spec_helper.rb
+- spec/vector_spec.rb
 homepage: https://github.com/tomas/groovy
 licenses: []
 metadata: {}