frenetic 0.0.20.alpha.5 → 0.0.20.alpha.6

data/lib/frenetic/concerns/resource_mockery.rb

@@ -27,6 +27,12 @@ class Frenetic
       {}
     end
 
+    module ClassMethods
+      def api_client
+        superclass.api_client
+      end
+    end
+
   private
 
     def build_params( p )

data/lib/frenetic/resource.rb

@@ -12,14 +12,6 @@ class Frenetic
     include HalLinked
     include MemberRestMethods
 
-    def api
-      self.class.api
-    end
-
-    def self.api
-      api_client
-    end
-
     def self.api_client( client = nil )
       if client
         @api_client = client
@@ -31,6 +23,8 @@ class Frenetic
         @api_client
       end
     end
+    # Alias class method hack
+    def self.api; api_client; end
 
     def self.namespace( namespace = nil )
       if namespace
@@ -46,12 +40,15 @@ class Frenetic
       (api.schema[namespace]||{})['properties'] or raise HypermediaError, %Q{Could not find schema definition for the resource "#{namespace}"}
     end
 
-    def self.as_mock( params = {} )
-      raise Frenetic::ClientError, "Mock resource not defined for #{namespace}." \
-                                    " Subclass #{self} and mixin Frenetic::ResourceMockery" \
-                                    " to define a mock" unless @mock_class
+    def self.mock_class
+      @mock_class or raise Frenetic::ClientError,
+                            "Mock resource not defined for #{namespace}." \
+                            " Subclass #{self} and mixin Frenetic::ResourceMockery" \
+                            " to define a mock"
+    end
 
-      @mock_class.new params
+    def self.as_mock( params = {} )
+      mock_class.new params
     end
 
     def initialize( p = {} )
@@ -65,6 +62,11 @@ class Frenetic
       build_structure
     end
 
+    def api_client
+      self.class.api_client
+    end
+    alias :api :api_client
+
     def attributes
       @attributes ||= begin
         @structure.each_pair.each_with_object({}) do |(k,v), attrs|
@@ -123,6 +125,5 @@ class Frenetic
     def self.test_mode?
       api_client.config.test_mode
     end
-
   end
 end

data/lib/frenetic/version.rb

@@ -1,3 +1,3 @@
 class Frenetic
-  VERSION = '0.0.20.alpha.5'
+  VERSION = '0.0.20.alpha.6'
 end

data/spec/resource_spec.rb

@@ -155,6 +155,20 @@ describe Frenetic::Resource do
   describe '.as_mock' do
     subject { MyNamespace::MyTempResource.as_mock id:99 }
 
+    before do
+      stub_const 'MyNamespace::MyMockResource', Class.new(MyNamespace::MyTempResource)
+
+      MyNamespace::MyMockResource.send :include, Frenetic::ResourceMockery
+    end
+
+    it 'should initialize the mock with the provided values' do
+      expect(subject.id).to eq 99
+    end
+  end
+
+  describe '.mock_class' do
+    subject { MyNamespace::MyTempResource.mock_class }
+
     context 'without a defined Mock-class' do
       it 'should raise an error' do
         expect{subject}.to raise_error Frenetic::ClientError
@@ -169,11 +183,7 @@ describe Frenetic::Resource do
       end
 
       it 'should return a mock instance of the resource' do
-        expect(subject).to be_an_instance_of MyNamespace::MyMockResource
-      end
-
-      it 'should initialize the mock with the provided values' do
-        expect(subject.id).to eq 99
+        expect(subject).to eq MyNamespace::MyMockResource
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frenetic
 version: !ruby/object:Gem::Version
-  version: 0.0.20.alpha.5
+  version: 0.0.20.alpha.6
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -215,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3382151532624258123
+      hash: -828936829114139905
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: