groovy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2968c89f9c0019f1984b53b34a1d5c4520e82bede4f56020a7ef490c76897fe
-  data.tar.gz: 6de69f1590be6a8bddd69f60bed379e8e59e75dcd2a9a00c5696ef5160b211a5
+  metadata.gz: 21ec75f430aa5b3ea423b52de62b4d578b4eb0b1e6722e9201c012cd444c616b
+  data.tar.gz: ec46772137b69e14dfe364d383fa9042ec8edd798bd22ed5c2dd4a47f895f1a4
 SHA512:
-  metadata.gz: 1b7be573999c72a9a5bb1a5b140388644702430c51a07a315d163c8a6f7db89058416ebcc252351498fd5d3b5e86d2cafeea06653e396bc6ddcf3d4bfaf6e6d3
-  data.tar.gz: 8693eb5c4472d634b62ad3be13e57e1c54172374aef7f8792807b107de068457bef293106437521b9200977db95122b524e2182438441fee780e72c15f129f1f
+  metadata.gz: 044e5ba04d8097a354be1a6feb07c2ddd06c6e28355a07b41586936a4e572e028f1aefd35bb587dff46f2d1bbad513332d915e7aec01c00df26b09f6a3ffb357
+  data.tar.gz: 30ae3849bb6d769beb08db3ea8c676a0270a1037eb854c5ba7f4df2c3467906ad06055c7409ef8f2cf5284712f668c7153055b77470d0fa902e2d808591eedc4

data/example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    groovy (0.1.0)
+    groovy (0.1.1)
       rroonga (~> 7.1)
 
 GEM

data/example/basic.rb

@@ -7,18 +7,20 @@ class Product
   include Groovy::Model
 
   schema do |t|
-    t.column :name, String
-    t.column :price, Integer
+    t.string :name
+    t.integer :price
     t.timestamps
   end
 end
 
-50_000.times do |i|
-  puts "Creating product #{i}" if i % 1000 == 0
-  Product.create!(name: "A product with index #{i}", price: 10000 + i)
+def populate
+  5_000.times do |i|
+    puts "Creating product #{i}" if i % 1000 == 0
+    Product.create!(name: "A product with index #{i}", price: 10000 + i)
+  end
 end
 
-puts Product.count
+populate if Product.count == 0 
 
 # 50_000 products: 50M
 # 100_000 products: 50M

data/example/config.ru

@@ -1,4 +1,4 @@
-require './models'
+require './relations'
 require 'groovy/middleware'
 
 Place.delete_all
@@ -15,4 +15,4 @@ app = Proc.new do |env|
 end
 
 use Groovy::MemoryPoolMiddleware
-run app
+run app

data/example/relations.rb

@@ -20,7 +20,7 @@ class Category
   include Groovy::Model
 
   schema do |t|
-    t.column :name, String
+    t.string :name
     t.timestamps
   end
 end
@@ -30,8 +30,8 @@ class Place
 
   schema do |t|
     t.reference :categories, "Categories", type: :vector
-    t.column :name, String
-    t.column :description, String, index: true
+    t.string :name
+    t.string :description, index: true
     t.timestamps
   end
 end
@@ -41,7 +41,7 @@ class Location
 
   schema do |t|
     t.reference :place, "Places"
-    t.column :coords, String
+    t.string :coords
     t.timestamps
   end
 end

data/groovy.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/groovy", __FILE__)
+require File.expand_path("../lib/groovy/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "groovy"

data/lib/groovy.rb

@@ -2,7 +2,6 @@ require 'groonga'
 require File.expand_path(File.dirname(__FILE__)) + '/groovy/model'
 
 module Groovy
-  VERSION = '0.1.1'.freeze
 
   class << self
 

data/lib/groovy/model.rb

@@ -107,12 +107,24 @@ module Groovy
         Query.new(self, table)
       end
 
-      def_instance_delegators :all, :first, :last
+      def first(count = 1)
+        arr = limit(count)
+        count == 1 && arr.first || arr
+      end
+
+      def last(count = 1)
+        arr = limit(count).to_a.reverse
+        count == 1 && arr.first || arr
+      end
 
       def find_by(params)
         where(params).limit(1).first
       end
 
+      def in_batches(of: 1000, from: nil, &block)
+        all.in_batches(of: of, from: from, &block)
+      end
+
       [:search, :where, :not, :sort_by, :limit, :offset].each do |scope_method|
         define_method scope_method do |*args|
           Query.new(self, table).tap do |q|
@@ -129,12 +141,7 @@ module Groovy
 
       def_instance_delegators :table, :count, :size
 
-      private
-
-      def db_context
-        Groovy.contexts[context_name] or raise "Context not defined: #{context_name}"
-      end
-
+      # called from instance too, so must by public
       def insert(key, attributes = nil)
         if table.support_key?
           table.add(key, attributes)
@@ -149,6 +156,12 @@ module Groovy
         obj[key_name] = Time.now if attribute_names.include?(key_name.to_sym)
       end
 
+      private
+
+      def db_context
+        Groovy.contexts[context_name] or raise "Context not defined: #{context_name}"
+      end
+
       def add_attr_accessors(col)
         define_method(col) { self[col] }
         define_method("#{col}=") { |val| self[col] = val }
@@ -176,20 +189,27 @@ module Groovy
       end
     end
 
-    attr_reader :attributes, :refs, :record, :changes
+    attr_reader :id, :attributes, :refs, :record, :changes
 
     def initialize(attributes = nil, record = nil)
-      @attributes = (attributes || {}).symbolize_keys.slice(*self.class.attribute_names)
-      @refs, @vectors = {}, {}
+      @attributes, @refs, @vectors = {}, {}, {}
       
       if @record = record 
+        @id = attributes.delete('_id')
         # TODO: lazy load this
-        self.class.schema.singular_references.each { |col| set_ref(col, record.public_send(col)) }
+        # self.class.schema.singular_references.each do |col| 
+        #   set_ref(col, record.public_send(col))
+        # end
       end
 
+      set_attributes(attributes)     
       @changes = {}
     end
 
+    def new_record?
+      id.nil?
+    end
+
     def key
       return unless record
       record.respond_to?(:_key) ? record._key : record.id
@@ -218,8 +238,13 @@ module Groovy
       changes.any?
     end
 
+    def set_attributes(obj = {})
+      # we call the method instead of []= to allow overriding setters
+      obj.each { |k,v| public_send("#{k}=", v) }
+    end
+
     def update_attributes(obj)
-      obj.each { |k,v| self[k] = v }
+      set_attributes(obj)
       update
     end
 

data/lib/groovy/query.rb

@@ -4,6 +4,7 @@ module Groovy
     include Enumerable
     AND = '+'.freeze
     NOT = '-'.freeze
+    PER_PAGE = 50.freeze
 
     attr_reader :parameters, :sorting
 
@@ -23,7 +24,9 @@ module Groovy
 
     def search(obj)
       obj.each do |col, q|
-        raise "Not a full-text search column: #{col}" unless model.search_columns.include?(col)
+        unless model.index_columns.include?(col)
+          raise "Not an index column, so cannot do fulltext search: #{col}" 
+        end
         parameters.push(AND + "(#{col}:@#{q})")
       end
     end
@@ -79,15 +82,21 @@ module Groovy
     end
       
     def limit(num)
-      @limit = num
+      @sorting[:limit] = num
       self
     end
 
     def offset(num)
-      @offset = num
+      @sorting[:offset] = num
       self
     end
 
+    def paginate(page)
+      page = 1 if page.to_i < 1
+      offset = ((page.to_i)-1) * PER_PAGE
+      offset(offset).limit(PER_PAGE)
+    end
+
     # sort_by(title: :asc)
     def sort_by(hash)
       sorting[:by] = hash.keys.map do |key|
@@ -97,7 +106,9 @@ module Groovy
     end
 
     def all
-      @all ||= results.map { |r| model.new(r.attributes['_value']['_key'], r) }
+      @all ||= results.map do |r| 
+        model.new(r.attributes['_value']['_key'], r)
+      end
     end
 
     def size
@@ -122,11 +133,26 @@ module Groovy
       all[size-1]
     end
 
+    def in_batches(of: 1000, from: nil)
+      @sorting[:limit] = of
+      @sorting[:offset] = from || 0
+
+      while results.any?
+        yield all
+
+        @sorting[:offset] += of
+        @all = @results = nil # reset
+      end
+    end
+
     private
     attr_reader :model, :table, :options
 
     def results
       @results ||= execute
+    rescue Groonga::TooLargeOffset
+      # puts "Offset is higher than table size!"
+      []
     end
 
     def execute
@@ -138,6 +164,7 @@ module Groovy
         table.select(options)
       end
 
+      puts "Sorting with #{sort_key_and_order}, #{sorting.inspect}" if ENV['DEBUG']
       set.sort(sort_key_and_order, { 
         limit: sorting[:limit], 
         offset: sorting[:offset] 

data/lib/groovy/schema.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__)) + '/types'
+# require File.expand_path(File.dirname(__FILE__)) + '/types'
 
 module Groovy
   class Schema
@@ -8,6 +8,17 @@ module Groovy
       compress: :zstandard
     }.freeze
 
+    TYPES = {
+      'string' => 'short_text',
+      'text' => 'text',
+      'float' => 'float',
+      # 'Bool' => 'boolean',
+      'boolean' => 'boolean',
+      'integer' => 'int32',
+      'big_integer' => 'int64',
+      'time' => 'time'
+    }.freeze
+
     attr_reader :index_columns
 
     def initialize(context, table_name, opts = {})
@@ -47,19 +58,26 @@ module Groovy
     end
 
     def column(name, type, options = {})
-      groonga_type = Types.map(type)
+      # groonga_type = Types.map(type)
+      groonga_type = type
       @index_columns.push(name) if options.delete(:index)
       @spec[name.to_sym] = { type: groonga_type, args: [COLUMN_DEFAULTS.merge(options)] }
     end
 
+    TYPES.each do |from_type, to_type|
+      define_method(from_type) do |*args|
+        column(args.shift, to_type, (args.shift || {}))
+      end
+    end
+
     def reference(name, table_name = nil, options = {})
       table_name = "#{name}s" if table_name.nil?
       @spec[name.to_sym] = { type: :reference, args: [table_name, options] }
     end
 
     def timestamps(opts = {})
-      column(:created_at, 'Time')
-      column(:updated_at, 'Time')
+      column(:created_at, 'time')
+      column(:updated_at, 'time')
     end
 
     def sync(db_context = nil)

data/lib/groovy/version.rb

@@ -0,0 +1,3 @@
+module Groovy
+  VERSION = '0.1.2'.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ files:
 - lib/groovy/schema.rb
 - lib/groovy/types.rb
 - lib/groovy/vector.rb
+- lib/groovy/version.rb
 - spec/groovy_spec.rb
 homepage: https://github.com/tomas/groovy
 licenses: []