sentiql 0.2.3 → 0.2.4

data/lib/sentiql/version.rb

@@ -1,3 +1,3 @@
 module SentiQL
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/sentiql.rb

@@ -9,7 +9,7 @@ module SentiQL
       @attrs = {}
       @errors = {}
       attrs.each_pair do |key, value|
-        @attrs[key.to_sym] = value
+        @attrs[key] = value
       end
     end
 
@@ -29,13 +29,15 @@ module SentiQL
       filter_with :before_save_filters
 
       if @attrs[:id]
+
+        self[:updated_at] = Time.now
+
         i = @attrs.select { |k| self.class.schema.include?(k) }     
         values = i.keys.map { |k| @attrs[k] }
         values << @attrs[:id]
 
         return self unless valid?
 
-        self[:updated_at] = Time.now
 
         SentiQL::Base.execute "UPDATE #{self.class.table} SET #{i.keys.map{|m| "#{m.to_s}=?"}.join(",")} WHERE id=?", values
 
@@ -43,14 +45,14 @@ module SentiQL
 
         filter_with :before_create_filters
 
+        self[:created_at] = Time.now
+        self[:updated_at] = Time.now
+
         i = @attrs.select { |k| self.class.schema.include?(k) }
         values = i.keys.map { |k| @attrs[k] }
 
         return self unless valid?
 
-        self[:created_at] = Time.now
-        self[:updated_at] = Time.now
-
         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
         

data/spec/sentiql_spec.rb

@@ -6,8 +6,6 @@ class User < SentiQL::Base
   set_schema :name, :full_name, :email, :crypted_password, :salt, :created_at, :updated_at
   set_table :users
 
-  #before_save :set_updated_at
-  #before_create :set_created_at
   before_save :touch_before_save
   before_create :touch_before_create
   after_create :touch_after_create
@@ -23,14 +21,6 @@ class User < SentiQL::Base
   end
 
   protected
-
-  #def set_updated_at
-    #self[:updated_at] = Time.now
-  #end
-
-  #def set_created_at
-    #self[:created_at] = Time.now
-  #end
   
   def touch_before_save
     self[:before_save_touched] = Time.now
@@ -87,7 +77,8 @@ describe SentiQL::Base do
       it "sets created_at attr" do
         u = User.new :name=>'Natalie'
         u.save
-        u.created_at.should_not be_nil
+        uu = User.find_by :id=>u.id
+        uu.created_at.should_not be_nil
         sleep(1)
         lambda { u.save }.should_not change(u, :created_at)
       end
@@ -95,8 +86,10 @@ describe SentiQL::Base do
       it "updates updated_at attr" do
         u = User.new :name=>'Natalie'
         u.save
-        u[:full_name] = 'Natalie Portman'
-        lambda { u.save }.should change(u, :updated_at)
+        uu = User.find_by :id=>u.id
+        uu.updated_at.should_not be_nil
+        uu[:full_name] = 'Natalie Portman'
+        lambda { uu.save }.should change(uu, :updated_at)
       end
 
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Martynas Miliauskas