base_indexer 0.3.8 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODBjNWU5ODFlZjY4YmM2MmMxNzQ0YzY3OTJjZTAzNzg5MzkwYjQ1ZQ==
-  data.tar.gz: !binary |-
-    YzBlNWY5ZGNkZjU5MjdkMWYwZWY4NzI3Yjg3MjllMzQ5ODlmNzNhZQ==
+SHA1:
+  metadata.gz: 0411b782fc2b37b199c84de8c1d0cfa407bf284f
+  data.tar.gz: f516ca6d3360adf7f7edc6e9c15ae02d97add79c
 SHA512:
-  metadata.gz: !binary |-
-    YzQzMDRmMGQ0ZmY5NTAzYTdhNGNjZDBhY2U2NDhmZjU2MThkNjE0N2JmNDI4
-    MjMwMWIxNzg4ODU2NGI3MWI2NmQ5NmFhMDUwMDRhMmU4OTdlZjM5OTRkMDYy
-    OWEwNTlkYTZmNDQxZDViZTQ1YTc2MTI1MzRkMzY4MjA1M2JkN2M=
-  data.tar.gz: !binary |-
-    MTNiMzFlYWQzNzU0ZmQ4YmMzYmZhOWM5ZjYzMWNhNTU0NTRiN2Q2OGFjMmZk
-    M2YyMzE1YzhkNzhjZGMyYWJlNzFkMGJkYzVjOWM3YmNjNjk3N2UzNjE0NmYy
-    YjExMTk0OGUzNWY1ZGJhNDFjMTJkNzBlN2UwZTM4MmFhNjQ3YmQ=
+  metadata.gz: 8aac42831ca4197392c0cf289d0d8dea5595910597f2dc99a84e22b867baefa3f48117bcb0eead9c3f3de2faf7b8bceee8b2b37fd961ef1c471b54ee6b513b34
+  data.tar.gz: 3a5289a81cce30caba2a7eb911d8e7a8bc157c36124fb62bd177c87303ce6d3af6796360d5fab0e0f65e069bb338d86b7902e211b07af27033abef8456ecf21b

data/Rakefile

@@ -11,23 +11,23 @@ require 'yard/rake/yardoc_task'
 
 Bundler::GemHelper.install_tasks
 
-
-
-APP_RAKEFILE = File.expand_path("../spec/internal/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
 Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
 
 # Travis ci task
 task :default => :ci  
 desc "run continuous integration suite (tests, coverage, docs)" 
-task :ci => [:rspec, :doc]
 
-# Run rspec
-task :spec => :rspec
-RSpec::Core::RakeTask.new(:rspec) do |spec|
-  spec.rspec_opts = ["-c", "-f progress", "--tty", "-r ./spec/spec_helper.rb"]
+require 'engine_cart/rake_task'
+EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
+
+task :ci => ['engine_cart:generate'] do
+  # run the tests
+  Rake::Task['spec'].invoke
+  Rake::Task['doc'].invoke
 end
 
+RSpec::Core::RakeTask.new(:spec)
+
 # Use yard to build docs
 begin
   project_root = File.expand_path(File.dirname(__FILE__))

data/lib/base_indexer/collection.rb

@@ -1,25 +1,25 @@
 module BaseIndexer
   
-  # It caches the collection information such as name
+  # It caches the collection information such as name and catkey
   class Collection
     
     # Returns the collection name from cache, otherwise will fetch it from PURL.
     #
     # @param collection_druid [String]  is the druid for a collection e.g., ab123cd4567
-    # @return [String] the collection name or nil if there is no name or the object 
+    # @return [Array<String>] the collection data or [] if there is no name and catkey or the object
     #   is not a collection
-    def self.get_collection_name(collection_druid)
+    def self.get_collection_info(collection_druid)
       
-      collection_name = get_from_cahce(collection_druid)
-      if collection_name.nil?
-        collection_name = get_from_purl(collection_druid)
+      collection_info = get_from_cache(collection_druid)
+      if collection_info.nil?
+        collection_info = get_from_purl(collection_druid)
       end
-      collection_name
+      collection_info
     end
     
     # @param [String] collection_druid is the druid for a collection e.g., ab123cd4567
     # @return [String] return the collection label from cache if available, nil otherwise
-    def self.get_from_cahce(collection_druid)
+    def self.get_from_cache(collection_druid)
       Rails.cache.read(collection_druid)
     end
     
@@ -28,13 +28,13 @@ module BaseIndexer
     def self.get_from_purl(collection_druid)
       begin
         purl_model =DiscoveryIndexer::InputXml::Purlxml.new(collection_druid).load()
-        unless purl_model.nil? or purl_model.label.nil? or not(purl_model.is_collection)
-          Rails.cache.write(collection_druid, purl_model.label, expires_in: 1.hours)
-          purl_model.label
+        unless purl_model.nil? or (purl_model.label.nil? and purl_model.catkey.nil?) or not(purl_model.is_collection)
+          Rails.cache.write(collection_druid, { label: purl_model.label, ckey: purl_model.catkey }, expires_in: 1.hours)
+          { label: purl_model.label, ckey: purl_model.catkey }
         end
       rescue => e
-        Rails.logger.error "There is a problem in retrieving collection name for #{collection_druid}. #{e.inspect}\n#{e.message }\n#{e.backtrace}"
-        return nil
+        Rails.logger.error "There is a problem in retrieving collection name and/or catkey for #{collection_druid}. #{e.inspect}\n#{e.message }\n#{e.backtrace}"
+        return {}
       end
     end
   end

data/lib/base_indexer/engine.rb

@@ -15,9 +15,12 @@ module BaseIndexer
  
     config.after_initialize do
       
-      # Reads the SOLR configuration fiel 
-      BaseIndexer.solr_configuration_class_name.constantize.instance.read(Rails.configuration.solr_config_file_path ||= 'test')
+      config.solr_config_file = File.join(Rails.root, "config","solr.yml")
       
+      if File.exists? config.solr_config_file
+        # Reads the SOLR configuration file
+        BaseIndexer.solr_configuration_class_name.constantize.instance.read(config.solr_config_file)
+      end
       
       # Initializes the DiscoveryIndexer log with Rails logger, so all the messages will go to 
       #   the same log file

data/lib/base_indexer/main_indexer_engine.rb

@@ -30,10 +30,10 @@ module BaseIndexer
       # Read input mods and purl
       purl_model =  read_purl(druid)
       mods_model =  read_mods(druid)
-      collection_names = get_collection_names(purl_model.collection_druids)
+      collection_data = get_collection_data(purl_model.collection_druids)
       
       # Map the input to solr_doc
-      solr_doc =  BaseIndexer.mapper_class_name.constantize.new(druid, mods_model, purl_model, collection_names).convert_to_solr_doc
+      solr_doc =  BaseIndexer.mapper_class_name.constantize.new(druid, mods_model, purl_model, collection_data).convert_to_solr_doc
       
       # Get target list
       targets_hash={}
@@ -96,16 +96,16 @@ module BaseIndexer
     #   !["ab123cd4567", "ef123gh4567"]
     # @return [Hash] a hash for collection druid and its name 
     #   !{"ab123cd4567"=>"Collection 1", "ef123gh4567"=>"Collection 2"}
-    def get_collection_names collection_druids
-      collection_names = {}
+    def get_collection_data collection_druids
+      collection_data = {}
       
       unless collection_druids.nil? then
         collection_druids.each do |cdruid|
-          cname = BaseIndexer::Collection.get_collection_name(cdruid)
-          collection_names[cdruid] = cname unless cname.nil? 
+        cdata = BaseIndexer::Collection.get_collection_info(cdruid)
+          collection_data[cdruid] = cdata unless cdata.nil?
         end
       end
-      collection_names
+      collection_data
     end
     
   end

data/lib/base_indexer/version.rb

@@ -1,3 +1,3 @@
 module BaseIndexer
-  VERSION = "0.3.8"
+  VERSION = "0.4.0"
 end

data/lib/generators/base_indexer/install_generator.rb

@@ -0,0 +1,14 @@
+require 'rails/generators'
+
+module BaseIndexer
+ class Install < Rails::Generators::Base
+
+	source_root File.expand_path('../templates', __FILE__)
+
+    desc "Install Base Indexer"
+
+    def assets
+      copy_file "solr.yml", "config/solr.yml"
+    end
+  end
+end

data/lib/generators/base_indexer/templates/solr.yml

@@ -0,0 +1,4 @@
+target1:
+  url: http://localhost:8983/solr/
+target2:
+  url: http://localhost:8983/solr/

metadata

@@ -1,215 +1,215 @@
 --- !ruby/object:Gem::Specification
 name: base_indexer
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Ahmed Alsum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.9
 - !ruby/object:Gem::Dependency
   name: discovery-indexer
   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: retries
   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: is_it_working-cbeer
   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: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Description of BaseIndexer.
@@ -239,6 +239,8 @@ files:
 - lib/base_indexer/solr/solr_configuration.rb
 - lib/base_indexer/solr/solr_configuration_from_file.rb
 - lib/base_indexer/version.rb
+- lib/generators/base_indexer/install_generator.rb
+- lib/generators/base_indexer/templates/solr.yml
 - lib/tasks/base_indexer_tasks.rake
 - lib/tasks/index.rake
 homepage: 
@@ -251,17 +253,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Summary of BaseIndexer.