active-fedora 10.3.0 → 11.0.0.rc1

data/lib/active_fedora/nested_attributes.rb

@@ -159,7 +159,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
 
       # Assigns the given attributes to the association.
       #
@@ -308,7 +308,7 @@ module ActiveFedora
         opts = nested_attributes_options[association_name]
         case callback = opts[:reject_if]
         when Symbol
-          method(callback).arity == 0 ? send(callback) : send(callback, attributes)
+          method(callback).arity.zero? ? send(callback) : send(callback, attributes)
         when Proc
           callback.call(attributes)
         end

data/lib/active_fedora/orders/list_node.rb

@@ -4,7 +4,7 @@ module ActiveFedora::Orders
     attr_accessor :prev, :next, :target
     attr_writer :next_uri, :prev_uri
     attr_accessor :proxy_in, :proxy_for
-    def initialize(node_cache, rdf_subject, graph = RDF::Graph.new)
+    def initialize(node_cache, rdf_subject, graph = RDF::Repository.new)
       @rdf_subject = rdf_subject
       @graph = graph
       @node_cache = node_cache
@@ -144,7 +144,7 @@ module ActiveFedora::Orders
         private
 
           def resource
-            @resource ||= Resource.new(uri, graph)
+            @resource ||= Resource.new(uri, data: graph)
           end
       end
 

data/lib/active_fedora/orders/ordered_list.rb

@@ -13,7 +13,11 @@ module ActiveFedora
       # @param [::RDF::URI] head_subject URI of head node in list.
       # @param [::RDF::URI] tail_subject URI of tail node in list.
       def initialize(graph, head_subject, tail_subject)
-        @graph = graph
+        @graph = if graph.respond_to?(:graph, true)
+                   graph.send(:graph).data
+                 else
+                   graph
+                 end
         @head_subject = head_subject
         @tail_subject = tail_subject
         @node_cache ||= NodeCache.new
@@ -86,7 +90,7 @@ module ActiveFedora
         node = build_node(new_node_subject)
         node.target = target
         node.proxy_in = proxy_in
-        if loc == 0
+        if loc.zero?
           append_to(node, head)
         else
           append_to(node, ordered_reader.take(loc).last)
@@ -99,7 +103,7 @@ module ActiveFedora
         node = build_node(new_node_subject)
         node.proxy_for = proxy_for
         node.proxy_in = proxy_in
-        if loc == 0
+        if loc.zero?
           append_to(node, head)
         else
           append_to(node, ordered_reader.take(loc).last)

data/lib/active_fedora/orders/target_proxy.rb

@@ -24,6 +24,10 @@ module ActiveFedora
         self
       end
 
+      def ids
+        association.reader.map(&:target_id)
+      end
+
       # Deletes the element at the specified index, returning that element, or nil if
       # the index is out of range.
       def delete_at(loc)

data/lib/active_fedora/rake_support.rb

@@ -21,7 +21,7 @@ def with_server(environment)
     unless Dir.exist?(solr_config_path)
       $stderr.puts "Solr configuration not found at #{solr_config_path}. Using ActiveFedora defaults"
       # Otherwise use the configs delivered with ActiveFedora.
-      solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), 'lib', 'generators', 'active_fedora', 'config', 'solr', 'templates', 'solr', 'config')
+      solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "config")
     end
     solr.with_collection(name: "hydra-#{environment}", dir: solr_config_path) do
       FcrepoWrapper.wrap(load_config(:fcrepo, environment, fcrepo_defaults)) do |fcrepo|

data/lib/active_fedora/rdf/persistence.rb

@@ -25,6 +25,7 @@ module ActiveFedora
 
       # Overrides ActiveTriples::Resource
       def persisted?
+        return true if frozen? && !datastream.new_record?
         @persisted ||= !datastream.new_record?
       end
     end

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -55,7 +55,13 @@ module ActiveFedora
     before_save do
       if content.blank?
         ActiveFedora::Base.logger.warn "Cowardly refusing to save a datastream with empty content: #{inspect}" if ActiveFedora::Base.logger
-        false
+        if ActiveSupport.respond_to?(:halt_callback_chains_on_return_false)
+          # For Rails 5+
+          throw :abort
+        else
+          # For Rails <= 4
+          false
+        end
       end
     end
 

data/lib/active_fedora/solr_hit.rb

@@ -46,15 +46,6 @@ module ActiveFedora
       end
     end
 
-    def instantiate_with_json
-      model.allocate.init_with_json(profile_json) do |allocated_object|
-        create_key = allocated_object.indexing_service.class.create_time_solr_name
-        modified_key = allocated_object.indexing_service.class.modified_time_solr_name
-        allocated_object.resource.set_value(:create_date, DateTime.parse(document[create_key])) if document[create_key]
-        allocated_object.resource.set_value(:modified_date, DateTime.parse(document[modified_key])) if document[modified_key]
-      end
-    end
-
     def reify(opts = {})
       model(opts).find(id, cast: true)
     end

