active_repository 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81105537b31e5f002fbc9ab9636c6432210dfe67
-  data.tar.gz: 8853f27b52a7573ca205e6a4dd711623275d48f5
+  metadata.gz: 4066b2f88bcb0854427c407b27da4ae0a17a5b92
+  data.tar.gz: a39ab7fe4b4dd35ccd0af5fcbf1a8e3c9ab67376
 SHA512:
-  metadata.gz: 00f5baf6e7e96bc125731fa6b3024ad6b775c50206705319892d971caa25a12d5de2fa534e7fea13111bf9e743ae5dcd2fb410c526b27e31dede3663b32b91e2
-  data.tar.gz: 23c40fae93b26edf79a0efc84665a8480e0cb82383f08b6fdf3122cf7c6378cc61cc3f89ef6f922fddb943119780140b8e18d19f70bd74332225a2aa6724aaa4
+  metadata.gz: d47c8c5572ce3b52e1d0c4c4dbe7871777a5805995008251152cd03b658a227dfe8931f4562124a995170fa6129879db7c8c7d922d68d944c3e4411b1e99d6ef
+  data.tar.gz: 7626c6fc598178aad7104ac083f0e174bf7e274e25c64a43e273e197652d0d765faa8ec0d060953ee12871b329e70de28311b38bcdf90924bb84ac8fdae91ad1

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in active_repository.gemspec
 gemspec
+
+gem 'sql_query_executor', ‘0.3.5’

data/lib/active_repository/base.rb

@@ -50,7 +50,8 @@ module ActiveRepository
     include ActiveRepository::Associations
     include ActiveRepository::Writers::InstanceMethods
 
-    class_attribute :model_class, :instance_writer => false
+    class_attribute :model_class, :before_save_methods, :after_save_methods, :instance_writer => false
+    class_attribute :before_create_methods, :after_create_methods, :instance_writer => false
     class_attribute :save_in_memory, :postfix, :instance_writer => true
 
     after_validation :set_timestamps
@@ -60,6 +61,14 @@ module ActiveRepository
       (repository? ? super : PersistenceAdapter.all(self).map { |object| serialize!(object.attributes) })
     end
 
+    def self.before_save(*methods, options)
+      self.before_save_methods = ((before_save_methods || []) + methods).flatten
+    end
+
+    def self.after_save(*methods, options)
+      self.after_save_methods = ((after_save_methods || []) + methods).flatten
+    end
+
     # Constantize class name
     def self.constantize
       self.to_s.constantize
@@ -194,21 +203,26 @@ module ActiveRepository
     end
 
     def save(force=false)
+      (before_save_methods || []).each { |method| self.send(method) }
+      result = true
+
       if self.class == persistence_class
         object = persistence_class.where(id: self.id).first_or_initialize
 
-        if force || self.id.nil?
+        result = if force || self.id.nil?
           self.id = nil if self.id.nil?
           super
         elsif self.valid?
-          object.attributes = self.attributes
+          object.attributes = self.attributes.select{ |key, value| self.class.serialized_attributes.include?(key.to_s) }
           object.save(true)
         end
-
-        self.valid?
       else
-        self.persist
+        result = self.persist
       end
+
+      (after_save_methods || []).each { |method| self.send(method) }
+
+      result
     end
 
     # Updates attributes from self with the attributes from the parameters
@@ -232,7 +246,7 @@ module ActiveRepository
 
         object ||= persistence_class.new
 
-        attributes = self.attributes
+        attributes = self.attributes.select{ |key, value| self.class.serialized_attributes.include?(key.to_s) }
 
         attributes.delete(:id)
 

data/lib/active_repository/uniqueness.rb

@@ -11,7 +11,8 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
-        duplicate = record.class.where("id is not ?", (record.id ? record.id : 'null')).all.select do |object|
+        query = (record.id ? "id <> #{record.id}" : 'id is not null')
+        duplicate = record.class.where(query).all.select do |object|
           object.id != record.id && object.send(attribute) == record.send(attribute)
         end
 

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/active_repository/write_support.rb

@@ -19,6 +19,14 @@ end
 
 module ActiveHash
   class Base
+    def initialize(attributes = {})
+      attributes = attributes.symbolize_keys
+      @attributes = attributes
+      attributes.dup.each do |key, value|
+        send "#{key}=", value
+      end
+    end
+
     def self.insert(record)
       record_id   = record.id.to_s
       record_hash = record.hash

data/spec/support/shared_examples.rb

@@ -88,6 +88,12 @@ shared_examples ".where" do
     results.last.name.should == "UK"
   end
 
+  it "finds elements which id's are not null" do
+    results = Country.where('id is not "null"').all
+    
+    results.size.should == 5
+  end
+
   it "filters the records from an AR-like conditions hash" do
     first_id = Country.first.id
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_repository
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash