ddc 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47db88316f12256bf011cba49ba908240c03ae22
-  data.tar.gz: 8be0483b5cb162c19e64e1c9e5961f6def051ecc
+  metadata.gz: 730dff323e8780de877e38da76e5f9095eb14664
+  data.tar.gz: bcebe8c41b6acaad90efb3454b7145dcf629c135
 SHA512:
-  metadata.gz: fd48fbdcba04e2d1d3243c43df3e40db755aad4bd514b314f4a2d57e7d2cfadcbb59cb6345eeb213dd3a1338743b2436007b37d3bba6209392e9a95f1d7748e6
-  data.tar.gz: f3b76c51dc6e8f2f81bdb5f36aae083045fa103bbd7b0045350aa9d46cb9c156a386d1dc666332da98f04279a672918a18e0fdbdd25cbfb906833ca956759901
+  metadata.gz: d5e577bfaf5d03c1c7684b0b2b98178a0f384ace150a2ff0e9f011ac727a4eb09bce2574fdcb866e60d4f4d3ea258371517f5d8c36e80c2a18e4f3daac2d8570
+  data.tar.gz: 2ab75c7a10cca1ef97d0af014a0b01ab6234ddcd548c94e564cc1486a0ace6ee103f39f10c081d3d4d419562f76991dfef5c5d4e6216b54cf16edc3389f6d76a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # DDC Changelog
 
+### 0.1.5
+
+* remove :render_opts to use :object_render_opts
+* add :errors_render_opts
+
 ### 0.1.4
 
 * remove :serializer and :each_serializer,  use :render_opts to pass a hash

data/lib/ddc/controller_builder.rb

@@ -45,18 +45,32 @@ module DDC
         end
       end
 
+      def reduce_contexts(contexts, context_params)
+        computed_contexts = contexts.map do |context_klass, context_method|
+          context_klass.new.send(context_method, context_params)
+        end
+        if computed_contexts.size == 1
+          computed_contexts.first
+        else
+          computed_contexts.reduce({}) do |h, ctx|
+            h.merge(ctx)
+          end.with_indifferent_access
+        end
+      end
+
       def setup_action!(controller_name, klass, action, action_desc, config)
         raise "Must specify a service for each action" unless action_desc[:service].present?
-        raise "Must specify a context for each action" unless action_desc[:context].present?
+        raise "Must specify a context for each action" unless (action_desc[:context].present? || action_desc[:contexts].present?)
         proc_klass, proc_method = parse_class_and_method(action_desc[:service])
-        context_klass, context_method = parse_class_and_method(action_desc[:context])
+        contexts = (action_desc[:contexts] || [action_desc[:context]]).map { |ctx| parse_class_and_method ctx }
+        #context_klass, context_method = parse_class_and_method(action_desc[:context])
 
         klass.send :define_method, action do
           context_params = (action_desc[:context_params] || config[:context_params] || DEFAULT_CONTEXT_PARAMS).inject({}) do |h, param|
             h[param] = send param
             h
           end
-          context = context_klass.new.send(context_method, context_params)
+          context = DDC::ControllerBuilder.reduce_contexts contexts, context_params
 
           result = proc_klass.new.send(proc_method, context)
           obj = result[:object]
@@ -76,13 +90,14 @@ module DDC
           respond_to do |format|
             format.json do
               if obj.nil?
-                render_opts = {
-                  json: {errors: errors}, status: status }
+                render_opts = { json: {errors: errors}, status: status }
+                render_opts.reverse_merge!(action_desc[:error_render_opts]) if action_desc.has_key? :error_render_opts
               else
                 render_opts = { json: obj, status: status }
+                render_opts.reverse_merge!(action_desc[:object_render_opts]) if action_desc.has_key? :object_render_opts
               end
 
-              render_opts = (action_desc[:render_opts]).merge(render_opts) if action_desc.has_key? :render_opts
+              render_opts.reverse_merge!(action_desc[:render_opts]) if action_desc.has_key? :render_opts
               render render_opts
             end
             format.html do

data/lib/ddc/version.rb

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

data/spec/controller_builder_spec.rb

@@ -54,7 +54,7 @@ describe DDC::ControllerBuilder do
       end
 
       expect(FooController).to receive(:before_action).with(:my_before_action)
-      subject.build :foo, 
+      subject.build :foo,
         before_actions: [:my_before_action],
         actions: {
           index: {
@@ -65,7 +65,7 @@ describe DDC::ControllerBuilder do
 
     end
 
-    it 'sunny day get params, process, return object and status, render' do 
+    it 'sunny day get params, process, return object and status, render' do
       class FooController
         def current_user; end
         def some_user; end
@@ -89,7 +89,7 @@ describe DDC::ControllerBuilder do
         current_user: :some_user,
         params: {a: :b})) { :context }
 
-      expect_any_instance_of(BazService).to receive(:qux).with(:context) do 
+      expect_any_instance_of(BazService).to receive(:qux).with(:context) do
         { object: :some_obj, status: :ok }
       end
 
@@ -137,7 +137,7 @@ describe DDC::ControllerBuilder do
         current_user: :some_user,
         params: {a: :b})) { :context }
 
