services 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f848f7e6c1284b6671f565cb1d27d4119cb4a355
-  data.tar.gz: 3dbce97879f9e9768715839d9151fb2e3e0bd3ee
+  metadata.gz: 8f7714cb0e9390aa539649cc30b178705ef47aa6
+  data.tar.gz: 8821244fee82df7be557f4bbc4591e7d084c2c56
 SHA512:
-  metadata.gz: 3c370c5325be285ad139465aeb88b471570de89dd0b791afcb4d18f83cf9505071edb0234c61f13946ed1bee9e2dda0013e5644607747ed04d23f049fd06149d
-  data.tar.gz: 5cfe01abb853bf5b6ac99127fecde95f225b23df823a1d46d6b09bee498a2a7d41f72062ed5d8bc3a07937c0ffda9e0d087e7b61a512fdd3df87076500e4c419
+  metadata.gz: ecbfa1b8fe169b98f68fcab6ea905b75a70e51c54872a39bbcc3a6e0b6c838caf18f093df743c0a1a84d61b9de209516205ab0a61114674ccc707ffafe5edd43
+  data.tar.gz: 6b81875b67297940f7fbae262b9a6532dca7aa2497e346940f3e8033bf67d325f9952725e273521fae06ce613a5768d40dca1b1194b0290177315b9f42118cb3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.1.0
+
+* Add possibility to automatically convert condition objects to IDs in query
+
 ## 4.0.2
 
 * Add null logger

data/lib/services/query.rb

@@ -4,6 +4,14 @@ module Services
 
     class << self
       delegate :call, to: :new
+
+      def convert_condition_objects_to_ids(*class_names)
+        @object_to_id_class_names = class_names
+      end
+
+      def object_to_id_class_names
+        @object_to_id_class_names || []
+      end
     end
 
     def call(ids = [], conditions = {})
@@ -15,11 +23,26 @@ module Services
       special_conditions = conditions.extract!(:order, :limit, :page, :per_page)
       special_conditions[:order] = object_table_id unless special_conditions.has_key?(:order)
 
-      scope = object_class.public_send(Rails::VERSION::MAJOR == 3 ? :scoped : :all)
+      scope = object_class.public_send(ActiveRecord::VERSION::MAJOR == 3 ? :scoped : :all)
       scope = scope.where(object_table_id => ids) unless ids.empty?
 
       unless conditions.empty?
+        self.class.object_to_id_class_names.each do |class_name|
+          if object_or_objects = conditions.delete(class_name)
+            ids = case object_or_objects
+            when Array
+              object_or_objects.map(&:id)
+            when ActiveRecord::Relation
+              object_or_objects.pluck(:id)
+            else
+              [object_or_objects.id]
+            end
+            conditions[:"#{class_name}_id"] = ids.size == 1 ? ids.first : ids
+          end
+        end
+
         scope = process(scope, conditions)
+
         # If a JOIN is involved, use a subquery to make sure we're getting DISTINCT records.
         if scope.to_sql =~ / join /i
           scope = object_class.where(id: scope.select("DISTINCT #{object_table_id}"))

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '4.0.2'
+  VERSION = '4.1.0'
 end

data/services.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'redis',       '~> 3.0'
   gem.add_development_dependency 'tries',       '~> 0.3'
   gem.add_development_dependency 'timecop',     '~> 0.7'
+  gem.add_development_dependency 'sqlite3',     '~> 1.3'
   gem.add_runtime_dependency     'rails',       '>= 3.2.0'
   gem.add_runtime_dependency     'gem_config',  '~> 0.3'
 end

data/spec/services/query_spec.rb

@@ -1,13 +1,25 @@
 require 'spec_helper'
+require SUPPORT_DIR.join('activerecord_models_and_services')
 
 describe Services::Query do
   include_context 'capture logs'
 
-  let(:base_find) { Services::Models::BaseFind }
-
   it 'has call logging disabled by default' do
-    pending 'Rails has to be loaded to call Query'
-    expect(base_find.call_logging_disabled).to eq(true)
-    expect { base_find.call }.to_not change { logs }
+    expect { Services::Posts::Find.call [] }.to_not change { logs }
+  end
+
+  describe '.convert_condition_objects_to_ids' do
+    let(:comment) { Comment.create! }
+    let(:comments) { (1..3).map { Comment.create! } }
+
+    it 'converts condition objects to ids' do
+      {
+        comment     => comment.id,
+        comments    => comments.map(&:id),
+        Comment.all => Comment.all.pluck(:id)
+      }.each do |condition_before, condition_after|
+        expect { Services::Posts::FindRaiseConditions.call [], comment: condition_before }.to raise_error({ comment_id: condition_after }.to_json)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -19,7 +19,9 @@ START_TIMEOUT          = 5
 SIDEKIQ_TIMEOUT        = 20
 REDIS_PORT             = 6479
 
-Dir[SUPPORT_DIR.join('**', '*.rb')].each { |f| require f }
+%w(shared helpers test_services).each do |file|
+  require SUPPORT_DIR.join(file)
+end
 
 Services.configure do |config|
   config.redis = Redis.new

data/spec/support/activerecord_models_and_services.rb

@@ -0,0 +1,77 @@
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+
+ActiveRecord::Schema.define do
+  create_table :posts, force: true do |t|
+    t.string :title
+    t.text :body
+  end
+
+  create_table :comments, force: true do |t|
+    t.string :body
+    t.references :post
+  end
+end
+
+class Post < ActiveRecord::Base
+  has_many :comments
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :post
+end
+
+module Services
+  module Posts
+    class FindRaiseConditions < Services::Query
+      convert_condition_objects_to_ids :comment
+
+      private def process(scope, conditions)
+        raise conditions.to_json
+      end
+    end
+  end
+end
+
+module Services
+  module Posts
+    class Find < Services::Query
+      convert_condition_objects_to_ids :comment
+
+      private def process(scope, conditions)
+        conditions.each do |k, v|
+          case k
+          when :title, :body
+            scope = scope.where(k => v)
+          when :comment_id
+            scope = scope.joins(:comments).where("#{Comment.table_name}.id" => v)
+          else
+            raise ArgumentError, "Unexpected condition: #{k}"
+          end
+        end
+        scope
+      end
+    end
+  end
+end
+
+module Services
+  module Comments
+    class Find < Services::Query
+      convert_condition_objects_to_ids :post
+
+      private def process(scope, conditions)
+        conditions.each do |k, v|
+          case k
+          when :body, :post_id
+            scope = scope.where(k => v)
+          else
+            raise ArgumentError, "Unexpected condition: #{k}"
+          end
+        end
+        scope
+      end
+    end
+  end
+end

data/spec/support/test_services.rb

@@ -1,5 +1,3 @@
-require 'services/query'
-
 class Model
   class << self
     def table_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +186,7 @@ files:
 - spec/services/modules/uniqueness_checker_spec.rb
 - spec/services/query_spec.rb
 - spec/spec_helper.rb
+- spec/support/activerecord_models_and_services.rb
 - spec/support/call_proxy.rb
 - spec/support/helpers.rb
 - spec/support/log/.gitkeep
@@ -212,6 +227,7 @@ test_files:
 - spec/services/modules/uniqueness_checker_spec.rb
 - spec/services/query_spec.rb
 - spec/spec_helper.rb
+- spec/support/activerecord_models_and_services.rb
 - spec/support/call_proxy.rb
 - spec/support/helpers.rb
 - spec/support/log/.gitkeep