active_repository 0.1.0 → 0.2.0

data/README.md

@@ -46,20 +46,43 @@ Or install it yourself as:
 
 ## Usage
 
-Firstly you must inherit ActiveRepository::Base:
+To use it you should inherit ActiveRepository::Base:
 
-    class User < ActiveHash::Base
-      # Defines the fields of the class
-      fields :name, :email, :birthdate
+    class User < ActiveRepository::Base
+    end
+
+ActiveRepository::Base has two class attributes to help it identify where it is going to persist data
+
+###model_class
+
+This attribute is used to identify the class responsible for persisting data, it should be the ActiveRecord model or the Mongoid Document.
+
+###save_in_memory
+
+This attribute is used to persist data directly into memory. When set to true, it ignores the model_class attribute value and save in the memory, if set to false it user model_class to persist data.
+
+P.S.: Just be careful, the set_save_in_memory method should always be called after set_model_class method.
 
+    class User < ActiveRepository::Base
       # Defines the class responsible for persisting data
-      set_model_class(Country)
+      set_model_class(UserModel)
 
       # Set this to true in order to ignore model_class attribute and persist in memory
       set_save_in_memory(true)
     end
 
-Then it is just using it as if it was your ActiveRecord model or Mongoid Document.
+Then, you have only to set the fields it is going to use:
+
+    class User < ActiveRepository::Base
+      # Defines the fields of the class
+      fields :name, :email, :birthdate
+
+      set_model_class(UserModel)
+
+      set_save_in_memory(true)
+    end
+
+Now you are all set and ready to go. It is just using ActiveRepository as if it was your ActiveRecord model or Mongoid Document.
 
 ## Contributing
 

data/lib/active_repository/associations.rb

@@ -80,7 +80,6 @@ module ActiveRepository
 
       # Defines "belongs to" type relation between ActiveRepository objects
       def belongs_to(association_id, options = {})
-
         options = {
           :class_name => association_id.to_s.classify,
           :foreign_key => association_id.to_s.foreign_key
@@ -100,7 +99,8 @@ module ActiveRepository
         end
 
         define_method("#{association_id}=") do |new_value|
-          attributes[options[:foreign_key].to_sym] = new_value ? new_value.id : nil
+          attributes.delete(association_id.to_sym)
+          send("#{options[:foreign_key]}=", (new_value.try(:id) ? new_value.id : new_value))
         end
 
       end

data/lib/active_repository/base.rb

@@ -5,6 +5,18 @@ require 'active_repository/sql_query_executor'
 require 'active_repository/finders'
 require 'active_repository/writers'
 
+begin
+  klass = Module.const_get(Mongoid::Document)
+  unless klass.is_a?(Class)
+    raise "Not defined"
+  end
+rescue
+  module Mongoid
+    module Document
+    end
+  end
+end
+
 module ActiveRepository
 
   # Base class for ActiveRepository gem.
@@ -54,6 +66,8 @@ module ActiveRepository
 
     fields :created_at, :updated_at
 
+    self.save_in_memory = true if self.save_in_memory == nil
+
     # Returns all persisted objects
     def self.all
       self == get_model_class ? super : get_model_class.all.map { |object| serialize!(object.attributes) }
@@ -84,7 +98,7 @@ module ActiveRepository
 
     # Returns the Class responsible for persisting the objects
     def self.get_model_class
-      return self if self.save_in_memory.nil?
+      return self if self.model_class.nil? || self.save_in_memory?
       save_in_memory? ? self : self.model_class
     end
 
@@ -107,6 +121,8 @@ module ActiveRepository
     def self.set_model_class(value)
       self.model_class = value if model_class.nil?
 
+      self.set_save_in_memory(self.model_class == self)
+
       field_names.each do |field_name|
         define_custom_find_by_field(field_name)
         define_custom_find_all_by_field(field_name)
@@ -116,7 +132,7 @@ module ActiveRepository
     # Sets the class attribute save_in_memory, set it to true to ignore model_class attribute
     # and persist objects in memory
     def self.set_save_in_memory(value)
-      self.save_in_memory = value if save_in_memory.nil?
+      self.save_in_memory = value
     end
 
     # Searches persisted objects that matches the criterias in the parameters.
@@ -146,18 +162,31 @@ module ActiveRepository
     # is saved in memory.
     def persist
       if self.valid?
-        save_in_memory? ? save : self.convert
+        save_in_memory? ? save : self.convert.present?
       end
     end
 
     # Gathers the persisted object from database and updates self with it's attributes.
     def reload
-      serialize! self.class.get_model_class.find(self.id).attributes
+      object = self.class.get_model_class.find(self.id)
+
+      serialize! (self.class.get_model_class.find(self.id) || self).attributes
     end
 
-    # Returns the value of the save_in_memory class attribute
-    def save_in_memory?
-      self.save_in_memory.nil? ? true : save_in_memory
+    def save(force=false)
+      if self.class == self.class.get_model_class
+        object = self.class.get_model_class.find(self.id)
+
+        if force || self.id.nil?
+          self.id = nil if self.id.nil?
+          super
+        else
+          object.save(true)
+        end
+        true
+      else
+        self.persist
+      end
     end
 
     # Updates attributes from self with the attributes from the parameters
@@ -166,7 +195,7 @@ module ActiveRepository
         self.attributes = attributes
       end
 
-      self
+      self.dup
     end
 
     protected
@@ -175,7 +204,7 @@ module ActiveRepository
       def convert(attribute="id")
         klass = self.class.get_model_class
         object = klass.where(attribute.to_sym => self.send(attribute)).first
-        
+
         object ||= self.class.get_model_class.new
 
         attributes = self.attributes

data/lib/active_repository/finders.rb

@@ -67,13 +67,15 @@ module ActiveRepository #:nodoc:
 
     # Searches first object that matches #field_name field with the #args value(s)
     def find_by_field(field_name, args)
-      self.find_all_by_field(field_name, args).first
+      self.find_all_by_field(field_name, args).first.dup
     end
 
     # Searches for an object that has id with #id value, if none is found returns nil
     def find_by_id(id)
       if self == get_model_class
-        super(id)
+        object = super(id)
+
+        object.nil? ? nil : object.dup
       else
         object = nil
 
@@ -101,7 +103,7 @@ module ActiveRepository #:nodoc:
     # Returns the object in the position specified in #position
     def get(position)
       object = get_model_class.send(position)
-      serialize! object.attributes
+      object.present? ? serialize!(object.attributes) : nil
     end
   end
 end

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/active_repository/write_support.rb

@@ -57,10 +57,16 @@ module ActiveHash
     end
 
     def save(*args)
-      record = self.class.find_by_id(self.id)
+      if self.valid?
+        record = self.class.find_by_id(self.id)
 
-      self.class.insert(self) if record.nil? && record != self
-      true
+        self.class.insert(self) if record.nil? && record != self
+
+        self.id = self.class.last.id if self.id.nil?
+        true
+      else
+        false
+      end
     end
 
     def to_param

data/lib/active_repository/writers.rb

@@ -1,20 +1,20 @@
-# Module containing writing methods of the ActiveRepository::Base class
+# Module containing methods responsible for writing attributes of the ActiveRepository::Base class
 module ActiveRepository
   module Writers
     # Creates an object and persists it.
     def create(attributes={})
       object = get_model_class.new(attributes)
 
-      object.id = nil if exists?(object.id)
+      object.id = nil unless exists?(object.id)
 
       if get_model_class == self
         object.save
       else
         repository = serialize!(object.attributes)
-        repository.valid? ? (object = get_model_class.create(attributes)) : false
+        object = repository.valid? ? get_model_class.create(attributes) : repository
       end
 
-      serialize!(object.attributes) unless object.class.name == self
+      object.valid? ? serialize!(object.reload.attributes) : object
     end
 
     # Searches for an object that matches the attributes on the parameter, if none is found
@@ -22,7 +22,7 @@ module ActiveRepository
     def find_or_create(attributes)
       object = get_model_class.where(attributes).first
 
-      object = model_class.create(attributes) if object.nil?
+      object = get_model_class.create(attributes) if object.nil?
 
       serialize!(object.attributes)
     end
@@ -38,37 +38,46 @@ module ActiveRepository
 
       # Updates #key attribute with #value value.
       def update_attribute(key, value)
-        if self.class == self.class.get_model_class
-          super(key,value)
-        else
-          object = self.class.get_model_class.find(self.id)
+        ret    = self.valid?
+
+        if ret
+          object = (self.id.nil? ? self.class.get_model_class.new : self.class.get_model_class.find(self.id))
+
+          if self.class == self.class.get_model_class
+            self.send("#{key}=", value)
+
+            ret = save
+          else
+            key = (key.to_s == 'id' ? '_id' : key.to_s) if mongoid?
 
-          if mongoid?
-            super(key,value)
-            key = key.to_s == 'id' ? '_id' : key.to_s
+            ret = object.update_attribute(key,value)
           end
 
-          object.update_attribute(key, value)
-          object.save
+          reload
         end
 
-        self.reload
+        ret
       end
 
       # Updates attributes in self with the attributes in the parameter
       def update_attributes(attributes)
-        object = nil
-        if mongoid?
-          object = self.class.get_model_class.find(self.id)
+        ret = true
+        klass       = self.class
+        model_class = self.class.get_model_class
+
+        if klass == model_class
+          attributes.each do |key, value|
+            self.send("#{key}=", value) unless key == :id
+          end
+          save
         else
-          object = self.class.get_model_class.find(self.id)
-        end
+          object = self.id.nil? ? model_class.new : model_class.find(self.id)
 
-        attributes.each do |k,v|
-          object.update_attribute("#{k.to_s}", v) unless k == :id
+          ret = object.update_attributes(attributes)
         end
 
-        self.reload
+        reload
+        ret
       end
     end
   end

data/spec/support/shared_examples.rb

@@ -63,7 +63,7 @@ shared_examples ".where" do
   end
 
   it "if id exists, use auto increment id" do
-    country = Country.create(:id => 1, :name => "Russia", :language => 'Russian')
+    country = Country.create(:name => "Russia", :language => 'Russian')
 
     country.id.should_not == 1
   end
@@ -472,7 +472,7 @@ shared_examples "#save" do
 
   it "adds the new object to the data collection" do
     Country.all.should be_empty
-    country = Country.new :id => 1, :name => "foo", :monarch => nil, :language => nil
+    country = Country.new :name => "foo", :monarch => nil, :language => nil
     country.persist.should be_true
     country.reload
 
@@ -526,17 +526,10 @@ shared_examples ".create" do
   it "adds an auto-incrementing id if the id is nil" do
     country1 = Country.new :name => "foo"
     country1.save
-    country1.id.should == 1
 
-    country2 = Country.new :name => "bar", :id => 2
+    country2 = Country.new :name => "bar"
     country2.save
-    country2.id.should == 2
-  end
-
-  it "does not add auto-incrementing id if the id is present" do
-    country1 = Country.new :id => 456, :name => "foo"
-    country1.save
-    country1.id.should == 456
+    country2.id.should == country1.id + 1
   end
 
   it "adds the new object to the data collection" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_repository
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash