active-fedora 9.7.3 → 9.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de5b093890058bc8f3139051495c81c9a3a3b3fa
-  data.tar.gz: 453d48c7a3d7896fbd0068916da87161682bafc0
+  metadata.gz: eb7bb622089037ec0a49870417c31aedf0b2b3c1
+  data.tar.gz: 077acf9671652587082be135de13ca1afa05b709
 SHA512:
-  metadata.gz: b1e410da785e646583a0cd9a085f9402e96e64c3740023d4f67736386e1c4e3e34a9e0dfc03c306b5d3281306c4ecd2b3911a1f67f77b9d078dc17113ed4174a
-  data.tar.gz: 854d7acbdaa846a6ea76ee273201fcbd1aab9167c4e60da359c18515694d27dffb93eee0cf82c57510067196cf182b5004e8aac8ff8ba3562346d02ae984c4ce
+  metadata.gz: 8cee9e01316cd57089335922d058f7bb537f3845c5da764601be842331707ac1ef175ecd20e6bc8e7cb759b432ec752b0fe9bcda08877b10dea2a72f97a2fc76
+  data.tar.gz: 23964a8f464c39dd2d0c53f5f6418337c76235489d2924895af34d979c214e551999b430d0072d28d6243e7c06114f170eecb8a6e9124664715e82b342f4c1f2

data/.gitignore

@@ -13,3 +13,4 @@ bin
 .ruby-version
 .ruby-gemset
 gemfiles/*.gemfile.lock
+/fcrepo4-data

data/.rubocop.yml

@@ -1,3 +1,5 @@
+require: rubocop-rspec
+
 AllCops:
   TargetRubyVersion: 2.2
   DisplayCopNames: true
@@ -12,7 +14,6 @@ Lint/HandleExceptions:
     - 'spec/unit/**/*'
     - 'spec/integration/**/*'
     - 'lib/active_fedora/cleaner.rb'
-    - 'lib/active_fedora/associations/builder/has_subresource.rb'
     - 'lib/active_fedora/associations/builder/contains.rb'
 
 Lint/AssignmentInCondition:
@@ -44,9 +45,6 @@ Metrics/CyclomaticComplexity:
     - 'lib/active_fedora/file_configurator.rb'
     - 'lib/active_fedora/file.rb'
     - 'lib/active_fedora/datastreams/nokogiri_datastreams.rb'
-    - 'lib/active_fedora/attribute_methods.rb'
-    - 'lib/active_fedora/scoping/named.rb'
-    - 'lib/active_fedora/inheritance.rb'
 
 Metrics/PerceivedComplexity:
   Exclude:
@@ -60,10 +58,6 @@ Metrics/PerceivedComplexity:
     - 'lib/active_fedora/associations/has_and_belongs_to_many_association.rb'
     - 'lib/active_fedora/associations/builder/indirectly_contains.rb'
     - 'lib/active_fedora/associations/builder/directly_contains_one.rb'
-    - 'lib/active_fedora/associations/collection_association.rb'
-    - 'lib/active_fedora/attribute_methods.rb'
-    - 'lib/active_fedora/scoping/named.rb'
-    - 'lib/active_fedora/inheritance.rb'
 
 Metrics/ModuleLength:
   Exclude:
@@ -73,7 +67,6 @@ Metrics/ModuleLength:
     - 'lib/active_fedora/attributes.rb'
     - 'lib/active_fedora/autosave_association.rb'
     - 'lib/active_fedora/attached_files.rb'
-    - 'lib/active_fedora/nested_attributes.rb'
 
 Metrics/ClassLength:
   Exclude:
@@ -83,13 +76,8 @@ Metrics/ClassLength:
     - 'lib/active_fedora/qualified_dublin_core_datastream.rb'
     - 'lib/active_fedora/file_configurator.rb'
     - 'lib/active_fedora/file.rb'
-    - 'lib/active_fedora/associations/association.rb'
-    - 'lib/active_fedora/associations/builder/association.rb'
     - 'lib/active_fedora/associations/collection_proxy.rb'
     - 'lib/active_fedora/associations/collection_association.rb'
-    - 'lib/active_fedora/reflection.rb'
-    - 'lib/active_fedora/orders/ordered_list.rb'
-    - 'lib/active_fedora/solr_service.rb'
 
 Metrics/MethodLength:
   Enabled: false
@@ -113,7 +101,6 @@ Style/AccessorMethodName:
 
 Style/PredicateName:
   Exclude:
-    - 'lib/active_fedora/attribute_methods.rb'
     - 'lib/active_fedora/relation/finder_methods.rb'
     - 'lib/active_fedora/versionable.rb'
     - 'lib/active_fedora/reflection.rb'
@@ -126,14 +113,10 @@ Style/PredicateName:
     - 'lib/active_fedora/attached_files.rb'
     - 'lib/active_fedora/associations.rb'
     - 'lib/active_fedora/association_hash.rb'
-    - 'lib/active_fedora/aggregation/list_source.rb'
-    - 'lib/active_fedora/associations/builder/aggregation.rb'
 
 Style/GuardClause:
   Exclude:
     - 'lib/active_fedora/autosave_association.rb'
-    - 'lib/active_fedora/associations/builder/belongs_to.rb'
-    - 'lib/active_fedora/associations/builder/has_and_belongs_to_many.rb'
 
 Style/TrivialAccessors:
   Exclude:
@@ -221,8 +204,10 @@ Style/FileName:
     - 'spec/samples/hydra-mods_article_datastream.rb'
 
 Style/ZeroLengthPredicate:
-  Exclude:
-    - 'lib/active_fedora/file/attributes.rb'
+  Enabled: false # https://github.com/bbatsov/rubocop/issues/2782
+
+Performance/RedundantMerge:
+  Enabled: false # https://github.com/bbatsov/rubocop/issues/2781
 
 Rails:
   Enabled: true
@@ -237,9 +222,6 @@ Rails/Date:
 Rails/TimeZone:
   Enabled: false
 
-RSpec/AnyInstance:
-  Enabled: false
-
 RSpec/ExampleWording:
   CustomTransform:
     be: is
@@ -262,6 +244,3 @@ RSpec/DescribeClass:
 RSpec/DescribedClass:
   Exclude:
     - 'spec/unit/finder_methods_spec.rb'
-
-RSpec/NotToNot:
-  Enabled: false

data/History.txt

@@ -1,7 +1,11 @@
-v9.7.2
- 2016-06-30 : Sending multiple values from a where cluase will join with OR [Carolyn Cole]
+v9.8.0
+2016-02-04: Remove unused files [Justin Coyne]
 
- 2016-06-29 : Fixing rubocop for latest version [Carolyn Cole]
+2016-02-03: Test on Solr 5 [Justin Coyne]
+
+2016-02-04: Fix rubocop [Justin Coyne]
+
+2016-01-29: Pass hash of options to index.as [Adam Wead]
 
 v9.7.1
  2016-01-22 : The jcr/mix versionable predicate is no longer used [Adam Wead]

data/README.md

@@ -63,12 +63,8 @@ You can test ActiveFedora using the same process as our continuous
 integration server. To do that, unzip a copy of hydra-jetty first. This includes copies of Fedora and Solr which are
 used during the testing process.
 
-```bash
-rake jetty:unzip
-```
-
-Once hydra-jetty is unzipped, the ci rake task will spin up jetty,
-import the fixtures, and run the tests for you.
+The `ci` rake task will download solr and fedora, start them,
+and run the tests for you.
 
 ```bash
 rake active_fedora:ci
@@ -76,18 +72,21 @@ rake active_fedora:ci
 
 ### Testing Manually
 
-If you want to run the tests manually, follow these instructions.
+If you want to run the tests manually, follow these instructions:
+
+```bash
+solr_wrapper -d solr/config/ --collection_name hydra-test
+```
+
+You can switch `hydra-test` to `hydra-dev` if you want to create a collection for development.
 
-You need to have a copy of hydra-jetty running. To do this, download a
-working copy of
-[hydra-jetty](https://github.com/projecthydra/hydra-jetty), cd into its
-root and run:
+To start FCRepo, open another shell and run:
 
 ```bash
-java -jar start.jar
+fedora_wrapper -p 8984
 ```
 
-Now you’re ready to run the tests. In the directory where active_fedora
+Now you’re ready to run the tests. In the directory where active\_fedora
 is installed, run:
 
 ```bash

data/Rakefile

@@ -9,7 +9,7 @@ load "lib/tasks/active_fedora_dev.rake"
 CLEAN.include %w(**/.DS_Store tmp *.log *.orig *.tmp **/*~)
 
 desc 'setup jetty and run tests'
-task ci: ['jetty:clean', 'active_fedora:ci']
+task ci: ['active_fedora:ci']
 desc 'run tests'
 task spec: ['active_fedora:rubocop', 'active_fedora:rspec']
 task rcov: ['active_fedora:rcov']

data/active-fedora.gemspec

@@ -27,13 +27,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"
   s.add_development_dependency "rake"
-  s.add_development_dependency "jettywrapper", ">= 2.0.0"
+  s.add_development_dependency "solr_wrapper", "~> 0.4"
+  s.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov", '~> 0.7.1'
-  s.add_development_dependency "rubocop", '~> 0.38.0'
-  s.add_development_dependency "rubocop-rspec", '~> 1.4.0'
+  s.add_development_dependency "rubocop", '~> 0.34'
+  s.add_development_dependency "rubocop-rspec", '~> 1.3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")

data/config/fedora.yml

@@ -1,12 +1,12 @@
 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:8983/fedora/rest
+  url: http://127.0.0.1:8984/rest
   base_path: /dev
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://localhost:8983/fedora/rest
+  url: http://localhost:8984/rest
   base_path: /test
 production:
   user: fedoraAdmin

data/config/solr.yml

@@ -1,15 +1,15 @@
 development:
   default:
-    url: http://localhost:8983/solr/development
+    url: http://localhost:8983/solr/hydra-dev
   full_text:
     url: http://localhost:8983/solr/development
-test: 
+test:
   default:
-    url: http://localhost:8983/solr/test
+    url: http://localhost:8983/solr/hydra-test
   full_text:
     url: http://localhost:8983/solr/test
 production:
   default:
-    url: http://localhost:8080/solr/production 
+    url: http://localhost:8080/solr/production
   full_text:
-    url: http://localhost:8080/solr/production
+    url: http://localhost:8080/solr/production

data/lib/active_fedora/autosave_association.rb

@@ -75,7 +75,7 @@ module ActiveFedora
   module AutosaveAssociation
     extend ActiveSupport::Concern
 
-    ASSOCIATION_TYPES = %w(HasMany BelongsTo HasAndBelongsToMany DirectlyContains IndirectlyContains).freeze
+    ASSOCIATION_TYPES = %w( HasMany BelongsTo HasAndBelongsToMany DirectlyContains IndirectlyContains).freeze
 
     module AssociationBuilderExtension #:nodoc:
       def self.included(base)

data/lib/active_fedora/file.rb

@@ -252,7 +252,17 @@ module ActiveFedora
         return @content if new_record?
 
         @content ||= ensure_fetch ? remote_content : @ds_content
-        @content.rewind if behaves_like_io?(@content)
+
+        if behaves_like_io?(@content)
+          begin
+            @content.rewind
+            @content.read
+          ensure
+            @content.rewind
+          end
+        else
+          @content
+        end
         @content
       end
   end

data/lib/active_fedora/indexing/map.rb

@@ -16,7 +16,7 @@ module ActiveFedora::Indexing
 
     # this enables a cleaner API for solr integration
     class IndexObject
-      attr_accessor :data_type, :behaviors
+      attr_accessor :data_type, :behaviors, :term
       attr_reader :key
 
       def initialize(name, &_block)
@@ -27,6 +27,7 @@ module ActiveFedora::Indexing
       end
 
       def as(*args)
+        @term = args.last.is_a?(Hash) ? args.pop : {}
         @behaviors = args
       end
 

data/lib/active_fedora/nested_attributes.rb

@@ -113,7 +113,7 @@ module ActiveFedora
 
       # Attribute hash keys that should not be assigned as normal attributes.
       # These hash keys are nested attributes implementation details.
-      UNASSIGNABLE_KEYS = %w(id _destroy).freeze
+      UNASSIGNABLE_KEYS = %w( id _destroy ).freeze
 
       def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
         options = nested_attributes_options[association_name]

data/lib/active_fedora/rdf/field_map.rb

@@ -70,10 +70,12 @@ module ActiveFedora::RDF
       end
     end
 
-    # Builds a FieldMap entry for a resource such as an ActiveFedora::Base object and returns the uri as the value.
+    # Builds a FieldMap entry for a resource such as an ActiveFedora::Base object and returns the uri as the value
+    # unless :using has been set as an option to the index.as block on the property in question. In that case, the
+    # symbol assigned to :using will used as the value.
     class ResourceBuilder < Builder
       def find_values
-        object.send(name).map(&:uri)
+        object.send(name).map(&index_field_config.term.fetch(:using, :uri))
       end
     end
 

data/lib/active_fedora/relation/finder_methods.rb

@@ -260,13 +260,13 @@ module ActiveFedora
       # @param [Hash<Symbol,String>] conditions
       # @return [Array<String>]
       def create_query_from_hash(conditions)
-        conditions.map { |key, value| condition_to_clauses(key, value, ' OR ') }.compact
+        conditions.map { |key, value| condition_to_clauses(key, value) }.compact
       end
 
       # @param [Symbol] key
       # @param [String] value
-      def condition_to_clauses(key, value, join_with = SolrQueryBuilder.default_join_with)
-        SolrQueryBuilder.construct_query([[field_name_for(key), value]], join_with)
+      def condition_to_clauses(key, value)
+        SolrQueryBuilder.construct_query([[field_name_for(key), value]])
       end
 
       # If the key is a property name, turn it into a solr field

data/lib/active_fedora/scoping/named.rb

@@ -13,7 +13,6 @@ module ActiveFedora
         #
         #   fruits = Fruit.all
         #   fruits = fruits.where(color: 'red') if options[:red_only]
-        #   fruits = fruits.where(size: ['big', 'little']) # gets big or little fruit
         #   fruits = fruits.limit(10) if limited?
         #
         # You can define a scope that applies to all finders using

data/lib/active_fedora/solr_query_builder.rb

@@ -32,7 +32,7 @@ module ActiveFedora
       #   # => _query_:"{!raw f=has_model_ssim}info:fedora/afmodel:ComplexCollection" OR _query_:"{!raw f=has_model_ssim}info:fedora/afmodel:ActiveFedora_Base"
       #
       #   construct_query_for_rel [[Book.reflect_on_association(:library), "foo/bar/baz"]]
-      def construct_query_for_rel(field_pairs, join_with = default_join_with)
+      def construct_query_for_rel(field_pairs, join_with = ' AND ')
         field_pairs = field_pairs.to_a if field_pairs.is_a? Hash
         construct_query(property_values_to_solr(field_pairs), join_with)
       end
@@ -44,15 +44,8 @@ module ActiveFedora
       # @example
       #   construct_query([['library_id_ssim', '123'], ['owner_ssim', 'Fred']])
       #   # => "_query_:\"{!raw f=library_id_ssim}123\" AND _query_:\"{!raw f=owner_ssim}Fred\""
-      def construct_query(field_pairs, join_with = default_join_with)
-        clauses = pairs_to_clauses(field_pairs)
-        return "" if clauses.count == 0
-        return clauses.first if clauses.count == 1
-        "(#{clauses.join(join_with)})"
-      end
-
-      def default_join_with
-        ' AND '
+      def construct_query(field_pairs, join_with = ' AND ')
+        pairs_to_clauses(field_pairs).join(join_with)
       end
 
       private

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.7.3".freeze
+  VERSION = "9.8.0".freeze
 end

data/lib/generators/active_fedora/config/fedora/templates/fedora.yml

@@ -1,12 +1,12 @@
 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:8983/fedora/rest
+  url: http://127.0.0.1:8984/rest
   base_path: /dev
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://localhost:8983/fedora/rest
+  url: http://localhost:8984/rest
   base_path: /test
 production:
   user: fedoraAdmin

data/lib/generators/active_fedora/config/solr/solr_generator.rb

@@ -6,7 +6,6 @@ module ActiveFedora
 
     def generate
       # Overwrite the configuration files that Blacklight has installed
-      copy_file 'jetty.yml', 'config/jetty.yml', force: true
       copy_file 'solr.yml', 'config/solr.yml', force: true
       directory 'solr_conf', 'solr_conf'
     end

data/lib/generators/active_fedora/config/solr/templates/solr.yml

@@ -1,7 +1,7 @@
 # This is a sample config file that points to a solr server for each environment
 development:
-  url: http://localhost:8983/solr/development
+  url: http://localhost:8983/solr/hydra-dev
 test:
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
+  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/hydra-test" %>
 production:
   url: http://your.production.server:8080/bl_solr/core0

data/lib/tasks/active_fedora_dev.rake

@@ -1,6 +1,7 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 
-require 'jettywrapper'
+require 'solr_wrapper'
+require 'fcrepo_wrapper'
 
 namespace :active_fedora do
   # Use yard to build docs
@@ -50,14 +51,18 @@ namespace :active_fedora do
   desc "CI build"
   task :ci do
     ENV['environment'] = "test"
-    Rake::Task["active_fedora:configure_jetty"].invoke
-    jetty_params = Jettywrapper.load_config
-    error = Jettywrapper.wrap(jetty_params) do
-      Rake::Task['active_fedora:coverage'].invoke
+    # Rake::Task["active_fedora:configure_jetty"].invoke
+    # jetty_params = Jettywrapper.load_config
+    solr_params = { port: 8983, verbose: true, managed: true }
+    fcrepo_params = { port: 8984, verbose: true, managed: true }
+    error = nil
+    SolrWrapper.wrap(solr_params) do |solr|
+      solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "config")) do
+        FcrepoWrapper.wrap(fcrepo_params) do
+          Rake::Task['active_fedora:coverage'].invoke
+        end
+      end
     end
-    raise "test failures: #{error}" if error
-    # Only create documentation if the tests have passed
-    Rake::Task["active_fedora:doc"].invoke
   end
 
   desc "Execute specs with coverage"