active_fedora_finders 0.1.1 → 0.1.2

data/lib/active_fedora_finders.rb

@@ -25,25 +25,12 @@ module ActiveFedora
       fk
     end
 
-    included do
-      class << self
-        alias_method :active_fedora_find, :find
-      end
-    end
-
     module ClassMethods    
-      def find(args)
-        if args.is_a? String
-          return active_fedora_find(args)
-        else
-          return find_by_conditions(nil, args)
-        end
-      end
         
       # modeled after ActiveRecord::FinderMethods.find_by_attributes
       def find_by_attributes(match, attribute_names, *args)
         conditions = Hash[attribute_names.map {|a| [a, args[attribute_names.index(a)]]}]
-        result = find_by_conditions(match, conditions)
+        result = fcrepo_find(match, conditions)
         if match.bang? && result.blank?
           raise ActiveRecord::RecordNotFound, "Couldn't find #{self.name} with #{conditions.to_a.collect {|p| p.join(' = ')}.join(', ')}"
         else
@@ -52,7 +39,7 @@ module ActiveFedora
         end
       end
     
-      def find_by_conditions(match, args)
+      def fcrepo_find(match, args)
         parms = args.dup
         maxResults = (match.nil? or match.finder == :first) ? 1 : 25 # find_all and find_last not yet supported    
         query = ""
@@ -84,20 +71,24 @@ module ActiveFedora
       def process_results(results)
         results = Nokogiri::XML.parse(results)
         results = results.xpath('/f:result/f:resultList/f:objectFields/f:pid',{'f'=>"http://www.fedora.info/definitions/1/0/types/"})
-        results.collect { |result| active_fedora_find(result.text) }
+        results.collect { |result| find_one(result.text) }
       end
       
       # this method is patterned after an analog in ActiveRecord::DynamicMatchers
       def all_attributes_exists?(attribute_names)
+        attribute_names.reduce(true) {|result, att| ALL_FIELDS.include? att or SUPPORTED_ALTS.include? att}
+      end
+      
+      def normalize_attribute_names!(attribute_names)
         field_keys = attribute_names.map {|val| FIELD_KEYS[val] or val}
         attribute_names.replace field_keys
-        attribute_names.reduce(true) {|result, att| ALL_FIELDS.include? att or SUPPORTED_ALTS.include? att}
       end
       
       # adapted from ActiveRecord::DynamicMatchers
       def method_missing(method_id, *arguments, &block)
         if match = (ActiveRecord::DynamicFinderMatch.match(method_id) || ActiveRecord::DynamicScopeMatch.match(method_id))
           attribute_names = match.attribute_names
+          normalize_attribute_names!(attribute_names)
           super unless all_attributes_exists?(attribute_names)
           if !(match.is_a?(ActiveRecord::DynamicFinderMatch) && match.instantiator? && arguments.first.is_a?(Hash)) && arguments.size < attribute_names.size
             method_trace = "#{__FILE__}:#{__LINE__}:in `#{method_id}'"

data/lib/active_fedora_finders/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module Finders
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/spec/finders_spec.rb

@@ -11,21 +11,21 @@ describe ActiveFedora::Finders do
   describe "finder methods" do
     describe "default find method" do
       it "should call the normal find method when passed a string" do
-        TestBase.expects(:active_fedora_find).returns TestBase.new
+        TestBase.expects(:find_one).returns TestBase.new
         TestBase.find(FCREPO_ID)
       end
     end
     describe "dynamic finder methods" do
       it "should call .find_by_conditions with correct attributes" do
-        TestBase.expects(:find_by_conditions).with(is_a(ActiveRecord::DynamicFinderMatch), :identifier => FCREPO_ID).returns(TestBase.new)
+        TestBase.expects(:fcrepo_find).with(is_a(ActiveRecord::DynamicFinderMatch), :identifier => FCREPO_ID).returns(TestBase.new)
         TestBase.find_by_identifier(FCREPO_ID)
-        TestBase.expects(:find_by_conditions).with(is_a(ActiveRecord::DynamicFinderMatch), :cDate => FCREPO_DATE, :identifier => FCREPO_ID).returns(TestBase.new)
+        TestBase.expects(:fcrepo_find).with(is_a(ActiveRecord::DynamicFinderMatch), :cDate => FCREPO_DATE, :identifier => FCREPO_ID).returns(TestBase.new)
         TestBase.find_by_create_date_and_identifier(FCREPO_DATE, FCREPO_ID)
       end
       it "should return an ActiveFedora::Base when there is a single result" do
         stubfedora = mock("Fedora")
         stubfedora.expects(:connection).returns(mock("Connection", :find_objects =>fixture('find_one.xml')))
-        TestBase.expects(:active_fedora_find).with(FCREPO_ID).returns TestBase.new(:pid=>FCREPO_ID)
+        TestBase.expects(:find_one).with(FCREPO_ID).returns TestBase.new(:pid=>FCREPO_ID)
         ActiveFedora::Base.fedora_connection = [stubfedora]
         TestBase.find_by_identifier(FCREPO_ID).should be_a TestBase
       end
@@ -33,8 +33,8 @@ describe ActiveFedora::Finders do
         stubfedora = mock("Fedora")
         stubfedora.expects(:connection).returns(mock("Connection", :find_objects =>fixture('find_multiple.xml')))
         ActiveFedora::Base.fedora_connection = [stubfedora]
-        TestBase.expects(:active_fedora_find).with(FCREPO_ID).returns TestBase.new(:pid=>FCREPO_ID)
-        TestBase.expects(:active_fedora_find).with("demo:1").returns TestBase.new(:pid=>"demo:1")
+        TestBase.expects(:find_one).with(FCREPO_ID).returns TestBase.new(:pid=>FCREPO_ID)
+        TestBase.expects(:find_one).with("demo:1").returns TestBase.new(:pid=>"demo:1")
         TestBase.find_all_by_source("test").should be_a Array
       end
       it "should throw an error when no results and a bang" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora_finders
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora