active-fedora 4.4.0 → 4.4.1

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.4.0)
+    active-fedora (4.4.1)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
+      deprecation
       equivalent-xml
       mediashelf-loggable
       om (~> 1.6.0)
       rdf
       rdf-rdfxml (~> 0.3.8)
       rsolr
-      rubydora (~> 0.5.10)
+      rubydora (~> 0.5.11)
       solrizer (~> 1.2.0)
 
 GEM
@@ -30,12 +31,14 @@ GEM
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
-    backports (2.6.1)
+    backports (2.6.2)
     builder (3.0.0)
     childprocess (0.3.3)
       ffi (~> 1.0.6)
     columnize (0.3.6)
     daemons (1.1.8)
+    deprecation (0.0.5)
+      activesupport
     diff-lcs (1.1.3)
     equivalent-xml (0.2.9)
       nokogiri (>= 1.4.3)
@@ -43,7 +46,8 @@ GEM
     ffi (1.0.11)
     gyoku (0.4.6)
       builder (>= 2.1.2)
-    httpi (1.1.0)
+    hooks (0.2.0)
+    httpi (1.1.1)
       rack
     i18n (0.6.0)
     jettywrapper (1.3.0)
@@ -62,7 +66,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
     nokogiri (1.5.5)
-    nori (1.1.0)
+    nori (1.1.3)
     om (1.6.1)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
@@ -96,10 +100,12 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.5.10)
+    rubydora (0.5.11)
       activemodel
       activesupport
+      deprecation
       fastercsv
+      hooks
       mime-types
       nokogiri
       rest-client

data/History.txt

@@ -1,3 +1,7 @@
+4.4.1
+HYDRA-834 find(:all) should work on ActiveFedora::Base
+update AF to hide the deprecation warnings introduced in rubydora 0.5.11
+
 4.4.0
 Updated gem dependencies
 Deprecated #find_by_solr()

data/active-fedora.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
-  s.add_dependency("rubydora", '~>0.5.10')
+  s.add_dependency("rubydora", '~>0.5.11')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>0.3.8')
+  s.add_dependency("deprecation")
   s.add_development_dependency("yard")
   s.add_development_dependency("RedCloth") # for RDoc formatting
   s.add_development_dependency("rake")

data/lib/active_fedora/digital_object.rb

@@ -4,6 +4,16 @@ module ActiveFedora
     attr_accessor :original_class
     
     def self.find(original_class, pid)
+      conn = original_class.connection_for_pid(pid)
+      obj = Deprecation.silence(Rubydora::DigitalObject) do
+        super(pid, conn)
+      end
+      obj.original_class = original_class
+      raise ActiveFedora::ObjectNotFoundError, "Unable to find '#{pid}' in fedora" if obj.new?
+      obj
+    end
+
+    def self.find_or_initialize(original_class, pid)
       conn = original_class.connection_for_pid(pid)
       obj = super(pid, conn)
       obj.original_class = original_class

data/lib/active_fedora/model.rb

@@ -5,9 +5,7 @@ module ActiveFedora
   # This module mixes various methods into the including class,
   # much in the way ActiveRecord does.  
   module Model 
-    def self.included(klass) # :nodoc:
-      klass.extend(ClassMethods)
-    end
+    extend ActiveSupport::Concern
     
     # Takes a Fedora URI for a cModel and returns classname, namespace
     def self.classname_from_uri(uri)
@@ -164,7 +162,7 @@ module ActiveFedora
       # @param[String] pid 
       # @return[boolean] 
       def exists?(pid)
-        inner = DigitalObject.find(self, pid)
+        inner = DigitalObject.find_or_initialize(self, pid)
         !inner.new?
       end
 
@@ -334,12 +332,11 @@ module ActiveFedora
       # Returns a solr query for the supplied conditions
       # @param[Hash] conditions solr conditions to match
       def create_query(conditions)
-        return '' unless conditions
         conditions.kind_of?(Hash) ? create_query_from_hash(conditions) : create_query_from_string(conditions)
       end
 
       def create_query_from_hash(conditions)
-        clauses = [search_model_clause]
+        clauses = search_model_clause ?  [search_model_clause] : []
         conditions.each_pair do |key,value|
           unless value.nil?
             if value.is_a? Array
@@ -353,7 +350,7 @@ module ActiveFedora
             end
           end
         end
-
+        return "*:*" if clauses.empty?
         clauses.compact.join(" AND ")
       end
 
@@ -380,11 +377,9 @@ module ActiveFedora
       #   Book.find_one("hydra:dataset1") 
       def find_one(pid, cast=false)
         inner = DigitalObject.find(self, pid)
-        raise ActiveFedora::ObjectNotFoundError, "Unable to find '#{pid}' in fedora" if inner.new?
         af_base = self.allocate.init_with(inner)
         cast ? af_base.adapt_to_cmodel : af_base
       end
-
     end
 
     private 

data/lib/active_fedora/unsaved_digital_object.rb

@@ -26,7 +26,7 @@ module ActiveFedora
 
     ### Change this into a real digital object
     def save
-      obj = DigitalObject.find(self.original_class, assign_pid)
+      obj = DigitalObject.find_or_initialize(self.original_class, assign_pid)
       self.datastreams.each do |k, v|
         v.digital_object = obj
         obj.datastreams[k] = v

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "4.4.0"
+  VERSION = "4.4.1"
 end

data/spec/unit/model_spec.rb

@@ -19,24 +19,41 @@ describe ActiveFedora::Model do
   
   describe '#find' do
     describe "without :cast" do
-      it "(:all) should query solr for all objects with :active_fedora_model_s of self.class" do
-        SpecModel::Basic.expects(:find_one).with("changeme:30", nil).returns("Fake Object1")
-        SpecModel::Basic.expects(:find_one).with("changeme:22", nil).returns("Fake Object2")
-        mock_docs = mock('docs')
-        mock_docs.expects(:each).multiple_yields([{"id" => "changeme:30"}],[{"id" => "changeme:22"}])
-        mock_docs.expects(:has_next?).returns(false)
-        ActiveFedora::SolrService.instance.conn.expects(:paginate).with(1, 1000, 'select', :params=>{:q=>'has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :qt => 'standard', :sort => ['system_create_dt asc'], :fl=> 'id', }).returns('response'=>{'docs'=>mock_docs})
-        SpecModel::Basic.find(:all).should == ["Fake Object1", "Fake Object2"]
-      end
-      it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
-        SpecModel::Basic.any_instance.expects(:init_with).returns(SpecModel::Basic.new)
-        ActiveFedora::DigitalObject.expects(:find).returns(stub("inner obj", :'new?'=>false))
-        SpecModel::Basic.find("_PID_").should be_a SpecModel::Basic
+      describe ":all" do
+        describe "called on a concrete class" do
+          it "should query solr for all objects with :has_model_s of self.class" do
+            SpecModel::Basic.expects(:find_one).with("changeme:30", nil).returns("Fake Object1")
+            SpecModel::Basic.expects(:find_one).with("changeme:22", nil).returns("Fake Object2")
+            mock_docs = mock('docs')
+            mock_docs.expects(:each).multiple_yields([{"id" => "changeme:30"}],[{"id" => "changeme:22"}])
+            mock_docs.expects(:has_next?).returns(false)
+            ActiveFedora::SolrService.instance.conn.expects(:paginate).with(1, 1000, 'select', :params=>{:q=>'has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :qt => 'standard', :sort => ['system_create_dt asc'], :fl=> 'id', }).returns('response'=>{'docs'=>mock_docs})
+            SpecModel::Basic.find(:all).should == ["Fake Object1", "Fake Object2"]
+          end
+        end
+        describe "called without a specific class" do
+          it "should specify a q parameter" do
+            ActiveFedora::Base.expects(:find_one).with("changeme:30", nil).returns("Fake Object1")
+            ActiveFedora::Base.expects(:find_one).with("changeme:22", nil).returns("Fake Object2")
+            mock_docs = mock('docs')
+            mock_docs.expects(:each).multiple_yields([{"id" => "changeme:30"}],[{"id" => "changeme:22"}])
+            mock_docs.expects(:has_next?).returns(false)
+            ActiveFedora::SolrService.instance.conn.expects(:paginate).with(1, 1000, 'select', :params=>{:q=>'*:*', :qt => 'standard', :sort => ['system_create_dt asc'], :fl=> 'id', }).returns('response'=>{'docs'=>mock_docs})
+            ActiveFedora::Base.find(:all).should == ["Fake Object1", "Fake Object2"]
+          end
+        end
       end
-      it "should raise an exception if it is not found" do
-        Rubydora::Repository.any_instance.expects(:object).raises(RestClient::ResourceNotFound)
-        SpecModel::Basic.expects(:connection_for_pid).with("_PID_")
-        lambda {SpecModel::Basic.find("_PID_")}.should raise_error ActiveFedora::ObjectNotFoundError
+      describe "and a pid is specified" do
+        it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
+          SpecModel::Basic.any_instance.expects(:init_with).returns(SpecModel::Basic.new)
+          ActiveFedora::DigitalObject.expects(:find).returns(stub("inner obj", :'new?'=>false))
+          SpecModel::Basic.find("_PID_").should be_a SpecModel::Basic
+        end
+        it "should raise an exception if it is not found" do
+          Rubydora::Repository.any_instance.expects(:object).raises(RestClient::ResourceNotFound)
+          SpecModel::Basic.expects(:connection_for_pid).with("_PID_")
+          lambda {SpecModel::Basic.find("_PID_")}.should raise_error ActiveFedora::ObjectNotFoundError
+        end
       end
     end
     describe "with :cast" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77306850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,15 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77306850
 - !ruby/object:Gem::Dependency
   name: om
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77306370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,15 +34,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
+  version_requirements: *77306370
 - !ruby/object:Gem::Dependency
   name: solrizer
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77305870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,15 +45,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+  version_requirements: *77305870
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77305030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,15 +56,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+  version_requirements: *77305030
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77304400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,15 +67,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+  version_requirements: *77304400
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77303790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -103,15 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77303790
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77758110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -119,31 +89,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77758110
 - !ruby/object:Gem::Dependency
   name: rubydora
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77757570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: 0.5.11
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.10
+  version_requirements: *77757570
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77757000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -151,15 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77757000
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77755670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,31 +122,32 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.8
+  version_requirements: *77755670
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
+  name: deprecation
+  requirement: &77755040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *77755040
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &77754090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *77754090
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77753270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,15 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77753270
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77752250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -215,15 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77752250
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77751360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,15 +177,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+  version_requirements: *77751360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77750230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -247,28 +188,18 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+  version_requirements: *77750230
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77766090 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.10.5
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.5
+  version_requirements: *77766090
 description: ActiveFedora provides for creating and managing objects in the Fedora
   Repository Architecture.
 email:
@@ -507,7 +438,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -160565939
+      hash: -434881585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -516,10 +447,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -160565939
+      hash: -434881585
 requirements: []
 rubyforge_project: rubyfedora
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A convenience libary for manipulating documents in the Fedora Repository.