Change api namespace to fail on redefinition.

piotrmurach · piotrmurach · commit 556fff6a13d4 · 2016-06-28T23:21:51.000+02:00
diff --git a/lib/github_api/api.rb b/lib/github_api/api.rb
@@ -300,21 +300,27 @@ def set(option, value=(not_set=true), ignore_setter=false, &block)
     # @param [Array[Symbol]] names
     #   the name for the scope
     #
+    # @example
+    #   namespace :scopes
+    #
     # @return [self]
     #
     # @api public
     def self.namespace(*names)
       options = names.last.is_a?(Hash) ? names.pop : {}
       names   = names.map(&:to_sym)
       name    = names.pop
-      return if public_method_defined?(name)
+
+      if public_method_defined?(name)
+        raise ArgumentError, "namespace '#{name}' is already defined"
+      end
 
       class_name = extract_class_name(name, options)
+
       define_method(name) do |*args, &block|
         options = args.last.is_a?(Hash) ? args.pop : {}
         API::Factory.new(class_name, current_options.merge(options), &block)
       end
-      self
     end
 
     # Extracts class name from options
@@ -325,6 +331,9 @@ def self.namespace(*names)
     # @option options [Boolean] :root
     #   if the class is at the root or not
     #
+    # @example
+    #   extract_class_name(:stats, class_name: :statistics)
+    #
     # @return [String]
     #
     # @api private
diff --git a/spec/github/api/namespace_spec.rb b/spec/github/api/namespace_spec.rb
diff --git a/spec/unit/api/namespace_spec.rb b/spec/unit/api/namespace_spec.rb
@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe Github::API, '::namespace' do
+  let(:foo_class) { Class.new(Github::API) }
+
+  let(:foo_scopes_class) { Class.new(Github::API) }
+
+  it "inherits namespace method" do
+    stub_const("Foo", foo_class)
+    expect(Foo).to respond_to(:namespace)
+  end
+
+  it "registers namespaced method" do
+    stub_const("Foo", foo_class)
+    stub_const("Foo::Scopes", foo_scopes_class)
+
+    Foo.namespace(:scopes)
+
+    foo_instance = Foo.new
+
+    expect(foo_instance).to respond_to(:scopes)
+    expect(foo_instance.scopes).to be_instance_of(Foo::Scopes)
+  end
+
+  it "doesn't redefine already existing namespace" do
+    stub_const("Foo", foo_class)
+
+    Foo.namespace(:scopes)
+
+    expect {
+      Foo.namespace(:scopes)
+    }.to raise_error(ArgumentError, /namespace 'scopes' is already defined/)
+  end
+end
