artirix_data_models 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e693f7a79fd0435a53c7315a66a0a87fddc00756
-  data.tar.gz: 1e2209be29d0228f38187d74079570b5d8326af6
+  metadata.gz: 5f5c9b67e6750f823690f34a19b2a147c496b682
+  data.tar.gz: 1c5e038ae44746f7c24ed28716bdd02ebe88160b
 SHA512:
-  metadata.gz: c51a77d2635bdbf0a2c32fb1a89caa6c63dc31d5e6980d388092287f7f31a5682b60c5f7e55636bfc8eee40c69372b7e7afb12a257c8a855bfe2827003149486
-  data.tar.gz: 29814e119cfe07b7b26390d7bf1132b0ed9f6b749d035303816b1c58b9b14aecf0a00226bdf06da2a40a249aa90af5598d346020327df1f1cde00e4c412d7f61
+  metadata.gz: c664f3ec187ed056d575d25ac933c901e78abdac5b7987500bfa44405959b37ff0cb36b01b998a6f899294f66830afc0e851b51e03e420c44025a68b59cd5258
+  data.tar.gz: 587cadda688164919abc0d7a27791c82549f6b878d59d876c349f067b16ec24305d24c41b8965a50cf1958b4ea3b66bf9d83476ff28a32f7e491332d434ab700

data/README.md

@@ -268,6 +268,12 @@ end
 
 ## Changes
 
+### 0.13.0
+- `DAO`: fake responses lazy loaded
+- `DAO`: response adaptor methods of basic dao moved to a module, included in `BasicDAO` and as part of the module `DAO`. Also added `response_adaptor_for_identity`, which returns the same.
+- `Model`: added `new_full_mode` method, that will build a new model and mark it as full mode
+
+
 ### 0.12.0
 - `attribute` call now can accept a hash of options as the last argument. This options include: `skip` (what to skip), `writer_visibility` and `reader_visibility`.
 

data/lib/artirix_data_models/dao.rb

@@ -17,10 +17,15 @@ module ArtirixDataModels
       :forced_fake_disabled?,
       :empty_collection,
       :empty_collection_for,
-      :model_adaptor_factory
+      :perform_get,
+      :perform_post,
+      :perform_put,
+      :perform_delete,
     ]
 
     included do
+      include ArtirixDataModels::DAOConcerns::WithResponseAdaptors
+
       attr_reader :basic_model_dao
       delegate *DELEGATED_METHODS, to: :basic_model_dao
     end

data/lib/artirix_data_models/dao_concerns/with_response_adaptors.rb

@@ -0,0 +1,41 @@
+module ArtirixDataModels
+  module DAOConcerns
+    module WithResponseAdaptors
+
+      def model_adaptor_factory
+        ArtirixDataModels::GatewayResponseAdaptors::ModelAdaptor
+      end
+
+      def response_adaptor_for_reload(model_to_reload)
+        model_adaptor_factory.with_block do |data_hash|
+          model_to_reload.reload_with data_hash
+        end
+      end
+
+      def response_adaptor_for_identity
+        model_adaptor_factory.identity
+      end
+
+      def response_adaptor_for_single(effective_model_class = model_class)
+        model_adaptor_factory.single effective_model_class
+      end
+
+      def response_adaptor_for_some(effective_model_class = model_class)
+        model_adaptor_factory.some effective_model_class
+      end
+
+      def response_adaptor_for_collection(from, size, collection_element_model_class = model_class)
+        model_adaptor_factory.collection collection_element_model_class, from, size
+      end
+
+      def response_adaptor_for_block(&block)
+        model_adaptor_factory.with_block &block
+      end
+
+      def response_adaptor_for_callable(callable)
+        model_adaptor_factory.with_callable callable
+      end
+
+    end
+  end
+end

data/lib/artirix_data_models/daos/basic_model_dao.rb

@@ -1,4 +1,6 @@
 class ArtirixDataModels::BasicModelDAO
+  include ArtirixDataModels::DAOConcerns::WithResponseAdaptors
+
   attr_reader :model_name, :model_class, :paths_factory, :fake_mode_factory, :gateway_factory, :loaded_gateway
 
   def initialize(model_name:, model_class:, paths_factory:, gateway:, fake_mode_factory:, gateway_factory:)
@@ -10,25 +12,15 @@ class ArtirixDataModels::BasicModelDAO
     @fake_mode_factory = fake_mode_factory
   end
 
-  def preloaded_gateway
-    loaded_gateway.presence || gateway_factory.call
-  end
-
-  alias_method :gateway, :preloaded_gateway
-
-  def partial_mode_fields
-    if fake?
-      fake_mode_factory.partial_mode_fields
-    else
-      ArtirixDataModels::DAORegistry.model_fields.partial_mode_fields_for model_name
-    end
-  end
+  ###########
+  # ACTIONS #
+  ###########
 
   def get_full(model_pk, model_to_reload:, response_adaptor: nil, cache_adaptor: nil, **extra_options)
     path             = paths_factory.get_full model_pk
     response_adaptor ||= response_adaptor_for_reload(model_to_reload)
 
-    _get path, response_adaptor: response_adaptor, fake_response: fake_get_full_response(model_pk, model_to_reload), cache_adaptor: cache_adaptor, **extra_options
+    perform_get path, response_adaptor: response_adaptor, fake_response: fake_get_full_response(model_pk, model_to_reload), cache_adaptor: cache_adaptor, **extra_options
 
     model_to_reload.mark_full_mode
     model_to_reload
@@ -44,18 +36,60 @@ class ArtirixDataModels::BasicModelDAO
     path             = paths_factory.get model_pk
     response_adaptor ||= response_adaptor_for_single
 
-    _get(path, response_adaptor: response_adaptor, fake_response: fake_get_response(model_pk), cache_adaptor: cache_adaptor, **extra_options)
+    perform_get(path, response_adaptor: response_adaptor, fake_response: fake_get_response(model_pk), cache_adaptor: cache_adaptor, **extra_options)
   end
 
   def get_some(model_pks, cache_adaptor: nil, response_adaptor: nil, **extra_options)
     path             = paths_factory.get_some(model_pks)
     response_adaptor ||= response_adaptor_for_some
 
-    _get(path, response_adaptor: response_adaptor, fake_response: fake_get_some_response(model_pks), cache_adaptor: cache_adaptor, **extra_options)
+    perform_get(path, response_adaptor: response_adaptor, fake_response: fake_get_some_response(model_pks), cache_adaptor: cache_adaptor, **extra_options)
   rescue ArtirixDataModels::DataGateway::NotFound
     []
   end
 
+  ###########
+  # GATEWAY #
+  ###########
+
+  def preloaded_gateway
+    loaded_gateway.presence || gateway_factory.call
+  end
+
+  alias_method :gateway, :preloaded_gateway
+
+  def partial_mode_fields
+    if fake?
+      fake_mode_factory.partial_mode_fields
+    else
+      ArtirixDataModels::DAORegistry.model_fields.partial_mode_fields_for model_name
+    end
+  end
+
+  def raise_no_gateway
+    msg = 'no gateway passed to request, no gateway configured on creation'
+    if gateway_factory.present?
+      msg = "#{msg}, and no gateway returned by the factory"
+    else
+      msg = "#{msg}, and no gateway factory configured on creation"
+    end
+
+    raise NoGatewayConfiguredError, msg
+  end
+
+  class NoGatewayConfiguredError < StandardError
+  end
+
+  #############
+  # FAKE MODE #
+  #############
+
+  def fake?
+    return true if forced_fake_enabled?
+    return false if forced_fake_disabled?
+    fake_mode_factory.enabled?
+  end
+
   def force_fake_enabled
     @_forced_fake_enabled = true
   end
@@ -80,35 +114,17 @@ class ArtirixDataModels::BasicModelDAO
 
   def fake_get_response(model_pk)
     return nil unless fake?
-    fake_mode_factory.get model_pk
+    -> { fake_mode_factory.get model_pk }
   end
 
   def fake_get_some_response(model_pks)
     return nil unless fake?
-    fake_mode_factory.get_some model_pks
+    -> { fake_mode_factory.get_some model_pks }
   end
 
   def fake_get_full_response(model_pk, model_to_reload = nil)
     return nil unless fake?
-    fake_mode_factory.get_full model_pk, model_to_reload
-  end
-
-  def response_adaptor_for_reload(model_to_reload)
-    model_adaptor_factory.with_block do |data_hash|
-      model_to_reload.reload_with data_hash
-    end
-  end
-
-  def response_adaptor_for_single
-    model_adaptor_factory.single model_class
-  end
-
-  def response_adaptor_for_some(element_model_class = model_class)
-    model_adaptor_factory.some element_model_class
-  end
-
-  def response_adaptor_for_collection(from, size, collection_element_model_class = model_class)
-    model_adaptor_factory.collection collection_element_model_class, from, size
+    -> { fake_mode_factory.get_full model_pk, model_to_reload }
   end
 
   def empty_collection(from, size)
@@ -119,52 +135,39 @@ class ArtirixDataModels::BasicModelDAO
     ArtirixDataModels::EsCollection.empty model_class, from: from, size: size
   end
 
-  def model_adaptor_factory
-    ArtirixDataModels::GatewayResponseAdaptors::ModelAdaptor
-  end
+  #################
+  # PERFORM CALLS #
+  #################
 
-  def _get(path, response_adaptor: nil, body: nil, fake_response: nil, cache_adaptor: nil, gateway: nil)
+  def perform_get(path, response_adaptor: nil, body: nil, fake_response: nil, cache_adaptor: nil, gateway: nil)
     g = gateway.presence || preloaded_gateway
     raise_no_gateway unless g.present?
     g.get path, response_adaptor: response_adaptor, body: body, fake: fake?, fake_response: fake_response, cache_adaptor: cache_adaptor
   end
 
-  def _post(path, response_adaptor: nil, body: nil, fake_response: nil, cache_adaptor: nil, gateway: nil)
+
+  def perform_post(path, response_adaptor: nil, body: nil, fake_response: nil, cache_adaptor: nil, gateway: nil)
     g = gateway.presence || preloaded_gateway
     raise_no_gateway unless g.present?
     g.post path, response_adaptor: response_adaptor, body: body, fake: fake?, fake_response: fake_response, cache_adaptor: cache_adaptor
   end
 
-  def _put(path, response_adaptor: nil, body: nil, fake_response: nil, cache_adaptor: nil, gateway: nil)
+  def perform_put(path, response_adaptor: nil, body: nil, fake_response: nil, cache_adaptor: nil, gateway: nil)
     g = gateway.presence || preloaded_gateway
     raise_no_gateway unless g.present?
     g.put path, response_adaptor: response_adaptor, body: body, fake: fake?, fake_response: fake_response, cache_adaptor: cache_adaptor
   end
 
-  def _delete(path, response_adaptor: nil, body: nil, fake_response: nil, cache_adaptor: nil, gateway: nil)
+  def perform_delete(path, response_adaptor: nil, body: nil, fake_response: nil, cache_adaptor: nil, gateway: nil)
     g = gateway.presence || preloaded_gateway
     raise_no_gateway unless g.present?
     g.delete path, response_adaptor: response_adaptor, body: body, fake: fake?, fake_response: fake_response, cache_adaptor: cache_adaptor
   end
 
-  def fake?
-    return true if forced_fake_enabled?
-    return false if forced_fake_disabled?
-    fake_mode_factory.enabled?
-  end
-
-  def raise_no_gateway
-    msg = 'no gateway passed to request, no gateway configured on creation'
-    if gateway_factory.present?
-      msg = "#{msg}, and no gateway returned by the factory"
-    else
-      msg = "#{msg}, and no gateway factory configured on creation"
-    end
-
-    raise NoGatewayConfiguredError, msg
-  end
-
-  class NoGatewayConfiguredError < StandardError
-  end
+  # old names
+  alias_method :_get, :perform_get
+  alias_method :_post, :perform_post
+  alias_method :_put, :perform_put
+  alias_method :_delete, :perform_delete
 
 end

data/lib/artirix_data_models/gateway_response_adaptors/model_adaptor.rb

@@ -40,6 +40,10 @@ module ArtirixDataModels::GatewayResponseAdaptors
 
     private_class_method :new
 
+    def self.identity
+      new ->(data_hash) { data_hash }
+    end
+
     def self.single(model_class)
       new ->(data_hash) { model_class.new data_hash }
     end

data/lib/artirix_data_models/model.rb

@@ -421,6 +421,10 @@ module ArtirixDataModels
       end
 
       module ClassMethods
+        def new_full_mode(*args, &block)
+          new(*args, &block).tap { |x| x.mark_full_mode }
+        end
+
         def always_in_partial_mode(attribute)
           attribute_config.always_in_partial_mode(attribute)
         end

data/lib/artirix_data_models/version.rb

@@ -1,3 +1,3 @@
 module ArtirixDataModels
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

data/lib/artirix_data_models.rb

@@ -28,6 +28,7 @@ require 'artirix_data_models/cached_action_adaptor'
 require 'artirix_data_models/cached_action_adaptor/get'
 require 'artirix_data_models/cached_action_adaptor/get_full'
 require 'artirix_data_models/cached_action_adaptor/get_some'
+require 'artirix_data_models/dao_concerns/with_response_adaptors'
 require 'artirix_data_models/dao'
 require 'artirix_data_models/daos/model_fields_dao'
 require 'artirix_data_models/daos/basic_model_dao'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artirix_data_models
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Eduardo Turiño
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,6 +250,7 @@ files:
 - lib/artirix_data_models/cached_action_adaptor/get_full.rb
 - lib/artirix_data_models/cached_action_adaptor/get_some.rb
 - lib/artirix_data_models/dao.rb
+- lib/artirix_data_models/dao_concerns/with_response_adaptors.rb
 - lib/artirix_data_models/dao_registry.rb
 - lib/artirix_data_models/daos/basic_model_dao.rb
 - lib/artirix_data_models/daos/model_fields_dao.rb