baza_models 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4c06e71c9d91e97504d17b5a469f2c941c68e26
-  data.tar.gz: 9d0cc2326a8ce71b1f0b67cf2193b28c1e264e98
+  metadata.gz: 4edadeab01c210ce4d6eb26989945d496aa66075
+  data.tar.gz: 00229063065ccfcfdb6189b926e5f3c81a33b1e4
 SHA512:
-  metadata.gz: c762af7cad3328bd461d34e07939be0ff54e87518eba020676111777d7e84425ce88f3b90fb625bfdcee635202a29e9fe5403556511238b3ed3c11c4464ffd26
-  data.tar.gz: cb735d831b9c233a4031465feb2258689eb57ee688a20e7ab3e96d5b88b682d05dab606eaa9e66c83624a86c7bdbf6ef5b9602378d69b06a5a6412ec1502dea5
+  metadata.gz: 8b3e220cb2c0467ce53fdb66b754eef986069cb5d8c208558dc1f94ec71106539ffc9552aa13600133fe0adc8824614d389308fb5cd8e4a67cf7c6a351e02f98
+  data.tar.gz: b9b8691f657f2febae4613e57c079d8f23bd9878a184d0ff174fb8c30bbd326fcf4d92dfa89e3b84052180a3ed7f68b980c8bd9a5b886df6c6fd6c38db811685

data/.rubocop.yml

@@ -0,0 +1,85 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  Exclude:
+    - db/schema.rb
+    - spec/dummy/db/schema.rb
+
+# https://github.com/AtomLinter/linter-rubocop/issues/2
+Style/FileName:
+  Enabled: false
+
+# Metrics/CyclomaticComplexity:
+#   Max: 10
+
+Metrics/LineLength:
+  Max: 160
+
+# Metrics/MethodLength:
+#   Max: 50
+
+# Metrics/AbcSize:
+#   Max: 25
+
+# Metrics/ClassLength:
+#   Max: 250
+
+# .find_each is not the same as .each
+Rails/FindEach:
+  Enabled: false
+
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact
+
+Style/ConditionalAssignment:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/EmptyLines:
+  Enabled: false
+
+# Will report offences for many places that are much more readable without using a guard clause
+Style/GuardClause:
+  Enabled: false
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+Style/NilComparison:
+  Enabled: false
+
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Style/TrivialAccessors:
+  ExactNameMatch: true
+  Enabled: true
+
+# Disabled on purpose: https://github.com/bbatsov/rubocop/issues/1758
+Style/ClosingParenthesisIndentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,35 +1,68 @@
-
-
-
-
-
-
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-12-20 19:19:55 +0100 using RuboCop version 0.35.1.
+# on 2016-04-06 18:56:17 +0200 using RuboCop version 0.37.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 6
+# Offense count: 2
+Lint/IneffectiveAccessModifier:
+  Exclude:
+    - 'lib/baza_models/model.rb'
+
+# Offense count: 7
 Metrics/AbcSize:
-  Max: 41
+  Max: 44
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 400
+  Max: 386
 
-# Offense count: 5
+# Offense count: 1
 Metrics/CyclomaticComplexity:
   Max: 15
 
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 77
+  Max: 74
 
-# Offense count: 6
+# Offense count: 7
 Metrics/PerceivedComplexity:
   Max: 21
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/MultilineIfThen:
+  Exclude:
+    - 'baza_models.gemspec'
+
+# Offense count: 42
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'baza_models.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: final_newline, final_blank_line
+Style/TrailingBlankLines:
+  Exclude:
+    - 'baza_models.gemspec'
+
+# Offense count: 42
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Exclude:
+    - 'baza_models.gemspec'

data/Gemfile

@@ -7,6 +7,7 @@ gem "array_enumerator", ">= 0.0.10"
 gem "baza", "~> 0.0.20"
 gem "string-cases", ">= 0.0.3"
 gem "auto_autoloader", ">= 0.0.1"
+gem "html_gen", ">= 0.0.12", require: false
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -19,7 +20,7 @@ group :development do
   gem "sqlite3", platform: :ruby
   gem "jdbc-sqlite3", platform: :jruby
   gem "best_practice_project", require: false, github: "kaspernj/best_practice_project"
-  gem "rubocop", require: false
+  gem "rubocop", "0.37.0", require: false
   gem "orm_adapter", require: false
 end
 

data/Gemfile.lock

@@ -1,8 +1,9 @@
 GIT
   remote: git://github.com/kaspernj/best_practice_project.git
-  revision: 35df59c22465901fd31f841af7716ce770236831
+  revision: c83ad748c63928b446c45e6ba50caabaf7af8714
   specs:
-    best_practice_project (0.0.7)
+    best_practice_project (0.0.9)
+      auto_autoloader
 
 GEM
   remote: http://rubygems.org/
@@ -16,9 +17,7 @@ GEM
     addressable (2.3.8)
     array_enumerator (0.0.10)
     ast (2.2.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    auto_autoloader (0.0.1)
+    auto_autoloader (0.0.4)
       string-cases
     baza (0.0.20)
       array_enumerator (~> 0.0.10)
@@ -50,6 +49,8 @@ GEM
       oauth2
     hashie (3.4.2)
     highline (1.7.2)
+    html_gen (0.0.12)
+      string-cases
     i18n (0.7.0)
     jdbc-sqlite3 (3.8.10.1)
     jeweler (2.0.1)
@@ -79,11 +80,11 @@ GEM
       multi_xml (~> 0.5)
       rack (~> 1.2)
     orm_adapter (0.5.0)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
+    parser (2.3.0.2)
+      ast (~> 2.2)
     powerpack (0.1.1)
     rack (1.6.4)
-    rainbow (2.0.0)
+    rainbow (2.1.0)
     rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -100,13 +101,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+    rubocop (0.37.0)
+      parser (>= 2.3.0.2, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
+      unicode-display_width (~> 0.3)
     ruby-progressbar (1.7.5)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -114,12 +114,12 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     sqlite3 (1.3.10)
-    string-cases (0.0.3)
+    string-cases (0.0.4)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
-    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unicode-display_width (0.3.1)
     wref (0.0.8)
 
 PLATFORMS
@@ -134,12 +134,13 @@ DEPENDENCIES
   bundler (~> 1.0)
   codeclimate-test-reporter
   factory_girl
+  html_gen (>= 0.0.12)
   jdbc-sqlite3
   jeweler (~> 2.0.1)
   orm_adapter
   rdoc (~> 3.12)
   rspec (~> 3.3.0)
-  rubocop
+  rubocop (= 0.37.0)
   sqlite3
   string-cases (>= 0.0.3)
 

data/README.md

@@ -81,6 +81,11 @@ User.last
 User.order(:id).reverse_order
 ```
 
+### Ransack
+```ruby
+Person.ransack(user_organization_name_cont: "test").result.to_a #=> [user]
+```
+
 
 ## Setting and saving attributes
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

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.3 ruby lib
+# stub: baza_models 0.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza_models"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   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-01-07"
+  s.date = "2016-04-07"
   s.description = "ActiveRecord like models for the Baza database framework"
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".rubocop.yml",
     ".rubocop_todo.yml",
     "Gemfile",
     "Gemfile.lock",
@@ -29,14 +30,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "baza_models.gemspec",
-    "config/best_project_practice_rubocop.yml",
-    "config/best_project_practice_rubocop_todo.yml",
     "lib/baza_models.rb",
     "lib/baza_models/autoloader.rb",
     "lib/baza_models/baza_orm_adapter.rb",
     "lib/baza_models/can_can_adapter.rb",
     "lib/baza_models/class_translation.rb",
     "lib/baza_models/errors.rb",
+    "lib/baza_models/helpers.rb",
+    "lib/baza_models/helpers/ransacker_helper.rb",
     "lib/baza_models/model.rb",
     "lib/baza_models/model/belongs_to_relations.rb",
     "lib/baza_models/model/custom_validations.rb",
@@ -51,7 +52,9 @@ Gem::Specification.new do |s|
     "lib/baza_models/query.rb",
     "lib/baza_models/query/inspector.rb",
     "lib/baza_models/query/not.rb",
+    "lib/baza_models/query/sql_generator.rb",
     "lib/baza_models/ransacker.rb",
+    "lib/baza_models/ransacker/relationship_scanner.rb",
     "lib/baza_models/test_database_cleaner.rb",
     "lib/baza_models/validators.rb",
     "lib/baza_models/validators/base_validator.rb",
@@ -96,7 +99,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/baza_models"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.0"
+  s.rubygems_version = "2.2.2"
   s.summary = "ActiveRecord like models for the Baza database framework"
 
   if s.respond_to? :specification_version then
@@ -107,6 +110,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<baza>, ["~> 0.0.20"])
       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_development_dependency(%q<rspec>, ["~> 3.3.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -115,13 +119,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<jdbc-sqlite3>, [">= 0"])
       s.add_development_dependency(%q<best_practice_project>, [">= 0"])
-      s.add_development_dependency(%q<rubocop>, [">= 0"])
+      s.add_development_dependency(%q<rubocop>, ["= 0.37.0"])
       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<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<rspec>, ["~> 3.3.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -130,7 +135,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
       s.add_dependency(%q<best_practice_project>, [">= 0"])
-      s.add_dependency(%q<rubocop>, [">= 0"])
+      s.add_dependency(%q<rubocop>, ["= 0.37.0"])
       s.add_dependency(%q<orm_adapter>, [">= 0"])
     end
   else
@@ -138,6 +143,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<baza>, ["~> 0.0.20"])
     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<rspec>, ["~> 3.3.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -146,7 +152,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
     s.add_dependency(%q<best_practice_project>, [">= 0"])
-    s.add_dependency(%q<rubocop>, [">= 0"])
+    s.add_dependency(%q<rubocop>, ["= 0.37.0"])
     s.add_dependency(%q<orm_adapter>, [">= 0"])
   end
 end

data/lib/baza_models/helpers.rb

@@ -0,0 +1,3 @@
+class BazaModels::Helpers
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
+end

data/lib/baza_models/helpers/ransacker_helper.rb

@@ -0,0 +1,23 @@
+module BazaModels::Helpers::RansackerHelper
+  def bm_sort_link(ransacker, attribute)
+    require "html_gen"
+
+    label = ransacker.klass.human_attribute_name(attribute)
+
+    new_params = params.clone
+    new_params[:q] ||= {}
+
+    sort_asc = "#{attribute} asc"
+
+    if new_params[:q][:s] == sort_asc
+      new_params[:q][:s] = "#{attribute} desc"
+    else
+      new_params[:q][:s] = sort_asc
+    end
+
+    href = url_for(new_params)
+
+    element = HtmlGen::Element.new(:a, str: label, attr: {href: href})
+    element.html
+  end
+end

data/lib/baza_models/model.rb

@@ -23,7 +23,7 @@ class BazaModels::Model
     :before_create, :after_create, :before_save, :after_save, :before_destroy, :after_destroy,
     :before_validation, :after_validation, :before_validation_on_create, :after_validation_on_create,
     :before_validation_on_update, :after_validation_on_update
-  ]
+  ].freeze
 
   CALLBACK_TYPES.each do |callback_type|
     # rubocop:disable Style/ClassVars
@@ -44,9 +44,9 @@ class BazaModels::Model
   end
 
   QUERY_METHODS = [
-    :all, :any?, :empty?, :none?, :count, :find, :first, :find_first, :last, :length, :select, :includes,
-    :joins, :group, :where, :order, :limit, :to_a, :accessible_by
-  ]
+    :all, :any?, :each, :empty?, :none?, :count, :find, :first, :find_first, :last, :length, :select, :includes,
+    :joins, :group, :where, :order, :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|
       BazaModels::Query.new(model: self).__send__(query_method, *args, &blk)
@@ -54,7 +54,7 @@ class BazaModels::Model
   end
 
   def initialize(data = {}, args = {})
-    self.class.init_model unless self.class.model_initialized?
+    self.class.init_model
 
     reset_errors
     @changes = {}
@@ -135,6 +135,8 @@ class BazaModels::Model
   end
 
   def self.init_model
+    return if @model_initialized
+
     @table = db.tables[table_name]
 
     @__blank_attributes ||= {}
@@ -211,13 +213,10 @@ class BazaModels::Model
   end
 
   def self.column_names
+    init_model
     @column_names ||= __blank_attributes.keys.map(&:to_s)
   end
 
-  def self.ransack(params)
-    BazaModels::Ransacker.new(class: self, params: params)
-  end
-
   def [](key)
     read_attribute(key)
   end
@@ -323,7 +322,7 @@ protected
         belongs_to_relations.each do |relation|
           if attribute_name.to_s == relation[:relation_name].to_s
             attribute_name = :"#{attribute_name}_id"
-            attribute_value = attribute_value.id
+            attribute_value = attribute_value.id if attribute_value
           end
         end
       end

data/lib/baza_models/model/has_one_relations.rb

@@ -40,22 +40,20 @@ module BazaModels::Model::HasOneRelations
       define_method(relation_name) do
         if (model = autoloads[relation_name])
           model
+        elsif relation[:args][:through]
+          __send__(relation[:args][:through]).__send__(relation_name)
         else
-          if relation[:args][:through]
-            __send__(relation[:args][:through]).__send__(relation_name)
-          else
-            class_instance = StringCases.constantize(relation.fetch(:class_name))
+          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 = class_instance.where(relation.fetch(:foreign_key) => id)
+          query._previous_model = self
+          query._relation = relation
 
-            all_args.each do |arg|
-              query = query.instance_exec(&arg) if arg.is_a?(Proc)
-            end
-
-            query.first
+          all_args.each do |arg|
+            query = query.instance_exec(&arg) if arg.is_a?(Proc)
           end
+
+          query.first
         end
       end
     end

data/lib/baza_models/query.rb

@@ -57,7 +57,22 @@ class BazaModels::Query
   end
 
   def length
-    count
+    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
+  end
+
+  def new(attributes)
+    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.assign_attributes(attributes)
+    autoloaded_cache_or_create << new_sub_model
+
+    new_sub_model
   end
 
   def find(id)
@@ -154,10 +169,10 @@ class BazaModels::Query
       args.each do |key, value|
         if value.is_a?(Hash)
           value.each do |hash_key, hash_value|
-            @wheres << "`#{key}`.`#{key_convert(hash_key, hash_value)}` = #{@db.sqlval(value_convert(hash_value))}"
+            @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)}` = #{@db.sqlval(value_convert(value))}"
+          @wheres << "`#{@model.table_name}`.`#{key_convert(key, value)}` #{value_with_mode(value_convert(value))}"
         end
       end
     end
@@ -274,84 +289,7 @@ class BazaModels::Query
   end
 
   def to_sql
-    sql = "SELECT "
-
-    if @selects.empty?
-      sql << "`#{@model.table_name}`.*"
-    else
-      sql << @selects.join(", ")
-    end
-
-    sql << " FROM `#{@model.table_name}`"
-
-    unless @joins.empty?
-      @joins.each do |join|
-        sql << " #{join}"
-      end
-    end
-
-    unless @wheres.empty?
-      sql << " WHERE "
-
-      first = true
-      @wheres.each do |where|
-        if first == true
-          first = false
-        else
-          sql << " AND "
-        end
-
-        sql << where
-      end
-    end
-
-    unless @groups.empty?
-      sql << " GROUP BY "
-
-      first = true
-      @groups.each do |group|
-        if first
-          first = false
-        else
-          sql << ", "
-        end
-
-        sql << group
-      end
-    end
-
-    unless @orders.empty?
-      sql << " ORDER BY "
-
-      first = true
-      @orders.each do |order|
-        if first
-          first = false
-        else
-          sql << ", "
-        end
-
-        if @reverse_order
-          if order.match(/\s+desc/i)
-            order = order.gsub(/\s+desc/i, " ASC")
-          elsif order.match(/\s+asc/i)
-            order = order.gsub(/\s+asc/i, " DESC")
-          else
-            order = "#{order} DESC"
-          end
-        end
-
-        sql << order
-      end
-    end
-
-    if @limit && @offset
-      sql << " LIMIT #{@offset.to_i}, #{@limit.to_i}"
-    elsif @limit
-      sql << " LIMIT #{@limit.to_i}"
-    end
-
-    sql.strip
+    BazaModels::Query::SqlGenerator.new(query: self).to_sql
   end
 
   def destroy_all
