simple_solr_client 0.2.0 → 0.2.1

data/spec/client_basics_spec.rb

@@ -6,20 +6,20 @@ describe SimpleSolrClient::Client do
     @client = TestClient.instance.client
   end
   it "creates a new object" do
-    @client.base_url.must_equal 'http://localhost:8983/solr'
+    @client.base_url.must_equal ENV['TEST_SOLR_URL']
   end
 
   it "strips off a trailing slash for base_url" do
-    c = SimpleSolrClient::Client.new('http://localhost:8983/solr/')
-    c.base_url.must_equal 'http://localhost:8983/solr'
+    c = SimpleSolrClient::Client.new( ENV['TEST_SOLR_URL'])
+    c.base_url.must_equal ENV['TEST_SOLR_URL']
   end
 
   it "constructs a url with no args" do
-    @client.url.must_equal 'http://localhost:8983/solr'
+    @client.url.must_equal ENV['TEST_SOLR_URL']
   end
 
   it "constructs a URL with args" do
-    @client.url('admin', 'ping').must_equal 'http://localhost:8983/solr/admin/ping'
+    @client.url('admin', 'ping').must_equal "#{ENV['TEST_SOLR_URL']}/admin/ping"
   end
 
 

data/spec/core_basics_spec.rb

@@ -0,0 +1,21 @@
+require 'minitest_helper'
+
+describe SimpleSolrClient::Core do
+
+  before do
+    @core = TempCore.instance.core('core_basics')
+  end
+  it "creates a new object" do
+    @core.base_url.must_equal ENV['TEST_SOLR_URL']
+  end
+
+  it "constructs a url with no args" do
+    @core.url.must_equal "#{ENV['TEST_SOLR_URL']}/#{@core.name}"
+  end
+
+  it "constructs a URL with args" do
+    @core.url('admin', 'ping').must_equal "#{ENV['TEST_SOLR_URL']}/#{@core.name}/admin/ping"
+  end
+
+
+end

data/spec/minitest_helper.rb

@@ -1,21 +1,24 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'simple_solr_client'
+
+
 require 'minitest/spec'
 require 'minitest/autorun'
 require "minitest/reporters"
+
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
 require 'singleton'
 
 ENV['TEST_SOLR_URL'] ||= 'http://localhost:8983/solr'
-ENV['TEST_SOLR_CORE_NAME'] ||= 'core1'
+#ENV['TEST_SOLR_CORE_NAME'] ||= 'core1'
 
 class TestClient
   include Singleton
-  attr_reader :client, :core
+  attr_reader :client #, :core
   def initialize
     @client = SimpleSolrClient::Client.new ENV['TEST_SOLR_URL']
-    @core = @client.core ENV['TEST_SOLR_CORE_NAME'] || 'simple_solr_test'
+#    @core = @client.core ENV['TEST_SOLR_CORE_NAME'] || 'simple_solr_test'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_solr_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Bill Dueber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -42,32 +42,18 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,13 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -134,14 +120,6 @@ files:
 - lib/simple_solr_client/response/document.rb
 - lib/simple_solr_client/response/generic_response.rb
 - lib/simple_solr_client/response/query_response.rb
-- lib/simple_solr_client/schema.rb
-- lib/simple_solr_client/schema/analysis.rb
-- lib/simple_solr_client/schema/copyfield.rb
-- lib/simple_solr_client/schema/dynamic_field.rb
-- lib/simple_solr_client/schema/field.rb
-- lib/simple_solr_client/schema/field_or_type.rb
-- lib/simple_solr_client/schema/field_type.rb
-- lib/simple_solr_client/schema/matcher.rb
 - lib/simple_solr_client/version.rb
 - simple_solr_client.gemspec
 - solr_sample_core/conf/_schema_analysis_stopwords_english.json
@@ -248,11 +226,10 @@ files:
 - solr_sample_core/conf/xslt/updateXml.xsl
 - spec/client_basics_spec.rb
 - spec/connect_spec.rb
-- spec/core_basics.rb
+- spec/core_basics_spec.rb
 - spec/index_spec.rb
 - spec/load_spec.rb
 - spec/minitest_helper.rb
-- spec/schema_spec.rb
 homepage: https://github.com/billdueber/simple_solr
 licenses:
 - MIT
