marcspec 1.6.6 → 1.7.1

data/.document

@@ -1,5 +1,3 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE
+- 
+ChangeLog.md
+LICENSE.txt

data/.gitignore

@@ -1,21 +1,4 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
+Gemfile.lock
+doc/
+pkg/
+vendor/cache/*.gem

data/.yardopts

@@ -0,0 +1 @@
+--markup markdown --title "marcspec Documentation" --protected

data/CHANGES

@@ -1,3 +1,6 @@
+1.7.0
+  * Add "separator" option for variable field specs so you can dictate what
+    separator to use (e.g., field('245ab') {separator '--'})
 1.6.6
   * Remove references to FATAL errors, which logback (nee jlogger) doesn't support
   * Exit with code 1 (not zero) when things are, in fact, fatal (using Process.abort)

data/Gemfile

@@ -0,0 +1,12 @@
+source :rubygems
+
+gemspec
+
+gem 'marc4j4r'
+gem 'jlogger'                   
+gem 'jruby_streaming_update_solr_server'
+
+group :development do
+  gem 'kramdown' 
+  gem 'rspec', '~> 2'
+end

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2009 BillDueber
+Copyright (c) 2013 Bill Dueber
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,68 +1,31 @@
+# encoding: utf-8
+
 require 'rubygems'
-require 'rake'
-gem 'ci_reporter'
-require 'ci/reporter/rake/rspec'
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "marcspec"
-    gem.summary = %Q{Extract data from MARC records and send to Solr}
-    gem.description = %Q{Relies on marc4j4r, based on work in solrmarc}
-    gem.email = "bill@dueber.com"
-    gem.homepage = "http://github.com/billdueber/marcspec"
-    gem.authors = ["BillDueber"]
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "yard", ">= 0"
-    gem.add_development_dependency 'ci_reporter'
-    gem.add_dependency 'marc4j4r', '>=1.2.0'
-    gem.add_dependency 'jlogger', '>=0.0.3'
-    gem.add_dependency 'jruby_streaming_update_solr_server', '>=0.5.3'
-    
-    
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-
-require 'spec/rake/spectask'
-desc "Run rspec specs"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  require 'bundler'
+rescue LoadError => e
+  warn e.message
+  warn "Run `gem install bundler` to install Bundler."
+  exit -1
 end
 
-desc "Run Rspec tests with CI output in spec/reports"
-Spec::Rake::SpecTask.new('cispec') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
+begin
+  Bundler.setup(:development)
+rescue Bundler::BundlerError => e
+  warn e.message
+  warn "Run `bundle install` to install missing gems."
+  exit e.status_code
 end
 
+require 'rake'
 
+require "bundler/gem_tasks"
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |spec|
-    spec.libs << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: jgem install rcov-java"
-  end
-end
-
-task :spec => :check_dependencies
-task :cispec => :"ci:setup:rspec"
-task :default => :spec
+require 'yard'
+YARD::Rake::YardocTask.new  
+task :doc => :yard
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/lib/marcspec/dsl.rb

@@ -125,7 +125,13 @@ module MARCSpec
     def sub c
       self.codes = c
       return self
+    end          
+    
+    def separator s
+      self.joiner = s
+      return self
     end
+      
     
     alias_method :subs, :sub
   end

data/lib/marcspec/version.rb

@@ -0,0 +1,4 @@
+module Marcspec
+  # marcspec version
+  VERSION = "1.7.1"
+end

data/marcspec.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path('../lib/marcspec/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.name          = "marcspec"
+  gem.version       = Marcspec::VERSION
+  gem.summary = %Q{Extract data from MARC records and send to Solr}
+  gem.description = %Q{Relies on marc4j4r, based on work in solrmarc}
+  gem.license       = "MIT"
+  gem.authors       = ["Bill Dueber"]
+  gem.email         = "bill@dueber.com"
+  gem.homepage      = "https://github.com/billdueber/marcspec#readme"
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ['lib']
+
+  gem.add_development_dependency 'bundler', '~> 1.0'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'yard'
+end

data/spec/dsl_spec.rb

@@ -291,8 +291,17 @@ describe "DSL" do
       end
       ss.hash_from_marc(@one)['tst'].should ==  ['The Texas ranger', 'Sung by Beale D. Taylor.']
     end
-
     
+   it "takes a custom joiner" do
+     ss = MARCSpec.build do
+       field('tst') do
+         spec("245ac") {
+           separator "|"
+         }
+       end
+     end
+     ss.hash_from_marc(@one)['tst'].should ==  [['The Texas ranger', 'Sung by Beale D. Taylor.'].join("|")]
+   end
   end
 
   describe "SolrFieldSpec modifiers DSL" do
@@ -320,7 +329,6 @@ describe "DSL" do
           }
         end
       end
-
       ss.hash_from_marc(@one)['tst'].should ==  ['Default value']
     end
   end

data/spec/maps_spec.rb

@@ -154,8 +154,8 @@ describe "MVMaps" do
   it "should read a pattern solrmarc file" do
     map = MARCSpec::MultiValueMap.from_solrmarc_file "#{DIR}/data/umich/translation_maps/library_map.properties"
     map.mapname.should ==  'library_map'
-    map['UMTRI Stuff'].should ==  ['Transportation Research Institute Library (UMTRI)']
-    map['HATCH DOCS'].should ==  ['Hatcher Graduate', 'Hatcher Graduate Documents Center']
+    map['UMTRI Stuff'].sort.should ==  ['Transportation Research Institute Library (UMTRI)']
+    map['HATCH DOCS'].sort.should ==  ['Hatcher Graduate', 'Hatcher Graduate Documents Center']
   end
 
   it "can dump/load a multivalue map via generic map interface" do

data/spec/spec.opts

@@ -1,7 +1,5 @@
 --colour
---format profile
+--format specdoc
 --format specdoc:spec/spec_full_report.txt
 --format failing_examples:spec/spec_failing_examples.txt
 --format html:spec/spec_report.html
---loadby mtime
---reverse

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'marc4j4r'
 require 'tempfile'
 require 'logger'

metadata

@@ -1,117 +1,67 @@
 --- !ruby/object:Gem::Specification 
 name: marcspec
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 1
-    - 6
-    - 6
-  version: 1.6.6
+  prerelease: 
+  version: 1.7.1
 platform: ruby
 authors: 
-  - BillDueber
+  - Bill Dueber
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -04:00
-default_executable: 
+date: 2013-02-20 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
     type: :development
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: yard
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: ci_reporter
+            version: "1.0"
+    requirement: *id001
+    name: bundler
     prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+  - !ruby/object:Gem::Dependency 
+    type: :development
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
-    type: :development
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: marc4j4r
+    requirement: *id002
+    name: rake
     prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 2
-              - 0
-            version: 1.2.0
-    type: :runtime
-    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
-    name: jlogger
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    type: :development
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 0
-              - 3
-            version: 0.0.3
-    type: :runtime
-    version_requirements: *id005
-  - !ruby/object:Gem::Dependency 
-    name: jruby_streaming_update_solr_server
+            version: "0"
+    requirement: *id003
+    name: yard
     prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 5
-              - 3
-            version: 0.5.3
-    type: :runtime
-    version_requirements: *id006
 description: Relies on marc4j4r, based on work in solrmarc
 email: bill@dueber.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-  - LICENSE
-  - README.md
+extra_rdoc_files: []
+
 files: 
   - .document
   - .gitignore
+  - .yardopts
   - CHANGES
-  - LICENSE
+  - Gemfile
+  - LICENSE.txt
   - README.md
   - Rakefile
-  - VERSION
   - lib/marcspec.rb
   - lib/marcspec/constantspec.rb
   - lib/marcspec/controlfieldspec.rb
@@ -125,6 +75,8 @@ files:
   - lib/marcspec/solrfieldspec.rb
   - lib/marcspec/specset.rb
   - lib/marcspec/variablefieldspec.rb
+  - lib/marcspec/version.rb
+  - marcspec.gemspec
   - spec/cachespot_spec.rb
   - spec/controlfieldspec_spec.rb
   - spec/data/batch.dat
@@ -153,45 +105,66 @@ files:
   - spec/spec_helper.rb
   - spec/specset_spec.rb
   - spec/variablefieldspec_spec.rb
-has_rdoc: true
-homepage: http://github.com/billdueber/marcspec
-licenses: []
-
+homepage: https://github.com/billdueber/marcspec#readme
+licenses: 
+  - MIT
 post_install_message: 
-rdoc_options: 
-  - --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
         segments: 
           - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
         segments: 
           - 0
         version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Extract data from MARC records and send to Solr
 test_files: 
   - spec/cachespot_spec.rb
   - spec/controlfieldspec_spec.rb
+  - spec/data/batch.dat
+  - spec/data/one.dat
+  - spec/data/simplemap.rb
+  - spec/data/umich/translation_maps/area_map.properties
+  - spec/data/umich/translation_maps/availability_map_ht.properties
+  - spec/data/umich/translation_maps/availability_map_umich.properties
+  - spec/data/umich/translation_maps/callnumber_map.properties
+  - spec/data/umich/translation_maps/callnumber_subject_map.properties
+  - spec/data/umich/translation_maps/country_map.properties
+  - spec/data/umich/translation_maps/format_map.properties
+  - spec/data/umich/translation_maps/format_map_umich.properties
+  - spec/data/umich/translation_maps/ht_namespace_map.properties
+  - spec/data/umich/translation_maps/institution_map.properties
+  - spec/data/umich/translation_maps/language_map.properties
+  - spec/data/umich/translation_maps/library_map.properties
+  - spec/data/umich/translation_maps/location_map.properties
+  - spec/data/umich/umich_index.properties
   - spec/dsl_spec.rb
   - spec/leaderspec_spec.rb
   - spec/maps_spec.rb
   - spec/marcfieldspecs_spec.rb
   - spec/solrfieldspec_spec.rb
+  - spec/spec.opts
   - spec/spec_helper.rb
   - spec/specset_spec.rb
   - spec/variablefieldspec_spec.rb
-  - spec/data/simplemap.rb
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-1.6.6