ru.Bee 2.5.9 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 788dd830fed7da7ee91d7b4a24524d6ea4726ad6c6aaa1a25eccd473e4a5c58a
-  data.tar.gz: f5382c6e8f2be46d2b91fcfb2166f0a7b11ca53e529740dfefe0791b4f72b1e7
+  metadata.gz: 796e02f0a5684f55333e56d9f0431017253e16540393fa419164398d2f275e16
+  data.tar.gz: 6ccf0a99ad59c183a7ca366ac91340cf49b4302f010574393bdade7c33aca515
 SHA512:
-  metadata.gz: 41828de01c96529f0f71e62ce4fea2174650cfcbffeff2143f32afb8bc6628cf772d469bd58c364c7c797ea0d28c832fad589a615dbba71da9c0319c609c7aa4
-  data.tar.gz: 37b42a7e28f68765cb6fe56a5424299b231ec519880b49f23086b4a0572ad4cd33de987f7183f650b1a454cd8e27f5c5646b579e5bf7e1e504f678d506c3cbc8
+  metadata.gz: 66d5ab7ea47e0761ff7c146aec727498e6b4cea1c3874dca437e10066aa1b6184c5d9834e0b7e7b2da378317b112b05f678bd65a7b96998e1b0c565c8f6226f3
+  data.tar.gz: c8523d00239a9e14abf3fc3174074de4eeee3935ee51667f1ead8fcdc68a3ed6de26c153d3743b1930914282b7c52fd575492ce6782e2e33c4706377a02f0fe4

data/lib/rubee/cli/server.rb

@@ -7,7 +7,7 @@ module Rubee
  | |_) | |  | ||  _ \|  _|
  |  _ <| |__| || |_) | |___
  |_| \_\\____/ |____/|_____|
- Ver: %s        ...bzzz
+ Ver: %s       ⬡ ⬢ ⬢ rubee ⬢ ⬡
 LOGO
 
       class << self

data/lib/rubee/models/assoc_array.rb

@@ -0,0 +1,73 @@
+module Rubee
+  class AssocArray < Array
+    include Rubee::Hookable
+
+    before :map, :each, :select, :to_a, :reject, :each_with_object, :each_with_index, :all?, :empty?,
+      :find, :find_all, :find_index, :find_last, :find_last_index, :include?, :any?, :none?, :one?, :memeber?,
+      :sum, :group_by, :filter, :collect, :filter_map, :min, :max, :min_by, :max_by, :sort, :sort_by,
+      :inspect, :to_json, :last, :first, :count, :fill_array
+
+    def initialize(*args, model, query_dataset, **options)
+      super(*args)
+      @__model = model
+      @__query_dataset = query_dataset
+      @__pagination_meta = options[:pagination_meta]
+    end
+
+    def all
+      @__model.all(__query_dataset: @__query_dataset)
+    end
+
+    def where(*args)
+      @__model.where(*args, __query_dataset: @__query_dataset)
+    end
+
+    def order(*args)
+      @__model.order(*args, __query_dataset: @__query_dataset)
+    end
+
+    def join(*args)
+      @__model.join(*args, __query_dataset: @__query_dataset)
+    end
+
+    def limit(*args)
+      @__model.limit(*args, __query_dataset: @__query_dataset)
+    end
+
+    def offset(*args)
+      @__model.offset(*args, __query_dataset: @__query_dataset)
+    end
+
+    def paginate(*args)
+      total_count = @__query_dataset.count
+      current_page, per_page = args
+      __pagination_meta = {
+        current_page:,
+        per_page:,
+        total_count:,
+        first_page?: current_page == 1,
+        last_page?: current_page == (total_count / per_page.to_f).ceil,
+        prev: current_page > 1 ? current_page - 1 : nil,
+        next: current_page < (total_count / per_page.to_f).ceil ? current_page + 1 : nil,
+      }
+
+      @__model.paginate(*args, __query_dataset: @__query_dataset, __pagination_meta:)
+    end
+
+    def pagination_meta
+      @__pagination_meta
+    end
+
+    def ^
+      @__query_dataset
+    end
+
+    private
+
+    def fill_array
+      if @__query_dataset && @__model
+        replace @__model.serialize(@__query_dataset)
+      end
+    end
+  end
+end

data/lib/rubee/models/sequel_object.rb

@@ -116,11 +116,13 @@ module Rubee
           klass = Object.const_get(assoc)
           if over
             sequel_dataset = klass
+              .dataset
               .join(over.to_sym, "#{singularized_assoc_name.snakeize}_id".to_sym => :id)
               .where(Sequel[over][fk_name.to_sym] => id).select_all(original_assoc).all
-            self.class.serialize(sequel_dataset, klass)
+
+            AssocArray.new([], klass, sequel_dataset)
           else
-            klass.where(fk_name.to_sym => id)
+            AssocArray.new([], klass, klass.dataset.where(fk_name.to_sym => id))
           end
         end
       end
@@ -190,9 +192,7 @@ module Rubee
       end
 
       def all
-        dataset.map do |record_hash|
-          new(**record_hash)
-        end
+        AssocArray.new([], self, dataset)
       end
 
       def find(id)
