active-fedora 9.7.1 → 9.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b84c2ad365e0934c1c9a6900e855dad6e3e0fb89
-  data.tar.gz: 138dc99577501a383818150e1e3ce25622312d90
+  metadata.gz: c903212b65a47dbc4d8bead4344376b8bbf354b1
+  data.tar.gz: ad8c00c8a9b6ece12d54255179838f0704a78e14
 SHA512:
-  metadata.gz: 045396d2d76fc88b5f1ceb99340cb5dfebf6b0af631c13f2ae22d15c5de243758aeaf0717221cb202f310b846b2541f588e941741a081e8f16a71577c214ef76
-  data.tar.gz: 42aa7a98b66b0dcc517aa67ec26889b84850bc195d2f7d6b444520f0de9afc890a5144e553906982e6181542a129d616f8d9cfec36bd02f49d8a54d0d84a2a68
+  metadata.gz: e349533000a57afd4a8bf6c189c553cf37cd90e6bd9e9b546557d45a497f88b4eace2de8a4434a039c855f7cb2c4668ca5a3254b064461239d6d72bd2a67585a
+  data.tar.gz: 11e2b687b719ff380e269938cdb25ee823c11b334d38e6f2dd244abcf35e9779e4483c3f9eae76e6181bae3fa721ddb277b5d045eab69c6b99fcf21460a61d0c

data/.rubocop.yml

@@ -1,5 +1,3 @@
-require: rubocop-rspec
-
 AllCops:
   TargetRubyVersion: 2.2
   DisplayCopNames: true
@@ -14,6 +12,7 @@ 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:
@@ -45,6 +44,9 @@ 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:
@@ -58,6 +60,10 @@ 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:
@@ -67,6 +73,7 @@ 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:
@@ -76,8 +83,13 @@ 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
@@ -101,6 +113,7 @@ 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'
@@ -113,10 +126,14 @@ 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:
@@ -203,6 +220,10 @@ Style/FileName:
     - 'lib/active-fedora.rb'
     - 'spec/samples/hydra-mods_article_datastream.rb'
 
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'lib/active_fedora/file/attributes.rb'
+
 Rails:
   Enabled: true
 
@@ -216,6 +237,9 @@ Rails/Date:
 Rails/TimeZone:
   Enabled: false
 
+RSpec/AnyInstance:
+  Enabled: false
+
 RSpec/ExampleWording:
   CustomTransform:
     be: is
@@ -238,3 +262,6 @@ RSpec/DescribeClass:
 RSpec/DescribedClass:
   Exclude:
     - 'spec/unit/finder_methods_spec.rb'
+
+RSpec/NotToNot:
+  Enabled: false

data/History.txt

@@ -1,3 +1,8 @@
+v9.7.2
+ 2016-06-30 : Sending multiple values from a where cluase will join with OR [Carolyn Cole]
+
+ 2016-06-29 : Fixing rubocop for latest version [Carolyn Cole]
+
 v9.7.1
  2016-01-22 : The jcr/mix versionable predicate is no longer used [Adam Wead]
  

data/active-fedora.gemspec

@@ -32,8 +32,8 @@ Gem::Specification.new do |s|
   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.34'
-  s.add_development_dependency "rubocop-rspec", '~> 1.3'
+  s.add_development_dependency "rubocop", '~> 0.38.0'
+  s.add_development_dependency "rubocop-rspec", '~> 1.4.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")

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/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/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) }.compact
+        conditions.map { |key, value| condition_to_clauses(key, value, ' OR ') }.compact
       end
 
       # @param [Symbol] key
       # @param [String] value
-      def condition_to_clauses(key, value)
-        SolrQueryBuilder.construct_query([[field_name_for(key), value]])
+      def condition_to_clauses(key, value, join_with = SolrQueryBuilder.default_join_with)
+        SolrQueryBuilder.construct_query([[field_name_for(key), value]], join_with)
       end
 
       # If the key is a property name, turn it into a solr field

data/lib/active_fedora/scoping/named.rb