-      expect_any_instance_of(BazService).to receive(:qux).with(:context) do 
+      expect_any_instance_of(BazService).to receive(:qux).with(:context) do
         { status: :error, errors: ["BOOM"] }
       end
 
@@ -151,7 +151,7 @@ describe DDC::ControllerBuilder do
         def some_user; end
         def render(args); end
       end
-      subject.build :foo, 
+      subject.build :foo,
         params: [:current_user, :params],
         actions: {
           index: {
@@ -176,51 +176,90 @@ describe DDC::ControllerBuilder do
       def qux(context) {} end
     end
 
-    it 'uses specified serializer json render calls' do
-      class FooController
-        def current_user; end
-        def some_user; end
-        def render(args); end
-        def respond_to; end
-      end
-      controller = FooController.new
-      expect(controller).to receive_messages( params: {a: :b})
+    context 'render_opts' do
 
-
-      subject.build :foo, 
-        actions: {
-          index: {
-            context: 'foo_context_builder#bar',
-            service: 'baz_service#qux',
-            render_opts: {
-              serializer: MySerializer
+      let (:controller) {
+        class FooController
+          def current_user; end
+          def some_user; end
+          def render(args); end
+          def respond_to; end
+        end
+        FooController.new
+      }
+      before do
+        expect(controller).to receive_messages( params: {a: :b})
+
+        subject.build :foo,
+          actions: {
+            index: {
+              context: 'foo_context_builder#bar',
+              service: 'baz_service#qux',
+              render_opts: {
+                serializer: MySerializer
+              }
+            },
+            show: {
+              context: 'foo_context_builder#bar',
+              service: 'baz_service#qux',
+              render_opts: {
+                serializer: MySerializer
+              },
+              object_render_opts: {
+                serializer: MyObjectSerializer
+              },
+              error_render_opts: {
+                serializer: MyErrorSerializer
+              },
             }
-          }
 
-        }
+          }
 
-      render_args = nil
-      expect(controller).to receive(:render) do |args|
-        render_args = args
+        @render_args = nil
+        expect(controller).to receive(:render) do |args|
+          @render_args = args
+        end
+        expect(controller).to receive(:respond_to) do |&block|
+          block.call(json_format)
+        end
+        expect_any_instance_of(FooContextBuilder).to receive(:bar).with(hash_including(
+          params: {a: :b})) { :context }
       end
-      expect(controller).to receive(:respond_to) do |&block|
-        block.call(json_format)
+
+      it 'uses specified serializer json render calls' do
+        expect_any_instance_of(BazService).to receive(:qux).with(:context) do
+          { object: :some_obj, status: :ok }
+        end
+        controller.index
+        expect(@render_args[:serializer]).to eq(MySerializer)
       end
-      expect_any_instance_of(FooContextBuilder).to receive(:bar).with(hash_including(
-        params: {a: :b})) { :context }
 
-      expect_any_instance_of(BazService).to receive(:qux).with(:context) do 
-        { object: :some_obj, status: :ok }
+      it 'uses object_render_opts' do
+        expect_any_instance_of(BazService).to receive(:qux).with(:context) do
+          { object: :some_obj, status: :ok }
+        end
+        controller.show
+        expect(@render_args[:serializer]).to eq(MyObjectSerializer)
       end
 
-      controller.index
-      
-      expect(render_args[:serializer]).to eq(MySerializer)
+      it 'uses error_render_opts' do
+        expect_any_instance_of(BazService).to receive(:qux).with(:context) do
+          { errors: [], status: :not_valid }
+        end
+        controller.show
+        expect(@render_args[:serializer]).to eq(MyErrorSerializer)
+      end
     end
 
     class MySerializer
     end
 
+    class MyObjectSerializer
+    end
+
+    class MyErrorSerializer
+    end
+
     class FooContextBuilder
       def bar(opts) {} end
     end
@@ -228,7 +267,42 @@ describe DDC::ControllerBuilder do
     class BazService
       def qux(context) {} end
     end
-  end
 
+    class MultiContextBuilder
+      def foo(opts) {foo: 2} end
+      def bar(opts) {bar: 3} end
+    end
+
+    class MultiContextService
+      def check(ctx)
+        {status: :ok, object: ctx[:foo] + ctx[:bar]}
+      end
+    end
+
+    it 'supports multiple contexts' do
+      class FooController
+        def render(args); end
+        def respond_to; end
+      end
+      subject.build :foo, actions: {
+        index: {
+          context_params: [],
+          contexts: ['multi_context_builder#foo', 'multi_context_builder#bar'],
+          service: 'multi_context_service#check'
+        }
+      }
+      expect(Object.const_get("FooController")).not_to be_nil
+      controller = Object.const_get("FooController").new
+      render_args = nil
+      expect(controller).to receive(:render) do |args|
+        render_args = args
+      end
+      expect(controller).to receive(:respond_to) do |&block|
+        block.call(json_format)
+      end
+      controller.index
+      expect(render_args[:json]).to eq(5)
+    end
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddc
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Shawn Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Data Driven Controllers for Rails