attribution 0.3.1 → 0.3.2

data/attribution.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "attribution"
-  gem.version       = "0.3.1"
+  gem.version       = "0.3.2"
   gem.authors       = ["Paul Barry"]
   gem.email         = ["mail@paulbarry.com"]
   gem.description   = %q{Add attributes to Ruby objects}

data/lib/attribution/util.rb

@@ -0,0 +1,24 @@
+module Attribution
+  module Util
+    # Returns an array of the values that match each key,
+    # up until the point at which it finds a blank value.
+    #
+    # @params hash Hash The hash containing values
+    # @params keys [Object] The keys to look up in the Hash
+    # @return [Object] The values
+    # @example
+    #   extract_values({ a: 1, b: 2, c: nil, d: 4}, :a, :b, :c :d) # => [1, 2]
+    def self.extract_values(hash, *keys)
+      values = []
+      keys.each do |key|
+        value = hash[key]
+        if value.present?
+          values << value
+        else
+          break
+        end
+      end
+      values
+    end
+  end
+end

data/lib/attribution/version.rb

@@ -1,3 +1,3 @@
 module Attribution
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/attribution.rb

@@ -1,3 +1,4 @@
+require "attribution/util"
 require "attribution/version"
 require "active_support/core_ext"
 
@@ -100,7 +101,9 @@ module Attribution
         when Date then arg
         when Time, DateTime then arg.to_date
         when String then Date.parse(arg)
-        when Hash then Date.new(*arg.slice(:year, :month, :day).values.map(&:to_i))
+        when Hash
+          args = Util.extract_values(arg, :year, :month, :day)
+          args.present? ? Date.new(*args.map(&:to_i)) : nil
         when nil then nil
         else raise ArgumentError.new("can't convert #{arg.class} to Date")
         end
@@ -115,7 +118,9 @@ module Attribution
         when Date, DateTime then arg.to_time
         when Time then arg
         when String then Time.parse(arg)
-        when Hash then Time.new(*arg.slice(:year, :month, :day, :hour, :min, :sec, :utc_offset).values.map(&:to_i))
+        when Hash
+          args = Util.extract_values(arg, :year, :month, :day, :hour, :min, :sec, :utc_offset)
+          args.present? ? Time.new(*args.map(&:to_i)) : nil
         when nil then nil
         else raise ArgumentError.new("can't convert #{arg.class} to Time")
         end

data/test/attribution_test.rb

@@ -120,11 +120,46 @@ class AttributionTest < Test::Unit::TestCase
     assert_equal Date.parse('2013-03-17'), book.published_on
   end
 
+  def test_date_hash_just_year
+    book = Book.new(:published_on => { :year => '2013', :month => '', :day => '' })
+    assert_equal Date.new(2013), book.published_on
+  end
+
+  def test_date_hash_just_year_month
+    book = Book.new(:published_on => { :year => '2013', :month => '5', :day => '' })
+    assert_equal Date.new(2013, 5), book.published_on
+  end
+
+  def test_date_hash_empty
+    book = Book.new(:published_on => { :year => '', :month => '', :day => '' })
+    assert_equal nil, book.published_on
+  end
+
   def test_time_hash
     book = Book.new(:created_at => { :year => '2013', :month => '03', :day => '17', :hour => '07', :min => '30', :sec => '11', :utc_offset => '3600' })
     assert_equal Time.parse('2013-03-17 07:30:11 +01:00'), book.created_at
   end
 
+  def test_time_hash_empty
+    book = Book.new(:created_at => { :year => '', :month => '', :day => '', :hour => '', :min => '', :sec => '', :utc_offset => '' })
+    assert_equal nil, book.created_at
+  end
+
+  def test_time_hash_just_year
+    book = Book.new(:created_at => { :year => '2013' })
+    assert_equal Time.parse('2013-01-01 00:00:00'), book.created_at
+  end
+
+  def test_time_hash_just_year_month
+    book = Book.new(:created_at => { :year => '2013', :month => '03' })
+    assert_equal Time.parse('2013-03-01 00:00:00'), book.created_at
+  end
+
+  def test_time_hash_just_year_month_day
+    book = Book.new(:created_at => { :year => '2013', :month => '03', :day => '17' })
+    assert_equal Time.parse('2013-03-17 00:00:00'), book.created_at
+  end
+
   def test_nil
     book = Book.new(
       :id => nil,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribution
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -57,6 +57,7 @@ files:
 - Rakefile
 - attribution.gemspec
 - lib/attribution.rb
+- lib/attribution/util.rb
 - lib/attribution/version.rb
 - test/attribution_test.rb
 homepage: http://github.com/pjb3/attribution