active-fedora 3.1.0.pre6 → 3.1.0.pre7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.1.0.pre2)
+    active-fedora (3.1.0.pre7)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml
@@ -13,7 +13,7 @@ PATH
       om (>= 1.0)
       rdf
       rdf-rdfxml
-      rubydora (~> 0.1.6)
+      rubydora (~> 0.1.7)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
@@ -71,7 +71,7 @@ GEM
     rack (1.3.4)
     rake (0.9.2)
     rbx-require-relative (0.0.5)
-    rcov (0.9.10)
+    rcov (0.9.11)
     rdf (0.3.4.1)
       addressable (>= 2.2.6)
     rdf-rdfxml (0.3.5)
@@ -87,7 +87,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.1.6)
+    rubydora (0.1.7)
       activemodel
       activesupport
       fastercsv
@@ -111,7 +111,7 @@ GEM
       om (>= 1.4.0)
       stomp
       xml-simple
-    solrizer-fedora (1.1.2)
+    solrizer-fedora (1.1.3)
       active-fedora (>= 2.3.0)
       fastercsv
       rsolr
@@ -120,7 +120,7 @@ GEM
     stomp (1.1.9)
     wasabi (2.0.0)
       nokogiri (>= 1.4.0)
-    xml-simple (1.1.0)
+    xml-simple (1.1.1)
     yard (0.7.2)
 
 PLATFORMS
@@ -135,5 +135,5 @@ DEPENDENCIES
   rcov
   rspec (< 2.0.0)
   ruby-debug
-  solrizer-fedora (>= 1.1.2)
+  solrizer-fedora (>= 1.1.3)
   yard

data/active-fedora.gemspec

@@ -27,14 +27,14 @@ Gem::Specification.new do |s|
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
   s.add_dependency("facets")
-  s.add_dependency("rubydora", '~>0.1.6')
+  s.add_dependency("rubydora", '~>0.1.7')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml")
   s.add_development_dependency("yard")
   s.add_development_dependency("RedCloth") # for RDoc formatting
   s.add_development_dependency("rake")
   s.add_development_dependency("rcov")
-  s.add_development_dependency("solrizer-fedora", ">=1.1.2") # used by the fixtures rake tasks
+  s.add_development_dependency("solrizer-fedora", ">=1.1.3") # used by the fixtures rake tasks
   s.add_development_dependency("jettywrapper", ">=1.0.1")
   s.add_development_dependency("rspec", "<2.0.0")
   s.add_development_dependency("mocha", ">= 0.9.8")

data/lib/active_fedora/base.rb

@@ -312,8 +312,7 @@ module ActiveFedora
       elsif opts.has_key?(:content_type)
         attrs.merge!({:mimeType=>opts[:content_type]})
       end
-      ds = create_datastream(ActiveFedora::Datastream, nil, attrs)
-      opts.has_key?(:dsid) ? ds.dsid=(opts[:dsid]) : nil
+      ds = create_datastream(ActiveFedora::Datastream, opts[:dsid], attrs)
       add_datastream(ds)
     end
     

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.pre6"
+    VERSION = "3.1.0.pre7"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832021
+  hash: 1923832023
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 6
-  version: 3.1.0.pre6
+  - 7
+  version: 3.1.0.pre7
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 -05:00
+date: 2011-10-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,12 +211,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 1
-        - 6
-        version: 0.1.6
+        - 7
+        version: 0.1.7
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -311,12 +311,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 1
-        - 2
-        version: 1.1.2
+        - 3
+        version: 1.1.3
   type: :development
   version_requirements: *id020
 - !ruby/object:Gem::Dependency