active_repository 0.0.1 → 0.0.3

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rbenv-version

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - 1.9.3
+  - jruby-19mode
+
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+
+services:
+  - mongodb

data/README.md

@@ -1,14 +1,34 @@
 # ActiveRepository
 
-ActiveRepository is 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) gem. Then when you decides which ORM you want to use you only have to connect ActiveRepository with it. Actually it only works with ActiveRecord, we are working to give mongoid suppoort.
+[![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/badge.png)](https://codeclimate.com/github/efreesen/active_repository)
 
-It also has the advantage of letting you test directly in memory, no need to save data in disk. This gives a great boost on your test suite speed.
+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.
+
+Currently it only works with ActiveRecord and/or Mongoid.
+
+It also has the advantage of letting you test directly in memory, with no need to save data on disk, which gives a great boost to your test suite speed.
+
+Here are some data for comparison:
+
+* **ActiveRepository:**
+  Finished in **0.63357** seconds;
+  78 examples, 0 failures
+
+* **ActiveRecord:**
+  Finished in **3.78** seconds;
+  78 examples, 0 failures
+
+* **Mongoid:**
+  Finished in **5.25** seconds;
+  78 examples, 0 failures
+
+With ActiveRepository you can make associations with ActiveRecord, Mongoid and ActiveRepository seamlessly.
 
 ## Requirements
 
 ### Ruby
 
-ActiveRepository requires Ruby version **>= 1.9.2**.
+ActiveRepository requires Ruby version **>= 1.9.3**.
 
 ## Installation
 

data/Rakefile

@@ -1,2 +1,12 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+desc 'Default: run rspec tests.'
+task :default => [:travis]
+
+task :travis do
+  cmd = "rspec spec"
+  puts "Starting to run `#{cmd}`..."
+  system("export DISPLAY=:99.0 && bundle exec rspec spec -c")
+  raise "#{cmd} failed!" unless $?.exitstatus == 0
+end

data/active_repository.gemspec

@@ -16,8 +16,12 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency(%q<active_hash>, [">= 0.9.12"])
   gem.add_runtime_dependency(%q<activemodel>, [">= 3.2.6"])
-  gem.add_development_dependency(%q<rspec>, ["~> 2.2.0"])
-  gem.add_development_dependency(%q<sqlite3>)
+  gem.add_development_dependency(%q<rspec>, [">= 2.2.0"])
   gem.add_development_dependency(%q<activerecord>)
-  gem.add_development_dependency(%q<mongoid>)
+  gem.add_development_dependency(%q<mongoid>, ["= 3.0.11"])
+  gem.add_development_dependency('rake')
+  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'
+  gem.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>)  if RUBY_PLATFORM == 'java'
 end

data/lib/active_repository/associations.rb

@@ -3,7 +3,7 @@ module ActiveRepository
 
     module ActiveRecordExtensions
 
