actionfacade 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 254de0962aa168621e443a7a14c7e4453f5f2c2274f04648bb6026f45699f108
-  data.tar.gz: 88829fc832f6ea5d6056395e0e4ce1bb28da6933b27521e39d0ed00996086863
+  metadata.gz: 36b54b632384d17a03da67a3c06b17af8f34d3860f4982d34a2085a0435d2050
+  data.tar.gz: d5b6cc6da5f073f084b42718f5cf00dbb5c33842aec0ba86eec5107ead413957
 SHA512:
-  metadata.gz: f0c6b513755215cdea05f2086c9dddf6e2ee66ee97b4f460dd1eee85dd26e080d105da6ae1144f11d8e992f154398e68f9df7ed5b442b530517db4ce06d5800d
-  data.tar.gz: f8ede72602f4e8eb948a95450c8af11b498f19a56f12e360b1ecfa23a24833c25e26adad21f99d837809c9b74045859592cd2507b0e7c58b4938e2bad4b78424
+  metadata.gz: 9cc9020127e0d5684dc29330a2a2d060b5466c56b2a14d59b2c26207b188ef20cf2a5010963b47c6b34b57f627afdd5107addb24c5e04badf3ff7bfb18141112
+  data.tar.gz: ec3730ca6f2a004aa8180e1d209ee9e5c5f400edb5e167c167afbc74b842d4bb162477f78e0b0202123c3cdc2552030a00ab9bfa0708eaac7730f6ed1c4142d7

data/lib/action_facade/retrieval.rb

@@ -13,11 +13,33 @@ module ActionFacade
   module Retrieval
     # Retrieve data from `facade`
     #
+    # If `facade_or_other` is a facade, retrieve data from it.
+    # If it is a string or a symbol, it will be merged to `variable_names` and
+    # retrieve_from method called with controller params.
+    # If it is a hash, retrieve_from method will be called with the hash as a payload.
+    #
     # `variable_names` are symbols for the method names in the facade and
     # they will be set as instance variables in the class that
     # includes the module.
-    def retrieve(facade, *variable_names)
-      variable_names.each do |name|
+    def retrieve(facade_or_other, *variable_names)
+      facade = nil
+      names = variable_names.dup
+      case facade_or_other
+      when ActionFacade::Base
+        facade = facade_or_other
+      when String, Symbol
+        if defined?(params)
+          names.unshift(facade_or_other)
+          return retrieve_from(params, *names)
+        else
+          raise ArgumentError.new("Can't call the method with #{facade_or_other.class} if params is undefined.")
+        end
+      when Hash
+        return retrieve_from(facade_or_other, *variable_names)
+      else
+        raise ArgumentError.new("First parameter must be instance of ActionFacade::Base, String, Symbol or Hash")
+      end
+      names.each do |name|
         instance_variable_set("@#{name}", facade.send(name.to_sym))
       end
     end

data/test/rails_app/retrieval_test.rb

@@ -20,7 +20,19 @@ class HomeController < ActionController::Base
   include ActionFacade::Retrieval
 
   def index
-    retrieve_from({}, :all_users)
+    case params[:retrieve]
+    when "facade"
+      facade = Home::IndexFacade.new
+      retrieve(facade, :all_users)
+    when "string"
+      retrieve("all_users")
+    when "symbol"
+      retrieve(:all_users)
+    when "hash"
+      retrieve({}, :all_users)
+    else
+      retrieve_from({}, :all_users)
+    end
     render plain: @all_users
   end
 end
@@ -34,7 +46,27 @@ class RailsApp::RetrievalTest < Test::Unit::TestCase
 
   test "@all_users is set after retrieve_from({}, :all_users)" do
     get "/"
-    assert_equal(last_response.body, USER_DATA.to_s)
+    assert_equal(last_response.body, RailsApp::USER_DATA.to_s)
+  end
+
+  test "@all_users is set after retrieve(facade, :all_users)" do
+    get "/", params: { retrieve: "facade" }
+    assert_equal(last_response.body, RailsApp::USER_DATA.to_s)
+  end
+
+  test "@all_users is set after retrieve(:all_users)" do
+    get "/", params: { retrieve: "symbol" }
+    assert_equal(last_response.body, RailsApp::USER_DATA.to_s)
+  end
+
+  test "@all_users is set after retrieve(\"all_users\")" do
+    get "/", params: { retrieve: "string" }
+    assert_equal(last_response.body, RailsApp::USER_DATA.to_s)
+  end
+
+  test "@all_users is set after retrieve({}, :all_users)" do
+    get "/", params: { retrieve: "hash" }
+    assert_equal(last_response.body, RailsApp::USER_DATA.to_s)
   end
 
   private

data/test/retrieval_test.rb

@@ -27,6 +27,18 @@ class UsersController
     retrieve(facade, :john)
   end
 
+  def show_symbol
+    retrieve(:john)
+  end
+
+  def show_string
+    retrieve("john")
+  end
+
+  def show_hash
+    retrieve({}, :john)
+  end
+
   def show_from
     payload = {}
     retrieve_from(payload, :john)
@@ -45,6 +57,31 @@ class RetrievalTest < Test::Unit::TestCase
     assert_equal(controller.john, { id: 1, name: "john" })
   end
 
+  test "raised exception when retrieve(:john)" do
+    controller = UsersController.new
+    assert_nil(controller.john)
+    error = assert_raises ArgumentError do
+      controller.show_symbol
+    end
+    assert_equal(error.message, "Can't call the method with Symbol if params is undefined.")
+  end
+
+  test "raised exception when retrieve(\"john\")" do
+    controller = UsersController.new
+    assert_nil(controller.john)
+    error = assert_raises ArgumentError do
+      controller.show_string
+    end
+    assert_equal(error.message, "Can't call the method with String if params is undefined.")
+  end
+
+  test "@john is set after retrieve({}, :john)" do
+    controller = UsersController.new
+    assert_nil(controller.john)
+    controller.show_hash
+    assert_equal(controller.john, { id: 1, name: "john" })
+  end
+
   test "@john is set after retrieve_from(payload, :john)" do
     controller = UsersController.new
     assert_nil(controller.john)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionfacade
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ryo Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Action Facade provides a simple interface for data required by view / controller