baza_models 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1953b9a3edb12121b165ba16b4ad833bda5529b
-  data.tar.gz: 18960bc46ba6f08b171186781844a9938ba48e1a
+  metadata.gz: d7af27121360692e3093505352f08c8f855cef0d
+  data.tar.gz: f926660c9fb19321c9cfc68e93b04bcd5dc06a26
 SHA512:
-  metadata.gz: f1232a900ec342d84e63c264bd7399fa6d9bc37672c42e4a038b4bf4f8194b9afd4f97e343e64d55ab6898f1c8c73139e66114cde10128f77d3990f665360dc3
-  data.tar.gz: f6ba88d75b1623ae7cfdb16f90fa1749c9cc2c8f41110b72f27792699e14a2d5cc03e36eb40acaba5313bdba8e3d78634bc0fa70a196a0f800e82c765abbd194
+  metadata.gz: 9c2f9cf0eecae07319682e1dff0413dc09809c75981ade008bf34648660a4f8f9478d03fef7209fc04d331074432e48e15c15e76847b56b6e036b9e196d6023b
+  data.tar.gz: 5dff49f599cb002d1e8731af809ae8c42c19b6920e0a801cd0846b8fa2adc8ab595292f42d6d43502e30838c95907b1681014cc0224a030ba9996ce9c151b6de

data/Gemfile

@@ -5,7 +5,7 @@ source "http://rubygems.org"
 
 gem "array_enumerator"
 gem "baza", "~> 0.0.20"
-gem "string-cases"
+gem "string-cases", ">= 0.0.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -114,7 +114,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     sqlite3 (1.3.10)
-    string-cases (0.0.1)
+    string-cases (0.0.2)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tins (1.6.0)
@@ -140,7 +140,7 @@ DEPENDENCIES
   rspec (~> 3.3.0)
   rubocop
   sqlite3
-  string-cases
+  string-cases (>= 0.0.2)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

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.1 ruby lib
+# stub: baza_models 0.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza_models"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["kaspernj"]
-  s.date = "2015-12-30"
+  s.date = "2016-01-06"
   s.description = "ActiveRecord like models for the Baza database framework"
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -104,7 +104,7 @@ 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"])
       s.add_runtime_dependency(%q<baza>, ["~> 0.0.20"])
-      s.add_runtime_dependency(%q<string-cases>, [">= 0"])
+      s.add_runtime_dependency(%q<string-cases>, [">= 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"])
@@ -118,7 +118,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<array_enumerator>, [">= 0"])
       s.add_dependency(%q<baza>, ["~> 0.0.20"])
-      s.add_dependency(%q<string-cases>, [">= 0"])
+      s.add_dependency(%q<string-cases>, [">= 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"])
@@ -133,7 +133,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<array_enumerator>, [">= 0"])
     s.add_dependency(%q<baza>, ["~> 0.0.20"])
