active-fedora 6.4.0.rc4 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6a491ed123f54d269d0768d80a8cb526c1d4b0b
-  data.tar.gz: 1ba1f6930603d6095d178d9762e6c4f465788fce
+  metadata.gz: 3ed505bd4c93e672099b6338c7835745b8b3c0da
+  data.tar.gz: 1a3ecd688f69dc30eadfad3712e173793a9971a7
 SHA512:
-  metadata.gz: e93d7508557149bdf107c7bb44b32751e4508506fd562d19d4cff9f74a148e771dc6cbc018e05fa8e603139d7f065046c324fe03ad9c5c7bde924e1b648daf68
-  data.tar.gz: 89d830d304a2ff251d8c4a0f3f2d37b3f370342a99c9432b05861028bb0e1c30420fba0c93184769d053be695a53cd6fa1fad4f5edfc86925de15b271d665fe4
+  metadata.gz: 1379046abbce3ef04db6542c3ff0905899acd5395771700d23ce04ba1157a68874930c3d5c7fd4ac3ba7523db1362c127cb9734287bdff3922b69540c2437337
+  data.tar.gz: a667ef87332c2d4656624cdf8cab47f3a27fdde1838023d85f5765d5b9c412656b82d94c10e2a6d7ca055bc13d9f831b09dc13c0f80fe472364d0f01c0967573

data/History.txt

@@ -1,4 +1,11 @@
-6.4.0 (unreleased)
+6.4.0 (2013-07-01)
+
+Removing experimental designation, tidying-up the code [Adam Wead]
+
+Providing a YAMLAdaptor for Psych dependency [Jeremy Friesen]
+
+Increase startup wait to 90 seconds [Justin Coyne]
+
 Bump dependency to om 3.0.0 [Justin Coyne]
 
 Updating "active_fedora:model" rails generator [Jeremy Friesen]

data/config/jetty.yml

@@ -1,5 +1,5 @@
 default:
-  startup_wait: 60
+  startup_wait: 90
   jetty_port: 8983
   java_opts:
     - "-Xmx256m" 

data/lib/active_fedora/datastream_collections.rb

@@ -18,8 +18,6 @@ module ActiveFedora
 
     module ClassMethods
 
-      # ** EXPERIMENTAL **
-      #
       # Allows for a datastream to be treated like any other attribute of a model class 
       # while enforcing mimeType and/or datastream type (ie. external, managed, etc.) if defined. 
       # ====Examples 
@@ -67,8 +65,6 @@ module ActiveFedora
         create_named_datastream_update_methods(args[:name])
       end
       
-      # ** EXPERIMENTAL **
-      #
       # Creates the following helper methods for a datastream name
       #   [datastream_name]_append  - Add a named datastream
       #
@@ -91,8 +87,6 @@ module ActiveFedora
         end
       end 
       
-      # ** EXPERIMENTAL **
-      #
       # Creates the following helper methods for a datastream name
       #   [datastream_name]  - Returns array of named datastreams
       #   [datastream_name]_ids - Returns array of named datastream dsids
@@ -130,8 +124,6 @@ module ActiveFedora
 
     end
 
-      # ** EXPERIMENTAL **
-      #
       # Accessor for class variable for hash that stores arguments passed to has_datastream calls within an
       # ActiveFedora::Base child class.    
       #  
@@ -147,15 +139,11 @@ module ActiveFedora
         self.class_named_datastreams_desc ||= {}
       end
 
-      # ** EXPERIMENTAL **
-      #
       # Returns array of datastream names defined for this object 
       def datastream_names
         named_datastreams_desc.keys
       end
       
-      # ** EXPERIMENTAL **
-      #
       # Calls add_named_datastream while assuming it will be managed content and sets :blob and :controlGroup values accordingly
       # ====Parameters
       #  name: Datastream name
@@ -166,8 +154,6 @@ module ActiveFedora
         add_named_datastream(name,opts)
       end
       
-      # ** EXPERIMENTAL **
-      #
       # This object is used by [datastream_name]_append helper to add a named datastream
       # but can also be called directly.
       # ====Parameters
@@ -236,8 +222,6 @@ module ActiveFedora
         add_datastream(ds,opts)
       end
 
-      # ** EXPERIMENTAL **
-      #
       # Update an existing named datastream.  It has same parameters as add_named_datastream
       # except the :dsid key is now required.
       #
@@ -251,26 +235,20 @@ module ActiveFedora
         add_named_datastream(name,opts)
       end
       
-      # ** EXPERIMENTAL **
-      #
       # Throws an assertion failure unless the object 'o' is kind_of? class 't'
       # ====Parameters
       #  n: Name of object
       #  o: The object to test
       #  t: The class type to check is kind_of?
-      def assert_kind_of(n, o,t)
+      def assert_kind_of(n,o,t)
         raise "Assertion failure: #{n}: #{o} is not of type #{t}" unless o.kind_of?(t)
       end
       
-      # ** EXPERIMENTAL **
-      #
       # Returns true if the name is a defined named datastream
       def is_named_datastream?(name)
         named_datastreams_desc.has_key?(name)
       end
 
-      # ** EXPERIMENTAL **
-      #
       # Returns hash of datastream names defined by has_datastream calls mapped to 
       # array of datastream objects that have been added
       # ====Example
@@ -288,8 +266,6 @@ module ActiveFedora
         return ds_values
       end
       
-      # ** EXPERIMENTAL **
-      #
       # Returns hash of datastream names mapped to an array
       # of dsid's for named datastream objects
       # === Example
@@ -308,8 +284,6 @@ module ActiveFedora
         return dsids
       end 
       
-      # ** EXPERIMENTAL **
-      #
       # Returns the hash that stores arguments passed to has_datastream calls within an
       # ActiveFedora::Base child class.    
       #  

data/lib/active_fedora/file_configurator.rb

@@ -1,5 +1,5 @@
 require 'erb'
-require 'psych'
+require 'active_fedora/yaml_adaptor'
 
 module ActiveFedora
   class FileConfigurator
@@ -110,7 +110,7 @@ module ActiveFedora
       end
 
       begin
-        fedora_yml = Psych.load(config_erb)
+        fedora_yml = YAMLAdaptor.load(config_erb)
       rescue StandardError => e
         raise("fedora.yml was found, but could not be parsed.\n")
       end
@@ -133,7 +133,7 @@ module ActiveFedora
       end
 
       begin
-        solr_yml = Psych.load(config_erb)
+        solr_yml = YAMLAdaptor.load(config_erb)
       rescue StandardError => e
         raise("solr.yml was found, but could not be parsed.\n")
       end
@@ -209,7 +209,7 @@ module ActiveFedora
 
     def predicate_config
       @predicate_config_path ||= build_predicate_config_path(File.dirname(self.path))
-      Psych.load(File.open(@predicate_config_path)) if File.exist?(@predicate_config_path)
+      YAMLAdaptor.load(File.open(@predicate_config_path)) if File.exist?(@predicate_config_path)
     end
 
     protected
@@ -227,7 +227,7 @@ module ActiveFedora
     end
 
     def valid_predicate_mapping?(testfile)
-      mapping = Psych.load(File.open(testfile))
+      mapping = YAMLAdaptor.load(File.open(testfile))
       return false unless mapping.has_key?(:default_namespace) && mapping[:default_namespace].is_a?(String)
       return false unless mapping.has_key?(:predicate_mapping) && mapping[:predicate_mapping].is_a?(Hash)
       true

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.4.0.rc4"
+  VERSION = "6.4.0"
 end

data/lib/active_fedora/yaml_adaptor.rb

@@ -0,0 +1,12 @@
+begin
+  require 'psych'
+  YAMLAdaptor = Psych
+rescue LoadError
+  $stderr.puts "*"*80
+  $stderr.puts "WARNING: Unable to load Psych, falling back to YAML for parser."
+  $stderr.puts "    YAML will be removed in ActiveFedora 7.0.0."
+  $stderr.puts "    YAMLAdaptor will be removed in ActiveFedora 7.0.0, and replaced with Psych"
+  $stderr.puts "*"*80
+  require 'yaml'
+  YAMLAdaptor = YAML
+end

data/lib/generators/active_fedora/model/templates/model.rb.erb

@@ -3,7 +3,7 @@
 require 'active_fedora/base'
 class <%= class_name %> < ActiveFedora::Base
   <% if options['descMetadata'] %>
-  has_metadata name: "descMetadata", type: <% options['descMetadata'] %>
+  has_metadata name: "descMetadata", type: <%= options['descMetadata'] %>
   <% else %>
   # Uncomment the following lines to add a #descMetadata method that is a
   #   datastream. You will need to specify the :type:, which may involve

data/spec/config_helper.rb

@@ -2,7 +2,7 @@ def mock_yaml(hash, path)
   mock_file = mock(path.split("/")[-1])
   File.stub(:exist?).with(path).and_return(true)
   File.stub(:open).with(path).and_return(mock_file)
-  YAML.stub(:load).and_return(hash)
+  YAMLAdaptor.stub(:load).and_return(hash)
 end
 
 def default_predicate_mapping_file

data/spec/integration/datastream_collections_spec.rb

@@ -48,7 +48,6 @@ describe ActiveFedora::DatastreamCollections do
   describe '#add_named_file_datastream' do
     it 'should add a file datastream with the given name to the object in fedora' do
       @test_object2 = MockAFBaseDatastream.new
-#      @test_object2.new_object = true
       f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
       f.stub(:content_type).and_return("image/jpeg")
       @test_object2.add_named_file_datastream("thumbnail",f)
@@ -62,11 +61,6 @@ describe ActiveFedora::DatastreamCollections do
       t2_thumb1.pid.should == @test_object2.pid
       t2_thumb1.dsLabel.should == "minivan.jpg"
       t2_thumb1.controlGroup.should == "M"
-
-# .attributes.should == {"label"=>ds.label,"dsid"=>ds.dsid,
-#                                                                                  "mimeType"=>ds.attributes[:mimeType],
-#                                                                                  :controlGroup=>ds.attributes[:controlGroup],
-#                                                                                  :pid=>ds.pid, :dsID=>ds.dsid, :dsLabel=>ds.attributes[:dsLabel]}
     end
   end
   
@@ -130,6 +124,4 @@ describe ActiveFedora::DatastreamCollections do
     end
   end
 
-  
-
-end
+end

data/spec/unit/code_configurator_spec.rb

@@ -38,7 +38,7 @@ describe ActiveFedora::FileConfigurator do
   end
 
   it "should initialize from code" do
-    YAML.should_receive(:load).never
+    YAMLAdaptor.should_receive(:load).never
     File.should_receive(:exists?).never
     File.should_receive(:read).never
     File.should_receive(:open).never

data/spec/unit/config_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe ActiveFedora::Config do
   describe "with a single fedora instance" do
-    conf = Psych.load(File.read('spec/fixtures/rails_root/config/fedora.yml'))['test']
+    conf = YAMLAdaptor.load(File.read('spec/fixtures/rails_root/config/fedora.yml'))['test']
     subject { ActiveFedora::Config.new(conf) }
     its(:credentials) { should == {:url => 'http://testhost.com:8983/fedora', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'}}
     it { should_not be_sharded }
   end
   describe "with several fedora shards" do
-    conf = Psych.load(File.read('spec/fixtures/sharded_fedora.yml'))['test']
+    conf = YAMLAdaptor.load(File.read('spec/fixtures/sharded_fedora.yml'))['test']
     subject { ActiveFedora::Config.new(conf) }
     its(:credentials) { should == [{:url => 'http://127.0.0.1:8983/fedora1', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'},
                               {:url => 'http://127.0.0.1:8983/fedora2', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'},

data/spec/unit/file_configurator_spec.rb

@@ -323,7 +323,7 @@ describe ActiveFedora::FileConfigurator do
       subject.instance_variable_set :@config_loaded, nil
     end
     it "should return the default mapping if it has not been initialized" do
-      subject.predicate_config().should == YAML.load(File.read(default_predicate_mapping_file))
+      subject.predicate_config().should == YAMLAdaptor.load(File.read(default_predicate_mapping_file))
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.4.0.rc4
+  version: 6.4.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -369,6 +369,7 @@ files:
 - lib/active_fedora/unsaved_digital_object.rb
 - lib/active_fedora/validations.rb
 - lib/active_fedora/version.rb
+- lib/active_fedora/yaml_adaptor.rb
 - lib/generators/active_fedora/config/USAGE
 - lib/generators/active_fedora/config/config_generator.rb
 - lib/generators/active_fedora/config/fedora/fedora_generator.rb
@@ -546,9 +547,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3