groovy 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2e7655a8fefa2f17295105acb6ba387f275eb158c0babed04675d566f736766
-  data.tar.gz: 5a9b94a767f58b033a11044d3b7992911a6cde0ad068955c76d85bdd2c0464b9
+  metadata.gz: 334e9f5cb0dffab38a1bcd065ba7bedd4d4382ad79cc8c572044ebb0fd6f3586
+  data.tar.gz: 6fae9ad07b1e8316594e320da974d5aee980deaaca717c729a260004a221d8a8
 SHA512:
-  metadata.gz: 2c8813e0920559c6422f8129ca40e51c42a6db26efc65c9f2d9a1d47d8f5f6d5638f9677f970a38d36a180c93cf610b99b7adc372579eaff92ae4d8bd9aa41ae
-  data.tar.gz: d12ed329507b8a5c191308e198a5434f8226fd24bf4f25c8b2b8d64a832c05df39ff9946dddd53b7da5df11c2d14bc9ab97e4dcf84d67e60c9c2811d0c0122b6
+  metadata.gz: fa11b79ead949a9f3595459a5b8b7baecb48ac30769e0586627f1d9753ec991a7e2a4a3f20e8cef12bf7f474e02fa30f8b347b9a7330db26fe39462496ed12a5
+  data.tar.gz: 113348c59d32fcefab72dfa707ce97e6972294454b5afb84e5e9e72bfe6c26538e6236161353d915827ae9962291437ac821d59c5d81ee86276a88d8630c7306

data/README.md

@@ -2,4 +2,7 @@
 
 An ORM for Groonga.
 
+# TODO: 
+ 
+ - [ ] Allow using scopes/queries through Vector class.
 

data/example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    groovy (0.4.3)
+    groovy (0.4.6)
       rroonga (= 9.0.3)
 
 GEM

data/example/basic.rb

@@ -28,4 +28,18 @@ populate if Product.count == 0
 
 # 50_000 products: 50M
 # 100_000 products: 50M
-# 500_000 products: 62M
+# 500_000 products: 62M
+
+module MemInfo
+  KERNEL_PAGE_SIZE = `getconf PAGESIZE`.chomp.to_i rescue 4096
+  STATM_PATH       = "/proc/#{Process.pid}/statm"
+  STATM_FOUND      = File.exist?(STATM_PATH)
+  def self.rss
+    STATM_FOUND ? (File.read(STATM_PATH).split(' ')[1].to_i * KERNEL_PAGE_SIZE) / 1024 : 0
+  end
+end
+
+puts MemInfo.rss
+prices = Product.all.map { |x| x.price }
+puts prices.inspect
+puts MemInfo.rss

data/example/relations.rb

@@ -21,6 +21,7 @@ class Category
 
   schema do |t|
     t.string :name
+    t.reference :place, "Places"
     t.timestamps
   end
 

data/lib/groovy/model.rb

@@ -26,7 +26,7 @@ module Groovy
     # end
 
     def self.model_from_table(table_name)
-      Kernel.const_get(table_name.sub(/ies$/, 'y').sub(/s$/, '').capitalize)
+      Kernel.const_get(table_name.to_s.sub(/ies$/, 'y').sub(/s$/, '').classify)
     end
 
     def self.included(base)
@@ -150,7 +150,6 @@ module Groovy
       #   Groonga["#{table_name}.#{name}"] # .search, .similar_search, etc
       # end
 
-
       def index_search(column, query, options = {}, &block)
         results = table.select { |rec| rec[column].match(query) }
         render_results(results, &block)
@@ -187,28 +186,23 @@ module Groovy
         query
       end
 
-      def first(num = 1)
-        arr = limit(num)
-        num == 1 ? arr.first : arr
-      end
-
-      def last(num = 1)
-        arr = all.sort_by(_id: :desc).limit(num)
-        num == 1 ? arr.first : arr
-      end
-
       def query
         query_class.new(self, table)
       end
 
+      def scopes
+        @scopes ||= []
+      end
+
       def scope(name, obj)
+        scopes.push(name)
         query_class.add_scope(name, obj)
         define_singleton_method(name) do |*args|
           query.public_send(name, *args)
         end
       end
 
-      [:select, :find_each, :find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
+      [:first, :last, :select, :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
@@ -293,13 +287,13 @@ module Groovy
       end
     end
 
-    attr_reader :id, :attributes, :record, :changes
+    attr_reader :id, :record, :changes
 
     def initialize(attrs = nil, record = nil, key = nil)
       @attributes, @vectors, @_key = {}, {}, key # key is used on creation only
 
       if set_record(record)
-        set_attributes_from_record(record)
+        # load_attributes_from_record(record)
       else
         attrs ||= {}
         unless attrs.is_a?(Hash)
@@ -317,8 +311,13 @@ module Groovy
 
     # get reference to the actual record in the Groonga table,
     # not the temporary one we get as part of a search result.
-    def load_record
-      self.class.table[id]
+    # def load_record
+    #   self.class.table[id]
+    # end
+
+    def attributes
+      load_attributes_from_record # populate missing
+      @attributes
     end
 
     def inspect
@@ -331,7 +330,9 @@ module Groovy
     end
 
     def [](key)
-      attributes[key.to_sym]
+      k = key.to_sym
+      @attributes[k] = get_record_attribute(k) unless @attributes.key?(k)
+      @attributes[k]
     end
 
     def []=(key, val)
@@ -392,11 +393,15 @@ module Groovy
     end
 
     def reload
-      raise RecordNotPersisted if id.nil?
-      ensure_persisted!
-      rec = self.class.table[id] # _key
-      # set_record(rec)
-      set_attributes_from_record(rec)
+      unless new_record?
+        # raise RecordNotPersisted if id.nil?
+        # ensure_persisted!
+        rec = self.class.table[id] # _key
+        set_record(rec)
+        # load_attributes_from_record
+      end
+
+      @attributes = {}
       @changes = {}
       self
     end
@@ -416,6 +421,7 @@ module Groovy
     private
 
     def get_record_attribute(key)
+      return if record.nil?
       val = record[key]
       if self.class.schema.time_columns.include?(key)
         fix_time_value(val)
@@ -433,15 +439,15 @@ module Groovy
     #   record.respond_to?(:_key) ? record._key : id
     # end
 
-    def set_attributes_from_record(rec)
+    def load_attributes_from_record
       self.class.attribute_names.each do |col|
-        public_send("#{col}=", get_record_attribute(col))
+        public_send("#{col}=", get_record_attribute(col)) unless @attributes.key?(col)
       end
     end
 
     def set_attribute(key, val)
-      changes[key.to_sym] = [self[key], val] if changes # nil when initializing
-      attributes[key.to_sym] = val
+      changes[key.to_sym] = [self[key], val] if changes # nil before initializing
+      @attributes[key.to_sym] = val
     end
 
     def get_ref(name)
@@ -466,7 +472,7 @@ module Groovy
 
     def create
       fire_callbacks(:before_create)
-      set_record(self.class.insert(attributes, @_key))
+      set_record(self.class.insert(@attributes, @_key))
       fire_callbacks(:after_create)
       self
     end

data/lib/groovy/query.rb

@@ -3,6 +3,7 @@ module Groovy
   class Query
 
     include Enumerable
+
     AND = '+'.freeze
     NOT = '-'.freeze
     PER_PAGE = 50.freeze
@@ -61,13 +62,13 @@ module Groovy
       where(conditions).limit(1).first
     end
 
-    def find_each(opts = {}, &block)
-      count = 0
-      in_batches({ of: 10 }.merge(opts)) do |group|
-        group.each { |item| count += 1; yield(item) }
-      end
-      count
-    end
+    # def find_each(opts = {}, &block)
+    #   count = 0
+    #   in_batches({ of: 10 }.merge(opts)) do |group|
+    #     group.each { |item| count += 1; yield(item) }
+    #   end
+    #   count
+    # end
 
     # http://groonga.org/docs/reference/grn_expr/query_syntax.html
     # TODO: support match_columns (search value in two or more columns)
@@ -138,12 +139,12 @@ module Groovy
     end
 
     def limit(num)
-      @sorting[:limit] = num
+      sorting[:limit] = num
       self
     end
 
     def offset(num)
-      @sorting[:offset] = num
+      sorting[:offset] = num
       self
     end
 
@@ -155,8 +156,8 @@ module Groovy
 
     # sort_by(title: :asc)
     def sort_by(hash)
-      if hash.is_a?(String) || hash.is_a?(Symbol) # e.g. 'title.desc' or :title (asc by default)
-        param, dir = hash.to_s.split('.')
+      if hash.is_a?(String) || hash.is_a?(Symbol) # e.g. 'title.desc', 'title desc' or :title (asc by default)
+        param, dir = hash.to_s.split(/\s|\./)
         hash = {}
         hash[param] = dir || 'asc'
       end
@@ -191,11 +192,16 @@ module Groovy
     end
 
     def [](index)
-      records[index]
+      if r = results[index]
+        model.new_from_record(r)
+      end
     end
 
     def each(&block)
-      records.each { |r| block.call(r) }
+      # records.each { |r| block.call(r) }
+      results.each_with_index do |r, index|
+        yield model.new_from_record(r)
+      end
     end
 
     def update_all(attrs)
@@ -207,35 +213,50 @@ module Groovy
       @total_entries
     end
 
-    def last(count = 1)
-      if count > 1
-        records[(size-count)..-1]
-      else
-        records[size-1]
+    def first(num = 1)
+      limit(num)
+      num == 1 ? records.first : records
+    end
+
+    def last(num = 1)
+      if sorting[:by]
+        get_last(num)
+      else # no sorting, so
+        sort_by(_id: :desc).limit(num)
+        # if last(2) or more, then re-sort by ascending ID
+        num == 1 ? records.first : records.sort { |a,b| a.id <=> b.id }
       end
     end
 
     def in_batches(of: 1000, from: nil, &block)
-      @sorting[:limit] = of
-      @sorting[:offset] = from || 0
+      sorting[:limit] = of
+      sorting[:offset] = from || 0
 
       while results.any?
         yield to_a
         break if results.size < of
 
-        @sorting[:offset] += of
+        sorting[:offset] += of
         @records = @results = nil # reset
       end
     end
 
+    private
+    attr_reader :model, :table, :options, :select_block
+
     def records
       @records ||= results.map do |r|
         model.new_from_record(r)
       end
     end
 
-    private
-    attr_reader :model, :table, :options, :select_block
+    def get_last(count = 1)
+      if count > 1
+        records[(size-count)..-1]
+      else
+        records[size-1]
+      end
+    end
 
     def add_param(param)
       raise "Select block already given!" if select_block
@@ -265,7 +286,7 @@ module Groovy
 
       @total_entries = set.size
 
-      debug "Sorting with #{sort_key_and_order}, #{sorting.inspect}"
+      debug "Sorting with #{sort_key_and_order} (options: #{sorting.inspect})"
       set = set.sort(sort_key_and_order, {
         limit: sorting[:limit],
         offset: sorting[:offset], # [sorting[:offset], @total_entries].min

data/lib/groovy/schema.rb

@@ -26,6 +26,7 @@ module Groovy
     def initialize(context, table_name, opts = {})
       @context, @table_name, @opts = context, table_name, opts || {}
       @spec, @index_columns = {}, []
+      @cache = {}
     end
 
     def table
@@ -33,47 +34,44 @@ module Groovy
     end
 
     def search_table
-      @search_table ||= context[SEARCH_TABLE_NAME]
+      @cache[:search_table] ||= context[SEARCH_TABLE_NAME]
     end
 
     def column_names
-      get_names table.columns
+      @cache[:column_names] ||= get_names(table.columns)
     end
 
     def singular_references
-      # @singular_references ||=
-      get_names(table.columns.select(&:reference_column?).reject(&:vector?))
+      @cache[:singular_references] ||= get_names(table.columns.select(&:reference_column?).reject(&:vector?))
     end
 
     def plural_references
-      # @plural_references ||=
-      get_names(table.columns.select(&:vector?))
+      @cache[:plural_references] ||= get_names(table.columns.select(&:vector?))
     end
 
     def attribute_columns
-      # @attribute_columns ||=
-      get_names(table.columns.select { |c| c.column? && !c.reference_column? && !c.vector? })
+      @cache[:attribute_columns] ||= get_names(table.columns.select { |c| c.column? && !c.reference_column? && !c.vector? })
     end
 
     def time_columns
-      columns_by_type('Time')
+      @cache[:time_columns] ||= columns_by_type('Time')
     end
 
     def integer_columns
-      columns_by_type('Int32')
+      @cache[:integer_columns] ||= columns_by_type('Int32')
     end
 
     def boolean_columns
-      columns_by_type('Bool')
+      @cache[:boolean_columns] ||= columns_by_type('Bool')
     end
 
     def columns_by_type(type)
       get_names(table.columns.select { |c| c.column? && c.range.name == type })
     end
 
-    # def time_column?(name)
-    #   time_columns.include?(name)
-    # end
+    def reload
+      @cache = {}
+    end
 
     def rebuild!
       log("Rebuilding!")
@@ -116,6 +114,8 @@ module Groovy
       @index_columns.each do |col|
         add_index_on(col)
       end
+
+      reload
       self
     end
 

data/lib/groovy/vector.rb

@@ -74,9 +74,30 @@ module Groovy
 
     alias_method :<<, :push
 
+    [:first, :last, :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
+
     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)
+        query.send(name)
+      else
+        super
+      end
+    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.4.5'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/spec/model_spec.rb

@@ -86,6 +86,28 @@ describe Groovy::Model do
   end
 
   describe '#[]' do
+    it 'reads value from record' do
+      prod = TestProduct.create!(name: 'A product', price: 100)
+      expect(prod.name).to eq('A product')
+      expect(prod['name']).to eq('A product')
+      expect(prod[:name]).to eq('A product')
+
+      prod = TestProduct.find(prod.id)
+      expect(prod.name).to eq('A product')
+      expect(prod['name']).to eq('A product')
+      expect(prod[:name]).to eq('A product')
+
+      prod = TestProduct.new
+      expect(prod.name).to eq(nil)
+      prod.name = 'Another product'
+      expect(prod.name).to eq('Another product')
+      prod.reload
+      expect(prod.name).to eq(nil)
+      prod.name = 'Another product'
+      prod.save
+      prod.reload
+      expect(prod.name).to eq('Another product')
+    end
   end
 
   describe '#[]=' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga