nazrin 2.6.3 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e9cf38a42182748cb66ae4cbe9b0fdee0ee0e28
-  data.tar.gz: 1697512262d0dc064e714f916475ca2a98bdfa28
+  metadata.gz: 2cd736ee5bb577b00f067cd4943957b7336784c8
+  data.tar.gz: e84165172550c0b184edb034c407b1351aaa2927
 SHA512:
-  metadata.gz: aadbe716cbbb97d6a22147a1b0341df7a7ce06b8eef371d3e1e00f2570c1fe1a1d8a2bcb4b809a5a199c98a1d8596ac11241b1c1beb1613901a948d2a4d8c840
-  data.tar.gz: 469c6dec4d4fa66a1972a9c4cb5b1d860ad9fd939024ad7e9cb6842652f084e77084cfce4bd4599ece4e4f56f9a526058fb819e9e45ca1b8beab7f8d598f47f5
+  metadata.gz: afdad315e8e9a9c74dabbc3c6c648dd23c6583e908ced70144c8a1b4e11e1bd2933ebb2dfcb390293108a99d08db9c916f62e8e24dab7bf1725c973359073763
+  data.tar.gz: d716cd9b912a55146524bac052a47c171bc3d119008d54efdaa5b1e237b73dbcab6f97c53fae54068733c5577c0f5ab498ea05362b467fc6cd1111dccbd5d319

data/lib/nazrin/data_accessor/struct.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk-cloudsearch'
+require 'nazrin/data_accessor/struct/attribute_transformer'
 
 module Nazrin
   class DataAccessor
@@ -14,43 +14,15 @@ module Nazrin
           end
         end
 
-        def transform_attributes(attributes)
-          attributes.each_with_object({}) do |(name, value), hash|
-            type = field_types[name]
+        def attribute_transformer
+          return @attribute_transformer if defined?(@attribute_transformer)
 
-            if type.end_with?('array')
-              hash[name] = value
-            else
-              hash[name] = value.first
-            end
+          if config.attribute_transformer
+            @attribute_transformer = config.attribute_transformer
+          else
+            @attribute_transformer = AttributeTransformer.new(config)
           end
         end
-
-        def field_types
-          return @field_types if defined?(@field_types)
-
-          response = cloudsearch_client.describe_index_fields(
-            domain_name: config.domain_name
-          )
-
-          @field_types = response.index_fields.each_with_object({}) do |field, fields|
-            name = field.options[:index_field_name]
-            type = field.options[:index_field_type]
-
-            fields[name] = type
-          end
-        end
-
-        private
-
-        def cloudsearch_client
-          @cloudsearch_client ||= Aws::CloudSearch::Client.new(
-            region: config.region,
-            access_key_id: config.access_key_id,
-            secret_access_key: config.secret_access_key,
-            logger: config.logger
-          )
-        end
       end
 
       def load_all(data)
@@ -61,7 +33,7 @@ module Nazrin
 
       def data_from_response(res)
         res.data[:hits][:hit].map do |hit|
-          self.class.transform_attributes(
+          self.class.attribute_transformer.call(
             { 'id' => hit[:id] }.merge(hit[:fields] || {})
           )
         end

data/lib/nazrin/data_accessor/struct/attribute_transformer.rb

@@ -0,0 +1,49 @@
+require 'aws-sdk-cloudsearch'
+
+module Nazrin
+  class DataAccessor
+    class Struct < Nazrin::DataAccessor
+      class AttributeTransformer
+        attr_reader :config, :cloudsearch_client
+        private :config, :cloudsearch_client
+
+        def initialize(config)
+          @config = config
+          @cloudsearch_client = Aws::CloudSearch::Client.new(
+            region: config.region,
+            access_key_id: config.access_key_id,
+            secret_access_key: config.secret_access_key,
+            logger: config.logger
+          )
+        end
+
+        def call(attributes)
+          attributes.each_with_object({}) do |(name, value), hash|
+            type = field_types[name]
+
+            if type.end_with?('array')
+              hash[name] = value
+            else
+              hash[name] = value.first
+            end
+          end
+        end
+
+        def field_types
+          return @field_types if defined?(@field_types)
+
+          response = cloudsearch_client.describe_index_fields(
+            domain_name: config.domain_name
+          )
+
+          @field_types = response.index_fields.each_with_object({}) do |field, fields|
+            name = field.options[:index_field_name]
+            type = field.options[:index_field_type]
+
+            fields[name] = type
+          end
+        end
+      end
+    end
+  end
+end

data/lib/nazrin/searchable/config.rb

@@ -1,7 +1,7 @@
 module Nazrin
   module Searchable
     class Configuration
-      attr_accessor :domain_name
+      attr_accessor :domain_name, :attribute_transformer
 
       %i(
         search_endpoint

data/lib/nazrin/version.rb

@@ -1,3 +1,3 @@
 module Nazrin
-  VERSION = '2.6.3'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nazrin
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.7.0
 platform: ruby
 authors:
 - Tomohiro Suwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -217,6 +217,7 @@ files:
 - lib/nazrin/data_accessor/active_record.rb
 - lib/nazrin/data_accessor/mongoid.rb
 - lib/nazrin/data_accessor/struct.rb
+- lib/nazrin/data_accessor/struct/attribute_transformer.rb
 - lib/nazrin/document_client.rb
 - lib/nazrin/paginated_array.rb
 - lib/nazrin/pagination_generator.rb