baza_models 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24043c37709619d4fa62e93c29aca64d38343f52
-  data.tar.gz: 3f314d8915ee7c914cd6c3d7831a5719c66d965d
+  metadata.gz: 1efdb34a4c3ec8e1fbefa2bff8e24906d880d77b
+  data.tar.gz: 7951d6da1f4bc03c5a77de5494e2431c9d5628b4
 SHA512:
-  metadata.gz: 3936eb5b728fa94d82cf3703027ef015c8c910328d6d912994ad27cf91a62a8bfbfd58f9235b383917c78bae607def2f206a263cf8c59d41e4a19db0310da279
-  data.tar.gz: 74070bf381abb76c1d46a0e2542321023b6fb047e08387dd839acf2b31141deb17108c35770ca19c37139af5596248963df82e0b76107debce70a29f06a53c4d
+  metadata.gz: b82f2aabc5d395d51ebe3128b8fdb6a033f5f840cea62a830287925046b0d2e3d56cf0d63198581ff37cc603bad7cbadc8220d4656570d6812e0db0d6f29650b
+  data.tar.gz: d88efce0327adc63a0c619c8172aa55c3000a7c6f82c031eaecc65b0129c7f2f83173f7e5d696b90b3aef6302328490e1df4c0b7dba4d38139b51789799135f5

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/baza_models.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza_models 0.0.6 ruby lib
+# stub: baza_models 0.0.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza_models"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["kaspernj"]
-  s.date = "2016-04-11"
+  s.date = "2016-05-05"
   s.description = "ActiveRecord like models for the Baza database framework"
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

data/lib/baza_models/helpers/ransacker_helper.rb

@@ -1,8 +1,46 @@
 module BazaModels::Helpers::RansackerHelper
-  def bm_sort_link(ransacker, attribute)
+  def bm_paginate_content(collection)
     require "html_gen"
 
-    label = ransacker.klass.human_attribute_name(attribute)
+    new_params = params.dup
+    current_page = collection.page
+    total_pages = collection.total_pages
+
+    container = HtmlGen::Element.new(:div)
+
+    if current_page > 1
+      new_params[:page] = current_page - 1
+      container.add_ele(:a, str: "Previous", attr: {href: url_for(new_params)})
+    else
+      container.add_ele(:span, str: "Previous")
+    end
+
+    1.upto(collection.total_pages) do |page_i|
+      new_params[:page] = page_i
+
+      link = container.add_ele(:a, attr: {href: url_for(new_params)})
+
+      if page_i == current_page
+        link.add_ele(:b, str: page_i.to_s)
+      else
+        link.add_str(page_i.to_s)
+      end
+    end
+
+    if current_page < total_pages
+      new_params[:page] = current_page + 1
+      container.add_ele(:a, str: "Next", attr: {href: url_for(new_params)})
+    else
+      container.add_ele(:span, str: "Next")
+    end
+
+    container.html
+  end
+
+  def bm_sort_link(ransacker, attribute, label = nil)
+    require "html_gen"
+
+    label = ransacker.klass.human_attribute_name(attribute) if label.to_s.strip.empty?
 
     new_params = params.clone
     new_params[:q] ||= {}

data/lib/baza_models/model.rb

@@ -44,8 +44,8 @@ class BazaModels::Model
   end
 
   QUERY_METHODS = [
-    :all, :any?, :each, :empty?, :none?, :count, :find, :first, :find_first, :last, :length, :size, :select, :includes,
-    :joins, :group, :where, :order, :limit, :to_a, :accessible_by, :ransack
+    :average, :all, :any?, :destroy_all, :each, :empty?, :ids, :maximum, :minimum, :none?, :count, :find, :first, :find_first, :last, :length,
+    :size, :select, :includes, :joins, :group, :where, :order, :pluck, :sum, :limit, :to_a, :accessible_by, :ransack
   ].freeze
   QUERY_METHODS.each do |query_method|
     (class << self; self; end).__send__(:define_method, query_method) do |*args, &blk|

data/lib/baza_models/query.rb

@@ -41,10 +41,29 @@ class BazaModels::Query
     end
   end
 
+  def average(column_name)
+    query = select("AVG(#{table_sql}.#{column_sql(column_name)}) AS average")
+    @db.query(query.to_sql).fetch.fetch(:average).to_f
+  end
+
   def empty?
     !any?
   end
 
+  def ids
+    pluck(:id)
+  end
+
+  def maximum(column_name)
+    query = select("MAX(#{table_sql}.#{column_sql(column_name)}) AS maximum")
+    @db.query(query.to_sql).fetch.fetch(:maximum).to_f
+  end
+
+  def minimum(column_name)
+    query = select("MIN(#{table_sql}.#{column_sql(column_name)}) AS minimum")
+    @db.query(query.to_sql).fetch.fetch(:minimum).to_f
+  end
+
   def none?
     !any?
   end
@@ -75,6 +94,26 @@ class BazaModels::Query
     length
   end
 
+  def pluck(*column_names)
+    results = @db.query(select(column_names).to_sql).to_a
+    results.map do |result|
+      if column_names.length == 1
+        result.fetch(column_names.first)
+      else
+        new_result = []
+        column_names.each do |column_name|
+          new_result << result.fetch(column_name)
+        end
+        new_result
+      end
+    end
+  end
+
+  def sum(column_name)
+    query = select("SUM(#{table_sql}.#{column_sql(column_name)}) AS sum")
+    @db.query(query.to_sql).fetch.fetch(:sum).to_f
+  end
+
   def new(attributes)
     raise "No previous model" unless @previous_model
     raise "No relation" unless @relation
