search_flip 4.0.0.beta2 → 4.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be586199f9609b395d29218436d8618e283610189dde3805b76145f1c44b3c52
-  data.tar.gz: 7312acda3dce1c1080cf9c6ee3ca10c3e6aab8556b152c9304c09af25aa61e12
+  metadata.gz: e9fcc6487802a3f4f2c26081fbb09a22cad112284a4faee6c144320c044fbbcd
+  data.tar.gz: 0caa17894a15d7eb03ad0a3e171ad94f80d85998caaa80b88162e5fc04a5bf97
 SHA512:
-  metadata.gz: 813ff8f5a836e56db83cdf11b15c85003a849572df83401411770ceed0309aac7214ed7d1640b843c85e3b4a910a38db3b8c5b6af298e7d8cff950d23a36572e
-  data.tar.gz: eb564e52771cf80668ae3bdfe145b533580ab04a3120fefdac75e6d661c4512c423606c80daa639940718f9c425d221c51d2e892e0cf184a634e3eead3cf8c06
+  metadata.gz: 2cf53c265c31136c50a0158f96f2c143a053304656dfcb7db3dd8ca3344031ebd724b3c3f5382451cfd6a805149619fe892b28eb47c2275d86bda042f4dfe526
+  data.tar.gz: e3ffe6f6ba945c62b45379607295af790df866b86489cc9d9f63fdf91f528e071b9da93d7067b16fab93e509e8acf87644de303bd7a63b6010e18b5439507fc3

data/.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
         - elasticsearch:5.4
         - docker.elastic.co/elasticsearch/elasticsearch:6.7.0
         - docker.elastic.co/elasticsearch/elasticsearch:7.0.0
-        - docker.elastic.co/elasticsearch/elasticsearch:7.9.0
+        - docker.elastic.co/elasticsearch/elasticsearch:7.11.2
         ruby:
         - 2.5
         - 2.6
@@ -28,6 +28,7 @@ jobs:
     - uses: actions/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+    - run: gem install bundler
     - run: bundle
     - run: sleep 10
     - run: bundle exec rspec

data/.rubocop.yml

@@ -1,10 +1,14 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+  SuggestExtensions: false
 
 Style/CaseLikeIf:
   Enabled: false
 
+Layout/EmptyLineBetweenDefs:
+  EmptyLineBetweenClassDefs: false
+
 Lint/EmptyBlock:
   Exclude:
     - spec/**/*.rb

data/CHANGELOG.md

@@ -11,6 +11,15 @@
 * Added `SearchFlip::Connection#get_cluster_settings` and
   `#update_cluster_settings`
 
+## v3.2.1
+
+* Fix `refresh` having a empty body breaking in elasticsearch 7.11
+
+## v3.2.0
+
+* Fix `index_scope` not being passed in `each_record` without block
+* Added `SearchFlip::Criteria#match_none`
+
 ## v3.1.2
 
 * Fix ignored false value for source when merging criterias

data/README.md

@@ -51,7 +51,7 @@ CommentIndex.search("hello world").where(available: true).sort(id: "desc").aggre
 
 ```
 
-Finally, SearchFlip comes with a minimal set of dependencies (http-rb and oj only).
+Finally, SearchFlip comes with a minimal set of dependencies.
 
 ## Reference Docs
 
@@ -418,6 +418,14 @@ Simply matches all documents:
 CommentIndex.match_all
 ```
 
+* `match_none`
+
+Simply matches none documents at all:
+
+```ruby
+CommentIndex.match_none
+```
+
 * `all`
 
 Simply returns the criteria as is or an empty criteria when called on the index
@@ -874,57 +882,52 @@ Thus, if your ORM supports `.find_each`, `#id` and `#where` you are already
 good to go. Otherwise, simply add your custom implementation of those methods
 that work with whatever ORM you use.
 
-## Date and Timestamps in JSON
-
-Elasticsearch requires dates and timestamps to have one of the formats listed
-here: [https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#strict-date-time](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#strict-date-time).
+## JSON
 
-However, `JSON.generate` in ruby by default outputs something like:
+SearchFlip is using the [Oj gem](https://github.com/ohler55/oj) to generate
+JSON. More concretely, SearchFlip is using:
 
 ```ruby
-JSON.generate(time: Time.now.utc)
-# => "{\"time\":\"2018-02-22 18:19:33 UTC\"}"
+Oj.dump({ key: "value" }, mode: :custom, use_to_json: true, time_format: :xmlschema, bigdecimal_as_decimal: false)
 ```
 
-This format is not compatible with Elasticsearch by default. If you're on
-Rails, ActiveSupport adds its own `#to_json` methods to `Time`, `Date`, etc.
-However, ActiveSupport checks whether they are used in combination with
-`JSON.generate` or not and adapt:
+The `use_to_json` option is used for maximum compatibility, most importantly
+when using rails `ActiveSupport::TimeWithZone` timestamps, which `oj` can not
+serialize natively. However, `use_to_json` adds performance overhead. You can
+change the json options via:
 
 ```ruby
-Time.now.utc.to_json
-=> "\"2018-02-22T18:18:22.088Z\""
-
-JSON.generate(time: Time.now.utc)
-=> "{\"time\":\"2018-02-22 18:18:59 UTC\"}"
+SearchFlip::Config[:json_options] = {
+  mode: :custom,
+  use_to_json: false,
+  time_format: :xmlschema,
+  bigdecimal_as_decimal: false
+}
 ```
 
-SearchFlip is using the [Oj gem](https://github.com/ohler55/oj) to generate
-JSON. More concretely, SearchFlip is using:
+However, you then have to convert timestamps manually for indexation via e.g.:
 
 ```ruby
-Oj.dump({ key: "value" }, mode: :custom, use_to_json: true)
-```
+class MyIndex
+  # ...
 
-This mitigates the issues if you're on Rails:
+  def self.serialize(model)
+    {
+      # ...
 
-```ruby
-Oj.dump(Time.now, mode: :custom, use_to_json: true)
-# => "\"2018-02-22T18:21:21.064Z\""
+      created_at: model.created_at.to_time
+    }
+  end
+end
 ```
 
-However, if you're not on Rails, you need to add `#to_json` methods to `Time`,
-`Date` and `DateTime` to get proper serialization. You can either add them on
-your own, via other libraries or by simply using:
-
-```ruby
-require "search_flip/to_json"
-```
+Please check out the oj docs for more details.
 
 ## Feature Support
 
 * for Elasticsearch 2.x, the delete-by-query plugin is required to delete
   records via queries
+* `#match_none` is only available with Elasticsearch >= 5
 * `#track_total_hits` is only available with Elasticsearch >= 7
 
 ## Keeping your Models and Indices in Sync

data/lib/search_flip.rb

@@ -2,6 +2,7 @@ require "ruby2_keywords"
 require "forwardable"
 require "http"
 require "thread"
+require "json"
 require "oj"
 require "set"
 

data/lib/search_flip/bulk.rb

@@ -143,7 +143,7 @@ module SearchFlip
 
       return if options[:raise] == false
 
-      parsed_response = response.parse
+      parsed_response = SearchFlip::JSON.parse(response.to_s)
 
       return unless parsed_response["errors"]
 

data/lib/search_flip/config.rb

@@ -5,6 +5,12 @@ module SearchFlip
     bulk_limit: 1_000,
     bulk_max_mb: 100,
     auto_refresh: false,
-    instrumenter: NullInstrumenter.new
+    instrumenter: NullInstrumenter.new,
+    json_options: {
+      mode: :custom,
+      use_to_json: true,
+      time_format: :xmlschema,
+      bigdecimal_as_decimal: false
+    }
   }
 end

data/lib/search_flip/connection.rb

@@ -28,7 +28,9 @@ module SearchFlip
     # @return [Hash] The cluster settings
 
     def get_cluster_settings
-      http_client.get("#{base_url}/_cluster/settings").parse
+      response = http_client.get("#{base_url}/_cluster/settings")
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Updates the cluster settings according to the specified payload
@@ -55,7 +57,11 @@ module SearchFlip
 
     def version
       @version_mutex.synchronize do
-        @version ||= http_client.headers(accept: "application/json").get("#{base_url}/").parse["version"]["number"]
+        @version ||= begin
+          response = http_client.headers(accept: "application/json").get("#{base_url}/")
+
+          SearchFlip::JSON.parse(response.to_s)["version"]["number"]
+        end
       end
     end
 
@@ -67,7 +73,9 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def cluster_health
-      http_client.headers(accept: "application/json").get("#{base_url}/_cluster/health").parse
+      response = http_client.headers(accept: "application/json").get("#{base_url}/_cluster/health")
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Uses the Elasticsearch Multi Search API to execute multiple search requests
@@ -117,10 +125,11 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def update_aliases(payload)
-      http_client
+      response = http_client
         .headers(accept: "application/json", content_type: "application/json")
         .post("#{base_url}/_aliases", body: SearchFlip::JSON.generate(payload))
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Sends an analyze request to Elasticsearch. Raises
@@ -132,10 +141,11 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def analyze(request, params = {})
-      http_client
+      response = http_client
         .headers(accept: "application/json")
         .post("#{base_url}/_analyze", json: request, params: params)
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Fetches information about the specified index aliases. Raises
@@ -151,10 +161,11 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def get_aliases(index_name: "*", alias_name: "*")
-      http_client
+      response = http_client
         .headers(accept: "application/json", content_type: "application/json")
         .get("#{base_url}/#{index_name}/_alias/#{alias_name}")
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Returns whether or not the associated Elasticsearch alias already
@@ -186,10 +197,11 @@ module SearchFlip
     # @return [Array] The raw response
 
     def get_indices(name = "*", params: {})
-      http_client
+      response = http_client
         .headers(accept: "application/json", content_type: "application/json")
         .get("#{base_url}/_cat/indices/#{name}", params: params)
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     alias_method :cat_indices, :get_indices
@@ -286,10 +298,11 @@ module SearchFlip
     # @return [Hash] The index settings
 
     def get_index_settings(index_name)
-      http_client
+      response = http_client
         .headers(accept: "application/json")
         .get("#{index_url(index_name)}/_settings")
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Sends a refresh request to Elasticsearch. Raises
@@ -299,7 +312,7 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def refresh(index_names = nil)
-      http_client.post("#{index_names ? index_url(Array(index_names).join(",")) : base_url}/_refresh", json: {})
+      http_client.post("#{index_names ? index_url(Array(index_names).join(",")) : base_url}/_refresh")
 
       true
     end
@@ -337,7 +350,9 @@ module SearchFlip
       url = type_name ? type_url(index_name, type_name) : index_url(index_name)
       params = type_name && version.to_f >= 6.7 ? { include_type_name: true } : {}
 
-      http_client.headers(accept: "application/json").get("#{url}/_mapping", params: params).parse
+      response = http_client.headers(accept: "application/json").get("#{url}/_mapping", params: params)
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Deletes the specified index from Elasticsearch. Raises

data/lib/search_flip/filterable.rb

@@ -235,6 +235,22 @@ module SearchFlip
       filter(match_all: options)
     end
 
+    # Adds a match none filter to the criteria, which simply matches none
+    # documents at all. Check out the Elasticsearch docs for further details.
+    #
+    # @example Basic usage
+    #   CommentIndex.match_none
+    #
+    # @example Filter chaining
+    #   query = CommentIndex.search("...")
+    #   query = query.match_none unless current_user.admin?
+    #
+    # @return [SearchFlip::Criteria] A newly created extended criteria
+
+    def match_none
+      filter(match_none: {})
+    end
+
     # Adds an exists filter to the criteria, which selects all documents for
     # which the specified field has a non-null value.
     #

data/lib/search_flip/index.rb

@@ -247,8 +247,8 @@ module SearchFlip
         SearchFlip::Criteria.new(target: self)
       end
 
-      def_delegators :criteria, :all, :profile, :where, :where_not, :filter, :range, :match_all, :exists,
-        :exists_not, :post_where, :post_where_not, :post_range, :post_exists, :post_exists_not,
+      def_delegators :criteria, :all, :profile, :where, :where_not, :filter, :range, :match_all, :match_none,
+        :exists, :exists_not, :post_where, :post_where_not, :post_range, :post_exists, :post_exists_not,
         :post_filter, :post_must, :post_must_not, :post_should, :aggregate, :scroll, :source,
         :includes, :eager_load, :preload, :sort, :resort, :order, :reorder, :offset, :limit, :paginate,
         :page, :per, :search, :highlight, :suggest, :custom, :find_in_batches, :find_results_in_batches,
@@ -487,7 +487,9 @@ module SearchFlip
       # @return [Hash] The raw response
 
       def analyze(request, params = {})
-        connection.http_client.headers(accept: "application/json").post("#{index_url}/_analyze", json: request, params: params).parse
+        response = connection.http_client.headers(accept: "application/json").post("#{index_url}/_analyze", json: request, params: params)
+
+        SearchFlip::JSON.parse(response.to_s)
       end
 
       # Sends a index refresh request to Elasticsearch. Raises

data/lib/search_flip/json.rb

@@ -1,11 +1,11 @@
 module SearchFlip
   class JSON
     def self.generate(obj)
-      Oj.dump(obj, mode: :custom, use_to_json: true)
+      Oj.dump(obj, SearchFlip::Config[:json_options])
     end
 
-    def self.parse(str)
-      Oj.load(str, mode: :compat)
+    def self.parse(json)
+      ::JSON.parse(json)
     end
   end
 end

data/lib/search_flip/result.rb

@@ -34,14 +34,10 @@ module SearchFlip
       end
     end
 
-    # rubocop:disable Style/MissingSuper
-
     def method_missing(name, *args, &block)
       self[name.to_s]
     end
 
-    # rubocop:enable Style/MissingSuper
-
     def respond_to_missing?(name, include_private = false)
       key?(name.to_s) || super
     end

data/lib/search_flip/to_json.rb

@@ -1,29 +1 @@
-require "time"
-require "date"
-require "json"
-
-class Time
-  def to_json(*args)
-    iso8601(6).to_json
-  end
-end
-
-class Date
-  def to_json(*args)
-    iso8601.to_json
-  end
-end
-
-class DateTime
-  def to_json(*args)
-    iso8601(6).to_json
-  end
-end
-
-if defined?(ActiveSupport)
-  class ActiveSupport::TimeWithZone
-    def to_json(*args)
-      iso8601(6).to_json
-    end
-  end
-end
+warn "[DEPRECATION] Using search_flip/to_json is not neccessary anymore"

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "4.0.0.beta2"
+  VERSION = "4.0.0.beta7"
 end

data/search_flip.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "http"
+  spec.add_dependency "json"
   spec.add_dependency "oj"
   spec.add_dependency "ruby2_keywords"
 end

data/spec/search_flip/criteria_spec.rb

@@ -416,6 +416,18 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
+  describe "#match_none" do
+    it "does not match any documents" do
+      if ProductIndex.connection.version.to_i >= 5
+        ProductIndex.import create(:product)
+
+        query = ProductIndex.match_none
+
+        expect(query.records).to eq([])
+      end
+    end
+  end
+
   describe "#exists" do
     it "sets up the constraints correctly and is chainable" do
       product1 = create(:product, title: "title1", description: "description1")

data/spec/search_flip/index_spec.rb

@@ -5,8 +5,8 @@ RSpec.describe SearchFlip::Index do
     subject { ProductIndex }
 
     methods = [
-      :all, :profile, :where, :where_not, :filter, :range, :match_all, :exists,
-      :exists_not, :post_where, :post_where_not, :post_filter, :post_must,
+      :all, :profile, :where, :where_not, :filter, :range, :match_all, :match_none,
+      :exists, :exists_not, :post_where, :post_where_not, :post_filter, :post_must,
       :post_must_not, :post_should, :post_range, :post_exists, :post_exists_not,
       :aggregate, :scroll, :source, :includes, :eager_load, :preload, :sort, :resort,
       :order, :reorder, :offset, :limit, :paginate, :page, :per, :search,
@@ -211,12 +211,18 @@ RSpec.describe SearchFlip::Index do
         mapping = { properties: { id: { type: "long" } } }
 
         allow(TestIndex).to receive(:mapping).and_return(mapping)
-        allow(TestIndex.connection).to receive(:update_mapping).and_call_original
+        allow(TestIndex.connection).to receive(:update_mapping)
 
         TestIndex.update_mapping
 
         expect(TestIndex.connection).to have_received(:update_mapping).with("test", { "test" => mapping }, type_name: "test")
       end
+
+      it "updates the mapping" do
+        TestIndex.create_index
+
+        expect(TestIndex.update_mapping).to eq(true)
+      end
     end
   end
 
@@ -258,12 +264,19 @@ RSpec.describe SearchFlip::Index do
         TestIndex.create_index
         TestIndex.update_mapping
 
-        allow(TestIndex.connection).to receive(:get_mapping).and_call_original
+        allow(TestIndex.connection).to receive(:get_mapping)
 
         TestIndex.get_mapping
 
         expect(TestIndex.connection).to have_received(:get_mapping).with("test", type_name: "test")
       end
+
+      it "returns the mapping" do
+        TestIndex.create_index
+        TestIndex.update_mapping
+
+        expect(TestIndex.get_mapping).to be_present
+      end
     end
   end
 

data/spec/search_flip/json_spec.rb

@@ -2,6 +2,16 @@ require File.expand_path("../spec_helper", __dir__)
 
 RSpec.describe SearchFlip::JSON do
   describe ".generate" do
+    it "encodes timestamps correctly" do
+      Timecop.freeze "2020-06-01 12:00:00 UTC" do
+        expect(described_class.generate(timestamp: Time.now.utc)).to eq('{"timestamp":"2020-06-01T12:00:00.000Z"}')
+      end
+    end
+
+    it "encodes bigdecimals as string" do
+      expect(described_class.generate(value: BigDecimal(1))).to eq('{"value":"1.0"}')
+    end
+
     it "delegates to Oj" do
       allow(Oj).to receive(:dump)
 
@@ -9,7 +19,7 @@ RSpec.describe SearchFlip::JSON do
 
       described_class.generate(payload)
 
-      expect(Oj).to have_received(:dump).with(payload, mode: :custom, use_to_json: true)
+      expect(Oj).to have_received(:dump).with(payload, mode: :custom, use_to_json: true, time_format: :xmlschema, bigdecimal_as_decimal: false)
     end
 
     it "generates json" do
@@ -18,14 +28,18 @@ RSpec.describe SearchFlip::JSON do
   end
 
   describe ".parse" do
-    it "delegates to Oj" do
-      allow(Oj).to receive(:load)
+    it "returns the parsed json payload" do
+      expect(described_class.parse('{"key":"value"}')).to eq("key" => "value")
+    end
+
+    it "delegates to JSON" do
+      allow(JSON).to receive(:parse)
 
       payload = '{"key":"value"}'
 
       described_class.parse(payload)
 
-      expect(Oj).to have_received(:load).with(payload, mode: :compat)
+      expect(JSON).to have_received(:parse).with(payload)
     end
   end
 end

data/spec/search_flip/null_instrumenter_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe SearchFlip::NullInstrumenter do
     it "calls start" do
       allow(subject).to receive(:start)
 
-      subject.instrument("name", { key: "value" }) {}
+      subject.instrument("name", { key: "value" }) { true }
 
       expect(subject).to have_received(:start)
     end
@@ -15,7 +15,7 @@ RSpec.describe SearchFlip::NullInstrumenter do
     it "calls finish" do
       allow(subject).to receive(:finish)
 
-      subject.instrument("name", { key: "value" }) {}
+      subject.instrument("name", { key: "value" }) { true }
 
       expect(subject).to have_received(:finish)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta7
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +264,6 @@ files:
 - spec/search_flip/null_instrumenter_spec.rb
 - spec/search_flip/response_spec.rb
 - spec/search_flip/result_spec.rb
-- spec/search_flip/to_json_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mrkamel/search_flip
 licenses:
@@ -274,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Full-Featured Elasticsearch Ruby Client with a Chainable DSL
@@ -292,5 +305,4 @@ test_files:
 - spec/search_flip/null_instrumenter_spec.rb
 - spec/search_flip/response_spec.rb
 - spec/search_flip/result_spec.rb
-- spec/search_flip/to_json_spec.rb
 - spec/spec_helper.rb

data/spec/search_flip/to_json_spec.rb

@@ -1,28 +0,0 @@
-require File.expand_path("../spec_helper", __dir__)
-require "search_flip/to_json"
-
-RSpec.describe "to_json" do
-  it "uses the correct format for Time" do
-    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
-      expect(Time.now.utc.to_json).to eq("\"2018-01-01T12:00:00.000000Z\"")
-    end
-  end
-
-  it "uses the correct format for Date" do
-    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
-      expect(Date.today.to_json).to eq("\"2018-01-01\"")
-    end
-  end
-
-  it "uses the correct format for DateTime" do
-    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
-      expect(Time.now.utc.to_json).to eq("\"2018-01-01T12:00:00.000000Z\"")
-    end
-  end
-
-  it "uses the correct format for TimeWithZone" do
-    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
-      expect(Time.find_zone("UTC").now.to_json).to eq("\"2018-01-01T12:00:00.000000Z\"")
-    end
-  end
-end