restpack_service 0.0.52 → 0.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c02f2a11ea34aed8e4a7aff557baba081a5c93
-  data.tar.gz: 5430c2c82f0e956ba1679c2fdb8df7f4cd0dc5fc
+  metadata.gz: 84652f92ea9880620294d24dbd3b1a3209f0cd1c
+  data.tar.gz: c8e07adc1114cbc3e211047828e5e0d512d1b65c
 SHA512:
-  metadata.gz: ebd2c210411d40291b041e8465f832b5ae644485337a08aaafe1949e0a370f53787c033a8ac8c3364567caf0c9b8852bd84c05b2b29506376ad4bdef17f6d702
-  data.tar.gz: d98c40364d420bf02c3b70edf74f6c41f257661a988af41ac8a583e7d83e99e26a6a7ba7902f1069c9926d054ce7c43762f41e5e229434d6d0e821dcdf290a3b
+  metadata.gz: 55238c61e69c5365cee4ba22bc4c98d6c3627120fb4fe42ca721a514f0ae7120b67bce2974a94b7df57085ce7e8f10efd3f54e52625c7a4daaa351a2d848c661
+  data.tar.gz: 6b2a08d9088d7d26f65d881207eedcb22a04b89a29287cf50d52b0099006b66f7c40013e1f5c4579ac6ca9b934fc5e9f8112ba062e2639a81e79f89a9a352a82

data/lib/restpack_service/loader.rb

@@ -1,3 +1,8 @@
+module Models;end
+module Serializers;end
+module Commands;end
+module Tasks;end
+
 module RestPack::Service
   class Loader
 
@@ -8,39 +13,23 @@ module RestPack::Service
       require 'active_support/core_ext'
 
       restpack_service_name = "restpack_#{name}_service"
-      restpack_namespace = "RestPack::#{name.capitalize}"
       service_path = self.get_service_path(caller, restpack_service_name)
 
       require "#{service_path}/version"
       require "#{service_path}/configuration"
       require_all "#{service_path}/tasks"
 
-      require_service_module 'models', service_path, restpack_namespace
-      require_service_module 'serializers', service_path, restpack_namespace
-      require_service_module 'commands', service_path, restpack_namespace
-      require_service_module 'jobs', service_path, restpack_namespace
+      require_service_module 'models', service_path
+      require_service_module 'serializers', service_path
+      require_service_module 'commands', service_path
+      require_service_module 'jobs', service_path
     end
 
     private
 
-    def self.require_service_module(module_name, service_path, restpack_namespace)
+    def self.require_service_module(module_name, service_path)
       path = "#{service_path}/#{module_name.downcase}"
-
-      if File.directory?(path)
-        require_all path
-        module_sym = module_name.capitalize.to_sym
-
-        existing_module = Object.const_defined?(module_sym) ? Object.const_get(module_sym) : nil
-
-        proxy_module = existing_module || Module.new
-        proxy_module.module_eval do
-          include Object.const_get("#{restpack_namespace}::Service::#{module_name.capitalize}")
-        end
-
-        unless existing_module
-          Object.const_set module_sym, proxy_module
-        end
-      end
+      require_all(path) if File.directory?(path)
     end
 
     def self.get_service_path(load_caller, restpack_service_name)

data/lib/restpack_service/support/matchers/create_command.rb

@@ -1,8 +1,9 @@
 def it_acts_as_create_command(type)
   plural = "#{type}s".to_sym
+  namespaced_type = "#{plural.to_s.camelize}::#{type.to_s.camelize}"
 
-  model_class = "Models::#{type.to_s.camelize}".constantize
-  serializer_class = "Serializers::#{type.to_s.camelize}".constantize
+  model_class = "Models::#{namespaced_type}".constantize
+  serializer_class = "Serializers::#{namespaced_type}".constantize
 
   let(:response) { subject.class.run(params) }
 

data/lib/restpack_service/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Service
-    VERSION = "0.0.52"
+    VERSION = "0.0.53"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_service
 version: !ruby/object:Gem::Version
-  version: 0.0.52
+  version: 0.0.53
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mutations