@@ -412,6 +350,10 @@ class BazaModels::Query
     pages_count
   end
 
+  def ransack(params)
+    BazaModels::Ransacker.new(class: @model, params: params, query: self)
+  end
+
 private
 
   def should_use_autoload?
@@ -471,4 +413,26 @@ private
     return value.id if value.is_a?(BazaModels::Model)
     value
   end
+
+  def value_with_mode(value)
+    if value.is_a?(Array)
+      sql = "IN ("
+
+      first = true
+      value.each do |val_i|
+        if first
+          first = false
+        else
+          sql << ", " unless first
+        end
+
+        sql << @db.sqlval(val_i)
+      end
+
+      sql << ")"
+      sql
+    else
+      "= #{@db.sqlval(value)}"
+    end
+  end
 end

data/lib/baza_models/query/not.rb

@@ -18,14 +18,12 @@ class BazaModels::Query::Not
             @wheres << "`#{key}`.`#{hash_key}` != '#{@db.esc(hash_value)}'"
           end
         end
-      else
-        if value.is_a?(Array)
-          values = value.map { |value_i| "'#{@db.esc(value_i)}'" }.join(",")
+      elsif value.is_a?(Array)
+        values = value.map { |value_i| "'#{@db.esc(value_i)}'" }.join(",")
 
-          @wheres << "`#{@model.table_name}`.`#{key}` NOT IN (#{values})"
-        else
-          @wheres << "`#{@model.table_name}`.`#{key}` != '#{@db.esc(value)}'"
-        end
+        @wheres << "`#{@model.table_name}`.`#{key}` NOT IN (#{values})"
+      else
+        @wheres << "`#{@model.table_name}`.`#{key}` != '#{@db.esc(value)}'"
       end
     end
 

data/lib/baza_models/query/sql_generator.rb

@@ -0,0 +1,95 @@
+class BazaModels::Query::SqlGenerator
+  def initialize(args)
+    @query = args.fetch(:query)
+
+    instance_variables = [
+      :selects, :joins, :wheres, :groups, :orders, :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)
+    end
+  end
+
+  def to_sql
+    sql = "SELECT "
+
+    if @selects.empty?
+      sql << "`#{@model.table_name}`.*"
+    else
+      sql << @selects.join(", ")
+    end
+
+    sql << " FROM `#{@model.table_name}`"
+
+    unless @joins.empty?
+      @joins.each do |join|
+        sql << " #{join}"
+      end
+    end
+
+    unless @wheres.empty?
+      sql << " WHERE "
+
+      first = true
+      @wheres.each do |where|
+        if first == true
+          first = false
+        else
+          sql << " AND "
+        end
+
+        sql << where
+      end
+    end
+
+    unless @groups.empty?
+      sql << " GROUP BY "
+
+      first = true
+      @groups.each do |group|
+        if first
+          first = false
+        else
+          sql << ", "
+        end
+
+        sql << group
+      end
+    end
+
+    unless @orders.empty?
+      sql << " ORDER BY "
+
+      first = true
+      @orders.each do |order|
+        if first
+          first = false
+        else
+          sql << ", "
+        end
+
+        if @reverse_order
+          if order =~ /\s+desc/i
+            order = order.gsub(/\s+desc/i, " ASC")
+          elsif order =~ /\s+asc/i
+            order = order.gsub(/\s+asc/i, " DESC")
+          else
+            order = "#{order} DESC"
+          end
+        end
+
+        sql << order
+      end
+    end
+
+    if @limit && @offset
+      sql << " LIMIT #{@offset.to_i}, #{@limit.to_i}"
+    elsif @limit
+      sql << " LIMIT #{@limit.to_i}"
+    end
+
+    sql.strip
+  end
+end

data/lib/baza_models/ransacker.rb

@@ -1,30 +1,66 @@
 class BazaModels::Ransacker
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
+
+  attr_accessor :query
+  attr_reader :db, :klass
+
   def initialize(args)
     @klass = args.fetch(:class)
+    @db = @klass.db
     @params = args.fetch(:params)
-    @query = @klass
+    @query = args.fetch(:query)
   end
 
   def result
-    add_filters_to_query
+    add_filters_to_query unless @add_filters_to_query_executed
     @query
   end
 
 private
 
   def add_filters_to_query
+    @add_filters_to_query_executed = true
     return unless @params
 
     @params.each do |key, value|
       if (match = key.to_s.match(/\A(.+?)_eq\Z/))
-        column_name = match[1]
-        @query = @query.where("`#{@klass.table_name}`.`#{@klass.db.escape_column(column_name)}` = '#{@klass.db.esc(value)}'")
+        filter_eq(match[1], value)
       elsif (match = key.to_s.match(/\A(.+?)_cont\Z/))
-        column_name = match[1]
-        @query = @query.where("`#{@klass.table_name}`.`#{@klass.db.escape_column(column_name)}` LIKE '%#{@klass.db.esc(value)}%'")
+        filter_cont(match[1], value)
+      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])
       else
         raise "Unknown modifier: #{key}"
       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)
+    BazaModels::Ransacker::RelationshipScanner.new(
+      column_name: column_name,
+      mode: :cont,
+      ransacker: self,
+      value: value
+    )
+  end
+
+  def sort_by(args)
+    BazaModels::Ransacker::RelationshipScanner.new(
+      column_name: args.fetch(:column_name),
+      mode: :sort,
+      ransacker: self,
+      value: args.fetch(:sort_mode)
+    )
+  end
 end

data/lib/baza_models/ransacker/relationship_scanner.rb

@@ -0,0 +1,110 @@
+class BazaModels::Ransacker::RelationshipScanner
+  def initialize(args)
+    @join_parts = args[:join_parts] || []
+    @mode = args.fetch(:mode)
+    @ransacker = args.fetch(:ransacker)
+    @db = @ransacker.db
+    @value = args.fetch(:value)
+
+    if args[:column_name]
+      @name_parts = args.fetch(:column_name).split("_")
+    else
+      @name_parts = args.fetch(:name_parts)
+    end
+
+    if args[:klass]
+      @klass = args.fetch(:klass)
+    else
+      @klass = @ransacker.klass
+    end
+
+    parse_relation
+  end
+
+private
+
+  def parse_relation
+    current_name = []
+    relationships = @klass.relationships
+
+    loop do
+      break if @name_parts.empty?
+      name_part = @name_parts.shift
+      current_name << name_part
+
+      relationships.each do |relationship_name, relationship|
+        next unless relationship_name.to_s == current_name.join("_")
+
+        @join_parts << relationship_name
+
+        BazaModels::Ransacker::RelationshipScanner.new(
+          join_parts: @join_parts,
+          klass: StringCases.constantize(relationship.fetch(:class_name)),
+          name_parts: @name_parts,
+          mode: @mode,
+          ransacker: @ransacker,
+          value: @value
+        )
+        return nil
+      end
+
+      name = current_name.join("_")
+      @klass.column_names.each do |column_name|
+        next unless name == column_name
+
+        add_filter_to_query(
+          column_name: column_name
+        )
+        return nil
+      end
+    end
+
+    raise "Could not figure out relationships based on name: #{current_name.join("_")}"
+  end
+
+  def join_parts_as_hash
+    return @join_parts.first if @join_parts.length == 1
+
+    hash = {}
+    current_hash = hash
+    join_parts = @join_parts.clone
+
+    loop do
+      break if join_parts.empty?
+      join_part = join_parts.shift
+
+      if join_parts.length == 1
+        current_hash[join_part] = join_parts.shift
+        break
+      else
+        current_hash[join_part] = {}
+        current_hash = current_hash.fetch(join_part)
+      end
+    end
+
+    hash
+  end
+
+  def add_filter_to_query(args)
+    @ransacker.query = @ransacker.query.joins(join_parts_as_hash) if @join_parts.any?
+
+    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
+      @ransacker.query = @ransacker
+        .query
+        .order("#{table_query}.#{column_query} #{@value}")
+    else
+      raise "Unknown mode: #{@mode}"
+    end
+  end
+end

data/spec/baza_models/model_spec.rb

@@ -140,6 +140,17 @@ describe "BazaModels::Model" do
     expect(user.changed?).to eq false
   end
 
+  it "#each" do
+    user.save!
+    count = 0
+    User.each do |user|
+      expect(user).to eq user
+      count += 1
+    end
+
+    expect(count).to eq 1
+  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_spec.rb

@@ -29,9 +29,16 @@ describe BazaModels::Query do
       expect(query.to_a).to eq [user]
       expect(query.to_sql).to eq "SELECT `users`.* FROM `users` WHERE (`users`.`email`='test@example.com')"
     end
+
+    it "supports arrays as values" do
+      query = User.where(email: [user.email])
+
+      expect(query.to_a).to eq [user]
+      expect(query.to_sql).to eq "SELECT `users`.* FROM `users` WHERE `users`.`email` IN ('test@example.com')"
+    end
   end
 
-  context '#joins' do
+  context "#joins" do
     before do
       user.save!
       role_admin.save!
@@ -152,4 +159,21 @@ describe BazaModels::Query do
       expect(sql).to end_with " DESC"
     end
   end
+
+  it "#new" do
+    user.save!
+    expect(user.roles.length).to eq 0
+    expect(user.roles.count).to eq 0
+
+    role = user.roles.new(role: "admin")
+    expect(role.new_record?).to eq true
+    expect(user.roles.length).to eq 1
+    expect(user.roles.count).to eq 0
+
+    role.save!
+
+    expect(user.roles.length).to eq 1
+    expect(user.roles.count).to eq 1
+    expect(user.roles.to_a).to eq [role]
+  end
 end

data/spec/baza_models/ransacker_spec.rb

@@ -3,7 +3,11 @@ require "spec_helper"
 describe BazaModels::Query do
   include DatabaseHelper
 
-  let!(:user) { User.create!(id: 1, email: "test@example.com") }
+  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!(:another_person) { Person.create!(id: 2, user: another_user) }
 
   it "eq" do
     expect(User.ransack(id_eq: 1).result.to_a).to eq [user]
@@ -12,4 +16,28 @@ describe BazaModels::Query do
   it "cont" do
     expect(User.ransack(email_cont: "test").result.to_a).to eq [user]
   end
+
+  it "s" do
+    query = User.ransack(s: "email asc")
+
+    expect(query.result.to_a).to eq [another_user, user]
+    expect(query.result.to_sql).to eq "SELECT `users`.* FROM `users` ORDER BY `users`.`email` asc"
+  end
+
+  it "sorts by sub column" do
+    query = Person.ransack(s: "user_email asc")
+
+    expect(query.result.to_a).to eq [another_person, person]
+    expect(query.result.to_sql).to include "`users`.`email` asc"
+  end
+
+  it "works with sub models" do
+    query = User.ransack(organization_name_cont: "Test")
+    expect(query.result.to_a).to eq [user]
+  end
+
+  it "works recursively with sub models" do
+    query = Person.ransack(user_organization_name_cont: "Test")
+    expect(query.result.to_a).to eq [person]
+  end
 end

data/spec/support/database_helper.rb

@@ -67,10 +67,13 @@ module DatabaseHelper
           indexes: [:user_id]
         )
 
-        @db.tables.create(:organizations, columns: [
-          {name: :id, type: :int, primarykey: true, autoincr: true},
-          {name: :name, type: :varchar}
-        ])
+        @db.tables.create(
+          :organizations,
+          columns: [
+            {name: :id, type: :int, primarykey: true, autoincr: true},
+            {name: :name, type: :varchar}
+          ]
+        )
       end
 
       after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza_models
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: html_gen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.12
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +196,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.37.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.37.0
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +230,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".rspec"
+- ".rubocop.yml"
 - ".rubocop_todo.yml"
 - Gemfile
 - Gemfile.lock
@@ -224,14 +239,14 @@ files:
 - Rakefile
 - VERSION
 - baza_models.gemspec
-- config/best_project_practice_rubocop.yml
-- config/best_project_practice_rubocop_todo.yml
 - lib/baza_models.rb
 - lib/baza_models/autoloader.rb
 - lib/baza_models/baza_orm_adapter.rb
 - lib/baza_models/can_can_adapter.rb
 - lib/baza_models/class_translation.rb
 - lib/baza_models/errors.rb
+- lib/baza_models/helpers.rb
+- lib/baza_models/helpers/ransacker_helper.rb
 - lib/baza_models/model.rb
 - lib/baza_models/model/belongs_to_relations.rb
 - lib/baza_models/model/custom_validations.rb
@@ -246,7 +261,9 @@ files:
 - lib/baza_models/query.rb
 - lib/baza_models/query/inspector.rb
 - lib/baza_models/query/not.rb
+- lib/baza_models/query/sql_generator.rb
 - lib/baza_models/ransacker.rb
+- lib/baza_models/ransacker/relationship_scanner.rb
 - lib/baza_models/test_database_cleaner.rb
 - lib/baza_models/validators.rb
 - lib/baza_models/validators/base_validator.rb
@@ -308,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord like models for the Baza database framework

data/config/best_project_practice_rubocop.yml

@@ -1,2 +0,0 @@
----
-inherit_from: best_project_practice_rubocop_todo.yml

data/config/best_project_practice_rubocop_todo.yml

@@ -1,35 +0,0 @@
-
-
-
-
-
-
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-12-20 19:19:55 +0100 using RuboCop version 0.35.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 6
-Metrics/AbcSize:
-  Max: 41
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 400
-
-# Offense count: 5
-Metrics/CyclomaticComplexity:
-  Max: 15
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 77
-
-# Offense count: 6
-Metrics/PerceivedComplexity:
-  Max: 21