active_repository 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGE4MzM4MmM5NmJjYzk1MTQwMGM5NTg4ZDA3ODQwNjBjYWNjZjEzNg==
+    MDgyNmE5MmNiMjAxZjE2MTdmOWJkYzIxOTlmNDA2NTllZmUyNzJiNQ==
   data.tar.gz: !binary |-
-    OGNlY2EwMWZhMWMzZmVlODYzM2I5ZjExZmM0ZTFjZTdkNjE1MmUzYw==
+    MGU3NmYwN2YzZTA1YTNjMWQ4ZDEwM2JlMGIzZGIzNTQ4ZmIzMTY1OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGY2M2ZiZWY2ODNmZDNhOGJmZWU1Y2IwODY2YzU3NTE0YTAxMzkyMWI5YmFk
-    Y2UxOWNmYzRiM2UzNDU3MmQxNjdiYTE4Yjk4ZGI5ZjE4OTQyZTYzNDRlNmVj
-    YWQ1N2UxNzNmYWI1OWYyOTk0ZDNjZTI3Mzk1NmNhNGQ0ZTUxODc=
+    MTM2MGUwMzZmMGExNTAwM2I1YTc0ZGE4YjVlODkxNDJhZWM0ODBlOWY5ZGQz
+    NWVkMGNmNjQ1MjM2MjVlNmIxODM2Mzc3YmJhOGI2MzNmNDc5ZTllN2IwNzAx
+    NzhiNjU1MjhmM2NkZWFiYzZiMGVjOWE2ZWE5ZjA1NTVhOTIzZjk=
   data.tar.gz: !binary |-
-    YWRjZGQ5NmE0MjM5NjE5ZTRlZGU4OWFmOTUyNGE3NzhiZDY4YmE0NjhiMzRj
-    ZmM1NDYzY2EwMGFhZmFhN2U1ZTExYmFlMzExZjhmOTZhNmMxZTFiNWFiZDUy
-    MGMwZDgzYTQ0ZDA2Yzk1NjQ2ZTBhYjM3NjNlYmMwZjA2NTU0ZjI=
+    MTBkNWJhMDI1MDE5NDU0OGIxMTRjN2MyM2MyOTRjYmQwNjNlYjgwMTU4MjEw
+    NTRiOWE3OTU4N2Q1YTRkNWVjNGZmODM4YWViOGMyOTVhYjJjNjA2OWNkNTAw
+    OWUxMWIxYmRjOTFiYjllNDRhZWQ4NTRjODY0ZDQwNWU5MzMwOWM=

data/LICENSE

@@ -1,22 +1,165 @@
-Copyright (c) 2012 Caio Torres
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

data/README.md

@@ -1,6 +1,6 @@
 # ActiveRepository
 
