services 0.2.14 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac839c9acd73ecdeb861be1d8b484bb3c49b39b6
-  data.tar.gz: a00b6d2cd4e15da02bf55e90d8f18c1d250fda2a
+  metadata.gz: 4987f523acb227a70a5fddee85a8fae8aab86f8c
+  data.tar.gz: 3c4f1ca4a27990a08b9f5fa691392e66329ce76c
 SHA512:
-  metadata.gz: cdbe4970cf52f2ccd1648e617bfb83483f6e3d8d47e9c183209385383975b8e51184e96f1ab0f16690de8955e6bb1fee03b12f8e74f5ab5dc179cc456c000d5a
-  data.tar.gz: 960d6879ba1b08c6592e724f2d8e642157d37ce6133383ab75d52daa626d2cb2daefdbdcc32a32b3d060d2808be599e9b67c5fdbc8ac106a105701541318f1ec
+  metadata.gz: 4ecc46999894ba5049d92c79c33a7d1745d4ebd6bd2db3b61037ed940ed0cd936800df117926b8b76694868771ab78ba78b99a0da84d80cd40258431e987bbcb
+  data.tar.gz: 6d9c4a3d5e7360f4e8422395b1b78148bd21f567dc2949610256836316277dc29d86d38057bbb60f5499bb41562b723b0628b178ff020eaa42c389322daeebbb

data/lib/services/base.rb

@@ -48,7 +48,7 @@ module Services
 
     def find_object(*args)
       find_objects(*args).tap do |objects|
-        raise "Expected only one object but found #{objects.size}" unless objects.size == 1
+        raise "Expected exactly one object but found #{objects.size}" unless objects.size == 1
       end.first
     end
 

data/lib/services/base_finder.rb

@@ -0,0 +1,36 @@
+module Services
+  class BaseFinder < Services::Base
+    def call(ids = [], conditions = {})
+      ids, conditions = Array(ids), conditions.symbolize_keys
+      special_conditions = conditions.extract!(:order, :limit, :page, :per_page)
+      scope = service_class
+        .select("DISTINCT #{service_class.table_name}.id")
+        .order("#{service_class.table_name}.id")
+      scope = scope.where(id: ids) unless ids.empty?
+
+      scope = process(scope, conditions)
+
+      scope = service_class.where(id: scope)
+      special_conditions.each do |k, v|
+        case k
+        when :order
+          order = if v == 'random'
+            'RANDOM()'
+          else
+            "#{service_class.table_name}.#{v}"
+          end
+          scope = scope.order(order)
+        when :limit
+          scope = scope.limit(v)
+        when :page
+          scope = scope.page(v)
+        when :per_page
+          scope = scope.per(v)
+        else
+          raise ArgumentError, "Unexpected special condition: #{k}"
+        end
+      end
+      scope
+    end
+  end
+end

data/lib/services/modules/uniqueness_checker.rb

@@ -97,7 +97,7 @@ module Services
       def uniqueness_key(args)
         [
           KEY_PREFIX,
-          self.class.to_s
+          self.class.to_s.gsub(':', '_')
         ].tap do |key|
           key << Digest::MD5.hexdigest(args.to_s) unless args.empty?
         end.join(':')
@@ -107,7 +107,7 @@ module Services
         [
           KEY_PREFIX,
           'errors',
-          self.class.to_s
+          self.class.to_s.gsub(':', '_')
         ].tap do |key|
           key << Digest::MD5.hexdigest(@service_args.to_s) unless @service_args.empty?
         end.join(':')

data/lib/services/railtie.rb

@@ -1,5 +1,11 @@
 module Services
   class Railtie < Rails::Railtie
+    # Require the base finder here since it relies
+    # on Rails.application to be present
+    initializer 'services.load_base_finder' do
+      require 'services/base_finder'
+    end
+
     config.after_initialize do
       Services.configuration.log_dir = Rails.root.join('log')
     end

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '0.2.14'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.3.4
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,6 +138,7 @@ files:
 - lib/services.rb
 - lib/services/asyncable.rb
 - lib/services/base.rb
+- lib/services/base_finder.rb
 - lib/services/logger.rb
 - lib/services/modules/call_logger.rb
 - lib/services/modules/exception_wrapper.rb