ddc 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730dff323e8780de877e38da76e5f9095eb14664
-  data.tar.gz: bcebe8c41b6acaad90efb3454b7145dcf629c135
+  metadata.gz: 1e62db9575fb5178f54f19d956f70199f582275b
+  data.tar.gz: d37c726ec92c27889f8ffdb4654b2f023e143e9b
 SHA512:
-  metadata.gz: d5e577bfaf5d03c1c7684b0b2b98178a0f384ace150a2ff0e9f011ac727a4eb09bce2574fdcb866e60d4f4d3ea258371517f5d8c36e80c2a18e4f3daac2d8570
-  data.tar.gz: 2ab75c7a10cca1ef97d0af014a0b01ab6234ddcd548c94e564cc1486a0ace6ee103f39f10c081d3d4d419562f76991dfef5c5d4e6216b54cf16edc3389f6d76a
+  metadata.gz: 94f69307b9649d32f6ba9742e5695f7a1812db92216e05f9d875d64f276d0971982d3dad31db7851eaeba337636ed5f7a4589078b9f7c6bbf0da349f159c8d21
+  data.tar.gz: 1d5e4053f091f76309479d695b8a61c37db675af9c9db3dfdbd19d34e967c664ffdbf566079b3772335eee83a9659638156b3b630555d1d76ca973d672009216

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # DDC Changelog
 
+### 0.1.7
+
+* patch to fix 0.1.6 bug
+
+### 0.1.6
+
+* remove use of `qualified_const_*` calls to fix a bug with global lookup
+* add :parent option
+
 ### 0.1.5
 
 * remove :render_opts to use :object_render_opts

data/lib/ddc/controller_builder.rb

@@ -12,24 +12,47 @@ module DDC
     }
     class << self
       def build(controller_name, config)
-        klass = find_or_create_class(controller_name)
+        klass = find_or_create_class(controller_name, config)
         setup_before_actions!(klass, config)
         setup_actions!(controller_name, klass, config)
         klass
       end
 
+ 
+      def specific_const_defined?(path)
+        path.split("::").inject(Object) do |mod, name|
+          return unless mod.const_defined?(name, false)
+          mod.const_get(name, false)
+        end
+        return true
+      end
+
+      def specific_const_get(path)
+        path.split("::").inject(Object) do |mod, name|
+          mod.const_get(name, false)
+        end
+      end
 
-      def find_or_create_class(controller_name)
+      def specific_const_set(path, klass)
+        path_pieces = path.split("::")
+        mod_name = path_pieces[0..-2].join("::")
+        mod = mod_name.present? ? Object.const_get(mod_name) : Object
+        mod.const_set(path_pieces.last, klass)
+      end
+
+      def find_or_create_class(controller_name, config)
         controller_klass_name = controller_name.to_s.camelize+'Controller'
         klass = nil
-        if Object.qualified_const_defined?(controller_klass_name)
-          klass = Object.qualified_const_get(controller_klass_name)
+        if specific_const_defined?(controller_klass_name)
+          klass = specific_const_get(controller_klass_name)
         else
-          klass = Class.new(ApplicationController)
-          Object.qualified_const_set(controller_klass_name, klass)
+          parent_klass = config[:parent] || ApplicationController
+          klass = Class.new(parent_klass)
+          specific_const_set(controller_klass_name, klass)
         end
+        klass
       end
-
+ 
       def setup_before_actions!(klass, config)
         (config[:before_actions] || []).each do |ba|
           klass.before_action ba

data/lib/ddc/version.rb

@@ -1,3 +1,3 @@
 module Ddc
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/spec/controller_builder_spec.rb

@@ -48,6 +48,21 @@ describe DDC::ControllerBuilder do
       }}}).to raise_exception
     end
 
+    it 'uses the provided parent class' do
+      class DarthVader
+      end
+
+      klass = subject.build :foo,
+        parent: DarthVader,
+        actions: {
+          index: {
+            context: 'foo_context_builder#bar',
+            service: 'baz_service#qux'
+          }
+        }
+      expect(klass.ancestors[1]).to be(DarthVader)
+    end
+
     it 'adds the before actions' do
       class FooController
         def self.before_action(*args);end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddc
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Shawn Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler