cistern 1.0.1.pre4 → 1.0.1.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76a29b277f47baf8fb8b49880ed74957a27a3272
-  data.tar.gz: cf0deea08ce6253918497921c6f74eecdb86809a
+  metadata.gz: 3350600e9eb0c61a630d3ea85419cb2b8051fc9c
+  data.tar.gz: 8cba84fcb1050da9caff1ad8155ba5fca2b43cc9
 SHA512:
-  metadata.gz: 4070e75f2028955918127abace8a977fe23a028078f41ee31c158f5f57a772df88665676f50841f86c3bf9fd9a5b114dd79391677cab1a02c9b9ff0a4d129939
-  data.tar.gz: 390b6fc9bc0b615d7dcc90cd0fb77ba335a01e544076bad037f88c3bf74dd1c569c4dd24b636b6292eb28330d511db84935c2a68a65f9b4f3cb8a7c52e2bbfe5
+  metadata.gz: f244f5d9a7fb8c9d43e378cb7b0d69714930488c3601d953d3df938bf2284fdfb67a6dc2cdce0ca9d0c2cef3472f7917600f2c6f9a0cbf821a0a03bc0a8dfed8
+  data.tar.gz: 65bdec7b34bc34aa14e17089631f9bf47a3c352294b7dc2fb856a2ce4639395f3578f5b52d8602dba7ce5a5a65bd3b0ac79ac124b0c3c7ce2635d8831644f4ae

data/lib/cistern/hash.rb

@@ -11,7 +11,7 @@ class Cistern::Hash
 
   # Replaces the hash without the given keys.
   def self.except!(hash, *keys)
-    hash.keys.each { |key| hash.delete(key) }
+    keys.each { |key| hash.delete(key) }
     hash
   end
 

data/lib/cistern/request.rb

@@ -4,15 +4,17 @@ module Cistern::Request
 
     service::Mock.module_eval <<-EOS, __FILE__, __LINE__
       def #{request}(*args)
-        #{klass}.new(self).mock(*args)
+        #{klass}.new(self)._mock(*args)
       end
     EOS
 
     service::Real.module_eval <<-EOS, __FILE__, __LINE__
       def #{request}(*args)
-        #{klass}.new(self).real(*args)
+        #{klass}.new(self)._real(*args)
       end
     EOS
+
+    request
   end
 
   attr_reader :service

data/lib/cistern/service.rb

@@ -73,12 +73,22 @@ class Cistern::Service
           def self.inherited(klass)
             klass.extend(Cistern::Request::ClassMethods)
 
-            Cistern::Request.service_request(service, klass)
+            name = Cistern::Request.service_request(service, klass)
+
+            service.requests[name.to_sym] = klass
           end
 
           def self.service
             #{klass.name}
           end
+
+          def _mock(*args)
+            mock(*args)
+          end
+
+          def _real(*args)
+            real(*args)
+          end
         end
       EOS
 
@@ -118,7 +128,7 @@ class Cistern::Service
     end
 
     def requests
-      @requests ||= []
+      @requests ||= {}
     end
 
     def requires(*args)
@@ -130,7 +140,7 @@ class Cistern::Service
     end
 
     def mocked_requests
-      @mocked_requests ||= []
+      @mocked_requests ||= {}
     end
 
     def validate_options(options={})

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = "1.0.1.pre4"
+  VERSION = "1.0.1.pre5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 1.0.1.pre4
+  version: 1.0.1.pre5
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email: