active-fedora 4.5.3 → 4.6.0.rc1

data/active-fedora.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency('solrizer', '~>1.2.0')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
+  s.add_dependency("builder", '~> 3.0.0')
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
   s.add_dependency("rubydora", '~>0.5.13')

data/lib/active_fedora.rb

@@ -22,6 +22,7 @@ module ActiveFedora #:nodoc:
 
   eager_autoload do
     autoload :Associations
+    autoload :Attributes
     autoload :Base
     autoload :ContentModel
     autoload :Callbacks

data/lib/active_fedora/associations/association_proxy.rb

@@ -35,7 +35,7 @@ module ActiveFedora
     # ActiveFedora::Associations::HasManyAssociation.
 
     class AssociationProxy
-      delegate :to_param, :to=>:target
+      #delegate :to_param, :to=>:target
       instance_methods.each { |m| undef_method m unless m.to_s =~ /^(?:nil\?|send|object_id|to_a)$|^__|^respond_to|proxy_/ }
 
       def initialize(owner, reflection)

data/lib/active_fedora/attributes.rb

@@ -0,0 +1,82 @@
+module ActiveFedora
+  module Attributes
+    extend ActiveSupport::Concern
+    extend ActiveSupport::Autoload
+    autoload :Serializers
+
+    included do
+      include Serializers
+    end
+
+    def attributes=(properties)
+      properties.each do |k, v|
+        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(UnknownAttributeError, "unknown attribute: #{k}")
+      end
+    end
+    
+
+    # A convenience method  for updating indexed attributes.  The passed in hash
+    # must look like this : 
+    #   {{:name=>{"0"=>"a","1"=>"b"}}
+    #
+    # This will result in any datastream field of name :name having the value [a,b]
+    #
+    # An index of -1 will insert a new value. any existing value at the relevant index 
+    # will be overwritten.
+    #
+    # As in update_attributes, this overwrites _all_ available fields by default.
+    #
+    # If you want to specify which datastream(s) to update,
+    # use the :datastreams argument like so:
+    #  m.update_attributes({"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}, :datastreams=>"my_ds")
+    # or
+    #  m.update_attributes({"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}, :datastreams=>["my_ds", "my_other_ds"])
+    #
+    def update_indexed_attributes(params={}, opts={})
+      if ds = opts[:datastreams]
+        ds_array = []
+        ds = [ds] unless ds.respond_to? :each
+        ds.each do |dsname|
+          ds_array << datastreams[dsname]
+        end
+      else
+        ds_array = metadata_streams
+      end
+      result = {}
+      ds_array.each do |d|
+        result[d.dsid] = d.update_indexed_attributes(params,opts)
+      end
+      return result
+    end
+    
+    # Updates the attributes for each datastream named in the params Hash
+    # @param [Hash] params A Hash whose keys correspond to datastream ids and whose values are appropriate Hashes to submit to update_indexed_attributes on that datastream
+    # @param [Hash] opts (currently ignored.)
+    # @example Update the descMetadata and properties datastreams with new values
+    #   article = HydrangeaArticle.new
+    #   ds_values_hash = {
+    #     "descMetadata"=>{ [{:person=>0}, :role]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"} },
+    #     "properties"=>{ "notes"=>"foo" }
+    #   }
+    #   article.update_datastream_attributes( ds_values_hash )
+    def update_datastream_attributes(params={}, opts={})
+      result = params.dup
+      params.each_pair do |dsid, ds_params| 
+        if datastreams.include?(dsid)
+          result[dsid] = datastreams[dsid].update_indexed_attributes(ds_params)
+        else
+          result.delete(dsid)
+        end
+      end
+      return result
+    end
+    
+    def get_values_from_datastream(dsid,field_key,default=[])
+      if datastreams.include?(dsid)
+        return datastreams[dsid].get_values(field_key,default)
+      else
+        return nil
+      end
+    end
+  end
+end

data/lib/active_fedora/attributes/serializers.rb

@@ -0,0 +1,74 @@
+module ActiveFedora
+  module Attributes
+    module Serializers
+      extend ActiveSupport::Concern
+
+      ## This allows you to use date_select helpers in rails views 
+      # @param [Hash] parms parameters hash
+      # @return [Hash] a parameters list with the date select parameters replaced with dates
+      def deserialize_dates_from_form(params)
+        dates = {}
+        params.each do |key, value| 
+          if data = key.to_s.match(/^(.+)\((\d)i\)$/)
+            dates[data[1]] ||= {}
+            dates[data[1]][data[2]] = value
+            params.delete(key)
+          end
+        end
+        dates.each do |key, value|
+          params[key] = [value['1'], value['2'], value['3']].join('-')
+        end
+        params
+      end
+      
+      # set a hash of attributes on the object
+      # @param [Hash] params the properties to set on the object
+      def attributes=(params)
+        super(deserialize_dates_from_form(params))
+      end
+
+      module ClassMethods 
+        # @param [String] value a string to be cast to integer
+        # @param [Hash] options 
+        # @option options [Integer] :default a value to return if the passed value argument is blank
+        # @return [Integer] 
+        def coerce_to_integer(value, options={})
+          if value.blank?
+            options[:default] || nil
+          else
+            value.to_i
+          end
+        end
+
+        # @param [String] value a string to be cast to boolean
+        # @param [Hash] options 
+        # @option options [Boolean] :default a value to return if the passed value argument is blank
+        # @return [Boolean] true if value == "true" or default if value is blank
+        def coerce_to_boolean(value, options={})
+          if value.blank?
+            options[:default] || nil
+          else
+            value=="true"
+          end
+        end
+
+        # @param [String] value a string to be cast to boolean
+        # @param [Hash] options 
+        # @option options [Boolean] :default a value to return if the passed value argument is blank
+        # @return [Boolean] true if value == "true" or default if value is blank
+        def coerce_to_date(v, options={})
+          if v.blank? && options[:default]
+            options[:default] == :today ? Date.today : options[:default]
+          else
+            begin
+              Date.parse(v)
+            rescue TypeError, ArgumentError
+              nil
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/active_fedora/base.rb

@@ -61,11 +61,6 @@ module ActiveFedora
       !new_object?
     end
 
-    def attributes=(properties)
-      properties.each do |k, v|
-        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(UnknownAttributeError, "unknown attribute: #{k}")
-      end
-    end
 
     # Constructor.  You may supply a custom +:pid+, or we call the Fedora Rest API for the
     # next available Fedora pid, and mark as new object.
@@ -207,6 +202,10 @@ module ActiveFedora
       self.pid
     end
     
+    def to_param
+      persisted? ? to_key.join('-') : nil
+    end
+
     def to_key
       persisted? ? [pid] : nil
     end
@@ -420,70 +419,6 @@ module ActiveFedora
       obj.inner_object.freeze
       obj
     end
-
-    # A convenience method  for updating indexed attributes.  The passed in hash
-    # must look like this : 
-    #   {{:name=>{"0"=>"a","1"=>"b"}}
-    #
-    # This will result in any datastream field of name :name having the value [a,b]
-    #
-    # An index of -1 will insert a new value. any existing value at the relevant index 
-    # will be overwritten.
-    #
-    # As in update_attributes, this overwrites _all_ available fields by default.
-    #
-    # If you want to specify which datastream(s) to update,
-    # use the :datastreams argument like so:
-    #  m.update_attributes({"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}, :datastreams=>"my_ds")
-    # or
-    #  m.update_attributes({"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}, :datastreams=>["my_ds", "my_other_ds"])
-    #
-    def update_indexed_attributes(params={}, opts={})
-      if ds = opts[:datastreams]
-        ds_array = []
-        ds = [ds] unless ds.respond_to? :each
-        ds.each do |dsname|
-          ds_array << datastreams[dsname]
-        end
-      else
-        ds_array = metadata_streams
-      end
-      result = {}
-      ds_array.each do |d|
-        result[d.dsid] = d.update_indexed_attributes(params,opts)
-      end
-      return result
-    end
-    
-    # Updates the attributes for each datastream named in the params Hash
-    # @param [Hash] params A Hash whose keys correspond to datastream ids and whose values are appropriate Hashes to submit to update_indexed_attributes on that datastream
-    # @param [Hash] opts (currently ignored.)
-    # @example Update the descMetadata and properties datastreams with new values
-    #   article = HydrangeaArticle.new
-    #   ds_values_hash = {
-    #     "descMetadata"=>{ [{:person=>0}, :role]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"} },
-    #     "properties"=>{ "notes"=>"foo" }
-    #   }
-    #   article.update_datastream_attributes( ds_values_hash )
-    def update_datastream_attributes(params={}, opts={})
-      result = params.dup
-      params.each_pair do |dsid, ds_params| 
-        if datastreams.include?(dsid)
-          result[dsid] = datastreams[dsid].update_indexed_attributes(ds_params)
-        else
-          result.delete(dsid)
-        end
-      end
-      return result
-    end
-    
-    def get_values_from_datastream(dsid,field_key,default=[])
-      if datastreams.include?(dsid)
-        return datastreams[dsid].get_values(field_key,default)
-      else
-        return nil
-      end
-    end
     
     def self.pids_from_uris(uris) 
       if uris.class == String
@@ -500,6 +435,7 @@ module ActiveFedora
   end
 
   Base.class_eval do
+    include Attributes
     include ActiveFedora::Persistence
     include Model
     include Solrizer::FieldNameMapper

data/lib/active_fedora/model.rb

@@ -6,6 +6,11 @@ module ActiveFedora
   # much in the way ActiveRecord does.  
   module Model 
     extend ActiveSupport::Concern
+
+    included do
+      class_attribute  :solr_query_handler
+      self.solr_query_handler = 'standard'
+    end
     
     # Takes a Fedora URI for a cModel and returns classname, namespace
     def self.classname_from_uri(uri)
@@ -131,7 +136,7 @@ module ActiveFedora
       
       def find_in_batches conditions, opts={}
         opts[:q] = create_query(conditions)
-        opts[:qt] = 'standard'
+        opts[:qt] = solr_query_handler
         #set default sort to created date ascending
         unless opts.include?(:sort)
           opts[:sort]=[ActiveFedora::SolrService.solr_name(:system_create,:date)+' asc'] 
@@ -180,9 +185,9 @@ module ActiveFedora
       # Get a count of the number of objects from solr
       # Takes :conditions as an argument
       def count(args = {})
-        q = search_model_clause
-        q << " AND #{args[:conditions]}"  if args[:conditions]
-        SolrService.query(q, :raw=>true, :rows=>0)['response']['numFound']
+        q = search_model_clause ? [search_model_clause] : []
+        q << "#{args[:conditions]}"  if args[:conditions]
+        SolrService.query(q.join(' AND '), :raw=>true, :rows=>0)['response']['numFound']
       end
 
       #@deprecated
@@ -218,8 +223,8 @@ module ActiveFedora
       # Find all ActiveFedora objects for this model that match arguments
       # passed in by querying Solr.  Like find_by_solr this returns a solr result.
       #
-      # query_fields   a hash of object field names and values to filter on (query_fields must be the solr_field_name for non-MetadataDatastream derived datastreams)
-      # opts           specifies options for the solr query
+      # @param query_fields [Hash] field names and values to filter on (query_fields must be the solr_field_name for non-MetadataDatastream derived datastreams)
+      # @param opts [Hash] specifies options for the solr query
       #
       #   options may include:
       # 

data/lib/active_fedora/validations.rb

@@ -32,11 +32,11 @@ module ActiveFedora
     module ClassMethods
       # Creates an object just like Base.create but calls <tt>save!</tt> instead of +save+
       # so an exception is raised if the record is invalid.
-      def create!(attributes = nil, options = {}, &block)
+      def create!(attributes = nil, &block)
         if attributes.is_a?(Array)
-          attributes.collect { |attr| create!(attr, options, &block) }
+          attributes.collect { |attr| create!(attr, &block) }
         else
-          object = new(attributes, options)
+          object = new(attributes)
           yield(object) if block_given?
           object.save!
           object

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "4.5.3"
+  VERSION = "4.6.0.rc1"
 end

data/spec/integration/persistence_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "persisting objects" do
+  before :all do
+    class MockAFBaseRelationship < ActiveFedora::Base
+      has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"foo" do |m|
+        m.field "name", :string
+      end
+      delegate :name, :to=>'foo', :unique=>true
+      validates :name, :presence=>true
+    end
+  end
+  after :all do
+    Object.send(:remove_const, :MockAFBaseRelationship)
+  end
+
+  describe "#create!" do
+    it "should validate" do
+      lambda { MockAFBaseRelationship.create!}.should raise_error ActiveFedora::RecordInvalid, "Validation failed: Name can't be blank"
+    end
+  end
+end

data/spec/unit/model_spec.rb

@@ -17,6 +17,19 @@ describe ActiveFedora::Model do
     Object.send(:remove_const, :SpecModel)
   end
   
+  describe '.solr_query_handler' do
+    after do
+      # reset to default
+      SpecModel::Basic.solr_query_handler = 'standard'
+    end
+    it "should have a default" do
+      SpecModel::Basic.solr_query_handler.should == 'standard'
+    end
+    it "should be settable" do
+      SpecModel::Basic.solr_query_handler = 'search'
+      SpecModel::Basic.solr_query_handler.should == 'search'
+    end
+  end
   
   describe '#find' do
     describe "without :cast" do
@@ -173,6 +186,12 @@ describe ActiveFedora::Model do
       ActiveFedora::SolrService.expects(:query).with("#{@model_query} AND foo:bar", :rows=>0, :raw=>true).returns(mock_result)
       SpecModel::Basic.count(:conditions=>'foo:bar').should == 7
     end
+
+    it "should count without a class specified" do
+      mock_result = {'response'=>{'numFound'=>7}}
+      ActiveFedora::SolrService.expects(:query).with("foo:bar", :rows=>0, :raw=>true).returns(mock_result)
+      ActiveFedora::Base.count(:conditions=>'foo:bar').should == 7
+    end
   end
   
   describe '#find_by_solr' do

data/spec/unit/serializers_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe ActiveFedora::Attributes::Serializers do
+  subject { ActiveFedora::Base }
+  describe "serialize to integer" do
+    it "should cast to integer" do
+      subject.coerce_to_integer("0").should == 0
+      subject.coerce_to_integer("01").should == 1
+      subject.coerce_to_integer("seven").should == 0 # same as "seven".to_i => 0
+      subject.coerce_to_integer("007seven").should == 7 # same as "007seven".to_i => 7
+      subject.coerce_to_integer("").should be_nil
+      subject.coerce_to_integer(nil).should be_nil
+      subject.coerce_to_integer("", :default=>7).should == 7
+      subject.coerce_to_integer(nil, :default=>7).should == 7
+      subject.coerce_to_integer("9", :default=>7).should == 9
+    end
+  end
+
+  describe "serialize to date" do
+    it "should cast to date" do
+      unless RUBY_VERSION < "1.9"
+        subject.coerce_to_date("30/10/2010").should == Date.parse('2010-10-30') # ruby interprets this as DD/MM/YYYY
+      end
+      subject.coerce_to_date("2010-01-31").should == Date.parse('2010-01-31')
+    end
+    it "should handle invalid dates" do
+      subject.coerce_to_date("0").should == nil #
+      unless RUBY_VERSION < "1.9"
+        subject.coerce_to_date("01/15/2010").should == nil # ruby interprets this as DD/MM/YYYY
+      end
+      subject.coerce_to_date("2010-31-01").should == nil
+    end
+    it "should work with a blank string" do
+      subject.coerce_to_date("").should == nil
+      subject.coerce_to_date("", :default=>:today).should be_kind_of Date
+      subject.coerce_to_date("", :default=>Date.parse('2010-01-31')).should == Date.parse('2010-01-31')
+    end
+    it "should work when nil is passed in" do
+      subject.coerce_to_date(nil).should == nil
+      subject.coerce_to_date(nil, :default=>:today).should be_kind_of Date
+      subject.coerce_to_date(nil, :default=>Date.parse('2010-01-31')).should == Date.parse('2010-01-31')
+    end
+  end
+  describe "serialize to boolean" do
+    it "should cast to bool" do
+      subject.coerce_to_boolean("true").should be_true
+      subject.coerce_to_boolean("false").should be_false
+      subject.coerce_to_boolean("faoo").should be_false
+      subject.coerce_to_boolean("").should be_false
+      subject.coerce_to_boolean("", :default=>true).should be_true
+      subject.coerce_to_boolean("", :default=>false).should be_false
+      subject.coerce_to_boolean("x", :default=>true).should be_false
+      subject.coerce_to_boolean("x", :default=>false).should be_false
+      subject.coerce_to_boolean(nil, :default=>true).should be_true
+      subject.coerce_to_boolean(nil, :default=>false).should be_false
+    end
+  end
+
+  describe "deserialize_dates_from_form" do
+    before do
+      class Foo < ActiveFedora::Base
+        attr_accessor :birthday
+      end
+    end
+    after do
+      Object.send(:remove_const, :Foo)
+    end
+    subject { Foo.new }
+    it "should deserialize dates" do
+      subject.attributes = {'birthday(1i)' =>'2012', 'birthday(2i)' =>'10', 'birthday(3i)' => '31'}
+      subject.birthday.should == '2012-10-31'
+    end
+  end
+
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 4.5.3
-  prerelease: 
+  version: 4.6.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -93,6 +93,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        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
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +344,8 @@ files:
 - lib/active_fedora/associations/belongs_to_association.rb
 - lib/active_fedora/associations/has_and_belongs_to_many_association.rb
 - lib/active_fedora/associations/has_many_association.rb
+- lib/active_fedora/attributes.rb
+- lib/active_fedora/attributes/serializers.rb
 - lib/active_fedora/base.rb
 - lib/active_fedora/callbacks.rb
 - lib/active_fedora/config.rb
@@ -417,6 +435,7 @@ files:
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/nokogiri_datastream_spec.rb
 - spec/integration/ntriples_datastream_spec.rb
+- spec/integration/persistence_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/semantic_node_spec.rb
 - spec/integration/solr_service_spec.rb
@@ -501,6 +520,7 @@ files:
 - spec/unit/rels_ext_datastream_spec.rb
 - spec/unit/rubydora_connection_spec.rb
 - spec/unit/semantic_node_spec.rb
+- spec/unit/serializers_spec.rb
 - spec/unit/service_definitions_spec.rb
 - spec/unit/simple_datastream_spec.rb
 - spec/unit/solr_config_options_spec.rb
@@ -520,12 +540,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 190185801018639774
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rubyfedora
 rubygems_version: 1.8.24
@@ -569,6 +592,7 @@ test_files:
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/nokogiri_datastream_spec.rb
 - spec/integration/ntriples_datastream_spec.rb
+- spec/integration/persistence_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/semantic_node_spec.rb
 - spec/integration/solr_service_spec.rb
@@ -653,6 +677,7 @@ test_files:
 - spec/unit/rels_ext_datastream_spec.rb
 - spec/unit/rubydora_connection_spec.rb
 - spec/unit/semantic_node_spec.rb
+- spec/unit/serializers_spec.rb
 - spec/unit/service_definitions_spec.rb
 - spec/unit/simple_datastream_spec.rb
 - spec/unit/solr_config_options_spec.rb