active-fedora 4.6.0.rc1 → 4.6.0.rc2

data/active-fedora.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
 
   s.add_dependency('rsolr')
-  s.add_dependency('om', '~> 1.6.0')
+  s.add_dependency('om', '~> 1.7.0.rc1')
   s.add_dependency('solrizer', '~>1.2.0')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')

data/lib/active_fedora/simple_datastream.rb

@@ -24,7 +24,7 @@ module ActiveFedora
     #   name 
     #
     #
-    # 'datatype' is a datatype, currently :string, :text and :date are supported.
+    # 'datatype' is a datatype, currently :string, :integer and :date are supported.
     #
     # opts is an options hash, which  will affect the generation of the xml representation of this datastream.
     #
@@ -49,7 +49,7 @@ module ActiveFedora
       self.class.class_fields << name.to_s
       # add term to terminology
       unless self.class.terminology.has_term?(name.to_sym)
-        term = OM::XML::Term.new(name.to_sym, {}, self.class.terminology)
+        term = OM::XML::Term.new(name.to_sym, {:type=>datatype}, self.class.terminology)
         self.class.terminology.add_term(term)
         term.generate_xpath_queries!
       end
@@ -81,7 +81,7 @@ module ActiveFedora
         if things 
           field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
           things.val.each do |val|    
-            ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )         
+            ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val.to_s )         
           end
         end
       end

data/lib/active_fedora/version.rb

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

data/spec/unit/simple_datastream_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActiveFedora::SimpleDatastream do
 
   before do
-    @sample_xml =  "<fields><coverage>coverage1</coverage><coverage>coverage2</coverage><creation_date>fake-date</creation_date><mydate>fake-date</mydate><publisher>publisher1</publisher></fields>"
+    @sample_xml =  "<fields><coverage>coverage1</coverage><coverage>coverage2</coverage><creation_date>2012-01-15</creation_date><mydate>fake-date</mydate><publisher>publisher1</publisher></fields>"
     @test_ds = ActiveFedora::SimpleDatastream.from_xml(@sample_xml )
     @test_ds.field :coverage
     @test_ds.field :creation_date, :date
@@ -19,13 +19,19 @@ describe ActiveFedora::SimpleDatastream do
   describe '#new' do
     describe "model methods" do 
 
-      [:coverage, :creation_date, :mydate, :publisher].each do |el|
-        it "should respond to getters and setters for #{el} element" do
+      [:coverage, :mydate, :publisher].each do |el|
+        it "should respond to getters and setters for the string typed #{el} element" do
           value = "Hey #{el}"
           @test_ds.send("#{el.to_s}=", value) 
           @test_ds.send(el).first.should == value  #Looking at first because creator has 2 nodes
         end
       end
+
+      it "should set date elements" do
+        d = Date.parse('1939-05-23')
+        @test_ds.creation_date = d
+        @test_ds.creation_date.first.should == d
+      end
     end
   end
   
@@ -38,7 +44,7 @@ describe ActiveFedora::SimpleDatastream do
         <fields>
           <coverage>80%</coverage>
           <coverage>20%</coverage>
-          <creation_date>fake-date</creation_date>
+          <creation_date>2012-01-15</creation_date>
           <mydate>fake-date</mydate>
           <publisher>charlie</publisher>
         </fields>')
@@ -49,7 +55,7 @@ describe ActiveFedora::SimpleDatastream do
     it "should have title" do
       solr = @test_ds.to_solr
       solr["publisher_t"].should == ["publisher1"]
-      solr["creation_date_dt"].should == ["fake-date"]
+      solr["creation_date_dt"].should == ["2012-01-15"]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 4.6.0.rc1
+  version: 4.6.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0.rc1
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
@@ -542,7 +542,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 190185801018639774
+      hash: 1839430800864093444
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: