mor 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5cb357bae3b07adc47856b8ed0d8ab4047f34aa
-  data.tar.gz: 2b014d70240842e4f18a337b559bf0b432375fd1
+  metadata.gz: b1afbeb537134b7328ed4769fda161403f81adf4
+  data.tar.gz: 622c07371fd2d4682019fa3deba77d48fddb844c
 SHA512:
-  metadata.gz: 5058bd04d296254ce9ad18037ba22ce5249b44c4d6202bd38936418f8049a0e4d7d4f42209a6842ee3e31d2470d65b6de99e4da67332ba8ad544f8195a35771e
-  data.tar.gz: ffa866b04161739abae23f887a144aec2daa6ff6838a954af91d2d0f47be151c4d504b77a7905808a49afaef7afe400f29dedf377adc30ef754a521a57189a8e
+  metadata.gz: fdef1f7bcb95126581c473fe6e98ffa04d9b1888498efecb6d7b3922d31ebed1e28a2b15586b39e4db26f2ff48c0ccb79d66cff53fdead486669f14fe9a5aada
+  data.tar.gz: 2d3e945cc5529cddcc99cc44d3c094c03b909e52c628050d7b26dac2791dec82cba7f0eaf892b161d18757ba76b46d3ed4ed771632b9888f0b14a33fb5239c87

data/lib/mor/model.rb

@@ -1,6 +1,7 @@
 require 'active_model'
 require 'active_support/concern'
 require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/hash'
 
 module Mor
   module Model
@@ -10,7 +11,10 @@ module Mor
       def attr_accessor *attrs
         super(*attrs)
         attrs.delete_if{ |a| a == :attributes }.each { |attr| 
-          define_method(:"#{attr}="){|val| self.attributes[attr]=val}
+          define_method(:"#{attr}="){ |val| 
+            self.attributes[attr]=val
+            self.attributes[:id]=val if attr == self.class.primary_key && attr != :id
+          }
           define_method(attr){ self.attributes[attr] }            
         }
       end
@@ -43,11 +47,16 @@ module Mor
         end
       end
       
-      def find_by hash
+      def where hash
         return nil unless hash
         self.all.select{ |app| 
           app.attributes.select{ |k,v| hash.keys.include?(k.to_sym) }.values.sort == hash.values.sort 
-        }.first
+        }
+      end
+      
+      def find_by hash
+        return nil unless hash
+        where(hash).first
       end
       
       def all
@@ -75,8 +84,8 @@ module Mor
                 
       define_model_callbacks :save, :create, :update, :destroy
       
-      validates_presence_of :id
-      validate :validate_uniqueness_of_id, unless: "persisted?"
+      validates_presence_of self.primary_key
+      validate :validate_uniqueness_of_primary_key, unless: "persisted?"
       after_create :add_to_index
       after_destroy :remove_from_index
     
@@ -127,8 +136,8 @@ module Mor
     
     private
     
-    def validate_uniqueness_of_id
-      errors.add(:id, :taken) if self.class.index.include?(self.id)
+    def validate_uniqueness_of_primary_key
+      errors.add(self.class.primary_key, :taken) if self.class.index.include?(self.id)
     end
     
     def save_or_update

data/lib/mor/version.rb

@@ -1,3 +1,3 @@
 module Mor
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/model_spec.rb

@@ -12,6 +12,19 @@ class TestModel
   end
 end
 
+class TestModelDiffPK
+  include Mor::Model
+  def self.primary_key
+    :slug
+  end
+  attr_accessor :slug, :title, :body, :slug
+  before_validation :set_slug 
+  private
+  def set_slug
+    self.slug = title.downcase
+  end
+end
+
 describe Mor::Model do
   
   it "acts as active_model/model" do
@@ -52,4 +65,22 @@ describe Mor::Model do
     TestModel.find("test-id").must_be_nil
   end
   
+  it "can has different primary key than id" do
+    instance = TestModelDiffPK.create(title: "Tett Name")
+    instance.persisted?.must_equal true
+    instance.id.must_equal instance.slug
+    instance.attributes[:id].must_equal instance.attributes[:slug]
+  end
+  
+  it "finds single record by attributes" do
+    instance = TestModel.create(id: "test-id", title: "title", body: "test body")
+    TestModel.find_by(title: "title").attributes.must_equal instance.attributes
+  end
+  
+  it "finds many records by attributes" do
+    instance = TestModel.create(id: "test-id", title: "title", body: "test body")
+    instance2 = TestModel.create(id: "test-id-2", title: "title", body: "test body")    
+    TestModel.where(title: "title").size.must_equal 2
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mor
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Onur Uyar