@@ -202,20 +202,47 @@ module Rubee
         nil
       end
 
-      def where(args)
-        dataset.where(**args).map do |record_hash|
-          new(**record_hash)
-        end
+      def where(args, options = {})
+        query_dataset = options[:__query_dataset] || dataset
+
+        AssocArray.new([], self, query_dataset.where(**args))
       end
 
-      def order(*args)
-        dataset.order(*args).map do |record_hash|
-          new(**record_hash)
+      def order(args, options = {})
+        query_dataset = options[:__query_dataset] || dataset
+
+        order_arg = if args.is_a? Hash
+          args.values[0] == :desc ? Sequel.desc(args.keys[0]) : Sequel.asc(args.keys[0])
+        else
+          args
         end
+        AssocArray.new([], self, query_dataset.order(order_arg))
+      end
+
+      def join(assoc, args, options = {})
+        query_dataset = options[:__query_dataset] || dataset
+
+        AssocArray.new([], self, query_dataset.join(assoc, **args))
       end
 
-      def join(assoc, args)
-        dataset.join(assoc, **args)
+      def limit(args, options = {})
+        query_dataset = options[:__query_dataset] || dataset
+
+        AssocArray.new([], self, query_dataset.limit(*args))
+      end
+
+      def offset(args, options = {})
+        query_dataset = options[:__query_dataset] || dataset
+
+        AssocArray.new([], self, query_dataset.offset(*args))
+      end
+
+      def paginate(page = 1, per_page = 10, options = {})
+        query_dataset = options[:__query_dataset] || dataset
+        offset = (page - 1) * per_page
+
+        AssocArray.new([], self, query_dataset.offset(offset).limit(per_page),
+                       pagination_meta: options[:__pagination_meta])
       end
 
       def create(attrs)

data/lib/rubee.rb

@@ -20,7 +20,7 @@ module Rubee
     RUBEE_SUPPORT = { "Rubee::Support::Hash" => Hash, "Rubee::Support::String" => String }
   end
 
-  VERSION = '2.5.9'
+  VERSION = '2.6.0'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/models/comment_model_test.rb

@@ -31,6 +31,85 @@ describe 'Comment model' do
         _(result.first.text).must_equal('test_enough')
       end
     end
+
+    describe 'where clause chain' do
+      it 'returns target records' do
+        _(Comment.where(text: 'test_enough').where(user_id: nil).count)
+          .must_equal(1)
+      end
+    end
+
+    describe 'join chain' do
+      it 'returns target records' do
+        _(Comment.join(:posts, comment_id: :id).where(text: 'test_enough').count)
+          .must_equal(1)
+      end
+    end
+
+    describe 'order clause chain' do
+      it 'returns target records' do
+        Comment.destroy_all cascade: true
+        comment = Comment.new(text: 'abcdef')
+        comment.save
+
+        _(Comment.order(text: :desc).where(user_id: nil).count)
+          .must_equal(1)
+
+        _(Comment.order(text: :asc).where(user_id: nil).first.text)
+          .must_equal('abcdef')
+      end
+    end
+
+    describe 'limit clause chain' do
+      it 'returns target records' do
+        Comment.destroy_all cascade: true
+        comment = Comment.new(text: 'abcdef')
+        Comment.new(text: 'abcdef1')
+        comment.save
+
+        _(Comment.limit(1).where(user_id: nil).count)
+          .must_equal(1)
+
+        _(Comment.limit(1).where(user_id: nil).first.text)
+          .must_equal('abcdef')
+      end
+    end
+
+    describe 'offset clause chain' do
+      it 'returns target records' do
+        Comment.destroy_all cascade: true
+        comment = Comment.new(text: 'abcdef')
+        comment.save
+        com2 = Comment.new(text: 'abcdef1')
+        com2.save
+        _(Comment.offset(1).where(user_id: nil).count)
+          .must_equal(1)
+
+        _(Comment.offset(1).where(user_id: nil).first.text)
+          .must_equal('abcdef1')
+      end
+    end
+
+    describe 'pagination' do
+      it 'returns target records' do
+        Comment.destroy_all cascade: true
+        10.times do |n|
+          Comment.new(text: "test_#{n}").save
+        end
+        comments = Comment.all.paginate(1, 5)
+        _(comments.count).must_equal(5)
+        _(comments.pagination_meta).must_equal(
+          current_page: 1,
+          per_page: 5,
+          total_count: 10,
+          first_page?: true,
+          last_page?: false,
+          prev: nil,
+          next: 2
+        )
+        Comment.destroy_all
+      end
+    end
   end
 
   describe 'method' do

metadata

@@ -1,34 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 2.5.9
+  version: 2.6.0
 platform: ruby
 authors:
 - Oleg Saltykov
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
+dependencies: []
 description: Application web server written on Ruby
 email:
 - oleg.saltykov@gmail.com
@@ -264,6 +244,7 @@ files:
 - lib/rubee/features.rb
 - lib/rubee/generator.rb
 - lib/rubee/logger.rb
+- lib/rubee/models/assoc_array.rb
 - lib/rubee/models/database_objectable.rb
 - lib/rubee/models/db_tools.rb
 - lib/rubee/models/sequel_object.rb