active-fedora 4.6.0.rc3 → 4.6.0.rc4

data/History.txt

@@ -1,3 +1,7 @@
+4.6.0
+Depend on solrizer 2.0.0 (for HYDRA-827 DO NOT index terms by default)
+
+
 4.5.1
 Removes .rvmrc and Gemfile.lock from version control (devs should deal with these themselves)
 HYDRA-837: ActiveFedora::Datastreams#has_file_datastream should support :versionable argument (re-opened)

data/active-fedora.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('rsolr')
   s.add_dependency('om', '~> 1.7.0.rc2')
-  s.add_dependency('solrizer', '~>1.2.0')
+  s.add_dependency('solrizer', '~>2.0.0.rc1')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')

data/lib/active_fedora/attributes/serializers.rb

@@ -1,7 +1,6 @@
 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
@@ -26,49 +25,6 @@ module ActiveFedora
       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/version.rb

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

data/spec/unit/serializers_spec.rb

@@ -2,60 +2,6 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 4.6.0.rc3
+  version: 4.6.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -542,7 +542,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3953471548892867214
+      hash: -4003154784949769176
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: