nazrin 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829ff9333c9acd832dcae6a046365f571967cff5
-  data.tar.gz: 7f4038757c2fdbed6101f850a02f9113bfb51b86
+  metadata.gz: f98b0576f7417a5acab58c60adf492414ce08a2e
+  data.tar.gz: c745e6f9830896c0fdf08206e83fa9b9ce7a3e04
 SHA512:
-  metadata.gz: dabb967d2fdad132f213ced5ad1d1a99e3a88013293155a08b3f0ccf00036c61b83447da27d5a5e18c61cd201930e1001178e53b4d9ba8b371c054f27654a01a
-  data.tar.gz: 347aed59409a42e2a9ab253eaa1ffb21e461acb04b98782896e91193f65a3c966c322cd36af5f3e5416daea43f28254360525bd60b5b34272e15c7687dfb0273
+  metadata.gz: 68875e9dde8ec03648a17add6d131b7ca2093150ddade67cfe6c246f30154d9eb17ee558ae5629b0dc629d89d959f270921b0e2eda9c51692d19322626a4cdeb
+  data.tar.gz: e07771ba1ed25375d58b7692026472bc1fd62c4a9a3b72a6b2293150dbc2938635df145b0d1d64971f6eda9f91b65fe36dc3d097549b0ea90a9fc9e352b20eef

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.4.0](https://github.com/tsuwatch/nazrin/compare/v2.3.0...v2.4.0)
+
+### Features:
+
+* Support multile domains [#23](https://github.com/tsuwatch/nazrin/pull/23) - [@totem3](https://github.com/totem3)
+
+* Allow logger setting of Aws::CloudSearchDomain::Client [#24](https://github.com/tsuwatch/nazrin/pull/24) - [@AMHOL](https://github.com/AMHOL)
+
+## [2.3.0](https://github.com/tsuwatch/nazrin/compare/v2.2.0...v2.3.0)
+
+### Features:
+
+* Dropped support for `aws-sdk` v2 [#22](https://github.com/tsuwatch/nazrin/pull/22)
+
 ## [2.2.0](https://github.com/tsuwatch/nazrin/compare/v2.1.2...v2.2.0)
 
 ### Breaking changes:

data/README.md

@@ -39,6 +39,7 @@ Nazrin.configure do |config|
   config.region = ''
   config.access_key_id = ''
   config.secret_access_key = ''
+  config.logger = nil
 end
 ```
 
@@ -46,6 +47,12 @@ end
 class Post < ActiveRecord::Base
   include Nazrin::Searchable
 
+  # You can override settings
+  searchable_configure do |config|
+    config.search_endpoint = 'http://example.com/override-search-endpoint'
+    config.document_endpoint = 'http://example.com/override-document-endpoint'
+  end
+
   searchable do
     fields [:content]
     field(:created_at) { created_at.utc.iso8601 }

data/lib/nazrin.rb

@@ -1,6 +1,7 @@
 require 'aws-sdk-cloudsearchdomain'
 
 require 'nazrin/searchable'
+require 'nazrin/searchable/config'
 require 'nazrin/data_accessor'
 require 'nazrin/config'
 require 'nazrin/search_client'

data/lib/nazrin/config.rb

@@ -18,5 +18,6 @@ module Nazrin
     config_accessor :region
     config_accessor :access_key_id
     config_accessor :secret_access_key
+    config_accessor :logger
   end
 end

data/lib/nazrin/document_client.rb

@@ -2,12 +2,13 @@ module Nazrin
   class DocumentClient
     attr_reader :client
 
-    def initialize
+    def initialize(config=Nazrin.config)
       @client = Aws::CloudSearchDomain::Client.new(
-        endpoint: Nazrin.config.document_endpoint,
-        region: Nazrin.config.region,
-        access_key_id: Nazrin.config.access_key_id,
-        secret_access_key: Nazrin.config.secret_access_key)
+        endpoint: config.document_endpoint,
+        region: config.region,
+        access_key_id: config.access_key_id,
+        secret_access_key: config.secret_access_key,
+        logger: config.logger)
     end
 
     def add_document(id, field_data)

data/lib/nazrin/search_client.rb

@@ -5,113 +5,115 @@ module Nazrin
     CLOUD_SEARCH_MAX_LIMIT = 10_000
 
     attr_accessor :data_accessor
+    attr_reader :client
     attr_reader :parameters
 
-    def initialize
+    def initialize(config=Nazrin.config)
       # @see http://docs.aws.amazon.com/sdkforruby/api/Aws/CloudSearchDomain/Client.html aws-sdk
       @client = Aws::CloudSearchDomain::Client.new(
-        endpoint: Nazrin.config.search_endpoint,
-        region: Nazrin.config.region,
-        access_key_id: Nazrin.config.access_key_id,
-        secret_access_key: Nazrin.config.secret_access_key)
+        endpoint: config.search_endpoint,
+        region: config.region,
+        access_key_id: config.access_key_id,
+        secret_access_key: config.secret_access_key,
+        logger: config.logger)
       @parameters = {}
     end
 
     # query
     # @param [String] query query string
     def query(query)
-      @parameters[:query] = query
+      parameters[:query] = query
       self
     end
 
     # return fields
     # @param [Array<String>] fields ex) ['title']
     def return(fields)
-      @parameters[:return] = fields.join(',')
+      parameters[:return] = fields.join(',')
       self
     end
 
     # set the number to get
     # @param [Integer] size the number to get
     def size(size)
-      @parameters[:size] = size
+      parameters[:size] = size
       self
     end
 
     # set the parser to be used
     # @param [String] parser 'simple', 'structured', 'lucene', dismax'
     def query_parser(query_parser)
-      @parameters[:query_parser] = query_parser
+      parameters[:query_parser] = query_parser
       self
     end
 
     # set the search start position
     # @param [Integer] start start position
     def start(start)
-      @parameters[:start] = start
+      parameters[:start] = start
       self
     end
 
     # set the cursor
     # @param [String] cursor cursor
     def cursor(cursor)
-      @parameters[:cursor] = cursor
+      parameters[:cursor] = cursor
       self
     end
 
     # sort
     # @param [Array<String>] sorts ex) ['year desc']
     def sort(sorts)
-      @parameters[:sort] = sorts.join(',')
+      parameters[:sort] = sorts.join(',')
       self
     end
 
     # partial
     # @param [Boolean] partial true or false
     def partial(partial)
-      @parameters[:partial] = partial
+      parameters[:partial] = partial
       self
     end
 
     # query filtering
     # @param [String] filter_query "tags:'aaa'"
     def filter_query(filter_query)
-      @parameters[:filter_query] = filter_query
+      parameters[:filter_query] = filter_query
       self
     end
 
     # query options
     # @param [String] query_options ex) target field "{fields:['title']}"
     def query_options(query_options)
-      @parameters[:query_options] = query_options
+      parameters[:query_options] = query_options
       self
     end
 
     # highlight
     # @param [String] highlight "{'tags':{}}"
     def highlight(highlight)
-      @parameters[:highlight] = highlight
+      parameters[:highlight] = highlight
       self
     end
 
     # facet
     # @param [String] facet ex) "{'year':{'sort':'bucket'}}"
     def facet(facet)
-      @parameters[:facet] = facet
+      parameters[:facet] = facet
       self
     end
 
     # define any expression
     # @param [String] expr ex) "{'EXPRESSIONNAME':'EXPRESSION'}"
     def expr(expr)
-      @parameters[:expr] = expr
+      parameters[:expr] = expr
       self
     end
 
     def search
       return fake_response if Nazrin.config.mode == 'sandbox'
       fail SearchClientError if deep_page?
-      @client.search(@parameters)
+      client.search(parameters)
     end
 
     def execute

data/lib/nazrin/searchable.rb

@@ -29,11 +29,12 @@ module Nazrin
           alias_method :searchable, :nazrin_searchable unless method_defined? :searchable
           alias_method :fields, :nazrin_fields unless method_defined? :fields
           alias_method :field, :nazrin_field unless method_defined? :field
+          alias_method :searchable_configure, :nazrin_searchable_configure unless method_defined? :searchable_configure
         end
       end
 
       def nazrin_search(options = {})
-        client = Nazrin::SearchClient.new
+        client = Nazrin::SearchClient.new(nazrin_searchable_config)
         client.data_accessor = Nazrin::DataAccessor.for(self).new(self, options)
         client
       end
@@ -41,7 +42,7 @@ module Nazrin
       def nazrin_searchable(&block)
         class_variable_set(
           :@@nazrin_doc_client,
-          Nazrin::DocumentClient.new)
+          Nazrin::DocumentClient.new(nazrin_searchable_config))
         class_variable_set(:@@nazrin_search_field_data, {})
         block.call
       end
@@ -87,6 +88,14 @@ module Nazrin
       def nazrin_delete_document(obj)
         nazrin_doc_client.delete_document(obj.send(:id))
       end
+
+      def nazrin_searchable_config
+        @nazrin_searchable_config ||= Nazrin::Searchable::Configuration.new
+      end
+
+      def nazrin_searchable_configure
+        yield nazrin_searchable_config
+      end
     end
   end
 end

data/lib/nazrin/searchable/config.rb

@@ -0,0 +1,24 @@
+module Nazrin
+  module Searchable
+    class Configuration
+      %i(
+        search_endpoint
+        document_endpoint
+        region
+        access_key_id
+        secret_access_key
+        logger
+      ).each do |attr|
+        class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{attr}
+            @#{attr} || Nazrin.config.#{attr}
+          end
+
+          def #{attr}=(v)
+            @#{attr} = v
+          end
+        CODE
+      end
+    end
+  end
+end

data/lib/nazrin/version.rb

@@ -1,3 +1,3 @@
 module Nazrin
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nazrin
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Tomohiro Suwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -207,6 +207,7 @@ files:
 - lib/nazrin/pagination_generator.rb
 - lib/nazrin/search_client.rb
 - lib/nazrin/searchable.rb
+- lib/nazrin/searchable/config.rb
 - lib/nazrin/version.rb
 - nazrin.gemspec
 homepage: https://github.com/tsuwatch/nazrin