active-fedora 9.0.0.beta6 → 9.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8fb1d0fea1b50349e3da9a6cb685e3865fcb716
-  data.tar.gz: 518c8edc13fd3a87ef09c7022eee3d6a29c2ddb0
+  metadata.gz: 0efb77ba5a2ca5e2a3a904bf1f6181eb8ec1b7b6
+  data.tar.gz: f3996a300d97a4237839bb8875754a5c8eb8a54d
 SHA512:
-  metadata.gz: 5c0bce8730af54df688fc1a3c0d5f41bc7df148070b21bfbeb81246c7766f650d73abf12b70deb3cefc415e40d416fb31c7856808705be923886334ced6200de
-  data.tar.gz: f6467c70c153178f4c190a42d084727093b57387fe571d8a33722ca3bfea90b5ef4d2f9dd043ccac253e6ec8cef808889c255f31a6fe6bc37af0e1f732f40201
+  metadata.gz: cb3b8dc10a355f976a397a67ae4d638a4de029bab93dbe63993e317890e1a3b0c9e75e7403c29b2accb349a1ee1e14984321aa4877aed56bb0a91dd2d8152922
+  data.tar.gz: 8305e854f8477f0796b094cbf7e048874971687801d7d19450c05b22a82b9f8e016c316f0c4b13c24144b3956026898a3ee6a2d8d5aed7450802ef0e76e9b60e

data/active-fedora.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rdf-rdfxml", '~> 1.1.0'
   s.add_dependency "linkeddata"
   s.add_dependency "deprecation"
-  s.add_dependency "ldp", '~> 0.1.0'
+  s.add_dependency "ldp", '~> 0.2.0'
   s.add_dependency "rdf-ldp"
 
   s.add_development_dependency "rdoc"

data/lib/active_fedora/associations/collection_association.rb

@@ -292,8 +292,9 @@ module ActiveFedora
       # @param opts [Hash] Options that will be passed through to ActiveFedora::SolrService.query.
       def load_from_solr(opts = Hash.new)
         return [] if @finder_query.empty?
-        solr_opts = {rows: opts.delete(:rows) || count}
-        SolrService.query(@finder_query, solr_opts.merge(opts))
+        rows = opts.delete(:rows) { count }
+        return [] if rows == 0
+        SolrService.query(@finder_query, {rows: rows}.merge(opts))
       end
 
       def add_to_target(record, skip_callbacks = false)

data/lib/active_fedora/attributes.rb

@@ -40,8 +40,8 @@ module ActiveFedora
         # This is for id attributes stored in the rdf graph.
         assoc.reader
       elsif self.class.properties.key?(key.to_s)
-        # The attribute is stored in the RDF graph for this object
-        resource[key]
+        # Use the generated method so that single value assetions are single
+        self.send(key)
       else
         # The attribute is a delegate to a datastream
         array_reader(key)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.0.beta6"
+  VERSION = "9.0.0.beta7"
 end

data/spec/integration/collection_association_spec.rb

@@ -9,22 +9,29 @@ describe ActiveFedora::Base do
       belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasMember
     end
   end
+
   let(:library) { Library.create! }
   let!(:book1) { Book.create!(library: library) }
   let!(:book2) { Book.create!(library: library) }
+
   after do
-    Book.delete_all
-    Library.delete_all
     Object.send(:remove_const, :Library)
     Object.send(:remove_const, :Book)
   end
+
   describe "load_from_solr" do
     it "should set rows to count, if not specified" do
       expect(library.books(response_format: :solr).size).to eq 2
     end
+
     it "should limit rows returned if option passed" do
       expect(library.books(response_format: :solr, rows: 1).size).to eq 1
     end
+
+    it "should not query solr if rows is 0" do
+      expect(ActiveFedora::SolrService).not_to receive(:query)
+      expect(library.books(response_format: :solr, rows: 0)).to eq []
+    end
   end
 
   describe "#delete_all" do

data/spec/unit/attributes_spec.rb

@@ -405,8 +405,24 @@ describe ActiveFedora::Base do
     let(:obj) { BarHistory4.new(title: ['test1']) }
     subject { obj }
 
-    it "should be able to access the attributes" do
-      expect(subject.title).to eq ['test1']
+    describe "accessing attributes" do
+      context "using generated methods" do
+        it "should return values" do
+          expect(subject.title).to eq ['test1']
+        end
+      end
+
+      context "using hash accessors" do
+        context "on single value fields" do
+          it "should have a default value" do
+            expect(subject[:abstract]).to be_nil
+          end
+
+          it "should return values" do
+            expect(subject[:title]).to eq ['test1']
+          end
+        end
+      end
     end
 
     context "indexing" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta6
+  version: 9.0.0.beta7
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -130,14 +130,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rdf-ldp
   requirement: !ruby/object:Gem::Requirement