data/lib/active_fedora/solr_query_builder.rb

@@ -33,7 +33,7 @@ module ActiveFedora
       #   # => "_query_:\"{!field f=library_id_ssim}123\" AND _query_:\"{!field 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 "" if clauses.count.zero?
         return clauses.first if clauses.count == 1
         "(#{clauses.join(join_with)})"
       end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "10.3.0".freeze
+  VERSION = "11.0.0.rc1".freeze
 end

data/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml

@@ -187,17 +187,6 @@
     </lst>
   </requestHandler>
 
-  <searchComponent name="termsComponent" class="solr.TermsComponent" />
-
-  <requestHandler name="/terms" class="solr.SearchHandler">
-    <lst name="defaults">
-      <bool name="terms">true</bool>
-    </lst>
-    <arr name="components">
-      <str>termsComponent</str>
-    </arr>
-  </requestHandler>
-
 <!-- Spell Check
 
         The spell check component can return a list of alternative spelling

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

@@ -1,5 +1,5 @@
 #config/solr_wrapper_test.yml
-# version: 6.1.0
+# version: 6.0.0
 port: 8985
 instance_dir: tmp/solr-test
 collection:

data/lib/generators/active_fedora/model/model_generator.rb

@@ -7,7 +7,7 @@ module ActiveFedora
 
     class_option :directory, type: :string, default: 'models', desc: "Which directory to generate? (i.e. app/DIRECTORY)"
     class_option :datastream_directory, type: :string, default: 'models/datastreams', desc: "Which datastream directory to generate? (i.e. models/datastreams)"
-    class_option :contains, type: :string, default: nil, desc: "Name a file to attach"
+    class_option :has_subresource, type: :string, default: nil, desc: "Name a file to attach"
     class_option :datastream, type: :string, default: nil, desc: "Name a metadata datastream to create"
 
     def install

data/lib/generators/active_fedora/model/templates/model.rb.erb

@@ -2,7 +2,7 @@
 #  `rails generate active_fedora:model <%= class_name %>`
 class <%= class_name %> < ActiveFedora::Base
   <% if options['datastream'] %>
-  contains :descMetadata, class_name: "<%= options['datastream'] %>"
+  has_subresource :descMetadata, class_name: "<%= options['datastream'] %>"
   <% else %>
   # Define some properties to store:
   #
@@ -19,12 +19,12 @@ class <%= class_name %> < ActiveFedora::Base
     index.as :stored_searchable
   end
   <%- end -%>
-  <% if options['contains'] %>
-  contains :<%= options['contains'] %>"
+  <% if options['has_subresource'] %>
+  has_subresource :<%= options['has_subresource'] %>"
   <% else %>
   # Uncomment the following lines to add an #attachment method that is a file
   #
-  # contains "attachment"
+  # has_subresource "attachment"
   <% end %>
   #
   # If you need to add additional attributes to the SOLR document, extend the default indexer:

data/lib/tasks/active_fedora_dev.rake

@@ -43,9 +43,9 @@ namespace :active_fedora do
 
   desc "CI build"
   task :ci do
+    Rake::Task['active_fedora:rubocop'].invoke unless ENV['NO_RUBOCOP']
     ENV['environment'] = "test"
     with_test_server do
-      Rake::Task['active_fedora:rubocop'].invoke unless ENV['NO_RUBOCOP']
       Rake::Task['active_fedora:coverage'].invoke
     end
   end

data/solr/config/_rest_managed.json

@@ -0,0 +1,3 @@
+{
+  "initArgs":{},
+  "managedList":[]}

data/solr/config/admin-extra.html

@@ -0,0 +1,31 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The content of this page will be statically included into the top
+of the admin page.  Uncomment this as an example to see there the content
+will show up.
+
+<hr>
+<i>This line will appear before the first table</i>
+<tr>
+<td colspan="2">
+This row will be appended to the end of the first table
+</td>
+</tr>
+<hr>
+
+-->

data/solr/config/elevate.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- If this file is found in the config directory, it will only be
+     loaded once at startup.  If it is found in Solr's data
+     directory, it will be re-loaded every commit.
+-->
+
+<elevate>
+ <query text="foo bar">
+  <doc id="1" />
+  <doc id="2" />
+  <doc id="3" />
+ </query>
+ 
+ <query text="ipod">
+   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
+   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
+ </query>
+ 
+</elevate>

data/solr/config/mapping-ISOLatin1Accent.txt

