baza_models 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7af27121360692e3093505352f08c8f855cef0d
-  data.tar.gz: f926660c9fb19321c9cfc68e93b04bcd5dc06a26
+  metadata.gz: b4c06e71c9d91e97504d17b5a469f2c941c68e26
+  data.tar.gz: 9d0cc2326a8ce71b1f0b67cf2193b28c1e264e98
 SHA512:
-  metadata.gz: 9c2f9cf0eecae07319682e1dff0413dc09809c75981ade008bf34648660a4f8f9478d03fef7209fc04d331074432e48e15c15e76847b56b6e036b9e196d6023b
-  data.tar.gz: 5dff49f599cb002d1e8731af809ae8c42c19b6920e0a801cd0846b8fa2adc8ab595292f42d6d43502e30838c95907b1681014cc0224a030ba9996ce9c151b6de
+  metadata.gz: c762af7cad3328bd461d34e07939be0ff54e87518eba020676111777d7e84425ce88f3b90fb625bfdcee635202a29e9fe5403556511238b3ed3c11c4464ffd26
+  data.tar.gz: cb735d831b9c233a4031465feb2258689eb57ee688a20e7ab3e96d5b88b682d05dab606eaa9e66c83624a86c7bdbf6ef5b9602378d69b06a5a6412ec1502dea5

data/Gemfile

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

data/Gemfile.lock

@@ -1,9 +1,8 @@
 GIT
   remote: git://github.com/kaspernj/best_practice_project.git
-  revision: 2493cc7b6afc89705e22e4eed8e52f92d309555b
+  revision: 35df59c22465901fd31f841af7716ce770236831
   specs:
-    best_practice_project (0.0.5)
-      psych (~> 2.0.0)
+    best_practice_project (0.0.7)
 
 GEM
   remote: http://rubygems.org/
@@ -19,6 +18,8 @@ GEM
     ast (2.2.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
+    auto_autoloader (0.0.1)
+      string-cases
     baza (0.0.20)
       array_enumerator (~> 0.0.10)
       datet (~> 0.0.25)
@@ -81,7 +82,6 @@ GEM
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
-    psych (2.0.17)
     rack (1.6.4)
     rainbow (2.0.0)
     rake (10.4.2)
@@ -114,7 +114,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     sqlite3 (1.3.10)
-    string-cases (0.0.2)
+    string-cases (0.0.3)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tins (1.6.0)
@@ -127,7 +127,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  array_enumerator
+  array_enumerator (>= 0.0.10)
+  auto_autoloader (>= 0.0.1)
   baza (~> 0.0.20)
   best_practice_project!
   bundler (~> 1.0)
@@ -140,7 +141,7 @@ DEPENDENCIES
   rspec (~> 3.3.0)
   rubocop
   sqlite3
-  string-cases (>= 0.0.2)
+  string-cases (>= 0.0.3)
 
 BUNDLED WITH
    1.11.2

data/README.md

@@ -1,6 +1,6 @@
-[![Build Status](https://img.shields.io/shippable/5506810c5ab6cc13529b84bf.svg)](https://app.shippable.com/projects/5506810c5ab6cc13529b84bf/builds/latest)
 [![Code Climate](https://codeclimate.com/github/kaspernj/baza_models/badges/gpa.svg)](https://codeclimate.com/github/kaspernj/baza_models)
 [![Test Coverage](https://codeclimate.com/github/kaspernj/baza_models/badges/coverage.svg)](https://codeclimate.com/github/kaspernj/baza_models)
+[![Build Status](https://img.shields.io/shippable/5506810c5ab6cc13529b84bf.svg)](https://app.shippable.com/projects/5506810c5ab6cc13529b84bf/builds/latest)
 
 # BazaModels
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

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.2 ruby lib
+# stub: baza_models 0.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza_models"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   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-06"
+  s.date = "2016-01-07"
   s.description = "ActiveRecord like models for the Baza database framework"
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
     "lib/baza_models/query/not.rb",
     "lib/baza_models/ransacker.rb",
     "lib/baza_models/test_database_cleaner.rb",
+    "lib/baza_models/validators.rb",
     "lib/baza_models/validators/base_validator.rb",
     "lib/baza_models/validators/confirmation_validator.rb",
     "lib/baza_models/validators/format_validator.rb",
@@ -102,9 +103,10 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<array_enumerator>, [">= 0"])
+      s.add_runtime_dependency(%q<array_enumerator>, [">= 0.0.10"])
       s.add_runtime_dependency(%q<baza>, ["~> 0.0.20"])
-      s.add_runtime_dependency(%q<string-cases>, [">= 0.0.2"])
+      s.add_runtime_dependency(%q<string-cases>, [">= 0.0.3"])
+      s.add_runtime_dependency(%q<auto_autoloader>, [">= 0.0.1"])
       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"])
@@ -116,9 +118,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rubocop>, [">= 0"])
       s.add_development_dependency(%q<orm_adapter>, [">= 0"])
     else
-      s.add_dependency(%q<array_enumerator>, [">= 0"])
+      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.2"])
+      s.add_dependency(%q<string-cases>, [">= 0.0.3"])
+      s.add_dependency(%q<auto_autoloader>, [">= 0.0.1"])
       s.add_dependency(%q<rspec>, ["~> 3.3.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -131,9 +134,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<orm_adapter>, [">= 0"])
     end
   else
-    s.add_dependency(%q<array_enumerator>, [">= 0"])
+    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.2"])
+    s.add_dependency(%q<string-cases>, [">= 0.0.3"])
+    s.add_dependency(%q<auto_autoloader>, [">= 0.0.1"])
     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.rb

@@ -1,15 +1,7 @@
-class BazaModels
-  path = "#{File.realpath(File.dirname(__FILE__))}/baza_models"
+require "auto_autoloader"
 
-  autoload :Autoloader, "#{path}/autoloader"
-  autoload :BazaOrmAdapter, "#{path}/baza_orm_adapter"
-  autoload :CanCanAdapter, "#{path}/can_can_adapter"
-  autoload :ClassTranslation, "#{path}/class_translation"
-  autoload :Errors, "#{path}/errors"
-  autoload :Model, "#{path}/model"
-  autoload :Ransacker, "#{path}/ransacker"
-  autoload :Query, "#{path}/query"
-  autoload :TestDatabaseCleaner, "#{path}/test_database_cleaner"
+class BazaModels
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
   class << self
     attr_accessor :primary_db
@@ -18,15 +10,4 @@ class BazaModels
       BazaModels::CanCanAdapter # Loading the model will make CanCan aware because of inherited hook CanCan implements
     end
   end
-
-  class Validators
-    path = "#{File.realpath(File.dirname(__FILE__))}/baza_models/validators"
-
-    autoload :BaseValidator, "#{path}/base_validator"
-    autoload :ConfirmationValidator, "#{path}/confirmation_validator"
-    autoload :FormatValidator, "#{path}/format_validator"
-    autoload :LengthValidator, "#{path}/length_validator"
-    autoload :PresenceValidator, "#{path}/presence_validator"
-    autoload :UniquenessValidator, "#{path}/uniqueness_validator"
-  end
 end

data/lib/baza_models/autoloader.rb

@@ -85,7 +85,7 @@ private
     end
 
     @db.select(relation.fetch(:table_name), id: model_ids) do |model_data|
-      model = ::Object.const_get(relation.fetch(:class_name)).new(model_data, init: true)
+      model = StringCases.constantize(relation.fetch(:class_name)).new(model_data, init: true)
 
       orig_model_id = model_id_mappings.fetch(model_data.fetch(:id))
       orig_model = @models.detect { |array_model| array_model.id == orig_model_id }
@@ -101,7 +101,7 @@ private
     result = {models: []}
 
     @db.select(relation.fetch(:table_name), relation.fetch(:foreign_key) => model_ids) do |model_data|
-      model = ::Object.const_get(relation.fetch(:class_name)).new(model_data, init: true)
+      model = StringCases.constantize(relation.fetch(:class_name)).new(model_data, init: true)
 
       orig_model_id = model_data.fetch(relation.fetch(:foreign_key).to_sym)
       orig_model = @models.detect { |array_model| array_model.id == orig_model_id }
@@ -119,7 +119,7 @@ private
     result = {models: []}
 
     @db.select(relation.fetch(:table_name), relation.fetch(:foreign_key) => model_ids) do |model_data|
-      model = ::Object.const_get(relation.fetch(:class_name)).new(model_data, init: true)
+      model = StringCases.constantize(relation.fetch(:class_name)).new(model_data, init: true)
 
       orig_model_id = model_data.fetch(relation.fetch(:foreign_key))
       orig_model = @models.detect { |array_model| array_model.id == orig_model_id }

data/lib/baza_models/class_translation.rb

@@ -4,7 +4,20 @@ class BazaModels::ClassTranslation
   end
 
   def class_name_snake
-    @class_name_snake ||= StringCases.camel_to_snake(@klass.name)
+    @class_name_snake ||= StringCases.camel_to_snake(@klass.name.split("::").last)
+  end
+
+  def class_name_snake_with_parents
+    unless @class_name_snake_with_parents
+      name = @klass.name
+        .split("::")
+        .map { |name_part| StringCases.camel_to_snake(name_part) }
+        .join("\\")
+
+      @class_name_snake_with_parents = name
+    end
+
+    @class_name_snake_with_parents
   end
 
   def human(args = {})
@@ -15,15 +28,15 @@ class BazaModels::ClassTranslation
     end
 
     keys = [
-      "baza_models.models.#{class_name_snake}.#{count_key}",
-      "activerecord.models.#{class_name_snake}.#{count_key}"
+      "baza_models.models.#{class_name_snake_with_parents}.#{count_key}",
+      "activerecord.models.#{class_name_snake_with_parents}.#{count_key}"
     ]
 
     keys.each do |key|
       return I18n.t(key) if I18n.exists?(key)
     end
 
-    @klass.name
+    @klass.name.split("::").last
   end
 
   def param_key

data/lib/baza_models/model.rb

@@ -1,18 +1,7 @@
 require "string-cases"
 
 class BazaModels::Model
-  path = "#{File.dirname(__FILE__)}/model"
-
-  autoload :BelongsToRelations, "#{path}/belongs_to_relations"
-  autoload :CustomValidations, "#{path}/custom_validations"
-  autoload :Delegation, "#{path}/delegation"
-  autoload :HasManyRelations, "#{path}/has_many_relations"
-  autoload :HasOneRelations, "#{path}/has_one_relations"
-  autoload :Manipulation, "#{path}/manipulation"
-  autoload :Queries, "#{path}/queries"
-  autoload :Scopes, "#{path}/scopes"
-  autoload :TranslationFunctionality, "#{path}/translation_functionality"
-  autoload :Validations, "#{path}/validations"
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
   include BelongsToRelations
   include Delegation
@@ -30,7 +19,7 @@ class BazaModels::Model
 
   # Define all callback methods.
   CALLBACK_TYPES = [
-    :after_initialize, :after_find,
+    :after_initialize, :after_find, :before_update, :after_update,
     :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
@@ -308,7 +297,12 @@ protected
       if callback_data[:block]
         instance_eval(&callback_data.fetch(:block))
       elsif callback_data[:method_name]
-        __send__(callback_data[:method_name], *callback_data.fetch(:args))
+        method_obj = method(callback_data.fetch(:method_name))
+
+        pass_args = callback_data.fetch(:args)
+        pass_args = [] if method_obj.arity == 0
+
+        __send__(callback_data[:method_name], *pass_args)
       else
         raise "Didn't know how to perform callbacks for #{name}"
       end

data/lib/baza_models/model/belongs_to_relations.rb

@@ -37,7 +37,7 @@ module BazaModels::Model::BelongsToRelations
           end
 
           foreign_id = @data.fetch(relation.fetch(:foreign_key))
-          Object.const_get(class_name).find(foreign_id) if foreign_id
+          StringCases.constantize(class_name).find(foreign_id) if foreign_id
         end
       end
 

data/lib/baza_models/model/has_many_relations.rb

@@ -29,7 +29,7 @@ module BazaModels::Model::HasManyRelations
       if args && args[:class_name]
         relation[:class_name] = args.fetch(:class_name)
       else
-        relation[:class_name] = StringCases.snake_to_camel(relation_name.to_s.gsub(/s$/, ""))
+        relation[:class_name] = StringCases.snake_to_camel(StringCases.singularize(relation_name))
       end
 
       @has_many_relations ||= []
@@ -39,7 +39,7 @@ module BazaModels::Model::HasManyRelations
       @relationships[relation_name] = relation
 
       define_method(relation_name) do
-        class_instance = Object.const_get(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
@@ -48,7 +48,7 @@ module BazaModels::Model::HasManyRelations
           query = query.instance_exec(&arg) if arg.is_a?(Proc)
         end
 
-        return query
+        query
       end
     end
   end

data/lib/baza_models/model/has_one_relations.rb

@@ -44,7 +44,7 @@ module BazaModels::Model::HasOneRelations
           if relation[:args][:through]
             __send__(relation[:args][:through]).__send__(relation_name)
           else
-            class_instance = Object.const_get(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

data/lib/baza_models/model/manipulation.rb

@@ -12,7 +12,9 @@ module BazaModels::Model::Manipulation
       if new_record
         status = create
       else
+        fire_callbacks(:before_update)
         db.update(table_name, @changes, id: id) if changed?
+        fire_callbacks(:after_update)
         status = true
       end
 

data/lib/baza_models/query.rb

@@ -1,10 +1,7 @@
 require "array_enumerator"
 
 class BazaModels::Query
-  path = "#{File.dirname(__FILE__)}/query"
-
-  autoload :Inspector, "#{path}/inspector"
-  autoload :Not, "#{path}/not"
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
   attr_accessor :_previous_model, :_relation
 

data/lib/baza_models/query/inspector.rb

@@ -65,7 +65,7 @@ private
       BazaModels::Query::Inspector.new(
         query: @query,
         argument: value,
-        model: Object.const_get(relationship.fetch(:class_name)),
+        model: StringCases.constantize(relationship.fetch(:class_name)),
         joins: @joins,
         joins_tracker: @joins_tracker[key]
       ).execute

data/lib/baza_models/validators.rb

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

data/spec/baza_models/model_spec.rb

@@ -61,12 +61,18 @@ describe "BazaModels::Model" do
   it "#before_save, #after_save" do
     expect(user.before_save_called).to eq nil
     expect(user.after_save_called).to eq nil
+    expect(user.before_update_called).to eq nil
+    expect(user.after_update_called).to eq nil
     user.save!
     expect(user.before_save_called).to eq 1
     expect(user.after_save_called).to eq 1
+    expect(user.before_update_called).to eq nil
+    expect(user.after_update_called).to eq nil
     user.save!
     expect(user.before_save_called).to eq 2
     expect(user.after_save_called).to eq 2
+    expect(user.before_update_called).to eq 1
+    expect(user.after_update_called).to eq 1
   end
 
   it "#before_create, #after_create" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza_models
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: baza
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: auto_autoloader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +248,7 @@ files:
 - lib/baza_models/query/not.rb
 - lib/baza_models/ransacker.rb
 - lib/baza_models/test_database_cleaner.rb
+- lib/baza_models/validators.rb
 - lib/baza_models/validators/base_validator.rb
 - lib/baza_models/validators/confirmation_validator.rb
 - lib/baza_models/validators/format_validator.rb