-[![Build Status](https://secure.travis-ci.org/efreesen/active_repository.png)](http://travis-ci.org/efreesen/active_repository)[![Dependency Status](https://gemnasium.com/efreesen/active_repository.png)](https://gemnasium.com/efreesen/active_repository) [![Code Climate](https://codeclimate.com/github/efreesen/active_repository.png)](https://codeclimate.com/github/efreesen/active_repository)
+[[![Coverage Status](https://coveralls.io/repos/efreesen/active_repository/badge.png)](https://coveralls.io/r/efreesen/active_repository)![Build Status](https://secure.travis-ci.org/efreesen/active_repository.png)](http://travis-ci.org/efreesen/active_repository)[![Dependency Status](https://gemnasium.com/efreesen/active_repository.png)](https://gemnasium.com/efreesen/active_repository) [![Code Climate](https://codeclimate.com/github/efreesen/active_repository.png)](https://codeclimate.com/github/efreesen/active_repository)
 
 ActiveRepository was designed so you can build your Business Models without depending on any ORM. It by default saves your data in memory using ActiveHash (https://github.com/zilkey/active_hash). Then when you decide which ORM you want to use you only have to connect ActiveRepository with it.
 

data/active_repository.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.name          = "active_repository"
   gem.require_paths = ["lib"]
   gem.version       = ActiveRepository::VERSION
-  gem.license       = "MIT"
+  gem.license       = "GPL"
   gem.files         = [
     "LICENSE",
     "README.md",
@@ -36,6 +36,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency(%q<activerecord>, [">= 3.2.6"])
   gem.add_development_dependency(%q<mongoid>, [">= 3.0.11"])
   gem.add_development_dependency('rake', [">= 10.0.0"])
+  gem.add_development_dependency('coveralls')
   gem.add_development_dependency(%q<sqlite3>) unless RUBY_PLATFORM == 'java'
   gem.add_development_dependency(%q<jdbc-sqlite3>)  if RUBY_PLATFORM == 'java'
   gem.add_development_dependency(%q<jruby-openssl>)  if RUBY_PLATFORM == 'java'

data/lib/active_repository/associations.rb

@@ -1,20 +1,17 @@
 # Defines the relations between ActiveRepository objects and/or ActiveRecord Models.
 #
 # Author::    Caio Torres  (mailto:efreesen@gmail.com)
-# License::   MIT
+# License::   GPL
 
 module ActiveRepository
   module Associations
-
     #:nodoc:
     module ActiveRecordExtensions
-
-      
       # Defines belongs to type relation between ActiveRepository objects and ActivRecord Models.
       def belongs_to_active_repository(association_id, options = {})
         options = {
-          :class_name => association_id.to_s.classify,
-          :foreign_key => association_id.to_s.foreign_key
+          class_name:  association_id.to_s.classify,
+          foreign_key: association_id.to_s.foreign_key
         }.merge(options)
 
         define_method(association_id) do
@@ -30,9 +27,8 @@ module ActiveRepository
             association_id.to_sym,
             options,
             options[:class_name].constantize
-            )
+          )
       end
-
     end
 
     #:nodoc:
@@ -46,8 +42,8 @@ module ActiveRepository
       def has_many(association_id, options = {})
         define_method(association_id) do
           options = {
-            :class_name => association_id.to_s.classify,
-            :foreign_key => self.class.to_s.foreign_key
+            class_name:  association_id.to_s.classify,
+            foreign_key: self.class.to_s.foreign_key
           }.merge(options)
 
           klass = options[:class_name].constantize
@@ -65,8 +61,8 @@ module ActiveRepository
       def has_one(association_id, options = {})
         define_method(association_id) do
           options = {
-            :class_name => association_id.to_s.classify,
-            :foreign_key => self.class.to_s.foreign_key
+            class_name:  association_id.to_s.classify,
+            foreign_key: self.class.to_s.foreign_key
           }.merge(options)
 
           scope = options[:class_name].constantize
@@ -74,6 +70,7 @@ module ActiveRepository
           if scope.respond_to?(:scoped) && options[:conditions]
             scope = scope.scoped(:conditions => options[:conditions])
           end
+          
           scope.send("find_by_#{options[:foreign_key]}", id)
         end
       end
@@ -81,8 +78,8 @@ 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
+          class_name:  association_id.to_s.classify,
+          foreign_key: association_id.to_s.foreign_key
         }.merge(options)
 
         field options[:foreign_key].to_sym
@@ -102,9 +99,7 @@ module ActiveRepository
           attributes.delete(association_id.to_sym)
           send("#{options[:foreign_key]}=", (new_value.try(:id) ? new_value.id : new_value))
         end
-
       end
     end
-
   end
 end

data/lib/active_repository/base.rb

@@ -51,7 +51,7 @@ module ActiveRepository
   #    end
   #
   # Author::    Caio Torres (mailto:efreesen@gmail.com)
-  # License::   MIT
+  # License::   GPL
   class Base < ActiveHash::Base
     extend ActiveModel::Callbacks
     extend ActiveRepository::Finders
@@ -69,8 +69,7 @@ module ActiveRepository
 
     # Returns all persisted objects
     def self.all
-      (self == get_model_class ? super : PersistenceAdapter.all(self).map { |object| serialize!(object.attributes) })
-      # self == get_model_class ? super : get_model_class.all.map { |object| serialize!(object.attributes) }
+      (repository? ? super : PersistenceAdapter.all(self).map { |object| serialize!(object.attributes) })
     end
 
     # Constantize class name
@@ -80,21 +79,12 @@ module ActiveRepository
 
     # Deletes all persisted objects
     def self.delete_all
-      self == get_model_class ? super : PersistenceAdapter.delete_all(self)
+      repository? ? super : PersistenceAdapter.delete_all(self)
     end
 
     # Checks the existence of a persisted object with the specified id
     def self.exists?(id)
-      self == get_model_class ? find_by_id(id).present? : PersistenceAdapter.exists?(self, id)
-      # if self == get_model_class
-      #   !find_by_id(id).nil?
-      # else
-      #   if mongoid?
-      #     find_by_id(id).present?
-      #   else
-      #     get_model_class.exists?(id)
-      #   end
-      # end
+      repository? ? find_by_id(id).present? : PersistenceAdapter.exists?(self, id)
     end
 
     # Returns the Class responsible for persisting the objects
@@ -122,7 +112,7 @@ 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)
+      self.set_save_in_memory(repository?)
 
       field_names.each do |field_name|
         define_custom_find_by_field(field_name)
@@ -145,21 +135,23 @@ module ActiveRepository
     #   * RelatedClass.where("name = 'Peter'")
     def self.where(*args)
       raise ArgumentError.new("wrong number of arguments (0 for 1)") if args.empty?
-      if self == get_model_class
-        query = ActiveHash::SQLQueryExecutor.args_to_query(args)
-        super(query)
-      else
-        objects = []
-        args = args.first.is_a?(Hash) ? args.first : (args.first.is_a?(Array) ? args.first : args)
 
-        PersistenceAdapter.where(self, args).each do |object|
-          objects << self.serialize!(object.attributes)
+      if repository?
+        args = args.first if args.try(:first).is_a?(Array)
+        super(ActiveHash::SQLQueryExecutor.args_to_query(args))
+      else
+        objects = PersistenceAdapter.where(self, sanitize_args(args)).map do |object|
+          self.serialize!(object.attributes)
         end
 
         objects
       end
     end
 
+    def get_model_class
+      self.class.get_model_class
+    end
+
     # Persists the object using the class defined on the model_class attribute, if none defined it 
     # is saved in memory.
     def persist
@@ -170,24 +162,24 @@ module ActiveRepository
 
     # Gathers the persisted object from database and updates self with it's attributes.
     def reload
-      object = self.id.present? ? self.class.get_model_class.find(self.id) : self
+      object = self.id.present? ? get_model_class.find(self.id) : self
 
       serialize! object.attributes
     end
 
     def save(force=false)
-      if self.class == self.class.get_model_class
-        object = self.class.get_model_class.find(self.id)
+      if self.class == get_model_class
+        object = get_model_class.find(self.id)
 
         if force || self.id.nil?
           self.id = nil if self.id.nil?
           super
-        else
+        elsif self.valid?
           object.attributes = self.attributes
           object.save(true)
         end
 
-        true
+        self.valid?
       else
         self.persist
       end
@@ -206,10 +198,10 @@ module ActiveRepository
       # Find related object on the database and updates it with attributes in self, if it didn't
       # find it on database it creates a new one.
       def convert(attribute="id")
-        klass = self.class.get_model_class
+        klass = get_model_class
         object = klass.where(attribute.to_sym => self.send(attribute)).first
 
-        object ||= self.class.get_model_class.new
+        object ||= get_model_class.new
 
         attributes = self.attributes
 
@@ -224,17 +216,25 @@ module ActiveRepository
         object
       end
 
-      # Returns the value of the model_class attribute.
-      def model_class
-        self.model_class
-      end
-
     private
+
       # Checks if model_class is a Mongoid model
       def self.mongoid?
         get_model_class.included_modules.include?(Mongoid::Document)
       end
 
+      def self.repository?
+        self == get_model_class
+      end
+
+      def self.sanitize_args(args)
+        args.first.is_a?(Hash) ? args.first : (args.first.is_a?(Array) ? args.first : args)
+      end
+
+      def repository?
+        self.class.repository?
+      end
+
       # Checks if model_class is a Mongoid model
       def mongoid?
         self.class.mongoid?

data/lib/active_repository/finders.rb

@@ -32,7 +32,7 @@ module ActiveRepository #:nodoc:
     # Searches for a object containing the id in #id
     def find(id)
       begin
-        if self == get_model_class
+        if repository?
           super(id)
         else
           object = (id == :all) ? all : PersistenceAdapter.find(self, id)
@@ -53,7 +53,7 @@ module ActiveRepository #:nodoc:
 
       # raise "field: #{field_name}; values: #{args.first.inspect}; all: #{get_model_class.all.inspect}"
 
-      if self == get_model_class
+      if repository?
         objects = self.where(field_name.to_sym => args.first)
       else
         objects = PersistenceAdapter.where(self, field_name.to_sym => args.first)
@@ -75,7 +75,7 @@ module ActiveRepository #:nodoc:
 
     # 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
+      if repository?
         object = super(id)
 
         object.nil? ? nil : object.dup
@@ -94,12 +94,12 @@ module ActiveRepository #:nodoc:
 
     # Returns first persisted object
     def first
-      self == get_model_class ? super : get(:first)
+      repository? ? super : get(:first)
     end
 
     # Returns last persisted object
     def last
-      self == get_model_class ? super : get(:last)
+      repository? ? super : get(:last)
     end
 
     private

data/lib/active_repository/sql_query_executor.rb

@@ -19,7 +19,7 @@ module ActiveHash #:nodoc:
       # Recursive method that divides the query in sub queries, executes each part individually
       # and finally relates its results as specified in the query.
       def execute(klass, query)
-        @operator, @sub_query, @objects = process_first(klass, query, query.split(" ")[1])
+        @operator, @sub_query, @objects = process_first(klass, query, query.split(" ")[1].downcase)
 
         @operator.nil? ? @objects : @objects.send(@operator, execute(klass, @sub_query)).sort_by{ |o| o.id }
       end
@@ -32,7 +32,7 @@ module ActiveHash #:nodoc:
         when "between"
           array[0..5]
         when "is"
-          size = array[2].downcase == "not" ? 4 : 3
+          size = array[2] == "not" ? 4 : 3
           array[0..size]
         else
           array[0..3]
@@ -43,7 +43,7 @@ module ActiveHash #:nodoc:
       # split into separate components of the query.
       def convert_attrs(field, *attrs)
         attrs.each_with_index do |attribute, i|
-          attribute = attribute.gsub("_", " ")
+          attribute = attribute.gsub("_", " ") rescue attribute
           attrs[i] = field.is_a?(Integer) ? attribute.to_i : attribute
         end
 
@@ -69,7 +69,8 @@ module ActiveHash #:nodoc:
       # Execute SQL between filter
       def execute_between(klass, sub_query)
         klass.all.select do |o|
-          field, first_attr, second_attr = convert_attrs(o.send(sub_query.first), sub_query[2], sub_query[4])
+          field = sub_query.first.gsub('(', '')
+          field, first_attr, second_attr = convert_attrs(o.send(field), sub_query[2], sub_query[4])
 
           (field >= first_attr && field <= second_attr)
         end
@@ -87,9 +88,15 @@ module ActiveHash #:nodoc:
       # Executes the #sub_quey defined operator filter
       def execute_operator(klass, sub_query)
         klass.all.select do |o|
-          field, attribute = convert_attrs(o.send(sub_query.first.gsub(/[\(\)]/, "")), sub_query[2])
+          query = sub_query.first
 
-          field.blank? ? false : field.send(@operator, attribute)
+          if query
+            field, attribute = convert_attrs(o.send(query.gsub(/[\(\)]/, "")), sub_query[2])
+
+            field.blank? ? false : field.send(@operator, attribute)
+          else
+            false
+          end
         end
       end
 
@@ -109,7 +116,7 @@ module ActiveHash #:nodoc:
       def get_operator(attributes)
         operator = attributes.size >= 4 ? attributes.last : nil
 
-        case operator
+        case operator.try(:downcase)
         when "or"  then "+"
         when "and" then "&"
         else nil
@@ -118,7 +125,7 @@ module ActiveHash #:nodoc:
 
       # Processes the first sub query in query
       def process_first(klass, query, operator)
-        @operator = operator == "=" ? "==" : operator
+        @operator = (operator == "=" ? "==" : (operator == '<>' ? '!=' : operator))
         @query    = sanitize_query(query)
         sub_query = divide_query
 
@@ -126,7 +133,9 @@ module ActiveHash #:nodoc:
 
         objects = execute_sub_query(klass, sub_query)
 
-        sub_query = query.gsub(sub_query.join(" "), "")
+        query_array = query.split(' ')
+
+        sub_query = query_array[sub_query.size..query_array.size].join(' ')
 
         [binding_operator, sub_query, objects]
       end

data/lib/active_repository/uniqueness.rb

@@ -11,14 +11,11 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
-        finder_class = record.class.get_model_class
-
-        finder_class.all.each do |object|
-          if object.id != record.id && object.send(attribute) == record.send(attribute)
-            record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope, :conditions).merge(:value => value))
-            break
-          end
+        duplicate = record.get_model_class.where("id != ?", record.id).select do |object|
+          object.id != record.id && object.send(attribute) == record.send(attribute)
         end
+
+        record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope, :conditions).merge(:value => value)) if duplicate.any?
       end
 
     protected
@@ -39,14 +36,8 @@ module ActiveModel
       end
 
       def build_relation(klass, table, attribute, value) #:nodoc:
-        reflection = klass.reflect_on_association(attribute)
-        if reflection
-          column = klass.columns_hash[reflection.foreign_key]
-          attribute = reflection.foreign_key
-          value = value.attributes[reflection.primary_key_column.name]
-        else
-          column = klass.columns_hash[attribute.to_s]
-        end
+        column, attribute, value = get_reflection_attributes(klass)
+
         value = column.limit ? value.to_s[0, column.limit] : value.to_s if !value.nil? && column.text?
 
         if !options[:case_sensitive] && value && column.text?
@@ -59,6 +50,21 @@ module ActiveModel
 
         relation
       end
+
+    private
+      def get_reflection_attributes(klass, attribute, value)
+        reflection = klass.reflect_on_association(attribute)
+        column     = klass.columns_hash[reflection.foreign_key]
+
+        if reflection
+          attribute = reflection.foreign_key
+          value = value.attributes[reflection.primary_key_column.name]
+        else
+          column = klass.columns_hash[attribute.to_s]
+        end
+
+        [column, attribute, value]
+      end
     end
 
     module ClassMethods

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/active_repository/write_support.rb

@@ -94,7 +94,7 @@ module ActiveHash
     end
 
     def eql?(other)