@@ -272,16 +249,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Interact with a Solr API via JSON
 test_files:
 - spec/client_basics_spec.rb
 - spec/connect_spec.rb
-- spec/core_basics.rb
+- spec/core_basics_spec.rb
 - spec/index_spec.rb
 - spec/load_spec.rb
 - spec/minitest_helper.rb
-- spec/schema_spec.rb

data/lib/simple_solr_client/schema.rb

@@ -1,217 +0,0 @@
-require 'nokogiri'
-
-require 'simple_solr_client/schema/matcher'
-require 'simple_solr_client/schema/copyfield'
-require 'simple_solr_client/schema/field'
-require 'simple_solr_client/schema/dynamic_field'
-require 'simple_solr_client/schema/field_type'
-
-class SimpleSolrClient::Schema
-  # A simplistic representation of a schema
-
-
-  def initialize(core)
-    @core           = core
-    @fields         = {}
-    @dynamic_fields = {}
-    @copy_fields    = Hash.new { |h, k| h[k] = [] }
-    @field_types    = {}
-    self.load
-  end
-
-
-  def fields
-    @fields.values.map { |x| x.resolve_type(self) }
-  end
-
-  def field(n)
-    @fields[n].resolve_type(self)
-  end
-
-  def dynamic_fields
-    @dynamic_fields.values.map { |x| x.resolve_type(self) }
-  end
-
-  def dynamic_field(n)
-    @dynamic_fields[n].resolve_type(self)
-  end
-
-  def copy_fields_for(n)
-    @copy_fields[n]
-  end
-
-  def copy_fields
-    @copy_fields.values.flatten
-  end
-
-  def add_field(f)
-    @fields[f.name] = f
-    field(f.name)
-  end
-
-  def drop_field(str)
-    @fields.delete(str)
-    self
-  end
-
-
-  def field_types
-    @field_types.values
-  end
-
-  def field_type(k)
-    @field_types[k]
-  end
-
-
-  # When we add dynamic fields, we need to keep them sorted by
-  # length of the key, since that's how they match
-  def add_dynamic_field(f)
-    raise "Dynamic field should be dynamic and have a '*' in it somewhere; '#{f.name}' does not" unless f.name =~ /\*/
-    @dynamic_fields[f.name] = f
-
-    @dynamic_fields = @dynamic_fields.sort { |a, b| b[0].size <=> a[0].size }.to_h
-
-  end
-
-  def drop_dynamic_field(str)
-    @dynamic_fields.delete(str)
-    self
-  end
-
-  def add_copy_field(f)
-    cf = @copy_fields[f.source]
-    cf << f
-  end
-
-  def drop_copy_field(str)
-    @copy_fields.delete(str)
-    self
-  end
-
-  def add_field_type(ft)
-    ft.core = @core
-    @field_types[ft.name] = ft
-  end
-
-  def drop_field_type(str)
-    @field_types.delete(str)
-    self
-  end
-
-
-  # For loading, we get the information about the fields via the API,
-  def load
-    load_explicit_fields
-    load_dynamic_fields
-    load_copy_fields
-    load_field_types
-  end
-
-
-  def load_explicit_fields
-    @fields = {}
-    @core.get('schema/fields')['fields'].each do |field_hash|
-      add_field(Field.new_from_solr_hash(field_hash))
-    end
-  end
-
-  def load_dynamic_fields
-    @dynamic_fields = {}
-    @core.get('schema/dynamicfields')['dynamicFields'].each do |field_hash|
-      f = DynamicField.new_from_solr_hash(field_hash)
-      if @dynamic_fields[f.name]
-        raise "Dynamic field '#{f.name}' defined more than once"
-      end
-      add_dynamic_field(f)
-    end
-  end
-
-  def load_copy_fields
-    @copy_fields = Hash.new { |h, k| h[k] = [] }
-    @core.get('schema/copyfields')['copyFields'].each do |cfield_hash|
-      add_copy_field(CopyField.new(cfield_hash['source'], cfield_hash['dest']))
-    end
-  end
-
-  def load_field_types
-    @field_types = {}
-    @core.get('schema/fieldtypes')['fieldTypes'].each do |fthash|
-      ft        = FieldType.new_from_solr_hash(fthash)
-      add_field_type(ft)
-    end
-  end
-
-  def reload
-    @core.reload
-  end
-
-
-  # Figuring out which fields are actually produced can be hard:
-  #   * If a non-dynamic field name matches, no dynamic_fields will match
-  #   * The result of a copyField may match another dynamicField, but the
-  #     result of *that* will not match more copyFields
-  #   * dynamicFields are matched longest to shortest
-  #
-  # Suppose I have the following:
-  #  dynamic *_ts => string
-  #  dynamic *_t  => string
-  #  dynamic *_s  => string
-  #  dynamic *_ddd => string
-  #
-  #  copy    *_ts => *_t
-  #  copy    *_ts => *_s
-  #  copy    *_s  => *_ddd
-  #
-  # You might expect:
-  #  name_ts => string
-  #  name_ts copied to name_t => string
-  #  name_ts copied to name_s => string
-  #  name_s  copied to name_ddd => string
-  #
-  # ...giving us name_ts, name_t, name_s, and name_ddd
-  #
-  # What you'll find is that we don't get name_ddd, since
-  # name_s was generated by a wildcard-enabled copyField
-  # and that's where things stop.
-  #
-  # However, if you explicitly add a field called
-  # name_s, it *will* get copied to name_ddd.
-  #
-  # Yeah. It's confusing.
-
-
-  def first_matching_field(str)
-    f = fields.find { |x| x.matches str } or first_matching_dfield(str)
-  end
-
-  def first_matching_dfield(str)
-    df = dynamic_fields.find { |x| x.matches str }
-    if df
-      f        = Field.new(df.to_h)
-      f[:name] = df.dynamic_name str
-    end
-    f
-
-  end
-
-  def resulting_fields(str)
-    rv = []
-    f  = first_matching_field(str)
-    rv << f
-    copy_fields.each do |cf|
-      if cf.matches(f.name)
-        dname      = cf.dynamic_name(f.name)
-        fmf        = Field.new(first_matching_field(dname).to_h)
-        fmf[:name] = dname
-        rv << fmf
-      end
-    end
-    rv.uniq
-  end
-
-end
-
-
-
-

data/lib/simple_solr_client/schema/analysis.rb

@@ -1,79 +0,0 @@
-# Figure out how the field type will parse out tokens
-# and change them in the analysis chain. Just calls the
-# provided solr analysis endpoints
-#
-# To be mixed into FieldType
-
-class SimpleSolrClient::Schema
-
-  class InvalidTokenError < RuntimeError
-    attr_accessor :resp
-
-
-    def initialize(msg, resp)
-      super(msg)
-      @resp = resp
-    end
-  end
-
-  module Analysis
-
-    #https://lucene.apache.org/solr/4_1_0/solr-core/org/apache/solr/handler/FieldAnalysisRequestHandler.html
-    def fieldtype_tokens(val, type)
-      target = 'analysis/field'
-      h      = {'analysis.fieldtype'  => name,
-                'analysis.fieldvalue' => val,
-                'analysis.query'      => val,
-      }
-      resp   = @core.get(target, h)
-
-      ftdata = resp['analysis']['field_types'][name][type]
-      rv     = []
-      ftdata.last.each do |t|
-        pos  = t['position'] - 1
-        text = t['text']
-        if rv[pos]
-          rv[pos] = Array[rv[pos]] << text
-        else
-          rv[pos] = text
-        end
-      end
-      rv
-    end
-
-
-    private :fieldtype_tokens
-
-    # Get an array of tokens as analyzed/transformed at index time
-    # Note that you may have multiple values at each token position if
-    # you use a synonym filter or a stemmer
-    # @param [String] ft the name of the fieldType (*not* the field)
-    # @param [String] val the search string to parse
-    # @return [Array] An array of tokens as produced by that index analysis chain
-    #
-    # @example Results when there's a stemmer
-    #   c.fieldtype_index_tokens 'text', "That's Life"
-    #     => [["that's", "that"], "life"]
-    #
-    def index_tokens(val)
-      fieldtype_tokens(val, 'index')
-    end
-
-
-    def index_input_valid?(val)
-      index_tokens(val)
-    rescue SimpleSolrClient::Schema::InvalidTokenError, RuntimeError => e
-      puts "IN HERE"
-      require 'pry'; binding.pry
-    end
-
-
-    # Get an array of tokens as analyzed/transformed at query time
-    # See #fieldtype_index_tokens
-    def query_tokens(val)
-      fieldtype_tokens(val, 'query')
-    end
-
-
-  end
-end