@@ -0,0 +1,246 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Syntax:
+#   "source" => "target"
+#     "source".length() > 0 (source cannot be empty.)
+#     "target".length() >= 0 (target can be empty.)
+
+# example:
+#   "??" => "A"
+#   "\u00C0" => "A"
+#   "\u00C0" => "\u0041"
+#   "??" => "ss"
+#   "\t" => " "
+#   "\n" => ""
+
+# ?? => A
+"\u00C0" => "A"
+
+# ?? => A
+"\u00C1" => "A"
+
+# ?? => A
+"\u00C2" => "A"
+
+# ?? => A
+"\u00C3" => "A"
+
+# ?? => A
+"\u00C4" => "A"
+
+# ?? => A
+"\u00C5" => "A"
+
+# ?? => AE
+"\u00C6" => "AE"
+
+# ?? => C
+"\u00C7" => "C"
+
+# ?? => E
+"\u00C8" => "E"
+
+# ?? => E
+"\u00C9" => "E"
+
+# ?? => E
+"\u00CA" => "E"
+
+# ?? => E
+"\u00CB" => "E"
+
+# ?? => I
+"\u00CC" => "I"
+
+# ?? => I
+"\u00CD" => "I"
+
+# ?? => I
+"\u00CE" => "I"
+
+# ?? => I
+"\u00CF" => "I"
+
+# ?? => IJ
+"\u0132" => "IJ"
+
+# ?? => D
+"\u00D0" => "D"
+
+# ?? => N
+"\u00D1" => "N"
+
+# ?? => O
+"\u00D2" => "O"
+
+# ?? => O
+"\u00D3" => "O"
+
+# ?? => O
+"\u00D4" => "O"
+
+# ?? => O
+"\u00D5" => "O"
+
+# ?? => O
+"\u00D6" => "O"
+
+# ?? => O
+"\u00D8" => "O"
+
+# ?? => OE
+"\u0152" => "OE"
+
+# ??
+"\u00DE" => "TH"
+
+# ?? => U
+"\u00D9" => "U"
+
+# ?? => U
+"\u00DA" => "U"
+
+# ?? => U
+"\u00DB" => "U"
+
+# ?? => U
+"\u00DC" => "U"
+
+# ?? => Y
+"\u00DD" => "Y"
+
+# ?? => Y
+"\u0178" => "Y"
+
+# ?? => a
+"\u00E0" => "a"
+
+# ?? => a
+"\u00E1" => "a"
+
+# ?? => a
+"\u00E2" => "a"
+
+# ?? => a
+"\u00E3" => "a"
+
+# ?? => a
+"\u00E4" => "a"
+
+# ?? => a
+"\u00E5" => "a"
+
+# ?? => ae
+"\u00E6" => "ae"
+
+# ?? => c
+"\u00E7" => "c"
+
+# ?? => e
+"\u00E8" => "e"
+
+# ?? => e
+"\u00E9" => "e"
+
+# ?? => e
+"\u00EA" => "e"
+
+# ?? => e
+"\u00EB" => "e"
+
+# ?? => i
+"\u00EC" => "i"
+
+# ?? => i
+"\u00ED" => "i"
+
+# ?? => i
+"\u00EE" => "i"
+
+# ?? => i
+"\u00EF" => "i"
+
+# ?? => ij
+"\u0133" => "ij"
+
+# ?? => d
+"\u00F0" => "d"
+
+# ?? => n
+"\u00F1" => "n"
+
+# ?? => o
+"\u00F2" => "o"
+
+# ?? => o
+"\u00F3" => "o"
+
+# ?? => o
+"\u00F4" => "o"
+
+# ?? => o
+"\u00F5" => "o"
+
+# ?? => o
+"\u00F6" => "o"
+
+# ?? => o
+"\u00F8" => "o"
+
+# ?? => oe
+"\u0153" => "oe"
+
+# ?? => ss
+"\u00DF" => "ss"
+
+# ?? => th
+"\u00FE" => "th"
+
+# ?? => u
+"\u00F9" => "u"
+
+# ?? => u
+"\u00FA" => "u"
+
+# ?? => u
+"\u00FB" => "u"
+
+# ?? => u
+"\u00FC" => "u"
+
+# ?? => y
+"\u00FD" => "y"
+
+# ?? => y
+"\u00FF" => "y"
+
+# ??? => ff
+"\uFB00" => "ff"
+
+# ??? => fi
+"\uFB01" => "fi"
+
+# ??? => fl
+"\uFB02" => "fl"
+
+# ??? => ffi
+"\uFB03" => "ffi"
+
+# ??? => ffl
+"\uFB04" => "ffl"
+
+# ??? => ft
+"\uFB05" => "ft"
+
+# ??? => st
+"\uFB06" => "st"