-      (other.instance_of?(self.class) || other.instance_of?(self.class.get_model_class)) && id.present? && (id == other.id) && (!self.respond_to?(:created_at) || (created_at == other.created_at))
+      (other.instance_of?(self.class) || other.instance_of?(get_model_class)) && id.present? && (id == other.id) && (!self.respond_to?(:created_at) || (created_at == other.created_at))
     end
 
     alias == eql?

data/lib/active_repository/writers.rb

@@ -32,11 +32,11 @@ module ActiveRepository
     end
 
     def find_or_initialize(attributes)
-      object = where(attributes).first
-      object = self.new(attributes) if object.nil?
+      attributes = attributes.symbolize_keys if attributes.respond_to?(:symbolize_keys)
+      object     = where(attributes).first || self.new(attributes)
 
       attributes.each do |key, value|
-        object.send("#{key.to_sym}=", value)
+        object.send("#{key}=", value)
       end
 
       serialize!(object.attributes)
@@ -63,35 +63,31 @@ module ActiveRepository
 
       # Updates #key attribute with #value value.
       def update_attribute(key, value)
-        ret = self.valid?
-
-        if ret
-          if self.class == self.class.get_model_class
-            object = self.class.find_or_initialize(:id => self.id)
-
-            self.send("#{key}=", value)
+        ret = true
+        key = key.to_sym
 
-            ret = save
-          else
-            # key = (key.to_s == 'id' ? '_id' : key.to_s) if mongoid?
+        if self.class == get_model_class
+          object = self.class.find_or_initialize(:id => self.id)
 
-            ret, object = PersistenceAdapter.update_attribute(self.class, self.id, key, value)
+          self.send("#{key}=", value)
 
-            self.attributes = object.attributes
-            # object.update_attribute(key,value)
-          end
+          ret = self.save
+        else
+          ret, object = PersistenceAdapter.update_attribute(self.class, self.id, key, value)
 
-          reload
+          self.attributes = object.attributes
         end
 
+        reload
+
         ret
       end
 
       # Updates attributes in self with the attributes in the parameter
       def update_attributes(attributes)
-        ret = true
+        attributes  = attributes.symbolize_keys if attributes.respond_to?(:symbolize_keys)
         klass       = self.class
-        model_class = self.class.get_model_class
+        model_class = get_model_class
 
         if klass == model_class
           attributes.each do |key, value|
@@ -103,12 +99,10 @@ module ActiveRepository
           ret, object = PersistenceAdapter.update_attributes(self.class, self.id, attributes)
 
           self.attributes = object.attributes
-          # object = self.id.nil? ? model_class.new : model_class.find(self.id)
-
-          # ret = object.update_attributes(attributes)
         end
 
         reload
+
         ret
       end
     end

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 require 'rspec'
 require 'rspec/autorun'
-
-# $LOAD_PATH.unshift(File.dirname(__FILE__))
-# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-# require 'active_repository'
+require 'coveralls'
+Coveralls.wear!

data/spec/support/shared_examples.rb

@@ -18,6 +18,14 @@ shared_examples ".update_attributes" do
     Country.first.name.should == "Russia"
     Country.first.id.should_not == 45
   end
+
+  it "updates records whit string keys" do
+    id = Country.first.id
+    country = Country.find(id)
+    country.update_attributes('name' => "Germany")
+
+    Country.first.name.should == "Germany"
+  end
 end
 
 shared_examples ".all" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_repository
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash
@@ -94,6 +94,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +154,7 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/efreesen/active_repository
 licenses:
-- MIT
+- GPL
 metadata: {}
 post_install_message: 
 rdoc_options: []