-      def belongs_to_active_hash(association_id, options = {})
+      def belongs_to_active_repository(association_id, options = {})
         options = {
           :class_name => association_id.to_s.classify,
           :foreign_key => association_id.to_s.foreign_key
@@ -33,7 +33,6 @@ module ActiveRepository
 
     module Methods
       def has_many(association_id, options = {})
-
         define_method(association_id) do
           options = {
             :class_name => association_id.to_s.classify,
@@ -48,8 +47,6 @@ module ActiveRepository
           else
             objects = klass.send("find_all_by_#{options[:foreign_key]}", id)
           end
-
-          objects.map{ |o| self.serialize!(o.attributes) }
         end
       end
 
@@ -79,13 +76,11 @@ module ActiveRepository
         field options[:foreign_key].to_sym
 
         define_method(association_id) do
-          klass = self.class.get_model_class
+          klass = options[:class_name].constantize
           id    = send(options[:foreign_key])
 
           if id.present?
             object = klass.find_by_id(id)
-
-            object.nil? || object.class == self.class ? object : self.class.serialize!(object.attributes)
           else
             nil
           end

data/lib/active_repository/base.rb

@@ -2,95 +2,26 @@ require 'active_repository/associations'
 require 'active_repository/uniqueness'
 require 'active_repository/write_support'
 require 'active_repository/sql_query_executor'
+require 'active_repository/finders'
+require 'active_repository/writers'
 
 module ActiveRepository
 
   class Base < ActiveHash::Base
     extend ActiveModel::Callbacks
+    extend ActiveRepository::Finders
+    extend ActiveRepository::Writers
     include ActiveModel::Validations
     include ActiveModel::Validations::Callbacks
     include ActiveRepository::Associations
+    include ActiveRepository::Writers::InstanceMethods
 
-    # TODO: implement first, last, 
-
-    class_attribute :model_class, :save_in_memory
+    class_attribute :model_class, :save_in_memory, :instance_writer => false
 
     before_validation :set_timestamps
 
     fields :created_at, :updated_at
 
-    def self.define_custom_find_by_field(field_name)
-      method_name = :"find_by_#{field_name}"
-      unless has_singleton_method?(method_name)
-        the_meta_class.instance_eval do
-          define_method(method_name) do |*args|
-            object = get_model_class.send(method_name)
-            object.nil? ? nil : serialize!(object.attributes)
-          end
-        end
-      end
-    end
-
-    def self.define_custom_find_by_field(field_name)
-      method_name = :"find_by_#{field_name}"
-      the_meta_class.instance_eval do
-        define_method(method_name) do |*args|
-          object = nil
-
-          if self == get_model_class
-            object = self.where(field_name.to_sym => args.first).first
-          else
-            object = get_model_class.send(method_name, args)
-          end
-
-          object.nil? ? nil : serialize!(object.attributes)
-        end
-      end
-    end
-
-    def self.define_custom_find_all_by_field(field_name)
-      method_name = :"find_all_by_#{field_name}"
-      the_meta_class.instance_eval do
-        define_method(method_name) do |*args|
-          objects = []
-
-          if self == get_model_class
-            objects = self.where(field_name.to_sym => args.first)
-          else
-            objects = get_model_class.send(method_name, args)
-          end
-
-          objects.empty? ? [] : objects.map{ |object| serialize!(object.attributes) }
-        end
-      end
-    end
-
-    def self.find(id)
-      begin
-        if self == get_model_class
-          super(id)
-        else
-          object = get_model_class.find(id)
-
-          if object.is_a?(Array)
-            object.map { |o| serialize!(o.attributes) }
-          else
-            serialize!(object.attributes)
-          end
-        end
-      rescue Exception => e
-        message = ""
-
-        if id.is_a?(Array)
-          message = "Couldn't find all #{self} objects with IDs (#{id.join(', ')})"
-        else
-          message = "Couldn't find #{self} with ID=#{id}"
-        end
-
-        raise ActiveHash::RecordNotFound.new(message)
-      end
-    end
-
     def reload
       serialize! self.class.get_model_class.find(self.id).attributes
     end
@@ -99,46 +30,12 @@ module ActiveRepository
       if self == get_model_class
         !find_by_id(id).nil?
       else
-        get_model_class.exists?(id)
-      end
-    end
-
-    def self.find_by_id(id)
-      if self == get_model_class
-        super(id)
-      else
-        get_model_class.find_by_id(id)
-      end
-    end
-
-    def self.find_or_create(attributes)
-      object = get_model_class.where(attributes).first
-
-      object = model_class.create(attributes) if object.nil?
-
-      serialize!(object.attributes)
-    end
-
-    def self.create(attributes={})
-      object = get_model_class.new(attributes)
-
-      object.id = nil if get_model_class.exists?(object.id)
-
-      object.save
-
-      serialize!(object.attributes) unless object.class.name == self
-    end
-
-    def update_attributes(attributes)
-      object = self.class.get_model_class.find(self.id)
-
-      attributes.each do |k,v|
-        object.send("#{k.to_s}=", v) unless k == :id
+        if mongoid?
+          find_by_id(id).present?
+        else
+          get_model_class.exists?(id)
+        end
       end
-
-      object.save
-
-      self.attributes = object.attributes
     end
 
     def self.all
@@ -184,32 +81,17 @@ module ActiveRepository
       end
     end
 
-    def self.first
-      get("first")
-    end
-
-    def self.last
-      get("last")
-    end
-
-    def self.get(position)
-      if self == get_model_class
-        id = get_model_class.all.map(&:id).sort.send(position)
-
-        self.find id
-      else
-        serialize! get_model_class.send(position).attributes
-      end
-    end
-
     def convert(attribute="id")
-      object = self.class.get_model_class.send("find_by_#{attribute}", self.send(attribute))
+      klass = self.class.get_model_class
+      object = klass.where(attribute.to_sym => self.send(attribute)).first
       
-      object = self.class.get_model_class.new if object.nil?
+      object ||= self.class.get_model_class.new
 
-      self.attributes.each do |k,v|
-        object.send("#{k.to_s}=", v) unless k == :id
-      end
+      attributes = self.attributes
+
+      attributes.delete(:id)
+
+      object.attributes = attributes
 
       object.save
 
@@ -218,26 +100,21 @@ module ActiveRepository
       object
     end
 
-    def attributes=(new_attributes)
-      new_attributes.each do |k,v|
-        self.send("#{k.to_s}=", v)
-      end
-    end
-
     def serialize!(attributes)
       unless attributes.nil?
-        attributes.each do |k,v|
-          self.send("#{k.to_s}=", v)
-        end
+        self.attributes = attributes
       end
 
       self
     end
 
-    def self.serialize!(attributes)
-      object = self.new
-
-      object.serialize!(attributes)
+    def self.serialize!(other)
+      case other.class.to_s
+      when "Hash" then self.new.serialize!(other)
+      when "Array" then other.map { |o| serialize!(o.attributes) }
+      when "Moped::BSON::Document" then self.new.serialize!(other)
+      else self.new.serialize!(other.attributes)
+      end
     end
 
     def self.serialized_attributes
@@ -249,9 +126,14 @@ module ActiveRepository
     end
 
     def self.get_model_class
+      return self if self.save_in_memory.nil?
       save_in_memory? ? self : self.model_class
     end
 
+    def save_in_memory?
+      self.save_in_memory.nil? ? true : save_in_memory
+    end
+
     protected
       def model_class
         self.model_class
@@ -262,5 +144,13 @@ module ActiveRepository
         self.created_at = DateTime.now.utc if self.new_record?
         self.updated_at = DateTime.now.utc
       end
+
+      def self.mongoid?
+        get_model_class.included_modules.include?(Mongoid::Document)
+      end
+
+      def mongoid?
+        self.class.mongoid?
+      end
   end
 end

data/lib/active_repository/finders.rb

@@ -0,0 +1,101 @@
+module ActiveRepository
+  module Finders
+    def define_custom_find_by_field(field_name)
+      method_name = :"find_all_by_#{field_name}"
+      the_meta_class.instance_eval do
+        define_method(method_name) do |*args|
+          object = nil
+
+          object = self.find_by_field(field_name.to_sym, args)
+
+          object.nil? ? nil : serialize!(object.attributes)
+        end
+      end
+    end
+
+    def define_custom_find_all_by_field(field_name)
+      method_name = :"find_all_by_#{field_name}"
+      the_meta_class.instance_eval do
+        define_method(method_name) do |*args|
+          objects = []
+
+          objects = self.find_all_by_field(field_name.to_sym, args)
+
+          objects.empty? ? [] : objects.map{ |object| serialize!(object.attributes) }
+        end
+      end
+    end
+
+    def find_by_field(field_name, args)
+      self.find_all_by_field(field_name, args).first
+    end
+
+    def find_all_by_field(field_name, args)
+      objects = []
+
+      if self == get_model_class
+        objects = self.where(field_name.to_sym => args.first)
+      else
+        if mongoid?
+          objects = get_model_class.where(field_name.to_sym => args.first)
+        else
+          method_name = :"find_all_by_#{field_name}"
+          objects = get_model_class.send(method_name, args)
+        end
+      end
+
+      objects
+    end
+
+    def find(id)
+      begin
+        if self == get_model_class
+          super(id)
+        else
+          object = (id == :all) ? all : get_model_class.find(id)
+
+          serialize!(object)
+        end
+      rescue Exception => e
+        message = "Couldn't find #{self} with ID=#{id}"
+        message = "Couldn't find all #{self} objects with IDs (#{id.join(', ')})" if id.is_a?(Array)
+
+        raise ActiveHash::RecordNotFound.new(message)
+      end
+    end
+
+    def find_by_id(id)
+      if self == get_model_class
+        super(id)
+      else
+        object = nil
+
+        if mongoid?
+          object = get_model_class.where(:id => id).entries.first
+        else
+          object = get_model_class.find_by_id(id)
+        end
+
+        object.nil? ? nil : serialize!(object.attributes)
+      end
+    end
+
+    def first
+      get("first")
+    end
+
+    def last
+      get("last")
+    end
+
+    private
+    def get(position)
+      if self == get_model_class
+        all.sort_by!{ |o| o.id }.send(position)
+      else
+        object = get_model_class.send(position)
+        serialize! object.attributes
+      end
+    end
+  end
+end

data/lib/active_repository/sql_query_executor.rb

@@ -75,23 +75,35 @@ module ActiveHash
       def execute_sub_query(klass, sub_query)
         case @operator
         when "between"
-          klass.all.select do |o|
-            field, first_attr, second_attr = convert_attrs(o.send(sub_query.first), sub_query[2], sub_query[4])
-
-            (field >= first_attr && field <= second_attr)
-          end
+          execute_between(klass, sub_query)
         when "is"
-          klass.all.select do |o|
-            field = o.send(sub_query.first).blank?
-
-            sub_query.size == 3 ? field : !field
-          end
+          execute_is(klass, sub_query)
         else
-          klass.all.select do |o|
-            field, attribute = convert_attrs(o.send(sub_query.first), sub_query[2])
+          execute_operator(klass, sub_query)
+        end
+      end
+
+      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 >= first_attr && field <= second_attr)
+        end
+      end
+
+      def execute_is(klass, sub_query)
+        klass.all.select do |o|
+          field = o.send(sub_query.first).blank?
+
+          sub_query.size == 3 ? field : !field
+        end
+      end
+
+      def execute_operator(klass, sub_query)
+        klass.all.select do |o|
+          field, attribute = convert_attrs(o.send(sub_query.first), sub_query[2])
 
-            field.blank? ? false : field.send(@operator, attribute)
-          end
+          field.blank? ? false : field.send(@operator, attribute)
         end
       end
 

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/active_repository/write_support.rb

@@ -18,22 +18,16 @@ end
 module ActiveHash
   class Base
     def self.insert(record)
-      if self.all.map(&:to_s).include?(record.to_s)
-        record_index.delete(record.id.to_s)
+      record_id   = record.id.to_s
+      record_hash = record.hash
+
+      if self.all.map(&:hash).include?(record_hash)
+        record_index.delete(record_id)
         self.all.delete(record)
       end
 
-      if record_index[record.id.to_s].nil? || !self.all.map(&:to_s).include?(record.to_s)
-        @records ||= []
-        record.attributes[:id] ||= next_id
-
-        validate_unique_id(record) if dirty
-        mark_dirty
-
-        if record.valid?
-          add_to_record_index({ record.id.to_s => @records.length })
-          @records << record
-        end
+      if record_index[record_id].nil? || !self.all.map(&:hash).include?(record_hash)
+        insert_record(record)
       end
     end
 
@@ -51,6 +45,11 @@ module ActiveHash
       raise IdError.new("Duplicate Id found for record #{record.attributes}") if record_index.has_key?(record.id.to_s)
     end
 
+    def update_attribute(key, value)
+      self.send("#{key}=", value)
+      self.save(:validate => false)
+    end
+
     def readonly?
       false
     end
@@ -62,9 +61,13 @@ module ActiveHash
       true
     end
 
+    def to_param
+      id.present? ? id.to_s : nil
+    end
+
     def persisted?
       other = self.class.find_by_id(id)
-      other.present? && other.created_at
+      other.present?
     end
 
     def eql?(other)
@@ -72,5 +75,19 @@ module ActiveHash
     end
 
     alias == eql?
+
+    private
+    def self.insert_record(record)
+      @records ||= []
+      record.attributes[:id] ||= next_id
+
+      validate_unique_id(record) if dirty
+      mark_dirty
+
+      if record.valid?
+        add_to_record_index({ record.id.to_s => @records.length })
+        @records << record
+      end
+    end
   end
 end

data/lib/active_repository/writers.rb

@@ -0,0 +1,67 @@
+module ActiveRepository
+  module Writers
+    def find_or_create(attributes)
+      object = get_model_class.where(attributes).first
+
+      object = model_class.create(attributes) if object.nil?
+
+      serialize!(object.attributes)
+    end
+
+    def create(attributes={})
+      object = get_model_class.new(attributes)
+
+      object.id = nil if exists?(object.id)
+
+      if get_model_class == self
+        object.save
+      else
+        repository = serialize!(object.attributes)
+        repository.valid? ? (object = get_model_class.create(attributes)) : false
+      end
+
+      serialize!(object.attributes) unless object.class.name == self
+    end
+
+    module InstanceMethods
+      def update_attributes(attributes)
+        object = nil
+        if mongoid?
+          object = self.class.get_model_class.find(self.id)
+        else
+          object = self.class.get_model_class.find(self.id)
+        end
+
+        attributes.each do |k,v|
+          object.update_attribute("#{k.to_s}", v) unless k == :id
+        end
+
+        self.reload
+      end
+
+      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)
+
+          if mongoid?
+            super(key,value)
+            key = key.to_s == 'id' ? '_id' : key.to_s
+          end
+
+          object.update_attribute(key, value)
+          object.save
+        end
+
+        self.reload
+      end
+
+      def attributes=(new_attributes)
+        new_attributes.each do |k,v|
+          self.send("#{k.to_s == '_id' ? 'id' : k.to_s}=", v)
+        end
+      end
+    end
+  end
+end