-    s.add_dependency(%q<string-cases>, [">= 0"])
+    s.add_dependency(%q<string-cases>, [">= 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/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)
+      model = ::Object.const_get(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,9 +101,9 @@ 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)
+      model = ::Object.const_get(relation.fetch(:class_name)).new(model_data, init: true)
 
-      orig_model_id = model_data.fetch(relation.fetch(:foreign_key))
+      orig_model_id = model_data.fetch(relation.fetch(:foreign_key).to_sym)
       orig_model = @models.detect { |array_model| array_model.id == orig_model_id }
 
       orig_model.autoloads[autoload_name] ||= []
@@ -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)
+      model = ::Object.const_get(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/model.rb

@@ -30,6 +30,7 @@ class BazaModels::Model
 
   # Define all callback methods.
   CALLBACK_TYPES = [
+    :after_initialize, :after_find,
     :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
@@ -53,9 +54,8 @@ class BazaModels::Model
     end
   end
 
-
   QUERY_METHODS = [
-    :all, :any?, :empty?, :none?, :count, :first, :find_first, :last, :length, :select, :includes,
+    :all, :any?, :empty?, :none?, :count, :find, :first, :find_first, :last, :length, :select, :includes,
     :joins, :group, :where, :order, :limit, :to_a, :accessible_by
   ]
   QUERY_METHODS.each do |query_method|
@@ -81,13 +81,13 @@ class BazaModels::Model
       @new_record = false
     else
       @new_record = true
+      fire_callbacks(:after_initialize)
     end
   end
 
   # rubocop:disable Style/TrivialAccessors
   def new_record?
     # rubocop:enable Style/TrivialAccessors
-
     @new_record
   end
 
@@ -114,6 +114,10 @@ class BazaModels::Model
     BazaModels::BazaOrmAdapter.new(class: self)
   end
 
+  def self.transaction(&blk)
+    @db.transaction(&blk)
+  end
+
   class << self
     attr_writer :db, :table_name
   end

data/lib/baza_models/model/belongs_to_relations.rb

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

data/lib/baza_models/model/manipulation.rb

@@ -7,12 +7,12 @@ module BazaModels::Model::Manipulation
     if args[:validate] == false || valid?
       new_record = new_record?
       fire_callbacks(:before_save)
-      self.updated_at = Time.now if has_attribute?(:updated_at)
+      self.updated_at = Time.now if changed? && has_attribute?(:updated_at)
 
       if new_record
         status = create
       else
-        db.update(table_name, @changes, id: id)
+        db.update(table_name, @changes, id: id) if changed?
         status = true
       end
 

data/lib/baza_models/model/queries.rb

@@ -11,9 +11,7 @@ module BazaModels::Model::Queries
     end
 
     def find_by(where_hash)
-      row = db.select(table_name, where_hash, limit: 1).fetch
-      return new(row, init: true) if row
-      false
+      where(where_hash).first
     end
 
     def find_by!(where_hash)

data/lib/baza_models/query.rb

@@ -64,7 +64,19 @@ class BazaModels::Query
   end
 
   def find(id)
-    clone.where(id: id).limit(1).to_enum.first
+    model = clone.where(id: id).limit(1).to_enum.first
+
+    if model
+      model.__send__(:fire_callbacks, :after_find)
+    else
+      raise BazaModels::Errors::RecordNotFound
+    end
+
+    model
+  end
+
+  def find_by(args)
+    clone.where(args).limit(1).to_enum.first
   end
 
   def first
@@ -89,14 +101,18 @@ class BazaModels::Query
     query.reverse_order.to_enum.first
   end
 
-  def select(select)
-    if select.is_a?(Symbol)
-      @selects << "`#{@model.table_name}`.`#{select}`"
+  def select(select = nil, &blk)
+    if !select && blk
+      to_enum.select(&blk)
     else
-      @selects << select
-    end
+      if select.is_a?(Symbol)
+        @selects << "`#{@model.table_name}`.`#{select}`"
+      else
+        @selects << select
+      end
 
-    self
+      self
+    end
   end
 
   def offset(offset)
@@ -128,7 +144,7 @@ class BazaModels::Query
         elsif arg.is_a?(TrueClass)
           arg = "1"
         else
-          arg = "'#{@db.esc(arg)}'"
+          arg = @db.sqlval(arg)
         end
 
         str.sub!("?", arg)
@@ -141,10 +157,10 @@ class BazaModels::Query
       args.each do |key, value|
         if value.is_a?(Hash)
           value.each do |hash_key, hash_value|
-            @wheres << "`#{key}`.`#{hash_key}` = '#{@db.esc(hash_value)}'"
+            @wheres << "`#{key}`.`#{key_convert(hash_key, hash_value)}` = #{@db.sqlval(value_convert(hash_value))}"
           end
         else
-          @wheres << "`#{@model.table_name}`.`#{key}` = '#{@db.esc(value)}'"
+          @wheres << "`#{@model.table_name}`.`#{key_convert(key, value)}` = #{@db.sqlval(value_convert(value))}"
         end
       end
     end
@@ -193,6 +209,10 @@ class BazaModels::Query
     self
   end
 
+  def map(&blk)
+    to_enum.map(&blk)
+  end
+
   def to_enum
     return autoloaded_cache if should_use_autoload?
 
@@ -249,7 +269,7 @@ class BazaModels::Query
   end
 
   def find_first(args)
-    where(args).first
+    clone.where(args).first
   end
 
   def to_a
@@ -416,7 +436,7 @@ private
 
   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}'"
+      looks_like = "`#{@_relation.fetch(:table_name)}`.`#{@_relation.fetch(:foreign_key)}` = #{@_previous_model.id}"
 
       return false if @wheres.first == looks_like
     end
@@ -444,4 +464,14 @@ private
       limit: @limit
     )
   end
+
+  def key_convert(key, value)
+    return "#{key}_id" if value.is_a?(BazaModels::Model)
+    key
+  end
+
+  def value_convert(value)
+    return value.id if value.is_a?(BazaModels::Model)
+    value
+  end
 end

data/spec/baza_models/autoloader_spec.rb

@@ -29,6 +29,7 @@ describe BazaModels::Autoloader do
     expect(role.user).to eq user
     expect(role.autoloads).to have_received(:[]).with(:user)
     expect(role.autoloads[:user]).to eq user
+    expect(role.autoloads[:user].id).to eq user.id
   end
 
   it "autoloads via includes on has_one relations" do

data/spec/baza_models/model/has_many_relations_spec.rb

@@ -40,7 +40,7 @@ describe BazaModels::Model::HasManyRelations do
 
       it "supports class_name and proc-arguments" do
         expect(user.admin_roles.to_a).to eq [role_admin]
-        expect(user.admin_roles.to_sql).to eq "SELECT `roles`.* FROM `roles` WHERE `roles`.`user_id` = '#{user.id}' AND `roles`.`role` = 'administrator'"
+        expect(user.admin_roles.to_sql).to eq "SELECT `roles`.* FROM `roles` WHERE `roles`.`user_id` = #{user.id} AND `roles`.`role` = 'administrator'"
       end
     end
   end

data/spec/baza_models/model/manipulation_spec.rb

@@ -19,6 +19,7 @@ describe BazaModels::Model::Manipulation do
     expect(user.updated_at).to_not eq nil
     old_updated_at = user.updated_at
     sleep 1
+    user.email = "test2@example.com"
     user.save!
     expect(user.updated_at).to_not eq old_updated_at
   end

data/spec/baza_models/model/queries_spec.rb

@@ -22,7 +22,7 @@ describe BazaModels::Model::Queries do
 
     it "returns false when nothing is found" do
       user_found = User.find_by(id: 1, email: "test@example.com")
-      expect(user_found).to eq false
+      expect(user_found).to eq nil
     end
 
     it "#find_by!" do

data/spec/baza_models/model_spec.rb

@@ -89,6 +89,18 @@ describe "BazaModels::Model" do
     expect(user.after_destroy_called).to eq 1
   end
 
+  it "#after_initialize" do
+    expect(user.instance_variable_get(:@after_initialize_called)).to eq 1
+  end
+
+  it "#after_find" do
+    user.save!
+
+    user_found = User.find(user.id)
+    expect(user_found.instance_variable_get(:@after_find_called)).to eq 1
+    expect(user.instance_variable_get(:@after_find_called)).to eq nil
+  end
+
   it "can use callbacks as blocks" do
     expect(user.before_save_block_called).to eq nil
     user.save!

data/spec/baza_models/query_spec.rb

@@ -99,7 +99,7 @@ describe BazaModels::Query do
   end
 
   it "#find" do
-    expect(User.all.find(1)).to eq nil
+    expect { User.all.find(1) }.to raise_error(BazaModels::Errors::RecordNotFound)
     user.save!
     expect(User.all.find(user.id)).to eq user
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza_models
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement