baza_models 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dbce57502f93c9b90c5d5dba534b57b4db38d2a
-  data.tar.gz: 2b6dc34ac4dbfcfeb36b38ad8e49f07ea80c41ae
+  metadata.gz: 24043c37709619d4fa62e93c29aca64d38343f52
+  data.tar.gz: 3f314d8915ee7c914cd6c3d7831a5719c66d965d
 SHA512:
-  metadata.gz: 90cdb2022ec8e2b869777e34cf83752f6074f045c1fff4c1489e013f3956b2f192410d56847401e9f954a6f92f44794e849ad809243ea274bd5e6aee5c7d5bdb
-  data.tar.gz: 3b6c290cc503f5314a8bcf3769ab003ea27d39b297bbf11fcd407f9bc05d903adabd722b37455c1e37cce72924cc538512e4dfb8f105ed95d09dd4c63a0208f6
+  metadata.gz: 3936eb5b728fa94d82cf3703027ef015c8c910328d6d912994ad27cf91a62a8bfbfd58f9235b383917c78bae607def2f206a263cf8c59d41e4a19db0310da279
+  data.tar.gz: 74070bf381abb76c1d46a0e2542321023b6fb047e08387dd839acf2b31141deb17108c35770ca19c37139af5596248963df82e0b76107debce70a29f06a53c4d

data/Gemfile

@@ -4,10 +4,11 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "array_enumerator", ">= 0.0.10"
-gem "baza", "~> 0.0.20"
+gem "baza", "~> 0.0.21"
 gem "string-cases", ">= 0.0.3"
 gem "auto_autoloader", ">= 0.0.1"
 gem "html_gen", ">= 0.0.12", require: false
+gem "simple_delegate", ">= 0.0.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -19,11 +19,13 @@ GEM
     ast (2.2.0)
     auto_autoloader (0.0.4)
       string-cases
-    baza (0.0.20)
+    baza (0.0.21)
       array_enumerator (~> 0.0.10)
+      auto_autoloader (~> 0.0.1)
       datet (~> 0.0.25)
       event_handler (~> 0.0.0)
-      string-cases (~> 0.0.1)
+      simple_delegate (~> 0.0.2)
+      string-cases (~> 0.0.4)
       wref (~> 0.0.8)
     builder (3.2.2)
     codeclimate-test-reporter (0.4.7)
@@ -108,6 +110,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 0.3)
     ruby-progressbar (1.7.5)
+    simple_delegate (0.0.2)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -129,7 +132,7 @@ PLATFORMS
 DEPENDENCIES
   array_enumerator (>= 0.0.10)
   auto_autoloader (>= 0.0.1)
-  baza (~> 0.0.20)
+  baza (~> 0.0.21)
   best_practice_project!
   bundler (~> 1.0)
   codeclimate-test-reporter
@@ -141,6 +144,7 @@ DEPENDENCIES
   rdoc (~> 3.12)
   rspec (~> 3.3.0)
   rubocop (= 0.37.0)
+  simple_delegate (>= 0.0.2)
   sqlite3
   string-cases (>= 0.0.3)
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

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.5 ruby lib
+# stub: baza_models 0.0.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza_models"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   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-09"
+  s.date = "2016-04-11"
   s.description = "ActiveRecord like models for the Baza database framework"
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/baza_models/helpers.rb",
     "lib/baza_models/helpers/ransacker_helper.rb",
     "lib/baza_models/model.rb",
+    "lib/baza_models/model/active_record_column_adapater.rb",
     "lib/baza_models/model/belongs_to_relations.rb",
     "lib/baza_models/model/custom_validations.rb",
     "lib/baza_models/model/delegation.rb",
@@ -46,12 +47,14 @@ Gem::Specification.new do |s|
     "lib/baza_models/model/has_one_relations.rb",
     "lib/baza_models/model/manipulation.rb",
     "lib/baza_models/model/queries.rb",
+    "lib/baza_models/model/reflection.rb",
     "lib/baza_models/model/scopes.rb",
     "lib/baza_models/model/translation_functionality.rb",
     "lib/baza_models/model/validations.rb",
     "lib/baza_models/query.rb",
     "lib/baza_models/query/inspector.rb",
     "lib/baza_models/query/not.rb",
+    "lib/baza_models/query/pagination.rb",
     "lib/baza_models/query/sql_generator.rb",
     "lib/baza_models/ransacker.rb",
     "lib/baza_models/ransacker/relationship_scanner.rb",
@@ -80,6 +83,7 @@ Gem::Specification.new do |s|
     "spec/baza_models/model/validations_spec.rb",
     "spec/baza_models/model_spec.rb",
     "spec/baza_models/query/not_spec.rb",
+    "spec/baza_models/query/pagination_spec.rb",
     "spec/baza_models/query_spec.rb",
     "spec/baza_models/ransacker_spec.rb",
     "spec/baza_models/validators/confirmation_validator_spec.rb",
@@ -107,10 +111,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<array_enumerator>, [">= 0.0.10"])
-      s.add_runtime_dependency(%q<baza>, ["~> 0.0.20"])
+      s.add_runtime_dependency(%q<baza>, ["~> 0.0.21"])
       s.add_runtime_dependency(%q<string-cases>, [">= 0.0.3"])
       s.add_runtime_dependency(%q<auto_autoloader>, [">= 0.0.1"])
       s.add_runtime_dependency(%q<html_gen>, [">= 0.0.12"])
+      s.add_runtime_dependency(%q<simple_delegate>, [">= 0.0.2"])
       s.add_development_dependency(%q<rspec>, ["~> 3.3.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -123,10 +128,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<orm_adapter>, [">= 0"])
     else
       s.add_dependency(%q<array_enumerator>, [">= 0.0.10"])
-      s.add_dependency(%q<baza>, ["~> 0.0.20"])
+      s.add_dependency(%q<baza>, ["~> 0.0.21"])
       s.add_dependency(%q<string-cases>, [">= 0.0.3"])
       s.add_dependency(%q<auto_autoloader>, [">= 0.0.1"])
       s.add_dependency(%q<html_gen>, [">= 0.0.12"])
+      s.add_dependency(%q<simple_delegate>, [">= 0.0.2"])
       s.add_dependency(%q<rspec>, ["~> 3.3.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -140,10 +146,11 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<array_enumerator>, [">= 0.0.10"])
-    s.add_dependency(%q<baza>, ["~> 0.0.20"])
+    s.add_dependency(%q<baza>, ["~> 0.0.21"])
     s.add_dependency(%q<string-cases>, [">= 0.0.3"])
     s.add_dependency(%q<auto_autoloader>, [">= 0.0.1"])
     s.add_dependency(%q<html_gen>, [">= 0.0.12"])
+    s.add_dependency(%q<simple_delegate>, [">= 0.0.2"])
     s.add_dependency(%q<rspec>, ["~> 3.3.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/lib/baza_models/model/active_record_column_adapater.rb

@@ -0,0 +1,32 @@
+class BazaModels::Model::ActiveRecordColumnAdapater
+  def initialize(baza_column)
+    @baza_column = baza_column
+  end
+
+  def name
+    @baza_column.name
+  end
+
+  def null
+    @baza_column.null?
+  end
+
+  def sql_type
+    result = @baza_column.type.to_s.clone
+    result << "(#{@baza_column.maxlength})" if @baza_column.maxlength
+    result
+  end
+
+  def type
+    case @baza_column.type
+    when :int
+      :integer
+    when :tinyint
+      :boolean
+    when :varchar, :string, :text
+      :string
+    else
+      raise "Unknown type: #{@baza_column.type}"
+    end
+  end
+end

data/lib/baza_models/model/has_many_relations.rb

@@ -41,8 +41,8 @@ module BazaModels::Model::HasManyRelations
       define_method(relation_name) do
         class_instance = StringCases.constantize(relation.fetch(:class_name))
         query = class_instance.where(relation.fetch(:foreign_key) => id)
-        query._previous_model = self
-        query._relation = relation
+        query.previous_model = self
+        query.relation = relation
 
         all_args.each do |arg|
           query = query.instance_exec(&arg) if arg.is_a?(Proc)

data/lib/baza_models/model/has_one_relations.rb

@@ -46,8 +46,8 @@ module BazaModels::Model::HasOneRelations
           class_instance = StringCases.constantize(relation.fetch(:class_name))
 
           query = class_instance.where(relation.fetch(:foreign_key) => id)
-          query._previous_model = self
-          query._relation = relation
+          query.previous_model = self
+          query.relation = relation
 
           all_args.each do |arg|
             query = query.instance_exec(&arg) if arg.is_a?(Proc)

data/lib/baza_models/model/manipulation.rb

@@ -40,7 +40,7 @@ module BazaModels::Model::Manipulation
     end
 
     fire_callbacks(:before_create)
-    self.created_at = Time.now if has_attribute?(:created_at) && !created_at?
+    self.created_at ||= Time.now if has_attribute?(:created_at)
 
     @data[:id] = db.insert(table_name, @changes, return_id: true)
 

data/lib/baza_models/model/reflection.rb

@@ -0,0 +1,25 @@
+class BazaModels::Model::Reflection
+  def initialize(relationship)
+    @relationship = relationship
+  end
+
+  def class_name
+    @relationship.fetch(:class_name)
+  end
+
+  def collection?
+    @relationship.fetch(:type) == :has_many
+  end
+
+  def foreign_key
+    @relationship.fetch(:foreign_key).to_s
+  end
+
+  def klass
+    StringCases.constantize(class_name)
+  end
+
+  def name
+    @relationship.fetch(:relation_name)
+  end
+end

data/lib/baza_models/model/scopes.rb

@@ -9,7 +9,7 @@ module BazaModels::Model::Scopes
       name = name.to_sym
 
       raise "Such a scope already exists" if @scopes.key?(name)
-      @scopes[name] = true
+      @scopes[name] = {blk: blk}
 
       (class << self; self; end).__send__(:define_method, name) do
         blk.call

data/lib/baza_models/model.rb

@@ -91,6 +91,11 @@ class BazaModels::Model
 
   attr_writer :db
 
+  def self.attribute_names
+    init_model
+    @table.columns.map(&:name).map(&:clone)
+  end
+
   def self.db
     @db = nil if @db && @db.closed?
     return @db if @db
@@ -107,6 +112,33 @@ class BazaModels::Model
     @db.transaction(&blk)
   end
 
+  def self.columns
+    init_model
+    @table.columns.map do |column|
+      BazaModels::Model::ActiveRecordColumnAdapater.new(column)
+    end
+  end
+
+  def self.columns_hash
+    init_model
+    result = {}
+
+    @table.columns do |column|
+      result[column.name] = BazaModels::Model::ActiveRecordColumnAdapater.new(column)
+    end
+
+    result
+  end
+
+  def self.reflections
+    result = {}
+    relationships.each_value do |relationship|
+      result[relationship.fetch(:relation_name).to_s] = BazaModels::Model::Reflection.new(relationship)
+    end
+
+    result
+  end
+
   class << self
     attr_writer :db, :table_name
   end
@@ -134,15 +166,15 @@ class BazaModels::Model
     self
   end
 
-  def self.init_model
-    return if @model_initialized
+  def self.init_model(args = {})
+    return if @model_initialized && !args[:force]
 
     @table = db.tables[table_name]
 
     @__blank_attributes ||= {}
 
     @table.columns do |column|
-      init_attribute_from_column(column)
+      init_attribute_from_column(column) unless @model_initialized
       @__blank_attributes[column.name.to_sym] = nil
     end
 

data/lib/baza_models/query/pagination.rb

@@ -0,0 +1,54 @@
+module BazaModels::Query::Pagination
+  def current_page
+    if @page
+      @page
+    else
+      raise "Page has not been set"
+    end
+  end
+
+  def out_of_bounds?
+    current_page > total_pages
+  end
+
+  def page(some_page = :non_given)
+    if some_page == :non_given
+      @page ||= 1
+    else
+      some_page ||= 1
+      some_page = some_page.to_i
+      offset = (some_page - 1) * per
+
+      clone(page: some_page, offset: offset, limit: per)
+    end
+  end
+
+  def paginated?
+    @page != nil
+  end
+
+  def per(value = :non_given)
+    if value == :non_given
+      @per ||= 30
+    else
+      value = value.to_i
+      offset = (page - 1) * value
+      clone(limit: value, offset: offset, per: value)
+    end
+  end
+
+  alias per_page per
+
+  def total_entries
+    @model.count
+  end
+
+  def total_pages
+    pages_count = (count.to_f / per.to_f)
+
+    pages_count = 1 if pages_count.nan? || pages_count == Float::INFINITY
+    pages_count = pages_count.ceil
+    pages_count = 1 if pages_count == 0
+    pages_count
+  end
+end

data/lib/baza_models/query/sql_generator.rb

@@ -3,7 +3,7 @@ class BazaModels::Query::SqlGenerator
     @query = args.fetch(:query)
 
     instance_variables = [
-      :selects, :joins, :wheres, :groups, :orders, :limit, :offset,
+      :selects, :joins, :wheres, :groups, :orders, :per, :limit, :offset,
       :model, :table_name, :reverse_order
     ]
     instance_variables.each do |instance_variable|

data/lib/baza_models/query.rb

@@ -3,7 +3,9 @@ require "array_enumerator"
 class BazaModels::Query
   AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
-  attr_accessor :_previous_model, :_relation
+  include BazaModels::Query::Pagination
+
+  attr_accessor :previous_model, :relation
 
   def initialize(args)
     @args = args
@@ -17,7 +19,11 @@ class BazaModels::Query
     @includes = args[:includes] || []
     @joins = args[:joins] || []
     @groups = args[:groups] || []
+    @offset = args[:offset]
     @orders = args[:orders] || []
+    @page = args[:page]
+    @per = args[:per]
+    @previous_model = args[:previous_model]
     @limit = args[:limit]
 
     @joins_tracker = {}
@@ -29,9 +35,9 @@ class BazaModels::Query
 
   def any?
     if @db.query(clone.select(:id).limit(1).to_sql).fetch
-      return true
+      true
     else
-      return false
+      false
     end
   end
 
@@ -44,21 +50,21 @@ class BazaModels::Query
   end
 
   def count
-    if @_previous_model && @_previous_model.new_record?
-      return autoloaded_cache_or_create.length
+    if @previous_model && @previous_model.new_record?
+      autoloaded_cache_or_create.length
     else
-      query = clone
-
-      query.instance_variable_set(:@selects, [])
-      query = clone.select("COUNT(*) AS count")
+      query = clone(selects: [])
+        .select("COUNT(*) AS count")
+        .limit(nil)
+        .offset(nil)
 
       @db.query(query.to_sql).fetch.fetch(:count)
     end
   end
 
   def length
-    if @_previous_model && !any_wheres_other_than_relation? && @_previous_model.autoloads[@_relation.fetch(:relation_name)]
-      @_previous_model.autoloads[@_relation.fetch(:relation_name)].length
+    if @previous_model && !any_wheres_other_than_relation? && @previous_model.autoloads[@relation.fetch(:relation_name)]
+      @previous_model.autoloads[@relation.fetch(:relation_name)].length
     else
       count
     end
@@ -70,10 +76,10 @@ class BazaModels::Query
   end
 
   def new(attributes)
-    raise "No previous model" unless @_previous_model
-    raise "No relation" unless @_relation
+    raise "No previous model" unless @previous_model
+    raise "No relation" unless @relation
 
-    new_sub_model = @model.new(@_relation.fetch(:foreign_key) => @_previous_model.id)
+    new_sub_model = @model.new(@relation.fetch(:foreign_key) => @previous_model.id)
     new_sub_model.assign_attributes(attributes)
     autoloaded_cache_or_create << new_sub_model
 
@@ -121,39 +127,41 @@ class BazaModels::Query
   def select(select = nil, &blk)
     if !select && blk
       to_enum.select(&blk)
+    elsif select.is_a?(Symbol)
+      clone(selects: @selects + ["`#{@model.table_name}`.`#{select}`"])
     else
-      if select.is_a?(Symbol)
-        @selects << "`#{@model.table_name}`.`#{select}`"
-      else
-        @selects << select
-      end
-
-      self
+      clone(selects: @selects + [select])
     end
   end
 
   def offset(offset)
-    @offset = offset
-    self
+    clone(offset: offset)
   end
 
   def limit(limit)
-    @limit = limit
-    self
+    clone(limit: limit)
   end
 
-  def includes(name)
-    @includes << name
-    self
+  def includes(*names)
+    clone(includes: @includes + names)
   end
 
-  def where(args = nil)
-    if args.is_a?(String)
-      @wheres << "(#{args})"
-    elsif args.is_a?(Array)
-      str = args.shift
+  def where(*args)
+    first_arg = args.first
+    new_wheres = @wheres.dup
+
+    if first_arg.is_a?(String)
+      new_where = "(#{args.shift})"
 
       args.each do |arg|
+        new_where.sub!("?", @db.sqlval(arg))
+      end
+
+      new_wheres << new_where
+    elsif first_arg.is_a?(Array)
+      str = first_arg.shift
+
+      first_arg.each do |arg|
         if arg.is_a?(Symbol)
           arg = "`#{@model.table_name}`.`#{@db.escape_column(arg)}`"
         elsif arg.is_a?(FalseClass)
@@ -167,22 +175,22 @@ class BazaModels::Query
         str.sub!("?", arg)
       end
 
-      @wheres << "(#{str})"
-    elsif args == nil
+      new_wheres << "(#{str})"
+    elsif first_arg == nil
       return Not.new(query: self)
     else
-      args.each do |key, value|
+      first_arg.each do |key, value|
         if value.is_a?(Hash)
           value.each do |hash_key, hash_value|
-            @wheres << "`#{key}`.`#{key_convert(hash_key, hash_value)}` #{value_with_mode(value_convert(hash_value))}"
+            new_wheres << "`#{key}`.`#{key_convert(hash_key, hash_value)}` #{value_with_mode(value_convert(hash_value))}"
           end
         else
-          @wheres << "`#{@model.table_name}`.`#{key_convert(key, value)}` #{value_with_mode(value_convert(value))}"
+          new_wheres << "`#{@model.table_name}`.`#{key_convert(key, value)}` #{value_with_mode(value_convert(value))}"
         end
       end
     end
 
-    self
+    clone(wheres: new_wheres)
   end
 
   def joins(*arguments)
@@ -199,26 +207,22 @@ class BazaModels::Query
 
   def group(name)
     if name.is_a?(Symbol)
-      @groups << "`#{@model.table_name}`.`#{name}`"
+      clone(groups: @groups + ["`#{@model.table_name}`.`#{name}`"])
     elsif name.is_a?(String)
-      @groups << name
+      clone(groups: @groups + [name])
     else
       raise "Didn't know how to group by that argument: #{name}"
     end
-
-    self
   end
 
   def order(name)
     if name.is_a?(Symbol)
-      @orders << "`#{@model.table_name}`.`#{name}`"
+      clone(orders: @orders + ["`#{@model.table_name}`.`#{name}`"])
     elsif name.is_a?(String)
-      @orders << name
+      clone(orders: @orders + [name])
     else
       raise "Didn't know how to order by that argument: #{name}"
     end
-
-    self
   end
 
   def reverse_order
@@ -310,11 +314,11 @@ class BazaModels::Query
   end
 
   def <<(model)
-    raise "No previous model set" unless @_previous_model
-    raise "No relation" unless @_relation
+    raise "No previous model set" unless @previous_model
+    raise "No relation" unless @relation
 
     if model.persisted?
-      model.update_attributes!(@_relation.fetch(:foreign_key) => @_previous_model.id)
+      model.update_attributes!(@relation.fetch(:foreign_key) => @previous_model.id)
     else
       autoloaded_cache_or_create << model
     end
@@ -336,25 +340,6 @@ class BazaModels::Query
     "'#{@db.esc(value)}'"
   end
 
-  def page(some_page)
-    some_page ||= 1
-    offset = (some_page.to_i - 1) * per
-
-    clone.offset(offset).limit(30)
-  end
-
-  def per
-    @per ||= 30
-  end
-
-  def total_pages
-    pages_count = (count.to_f / @per.to_f)
-    pages_count = 1 if pages_count.nan? || pages_count == Float::INFINITY
-    pages_count = pages_count.to_i
-    pages_count = 1 if pages_count == 0
-    pages_count
-  end
-
   def ransack(params)
     BazaModels::Ransacker.new(class: @model, params: params, query: self)
   end
@@ -366,12 +351,12 @@ private
   end
 
   def autoloaded_cache_or_create
-    @_previous_model.autoloads[@_relation.fetch(:relation_name)] ||= []
+    @previous_model.autoloads[@relation.fetch(:relation_name)] ||= []
     autoloaded_cache
   end
 
   def autoloaded_cache
-    @_previous_model.autoloads.fetch(@_relation.fetch(:relation_name))
+    @previous_model.autoloads.fetch(@relation.fetch(:relation_name))
   end
 
   def any_mods?
@@ -379,8 +364,8 @@ private
   end
 
   def any_wheres_other_than_relation?
-    if @_previous_model && @_relation && @wheres.length == 1
-      looks_like = "`#{@_relation.fetch(:table_name)}`.`#{@_relation.fetch(:foreign_key)}` = #{@_previous_model.id}"
+    if @previous_model && @relation && @wheres.length == 1
+      looks_like = "`#{@relation.fetch(:table_name)}`.`#{@relation.fetch(:foreign_key)}` = #{@previous_model.id}"
 
       return false if @wheres.first == looks_like
     end
@@ -389,24 +374,28 @@ private
   end
 
   def autoloaded_on_previous_model?
-    if @_previous_model && @_relation
-      return true if @_previous_model.autoloads.include?(@_relation.fetch(:relation_name))
+    if @previous_model && @relation
+      return true if @previous_model.autoloads.include?(@relation.fetch(:relation_name))
     end
 
     false
   end
 
-  def clone
-    BazaModels::Query.new(
+  def clone(args = {})
+    BazaModels::Query.new({
       model: @model,
-      selects: @selects.dup,
-      wheres: @wheres.dup,
+      selects: @selects,
+      wheres: @wheres,
       joins: @joins.dup,
-      includes: @includes.dup,
-      groups: @groups.dup,
-      orders: @orders.dup,
+      includes: @includes,
+      groups: @groups,
+      offset: @offset,
+      orders: @orders,
+      page: @page,
+      per: @per,
+      previous_model: @previous_model,
       limit: @limit
-    )
+    }.merge(args))
   end
 
   def key_convert(key, value)
@@ -440,4 +429,14 @@ private
       "= #{@db.sqlval(value)}"
     end
   end
+
+  def method_missing(method_name, *args, &blk)
+    return super unless @model
+
+    scopes = @model.instance_variable_get(:@scopes)
+    return super if !scopes || !scopes.key?(method_name)
+
+    block = scopes.fetch(method_name).fetch(:blk)
+    instance_exec(*args, &block)
+  end
 end

data/lib/baza_models/ransacker/relationship_scanner.rb

@@ -85,26 +85,42 @@ private
     hash
   end
 
-  def add_filter_to_query(args)
+  def add_join_parts
     @ransacker.query = @ransacker.query.joins(join_parts_as_hash) if @join_parts.any?
+  end
 
-    column_query = "#{@db.sep_col}#{@db.escape_column(args.fetch(:column_name))}#{@db.sep_col}"
-    table_query = "#{@db.sep_table}#{@db.escape_table(@klass.table_name)}#{@db.sep_table}"
-
-    if @mode == :cont
-      @ransacker.query = @ransacker
-        .query
-        .where("#{table_query}.#{column_query} LIKE #{@db.sep_val}%#{@klass.db.esc(@value)}%#{@db.sep_val}")
-    elsif @mode == :eq
-      @ransacker.query = @ransacker
-        .query
-        .where("#{table_query}.#{column_query} = #{@db.sep_val}#{@klass.db.esc(@value)}#{@db.sep_val}")
-    elsif @mode == :sort
+  def add_filter_to_query(args)
+    @column_query = "#{@db.sep_col}#{@db.escape_column(args.fetch(:column_name))}#{@db.sep_col}"
+    @table_query = "#{@db.sep_table}#{@db.escape_table(@klass.table_name)}#{@db.sep_table}"
+
+    case @mode
+    when :cont
+      return if @value.empty?
+      add_query_with_symbol("LIKE", "%#{@klass.db.esc(@value)}%")
+    when :eq
+      add_query_with_symbol("=")
+    when :lt
+      add_query_with_symbol("<")
+    when :lteq
+      add_query_with_symbol("<=")
+    when :gt
+      add_query_with_symbol(">")
+    when :gteq
+      add_query_with_symbol(">=")
+    when :sort
+      add_join_parts
       @ransacker.query = @ransacker
         .query
-        .order("#{table_query}.#{column_query} #{@value}")
+        .order("#{@table_query}.#{@column_query} #{@value}")
     else
       raise "Unknown mode: #{@mode}"
     end
   end
+
+  def add_query_with_symbol(symbol, value = @value)
+    add_join_parts
+    @ransacker.query = @ransacker
+      .query
+      .where("#{@table_query}.#{@column_query} #{symbol} #{@klass.db.sqlval(value)}")
+  end
 end

data/lib/baza_models/ransacker.rb

@@ -8,6 +8,7 @@ class BazaModels::Ransacker
     @klass = args.fetch(:class)
     @db = @klass.db
     @params = args.fetch(:params)
+    @_registered_params = @params # Support for SimpleFormRansack
     @query = args.fetch(:query)
   end
 
@@ -22,32 +23,25 @@ private
     @add_filters_to_query_executed = true
     return unless @params
 
+    ransackable_scopes = @klass.ransackable_scopes.map(&:to_s) if @klass.respond_to?(:ransackable_scopes)
+
     @params.each do |key, value|
-      if (match = key.to_s.match(/\A(.+?)_eq\Z/))
-        filter_eq(match[1], value)
-      elsif (match = key.to_s.match(/\A(.+?)_cont\Z/))
-        filter_cont(match[1], value)
+      if (match = key.to_s.match(/\A(.+?)_(cont|eq|lt|lteq|gt|gteq)\Z/))
+        filter(match[1], value, match[2])
       elsif key.to_s == "s"
         match = value.to_s.match(/\A([A-z_\d]+)\s+(asc|desc)\Z/)
         raise "Couldn't sort-match: #{value}" unless match
         sort_by(column_name: match[1], sort_mode: match[2])
+      elsif ransackable_scopes && ransackable_scopes.include?(key.to_s)
+        @query = @query.__send__(key, value)
       end
     end
   end
 
-  def filter_eq(column_name, value)
-    BazaModels::Ransacker::RelationshipScanner.new(
-      column_name: column_name,
-      mode: :eq,
-      ransacker: self,
-      value: value
-    )
-  end
-
-  def filter_cont(column_name, value)
+  def filter(column_name, value, mode)
     BazaModels::Ransacker::RelationshipScanner.new(
       column_name: column_name,
-      mode: :cont,
+      mode: mode.to_sym,
       ransacker: self,
       value: value
     )

data/spec/baza_models/baza_orm_adapter_spec.rb

@@ -47,6 +47,6 @@ describe BazaModels::Query do
   end
 
   it "#column_names" do
-    expect(User.to_adapter.column_names).to eq %w(id organization_id email email_confirmation created_at updated_at)
+    expect(User.to_adapter.column_names).to eq %w(id organization_id email email_confirmation created_at updated_at admin)
   end
 end

data/spec/baza_models/model_spec.rb

@@ -151,6 +151,51 @@ describe "BazaModels::Model" do
     expect(count).to eq 1
   end
 
+  it "#attribute_names" do
+    expect(User.attribute_names).to eq %w(id organization_id email email_confirmation created_at updated_at admin)
+  end
+
+  it "#columns" do
+    id_column = User.columns.find { |column| column.name == "id" }
+
+    expect(id_column.name).to eq "id"
+    expect(id_column.type).to eq :integer
+  end
+
+  it "#columns_hash" do
+    columns_hash = User.columns_hash
+
+    id_column = columns_hash["id"]
+
+    expect(id_column.type).to eq :integer
+    expect(id_column.name).to eq "id"
+    expect(id_column.null).to eq true
+    expect(id_column.sql_type).to eq "int"
+
+    email_column = columns_hash["email"]
+
+    expect(email_column.type).to eq :string
+    expect(email_column.name).to eq "email"
+    expect(email_column.sql_type).to eq "varchar(255)"
+
+    admin_column = columns_hash["admin"]
+
+    expect(admin_column.type).to eq :boolean
+    expect(admin_column.name).to eq "admin"
+    expect(admin_column.sql_type).to eq "tinyint"
+  end
+
+  it "#reflections" do
+    reflections = User.reflections
+
+    person_reflection = reflections.values.find { |reflection| reflection.name == :person }
+    expect(person_reflection.name).to eq :person
+    expect(person_reflection.class_name).to eq "Person"
+    expect(person_reflection.foreign_key).to eq "user_id"
+    expect(person_reflection.klass).to eq Person
+    expect(person_reflection.collection?).to eq false
+  end
+
   it "doesnt care if initialized data has keys as strings" do
     user = User.new("email" => "test@example.com")
     expect(user.email).to eq "test@example.com"

data/spec/baza_models/query/pagination_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+
+describe BazaModels::Query::Pagination do
+  include DatabaseHelper
+
+  before do
+    User.transaction do
+      100.times { |n| User.create! email: "user#{n}@example.com" }
+    end
+  end
+
+  describe "#out_of_bounds?" do
+    it "returns the right values under the right conditions" do
+      collection = User.all.page(5)
+      expect(collection.out_of_bounds?).to eq true
+
+      collection = User.all.page(4)
+      expect(collection.out_of_bounds?).to eq false
+    end
+  end
+
+  describe "#paginated?" do
+    it "returns the right values under the right conditions" do
+      collection = User.all
+      expect(collection.paginated?).to eq false
+
+      collection = collection.page(3)
+      expect(collection.paginated?).to eq true
+    end
+  end
+
+  describe "#per #total_pages" do
+    it "sets a custom per_page" do
+      collection = User
+        .all
+        .per_page(40)
+
+      expect(collection.per_page).to eq 40
+      expect(collection.per).to eq 40
+      expect(collection.to_a.length).to eq 40
+      expect(collection.total_pages).to eq 3
+    end
+  end
+
+  describe "#page" do
+    it "sets the page and returns the correct numbers" do
+      collection = User
+        .all
+        .page(2)
+        .per_page(60)
+
+      expect(collection.page).to eq 2
+      expect(collection.to_a.length).to eq 40
+      expect(collection.page(1).to_a.length).to eq 60
+    end
+  end
+
+  describe "#total_entries" do
+    it "returns the correct number" do
+      collection = User.where(email: "user5@example.com")
+      expect(collection.total_entries).to eq 100
+    end
+  end
+end

data/spec/baza_models/ransacker_spec.rb

@@ -5,8 +5,8 @@ describe BazaModels::Query do
 
   let!(:organization) { Organization.create!(id: 1, name: "Test organization") }
   let!(:person) { Person.create!(id: 1, user: user) }
-  let!(:user) { User.create!(id: 1, organization: organization, email: "test@example.com") }
-  let!(:another_user) { User.create!(id: 2, organization: nil, email: "another_user@example.com") }
+  let!(:user) { User.create!(id: 1, organization: organization, email: "test@example.com", created_at: "2015-06-17 10:00") }
+  let!(:another_user) { User.create!(id: 2, organization: nil, email: "another_user@example.com", created_at: "2015-08-20 6:00") }
   let!(:another_person) { Person.create!(id: 2, user: another_user) }
 
   it "eq" do
@@ -17,6 +17,53 @@ describe BazaModels::Query do
     expect(User.ransack(email_cont: "test").result.to_a).to eq [user]
   end
 
+  describe "lt" do
+    it "finds the right models" do
+      expect(User.ransack(id_lt: 3).result.to_a).to eq [user, another_user]
+    end
+
+    it "excludes the right models" do
+      expect(User.ransack(id_lt: 2).result.to_a).to eq [user]
+    end
+  end
+
+  describe "lteq" do
+    it "finds the right models" do
+      expect(User.ransack(id_lteq: 2).result.to_a).to eq [user, another_user]
+    end
+
+    it "excludes the right models" do
+      expect(User.ransack(id_lteq: 1).result.to_a).to eq [user]
+    end
+  end
+
+  describe "gt" do
+    it "finds the right models" do
+      expect(User.ransack(id_gt: 0).result.to_a).to eq [user, another_user]
+    end
+
+    it "excludes the right models" do
+      expect(User.ransack(id_gt: 1).result.to_a).to eq [another_user]
+    end
+  end
+
+  describe "gteq" do
+    it "finds the right models" do
+      expect(User.ransack(id_gteq: 1).result.to_a).to eq [user, another_user]
+    end
+
+    it "excludes the right models" do
+      expect(User.ransack(id_gteq: 2).result.to_a).to eq [another_user]
+    end
+  end
+
+  describe "since" do
+    it "finds the right users" do
+      query = User.ransack(created_at_since: "2015-08-20").result
+      expect(query.to_a).to eq [another_user]
+    end
+  end
+
   it "s" do
     query = User.ransack(s: "email asc")
 
@@ -41,6 +88,11 @@ describe BazaModels::Query do
     expect(query.result.to_a).to eq [person]
   end
 
+  it "ignores empty contains" do
+    query = Person.ransack(user_organization_name_cont: "")
+    expect(query.result.to_sql).to eq "SELECT `persons`.* FROM `persons`"
+  end
+
   it "ignores unknown parameters and doesn't raise exceptions" do
     Person.ransack(custom_something: "Test").result
   end

data/spec/support/database_helper.rb

@@ -1,90 +1,97 @@
+require "tempfile"
+require "baza"
+
+if RUBY_PLATFORM == "java"
+  require "jdbc/sqlite3"
+  ::Jdbc::SQLite3.load_driver
+else
+  require "sqlite3"
+end
+
 module DatabaseHelper
   def self.included(base)
     base.instance_eval do
       let(:db) { @db }
 
       before do
-        @count ||= 0
-        @count += 1
-
-        require "tempfile"
-        require "baza"
-
-        if RUBY_PLATFORM == "java"
-          require "jdbc/sqlite3"
-          ::Jdbc::SQLite3.load_driver
-        else
-          require "sqlite3"
-        end
-
-        tempfile = Tempfile.new(["baza_test", ".sqlite3"])
-        path = tempfile.path
-        tempfile.close!
-
-        @db = Baza::Db.new(type: :sqlite3, path: path, index_append_table_name: true, debug: false)
-        BazaModels.primary_db = @db
-
-        @db.tables.create(
-          :users,
-          columns: [
-            {name: :id, type: :int, primarykey: true, autoincr: true},
-            {name: :organization_id, type: :int},
-            {name: :email, type: :varchar},
-            {name: :email_confirmation, type: :varchar},
-            {name: :created_at, type: :datetime},
-            {name: :updated_at, type: :datetime}
-          ],
-          indexes: [:organization_id, :email])
-
-        @db.tables.create(
-          :user_passports,
-          columns: [
-            {name: :id, type: :int, primarykey: true, autoincr: true},
-            {name: :user_id, type: :int},
-            {name: :code, type: :varchar}
-          ],
-          indexes: [
-            :user_id
-          ])
-
-        @db.tables.create(
-          :persons,
-          columns: [
-            {name: :id, type: :int, primarykey: true, autoincr: true},
-            {name: :user_id, type: :int}
-          ],
-          indexes: [:user_id])
+        init_database_connection
+        init_database_structure
 
-        @db.tables.create(
-          :roles,
-          columns: [
-            {name: :id, type: :int, primarykey: true, autoincr: true},
-            {name: :user_id, type: :int},
-            {name: :role, type: :varchar},
-            {name: :created_at, type: :datetime},
-            {name: :updated_at, type: :datetime}
-          ],
-          indexes: [:user_id]
-        )
-
-        @db.tables.create(
-          :organizations,
-          columns: [
-            {name: :id, type: :int, primarykey: true, autoincr: true},
-            {name: :name, type: :varchar}
-          ]
-        )
+        User.init_model(force: true)
       end
 
       after do
         BazaModels.primary_db = nil
 
         @db.close
-        path = db.args[:path]
+        path = db.args.fetch(:path)
         File.unlink(path) if File.exist?(path)
         Thread.current[:baza] = nil
         @db = nil
       end
     end
   end
+
+  def init_database_connection
+    tempfile = Tempfile.new(["baza_test", ".sqlite3"])
+    path = tempfile.path
+    tempfile.close!
+
+    @db = Baza::Db.new(type: :sqlite3, path: path, index_append_table_name: true, debug: false)
+    BazaModels.primary_db = @db
+  end
+
+  def init_database_structure
+    @db.tables.create(
+      :users,
+      columns: [
+        {name: :id, type: :int, primarykey: true, autoincr: true},
+        {name: :organization_id, type: :int},
+        {name: :email, type: :varchar},
+        {name: :email_confirmation, type: :varchar},
+        {name: :created_at, type: :datetime},
+        {name: :updated_at, type: :datetime},
+        {name: :admin, type: :tinyint}
+      ],
+      indexes: [:organization_id, :email])
+
+    @db.tables.create(
+      :user_passports,
+      columns: [
+        {name: :id, type: :int, primarykey: true, autoincr: true},
+        {name: :user_id, type: :int},
+        {name: :code, type: :varchar}
+      ],
+      indexes: [
+        :user_id
+      ])
+
+    @db.tables.create(
+      :persons,
+      columns: [
+        {name: :id, type: :int, primarykey: true, autoincr: true},
+        {name: :user_id, type: :int}
+      ],
+      indexes: [:user_id])
+
+    @db.tables.create(
+      :roles,
+      columns: [
+        {name: :id, type: :int, primarykey: true, autoincr: true},
+        {name: :user_id, type: :int},
+        {name: :role, type: :varchar},
+        {name: :created_at, type: :datetime},
+        {name: :updated_at, type: :datetime}
+      ],
+      indexes: [:user_id]
+    )
+
+    @db.tables.create(
+      :organizations,
+      columns: [
+        {name: :id, type: :int, primarykey: true, autoincr: true},
+        {name: :name, type: :varchar}
+      ]
+    )
+  end
 end

data/spec/test_classes/user.rb

@@ -14,6 +14,7 @@ class User < BazaModels::Model
   validates_confirmation_of :email, if: :validate_confirmation
 
   scope :admin_roles_scope, -> { joins(:roles).where(roles: {role: "administrator"}) }
+  scope :created_at_since, ->(date) { where("users.created_at >= ?", date) }
 
   before_save do
     self.before_save_block_called ||= 0
@@ -26,6 +27,10 @@ class User < BazaModels::Model
     __send__(callback_type, :add_callback, callback_type)
   end
 
+  def self.ransackable_scopes(_auth_object = nil)
+    %i(created_at_since)
+  end
+
 private
 
   def add_callback(callback_type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza_models
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.0.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.0.21
 - !ruby/object:Gem::Dependency
   name: string-cases
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.12
+- !ruby/object:Gem::Dependency
+  name: simple_delegate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +262,7 @@ files:
 - lib/baza_models/helpers.rb
 - lib/baza_models/helpers/ransacker_helper.rb
 - lib/baza_models/model.rb
+- lib/baza_models/model/active_record_column_adapater.rb
 - lib/baza_models/model/belongs_to_relations.rb
 - lib/baza_models/model/custom_validations.rb
 - lib/baza_models/model/delegation.rb
@@ -255,12 +270,14 @@ files:
 - lib/baza_models/model/has_one_relations.rb
 - lib/baza_models/model/manipulation.rb
 - lib/baza_models/model/queries.rb
+- lib/baza_models/model/reflection.rb
 - lib/baza_models/model/scopes.rb
 - lib/baza_models/model/translation_functionality.rb
 - lib/baza_models/model/validations.rb
 - lib/baza_models/query.rb
 - lib/baza_models/query/inspector.rb
 - lib/baza_models/query/not.rb
+- lib/baza_models/query/pagination.rb
 - lib/baza_models/query/sql_generator.rb
 - lib/baza_models/ransacker.rb
 - lib/baza_models/ransacker/relationship_scanner.rb
@@ -289,6 +306,7 @@ files:
 - spec/baza_models/model/validations_spec.rb
 - spec/baza_models/model_spec.rb
 - spec/baza_models/query/not_spec.rb
+- spec/baza_models/query/pagination_spec.rb
 - spec/baza_models/query_spec.rb
 - spec/baza_models/ransacker_spec.rb
 - spec/baza_models/validators/confirmation_validator_spec.rb