active_repository 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff6e4e5fadd2500e1f73c3b4312a951dcb45e62c
-  data.tar.gz: 95ff3cbc00194b0c0a8a43c777857e6bd88a0736
+  metadata.gz: e7508e60aba070d40b81e20055ffbba52c2c3ee3
+  data.tar.gz: c6565367f7ed1dafbeccd9d5916477b5555b35de
 SHA512:
-  metadata.gz: ca450e5b9d32696ab4cffdf1ba1569ebf94265c116104fa1c23e084da35f6828f64af1149e5d313593c58a3fe546d6cc23a93ecd7329fd91770c2c8546fb4d5b
-  data.tar.gz: 471e41743a6f70997f6f19729cd48288b285243199e25347c06e56a7cf15a74c3e86d33ad5473ba16ee235e7d86be77a0c9d7bf7fcaf2f78002d5349ed851d48
+  metadata.gz: b58a6448b9691f89993a61b389d6ecb1a03dc7340639661050feef60326f571c816fa6c9b67916d56c495eef3fc1f6df2f6156613d12c58f4fddff4eb6107989
+  data.tar.gz: 5c373400c319b8b5036024f52349c425dc45d1c38b473eaafac03045aa4e7918a7168503afa932fdbc9f4db8c64cb5f3403d86a0958346ec245c6155c9b4bb4b

data/active_repository.gemspec

@@ -30,12 +30,12 @@ Gem::Specification.new do |gem|
   ]
 
   gem.add_runtime_dependency(%q<active_hash>, [">= 1.2.3"])
-  gem.add_runtime_dependency(%q<activemodel>, [">= 3.2"])
+  gem.add_runtime_dependency(%q<activemodel>, [">= 4.1.4"])
   gem.add_runtime_dependency(%q<sql_query_executor>, [">= 0.3.6"])
   gem.add_development_dependency(%q<pry>)
-  gem.add_development_dependency(%q<rspec>, [">= 2.2.0"])
-  gem.add_development_dependency(%q<activerecord>, [">= 3.2"])
-  gem.add_development_dependency(%q<mongoid>, [">= 3.1"])
+  gem.add_development_dependency(%q<rspec>, [">= 2.14.1"])
+  gem.add_development_dependency(%q<activerecord>, [">= 4.1.4"])
+  gem.add_development_dependency(%q<mongoid>, [">= 4.0.0"])
   gem.add_development_dependency('rake', [">= 10.0.0"])
   gem.add_development_dependency('coveralls')
   gem.add_development_dependency(%q<sqlite3>) unless RUBY_PLATFORM == 'java'

data/lib/active_repository/callback/base.rb

@@ -0,0 +1,24 @@
+module ActiveRepository
+  module Callback
+    class Base
+      def initialize(object, method, options={})
+        @object = object
+        @method = method
+        @options = options
+      end
+
+      def call
+        @object.send(@method) if can_run?
+      end
+
+    private
+      def can_run?
+        return @can_run if @can_run
+
+        if_option = @options[:if].nil? ? true : @object.send(@options[:if])
+        unless_option = @options[:unless].nil? ? false : @object.send(@options[:unless])
+        @can_run = if_option && !unless_option
+      end
+    end
+  end
+end

data/lib/active_repository/callback/pool.rb

@@ -0,0 +1,28 @@
+module ActiveRepository
+  module Callback
+    class Pool
+      def initialize
+        @pools = {}
+      end
+
+      def add(pool, callback)
+        return false unless can_add?(pool, callback)
+
+        @pools[pool] ||= []
+
+        @pools[pool] << callback
+
+        true
+      end
+
+      def get(pool='')
+        @pools[pool] || []
+      end
+
+    private
+      def can_add?(pool, callback)
+        pool && callback.is_a?(Base) && !get(pool).include?(callback)
+      end
+    end
+  end
+end

data/lib/active_repository/result_set.rb

@@ -1,3 +1,4 @@
+require 'pry'
 class ActiveRepository::ResultSet
 	def initialize(klass, query={}, attributes={})
     @klass = klass
@@ -13,6 +14,18 @@ class ActiveRepository::ResultSet
     all.each(&block)
   end
 
+  def empty?
+    all.empty?
+  end
+
+  def any?
+    all.any?
+  end
+
+  def map(&block)
+    all.map(&block)
+  end
+
   def pluck(attribute)
     all.map(&attribute)
   end
@@ -52,7 +65,7 @@ class ActiveRepository::ResultSet
   end
 
   def where(query)
-    @attributes = @attributes.merge(query) if query.is_a?(Hash)
+    @attributes = @attributes.merge(SqlQueryExecutor::Query::Normalizers::QueryNormalizer.attributes_from_query(query))
     query = join_query(query, 'and')
 
     ActiveRepository::ResultSet.new(@klass, query, @attributes)

data/lib/active_repository/uniqueness.rb

@@ -2,12 +2,9 @@ module ActiveModel
   module Validations
     class UniquenessValidator < ActiveModel::EachValidator #:nodoc:
       def initialize(options)
-        super(options.reverse_merge(:case_sensitive => true))
-      end
-
-      # Unfortunately, we have to tie Uniqueness validators to a class.
-      def setup(klass)
-        @klass = klass
+        super
+        options.reverse_merge(:case_sensitive => true)
+        options[:class].send :attr_accessor, :custom_attribute
       end
 
       def validate_each(record, attribute, value)

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/lib/active_repository/write_support.rb

@@ -1,22 +1,6 @@
 require 'active_hash'
 require 'sql_query_executor'
 
-# Changes made in order to make write support in ActiveHash.
-
-begin
-  klass = Module.const_get(ActiveRecord::Rollback)
-  unless klass.is_a?(Class)
-    raise "Not defined"
-  end
-rescue
-  module ActiveRecord
-    class ActiveRecordError < StandardError
-    end
-    class Rollback < ActiveRecord::ActiveRecordError
-    end
-  end
-end
-
 module ActiveHash
   class Base
     def initialize(attributes = {})

data/spec/active_repository/result_set_spec.rb

@@ -219,7 +219,165 @@ describe ActiveRepository::ResultSet, :result_set do
     end
   end
 
+  describe '#each' do
+    subject { ActiveRepository::ResultSet.new(Country) }
+
+    context 'when result_set is not empty' do
+      before do
+        Country.delete_all
+        Country.create(name: 'Canada', continent: 'America')
+        Country.create(name: 'Russia', continent: 'Europe')
+        Country.create(name: 'USA', continent: 'America')
+        Country.create(name: 'Brazil', continent: 'America')
+      end
+
+      it 'returns an array of objects' do
+        objects = subject.where(continent: 'America').each
+
+        expect(objects.class).to eq Enumerator
+      end
+
+      it 'returns a collection of Countries' do
+        objects = subject.where(continent: 'America').each
+
+        expect(objects.map(&:class).uniq).to eq [Country]
+      end
+
+      it 'executes given method on all objects' do
+        objects = subject.where('id is not null').each(&:delete)
+
+        expect(Country.count).to eq 0
+      end
+    end
+
+    context 'when result_set is empty' do
+      it 'returns nil' do
+        expect(subject.where(continent: 'America').each).not_to be_any
+      end
+    end
+  end
+
+  describe '#empty?' do
+    subject { ActiveRepository::ResultSet.new(Country) }
+
+    context 'when result_set is not empty' do
+      before do
+        Country.delete_all
+        Country.create(name: 'Canada', continent: 'America')
+        Country.create(name: 'Russia', continent: 'Europe')
+        Country.create(name: 'USA', continent: 'America')
+        Country.create(name: 'Brazil', continent: 'America')
+      end
+
+      it 'returns false' do
+        result = subject.where(continent: 'America').empty?
+
+        expect(result).not_to be
+      end
+    end
+
+    context 'when result_set is empty' do
+      it 'returns true' do
+        result = subject.where(continent: 'Americas').empty?
+
+        expect(result).to be
+      end
+    end
+  end
+
+  describe '#any?' do
+    subject { ActiveRepository::ResultSet.new(Country) }
+
+    context 'when result_set is not empty' do
+      before do
+        Country.delete_all
+        Country.create(name: 'Canada', continent: 'America')
+        Country.create(name: 'Russia', continent: 'Europe')
+        Country.create(name: 'USA', continent: 'America')
+        Country.create(name: 'Brazil', continent: 'America')
+      end
+
+      it 'returns true' do
+        result = subject.where(continent: 'America').any?
+
+        expect(result).to be
+      end
+    end
+
+    context 'when result_set is empty' do
+      it 'returns false' do
+        result = subject.where(continent: 'Americas').any?
+
+        expect(result).not_to be
+      end
+    end
+  end
+
+  describe '#map' do
+    subject { ActiveRepository::ResultSet.new(Country) }
+
+    context 'when result_set is not empty' do
+      before do
+        Country.delete_all
+        Country.create(name: 'Canada', continent: 'America')
+        Country.create(name: 'Russia', continent: 'Europe')
+        Country.create(name: 'USA', continent: 'America')
+        Country.create(name: 'Brazil', continent: 'America')
+      end
+
+      it 'returns an array with given attributes' do
+        result = subject.where(continent: 'America').map(&:name)
+
+        expect(result).to eq ["Canada", "USA", "Brazil"]
+      end
+    end
+
+    context 'when result_set is empty' do
+      it 'returns an empty array' do
+        result = subject.where(continent: 'Americas').map(&:name)
+
+        expect(result).to eq []
+      end
+    end
+  end
+
+  describe '#pluck' do
+    subject { ActiveRepository::ResultSet.new(Country) }
+
+    context 'when result_set is not empty' do
+      before do
+        Country.delete_all
+        Country.create(name: 'Canada', continent: 'America')
+        Country.create(name: 'Russia', continent: 'Europe')
+        Country.create(name: 'USA', continent: 'America')
+        Country.create(name: 'Brazil', continent: 'America')
+      end
+
+      it 'returns an array with given attributes' do
+        result = subject.where(continent: 'America').pluck(:name)
+
+        expect(result).to eq ["Canada", "USA", "Brazil"]
+      end
+    end
+
+    context 'when result_set is empty' do
+      it 'returns an empty array' do
+        result = subject.where(continent: 'Americas').pluck(:name)
+
+        expect(result).to eq []
+      end
+    end
+  end
+
   describe '#first' do
+    before do
+      Country.delete_all
+      Country.create(name: 'Canada', continent: 'America')
+      Country.create(name: 'Russia', continent: 'Europe')
+      Country.create(name: 'USA', continent: 'America')
+      Country.create(name: 'Brazil', continent: 'America')
+    end
+
     subject { ActiveRepository::ResultSet.new(Country) }
 
     context 'when result_set is not empty' do

data/spec/spec_helper.rb

@@ -1,12 +1,18 @@
-require 'coveralls'
-Coveralls.wear!
-# require 'simplecov'
-# SimpleCov.start do
-#   add_filter "/spec/"
-# end
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+else
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+end
 
 require 'rspec'
 require 'rspec/autorun'
+require 'i18n'
+
+I18n.enforce_available_locales = false
 
 RSpec.configure do |c|
   c.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_repository
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.4
 - !ruby/object:Gem::Dependency
   name: sql_query_executor
   requirement: !ruby/object:Gem::Requirement
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.4
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,8 @@ files:
 - lib/active_repository/adapters/persistence_adapter.rb
 - lib/active_repository/associations.rb
 - lib/active_repository/base.rb
+- lib/active_repository/callback/base.rb
+- lib/active_repository/callback/pool.rb
 - lib/active_repository/finders.rb
 - lib/active_repository/result_set.rb
 - lib/active_repository/uniqueness.rb