@@ -430,6 +469,14 @@ private
     end
   end
 
+  def table_sql
+    @table_sql ||= "#{@db.sep_table}#{@db.escape_table(@model.table_name)}#{@db.sep_table}"
+  end
+
+  def column_sql(column_name)
+    "#{@db.sep_col}#{@db.escape_column(column_name)}#{@db.sep_col}"
+  end
+
   def method_missing(method_name, *args, &blk)
     return super unless @model
 

data/lib/baza_models/query/sql_generator.rb

@@ -2,10 +2,7 @@ class BazaModels::Query::SqlGenerator
   def initialize(args)
     @query = args.fetch(:query)
 
-    instance_variables = [
-      :selects, :joins, :wheres, :groups, :orders, :per, :limit, :offset,
-      :model, :table_name, :reverse_order
-    ]
+    instance_variables = [:db, :selects, :joins, :wheres, :groups, :orders, :per, :limit, :offset, :model, :table_name, :reverse_order]
     instance_variables.each do |instance_variable|
       value = @query.instance_variable_get(:"@#{instance_variable}")
       instance_variable_set(:"@#{instance_variable}", value)
@@ -16,12 +13,12 @@ class BazaModels::Query::SqlGenerator
     sql = "SELECT "
 
     if @selects.empty?
-      sql << "`#{@model.table_name}`.*"
+      sql << "#{@db.sep_table}#{@model.table_name}#{@db.sep_table}.*"
     else
       sql << @selects.join(", ")
     end
 
-    sql << " FROM `#{@model.table_name}`"
+    sql << " FROM #{@db.sep_table}#{@model.table_name}#{@db.sep_table}"
 
     unless @joins.empty?
       @joins.each do |join|

data/spec/baza_models/model_spec.rb

@@ -27,6 +27,16 @@ describe "BazaModels::Model" do
     expect(user.to_param).to eq user.id.to_s
   end
 
+  it "#destroy_all" do
+    5.times do |n|
+      User.create! email: "user#{n}@example.com"
+    end
+
+    expect(User.count).to eq 5
+    User.destroy_all
+    expect(User.count).to eq 0
+  end
+
   it "#email=" do
     user.email = "newemail@example.com"
     expect(user.email).to eq "newemail@example.com"

data/spec/baza_models/query_spec.rb

@@ -7,6 +7,17 @@ describe BazaModels::Query do
   let(:role_user) { Role.new(user: user, role: "user") }
   let(:role_admin) { Role.new(user: user, role: "administrator") }
 
+  context "#average" do
+    it "calculates the average" do
+      5.times do |n|
+        User.create! id: n + 1, email: "user#{n}@example.com"
+      end
+
+      expect(User.average(:id)).to eq 3.0
+      expect(User.where("id >= 4").average(:id)).to eq 4.5
+    end
+  end
+
   context "#where" do
     before do
       user.save!
@@ -38,6 +49,17 @@ describe BazaModels::Query do
     end
   end
 
+  context "#ids" do
+    it "returns the ids of the models" do
+      5.times do |n|
+        User.create! id: n + 1, email: "user#{n}@example.com"
+      end
+
+      expect(User.ids).to eq [1, 2, 3, 4, 5]
+      expect(User.where("id >= 3").ids).to eq [3, 4, 5]
+    end
+  end
+
   context "#joins" do
     before do
       user.save!
@@ -133,6 +155,28 @@ describe BazaModels::Query do
     expect(Role.last).to eq role_admin
   end
 
+  describe "#maximum" do
+    it "returns the maximum" do
+      5.times do |n|
+        User.create! id: n + 1, email: "user#{n}@example.com"
+      end
+
+      expect(User.maximum(:id)).to eq 5
+      expect(User.where("id < 4").maximum(:id)).to eq 3
+    end
+  end
+
+  describe "#minimum" do
+    it "returns the minimum" do
+      5.times do |n|
+        User.create! id: n + 1, email: "user#{n}@example.com"
+      end
+
+      expect(User.minimum(:id)).to eq 1
+      expect(User.where("id >= 3").minimum(:id)).to eq 3
+    end
+  end
+
   describe "#order" do
     it "converts symbols to escaped strings" do
       sql = Role.order(:role).to_sql
@@ -140,6 +184,20 @@ describe BazaModels::Query do
     end
   end
 
+  describe "#pluck" do
+    it "returns the given columns in an array" do
+      5.times do |n|
+        User.create! id: n + 1, email: "user#{n + 1}@example.com"
+      end
+
+      expect(User.pluck(:id, :email)).to eq [
+        [1, "user1@example.com"], [2, "user2@example.com"], [3, "user3@example.com"], [4, "user4@example.com"], [5, "user5@example.com"]
+      ]
+      expect(User.where("id >= 4").pluck(:id, :email)).to eq [[4, "user4@example.com"], [5, "user5@example.com"]]
+      expect(User.pluck(:id)).to eq [1, 2, 3, 4, 5]
+    end
+  end
+
   describe "#reverse_order" do
     before do
       role_user.save!
@@ -162,6 +220,17 @@ describe BazaModels::Query do
     end
   end
 
+  describe "#sum" do
+    it "returns the sum" do
+      5.times do |n|
+        User.create! id: n + 1, email: "user#{n}@example.com"
+      end
+
+      expect(User.sum(:id)).to eq 15.0
+      expect(User.where("id >= 3").sum(:id)).to eq 12.0
+    end
+  end
+
   it "#new" do
     user.save!
     expect(user.roles.length).to eq 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza_models
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator