base_indexer 0.1.4 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b056140c6cfe391b49aad7992cfaa1c4ab45890
-  data.tar.gz: c724ef56d8706a91a7fcc319f6998980b2bf3807
+  metadata.gz: 1220e752bf2216ae1aaff3753ec171f099ae45eb
+  data.tar.gz: 045aedb65c90aef594d1fdfc93157d770a09d068
 SHA512:
-  metadata.gz: f3fd112bd2d2b2ec962a164adebce21611636b131280106b6ebd2f2aa4ddef1ecfadc162edb6946446df48fa43e9dadb5cc63cd00ebbad8bc10748d79d300816
-  data.tar.gz: ff4b8426cd63e3e76f606c0756917a802a37f832745517fb8b85662a59d7f7ced0ea6d152b0c0059da62bbad7547c479ad96edfc14452f7b57650a31ea35f5c1
+  metadata.gz: 40898053ee492e35d690f5bbbd31b2337cdbf3301a2dfc9a3b517b089afa7fb3b13563fc2b7c69b8bf9e5800ba640244ff8974bb640a960e517420fb8a41a66a
+  data.tar.gz: b772fde1333708f8321d97c2a8e8d2fec83e54071ac41cda08a051a29a66c360597caa90ed3e97d49c88c5dfe52406e4cd4201eb5215948ea645f043263f7071

data/Rakefile

@@ -4,36 +4,57 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'BaseIndexer'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require 'rspec/core'
+require 'rspec/core/rake_task'
+require 'yard'
+require 'yard/rake/yardoc_task'
+require 'engine_cart/rake_task'
+
+Bundler::GemHelper.install_tasks
+
+
+# Travis ci task
+task :default => :ci  
+task :ci => ['engine_cart:generate'] do
+  # run the tests
+  RAILS_ENV = 'test'
+  Rake::Task['spec'].invoke
+  RSpec::Core::RakeTask.new(:rspec) do |spec|
+    spec.rspec_opts = ["-c", "-f progress", "--tty", "-r ./spec/spec_helper.rb"]
+  end
+
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
 
-Bundler::GemHelper.install_tasks
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
 
-#require 'rake/testtask'
+#desc "run continuous integration suite (tests, coverage, docs)" 
+#task :ci => [:rspec, :doc]
 
-#Rake::TestTask.new(:test) do |t|
-#  t.libs << 'lib'
-#  t.libs << 'test'
-#  t.pattern = 'test/**/*_test.rb'
-#  t.verbose = false
+# Run rspec
+#task :spec => :rspec
+#RSpec::Core::RakeTask.new(:rspec) do |spec|
+#  spec.rspec_opts = ["-c", "-f progress", "--tty", "-r ./spec/spec_helper.rb"]
 #end
 
+# Use yard to build docs
+begin
+  project_root = File.expand_path(File.dirname(__FILE__))
+  doc_dest_dir = File.join(project_root, 'doc')
+
+  YARD::Rake::YardocTask.new(:doc) do |yt|
+    yt.files = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
+                 [ File.join(project_root, 'README.rdoc') ]
+    yt.options = ['--output-dir', doc_dest_dir, '--readme', 'README.rdoc', '--title', 'Discovery Indexer Documentation']
+  end
+rescue LoadError
+  desc "Generate YARD Documentation"
+  task :doc do
+    abort "Please install the YARD gem to generate rdoc."
+  end
+end  
+
 
-#task default: :test
 
-Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
-require 'rspec/core'
-require 'rspec/core/rake_task'
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
-task :default => :spec

data/app/controllers/base_indexer/items_controller.rb

@@ -33,7 +33,7 @@ module BaseIndexer
     end
         
     def report_failure method_symbol, params, e
-      return "#{method_symbol} #{params}\n\n#{e.inspect}\n#{e.cause.inspect }\n#{e.backtrace}"
+      return "#{method_symbol} #{params}\n\n#{e.inspect}\n#{e.message}\n#{e.backtrace}"
     end
     
     def report_success

data/lib/base_indexer/collection.rb

@@ -32,8 +32,8 @@ module BaseIndexer
           Rails.cache.write(collection_druid, purl_model.label, expires_in: 1.hours)
           purl_model.label
         end
-      rescue Exception => e
-        Rails.logger.error "There is a problem in retrieving collection name for #{collection_druid}. #{e.inspect}\n#{e.cause.inspect }\n#{e.backtrace}"
+      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
       end
     end

data/lib/base_indexer/main_indexer_engine.rb

@@ -33,7 +33,7 @@ module BaseIndexer
       collection_names = get_collection_names(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).map
+      solr_doc =  BaseIndexer.mapper_class_name.constantize.new(druid, mods_model, purl_model, collection_names).convert_to_solr_doc
       
       # Get target list
       targets_hash={}

data/lib/base_indexer/version.rb

@@ -1,3 +1,3 @@
 module BaseIndexer
-  VERSION = "0.1.4"
+  VERSION = "0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: base_indexer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: '0.2'
 platform: ruby
 authors:
 - Ahmed Alsum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,7 +212,7 @@ files:
 - lib/tasks/base_indexer_tasks.rake
 homepage: 
 licenses:
-- MIT
+- Apache 2
 metadata: {}
 post_install_message: 
 rdoc_options: []