sentiql 0.3.1 → 0.4.0

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in sentiql.gemspec
-gemspec
+gem 'mysql2', '<0.3.0'

data/README.rdoc

@@ -2,13 +2,13 @@
 A minimalistic Ruby wrapper for MySQL. I love using SQL for data selection, except for basic selects (e.g. finding something by id), I love using OM interface to create, update and delete records in the database and I love when lib is not "overcoded". When you combine all this love, you get SentiQL.
 
 == Why SentiQL
-I don't like using ActiveRecord or other fat ORMs because I think they are breaking following rules:
+I wanted to have a lightweight OM for my Sinatras' apps, that wouldn't add a thick abstraction layer and would allow me to be flexible.
+
+== SentiQL Philosophy
 1. "Make everything as simple as possible, but not simpler" - Albert Einstein.
 2. Rule of Clarity. Clarity is better than cleverness. (Unix Philosophy)
 3. Rule of Simplicity: Design for simplicity; add complexity only where you must. (Unix Philosophy)
 
-Plus. I think it is wrong to put a thick abstraction layer on one of the biggest web application's performance bottlenecks.
-
 == Notice
 This is REALY a work in progress, I wrote this lib during one evening after reading "Metaprogramming Ruby: Program Like a Ruby Pros". It is less then 140 LOCs, so even if it is missing one or other thing, just open the sentiql.rb file and happy hacking.
 
@@ -76,6 +76,8 @@ This is REALY a work in progress, I wrote this lib during one evening after read
     before_save :create_salt, :encrypt_password, 
     after_create :download_profile_image
 
+
+Plus. I think it is wrong to put a thick abstraction layer on one of the biggest web application's performance bottlenecks.
     protected
 
     def create_salt
@@ -99,8 +101,7 @@ This is REALY a work in progress, I wrote this lib during one evening after read
 
     def name_not_blank?
       if self[:name] == "" || self[:name].nil?
-        @errors << "Name can't 
-be blank"
+        @errors << "Name can't be blank"
         return false
       end
       return true

data/Rakefile

@@ -2,6 +2,7 @@ require 'bundler'
 require 'yaml'
 require 'logger'
 require 'active_record'
+require 'mysql2'
 
 Bundler::GemHelper.install_tasks
 

data/lib/sentiql.rb

@@ -41,7 +41,9 @@ module SentiQL
         values = i.keys.map { |k| @attrs[k] }
         values << @attrs[:id]
 
+        filter_with :before_validation_filters
         return self unless valid?
+        filter_with :after_validation_filters
 
 
         SentiQL::Base.execute "UPDATE #{self.class.table} SET #{i.keys.map{|m| "#{m.to_s}=?"}.join(",")} WHERE id=?", values
@@ -56,7 +58,9 @@ module SentiQL
         i = @attrs.select { |k| self.class.schema.include?(k) }
         values = i.keys.map { |k| @attrs[k] }
 
+        filter_with :before_validation_filters
         return self unless valid?
+        filter_with :after_validation_filters
 
         id = SentiQL::Base.insert "INSERT INTO #{self.class.table} (#{i.keys.map{|k| k.to_s}.join(",")}) VALUES (#{i.map{|k| k="?"}.join(",")})", values
         @attrs[:id] = id
@@ -84,6 +88,7 @@ module SentiQL
     end
 
     def validate; end
+
     def valid?
       @errors = []
       validate
@@ -101,11 +106,18 @@ module SentiQL
       def before_save_filters; @before_save_filters ||={} ; end
       def before_create *args; @before_create_filters = args; end 
       def before_create_filters; @before_create_filters ||={}; end
+
+      def before_validation *args; @before_validation_filters = args; end 
+      def before_validation_filters; @before_validation_filters ||={}; end
+
       def after_create *args; @after_create_filters = args; end 
       def after_create_filters; @after_create_filters ||={}; end
       def after_save *args; @after_save_filters= args; end 
       def after_save_filters; @after_save_filters ||={}; end
 
+      def after_validation *args; @after_validation_filters = args; end 
+      def after_validation_filters; @after_validation_filters ||={}; end
+
       def set_table name; @table= name.to_s; end
       def table; @table.to_sym; end
 

data/lib/sentiql/version.rb

@@ -1,3 +1,3 @@
 module SentiQL
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/sentiql_spec.rb

@@ -47,6 +47,20 @@ class User < SentiQL::Base
   before_create :touch_before_create
   after_create :touch_after_create
   after_save :touch_after_save
+  before_validation :touch_before_validation
+  after_validation :touch_after_validation
+
+  def validate
+    name_not_blank?
+  end
+
+  def name_not_blank?
+    if self[:name].blank?
+      errors << "Name can't be blank" 
+      return false
+    end
+    return true
+  end
 
   class << self
 
@@ -75,6 +89,14 @@ class User < SentiQL::Base
     self[:after_save_touched] = Time.now
   end
 
+  def touch_before_validation
+    self[:before_validation_touched] = Time.now
+  end
+
+  def touch_after_validation
+    self[:after_validation_touched] = Time.now
+  end
+
 end
 
 
@@ -203,6 +225,20 @@ describe SentiQL::Base do
         sleep(1)
         lambda { u.save }.should_not change(u, :before_create_touched)
       end
+
+      it "executes before_validation filters even if record is not valid" do
+        u = User.new :before_validation_touched=>Time.now
+        lambda { u.save }.should change(u, :before_validation_touched)
+      end
+
+      it "executes after_validation filters after record only if record validates" do
+        u = User.new :after_validation_touched=>Time.now
+        sleep(1)
+        lambda { u.save }.should_not change(u, :after_validation_touched)
+        u[:name] = 'Natalie'
+        sleep(1)
+        lambda { u.save }.should change(u, :after_validation_touched)
+      end
       
       it "executes after_create filters only after record is created" do
         u = User.new :name=>'Natalie'

metadata

@@ -1,87 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sentiql
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Martynas Miliauskas
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-28 00:00:00 +01:00
+date: 2011-07-23 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mysql2
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &77535290 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *77535290
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &77535070 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *77535070
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &77534840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *77534840
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &77534580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 5
+      - !ruby/object:Gem::Version
         version: 3.0.5
   type: :development
-  version_requirements: *id004
-description: This is a work in progress. SentiQL promotes use of SQL for data selection, OM for CUD operations and being as lean as possible.
-email: 
+  prerelease: false
+  version_requirements: *77534580
+description: This is a work in progress. SentiQL promotes use of SQL for data selection,
+  OM for CUD operations and being as lean as possible.
+email:
 - miliauskas@facebook.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -94,36 +76,28 @@ files:
 - spec/sentiql_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sentiql
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A minimalistic Ruby wrapper for MySQL
 test_files: []
-