@@ -13,6 +13,7 @@ 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 = ' AND ')
+      def construct_query_for_rel(field_pairs, join_with = default_join_with)
         field_pairs = field_pairs.to_a if field_pairs.is_a? Hash
         construct_query(property_values_to_solr(field_pairs), join_with)
       end
@@ -44,8 +44,15 @@ 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 = ' AND ')
-        pairs_to_clauses(field_pairs).join(join_with)
+      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 '
       end
 
       private

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.7.1".freeze
+  VERSION = "9.7.2".freeze
 end

data/spec/integration/datastream_rdf_nested_attributes_spec.rb

@@ -91,8 +91,7 @@ describe "Nesting attribute behavior of RDFDatastream" do
               }
               # , "Hemings, Sally"
             ]
-          }
-        }
+          } }
       end
 
       describe "on lists" do
@@ -160,7 +159,8 @@ describe "Nesting attribute behavior of RDFDatastream" do
           { label: 'Alternator' },
           { label: 'Distributor' },
           { label: 'Transmission' },
-          { label: 'Fuel Filter' }] }
+          { label: 'Fuel Filter' }
+        ] }
       end
       let(:replace_object_id) { subject.parts[1].rdf_subject.to_s }
       let(:remove_object_id) { subject.parts[3].rdf_subject.to_s }

data/spec/integration/has_and_belongs_to_many_associations_spec.rb

@@ -34,7 +34,7 @@ describe ActiveFedora::Base do
         end
 
         it "allows for more than 10 items" do
-          (1..12).each do
+          12.times do
             book.topics << Topic.create
           end
           book.save

data/spec/integration/scoped_query_spec.rb

@@ -39,7 +39,7 @@ describe ActiveFedora::Querying do
         result = ModelIntegrationSpec::Basic.all.to_a
         expect(result).to be_instance_of(Array)
         # this test is meaningless if the array length is zero
-        expect(result.length > 0).to be true
+        expect(result).not_to be_empty
         expect(result).to all(be_an(ModelIntegrationSpec::Basic))
       end
     end
@@ -67,6 +67,7 @@ describe ActiveFedora::Querying do
         field = ActiveFedora::SolrQueryBuilder.solr_name('foo', type: :string)
         expect(ModelIntegrationSpec::Basic.where(field => 'Beta')).to eq [test_instance1]
         expect(ModelIntegrationSpec::Basic.where('foo' => 'Beta')).to eq [test_instance1]
+        expect(ModelIntegrationSpec::Basic.where('foo' => ['Beta', 'Alpha'])).to eq [test_instance1, test_instance2]
       end
       it "orders" do
         expect(ModelIntegrationSpec::Basic.order(ActiveFedora::SolrQueryBuilder.solr_name('foo', :sortable) + ' asc')).to eq [test_instance2, test_instance1, test_instance3]

data/spec/samples/hydra-mods_article_datastream.rb

@@ -253,8 +253,7 @@ module Hydra
         "edt" => "Editor",
         "ill" => "Illustrator",
         "oth" => "Other",
-        "trl" => "Translator"
-       }
+        "trl" => "Translator" }
     end
 
     def self.person_relator_terms
@@ -268,8 +267,7 @@ module Hydra
         "res" => "Researcher",
         "rth" => "Research team head",
         "rtm" => "Research team member",
-        "trl" => "Translator"
-       }
+        "trl" => "Translator" }
     end
 
     def self.conference_relator_terms

data/spec/unit/finder_methods_spec.rb

@@ -43,8 +43,8 @@ describe ActiveFedora::FinderMethods do
 
     context "when value is an array" do
       let(:value) { ['one', 'four'] }
-      it { is_expected.to eq "_query_:\"{!raw f=library_id}one\" AND " \
-                             "_query_:\"{!raw f=library_id}four\"" }
+      it { is_expected.to eq "(_query_:\"{!raw f=library_id}one\" AND " \
+                             "_query_:\"{!raw f=library_id}four\")" }
     end
   end
 end

data/spec/unit/query_spec.rb

@@ -78,8 +78,8 @@ describe ActiveFedora::Base do
     let(:solr) { ActiveFedora::SolrService.instance.conn }
     let(:expected_query) { "#{model_query} AND " \
                            "_query_:\"{!raw f=foo}bar\" AND " \
-                           "_query_:\"{!raw f=baz}quix\" AND " \
-                           "_query_:\"{!raw f=baz}quack\"" }
+                           "(_query_:\"{!raw f=baz}quix\" OR " \
+                           "_query_:\"{!raw f=baz}quack\")" }
     let(:expected_params) { { params: { sort: [sort_query], fl: 'id', q: expected_query, qt: 'standard' } } }
     let(:expected_sort_params) { { params: { sort: ["title_t desc"], fl: 'id', q: expected_query, qt: 'standard' } } }
     let(:mock_docs) { [{ "id" => "changeme:30" }, { "id" => "changeme:22" }] }
@@ -137,8 +137,8 @@ describe ActiveFedora::Base do
       let(:solr) { ActiveFedora::SolrService.instance.conn }
       let(:expected_query) { "#{model_query} AND " \
                              "_query_:\"{!raw f=foo}bar\" AND " \
-                             "_query_:\"{!raw f=baz}quix\" AND " \
-                             "_query_:\"{!raw f=baz}quack\"" }
+                             "(_query_:\"{!raw f=baz}quix\" OR " \
+                             "_query_:\"{!raw f=baz}quack\")" }
       let(:expected_params) { { params: { sort: [sort_query], fl: 'id', q: expected_query, qt: 'standard' } } }
       let(:mock_docs) { [{ "id" => "changeme-30" }, { "id" => "changeme-22" }] }
 
@@ -158,8 +158,8 @@ describe ActiveFedora::Base do
       let(:solr) { ActiveFedora::SolrService.instance.conn }
       let(:expected_query) { "#{model_query} AND " \
                              "_query_:\"{!raw f=foo}bar\" AND " \
-                             "_query_:\"{!raw f=baz}quix\" AND " \
-                             "_query_:\"{!raw f=baz}quack\"" }
+                             "(_query_:\"{!raw f=baz}quix\" OR " \
+                             "_query_:\"{!raw f=baz}quack\")" }
       let(:expected_params) { { params: { sort: [sort_query], fl: 'id', q: expected_query, qt: 'standard' } } }
       let(:mock_docs) { double('docs') }
 
@@ -253,8 +253,8 @@ describe ActiveFedora::Base do
     context "with a hash of conditions" do
       let(:expected_query) { "#{model_query} AND " \
                              "_query_:\"{!raw f=foo}bar\" AND " \
-                             "_query_:\"{!raw f=baz}quix\" AND " \
-                             "_query_:\"{!raw f=baz}quack\"" }
+                             "(_query_:\"{!raw f=baz}quix\" OR " \
+                             "_query_:\"{!raw f=baz}quack\")" }
       let(:conditions) { { foo: 'bar', baz: ['quix', 'quack'] } }
 
       it "makes a query to solr and returns the results" do
@@ -265,8 +265,8 @@ describe ActiveFedora::Base do
     context "with quotes in the params" do
       let(:expected_query) { "#{model_query} AND " \
                              "_query_:\"{!raw f=foo}9\\\" Nails\" AND " \
-                             "_query_:\"{!raw f=baz}7\\\" version\" AND " \
-                             "_query_:\"{!raw f=baz}quack\"" }
+                             "(_query_:\"{!raw f=baz}7\\\" version\" OR " \
+                             "_query_:\"{!raw f=baz}quack\")" }
       let(:conditions) { { foo: '9" Nails', baz: ['7" version', 'quack'] } }
 
       it "escapes quotes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.7.1
+  version: 9.7.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -256,28 +256,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.0
 description: ActiveFedora provides for creating and managing objects in the Fedora
   Repository Architecture.
 email:
@@ -638,7 +638,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.