mbrao 1.4.1 → 1.4.2

data/doc/Mbrao/ContentPublicInterface.html

@@ -653,7 +653,7 @@ is returned, else a <code>HashWithIndifferentAccess</code> with locales as keys.
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Exceptions/InvalidDate.html

@@ -124,7 +124,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Exceptions/InvalidMetadata.html

@@ -124,7 +124,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Exceptions/Parsing.html

@@ -124,7 +124,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Exceptions/Rendering.html

@@ -124,7 +124,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Exceptions/UnavailableLocalization.html

@@ -124,7 +124,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Exceptions/Unimplemented.html

@@ -124,7 +124,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Exceptions/UnknownEngine.html

@@ -124,7 +124,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Exceptions.html

@@ -116,7 +116,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Parser.html

@@ -409,7 +409,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/ParsingEngines/Base.html

@@ -650,7 +650,7 @@ returned, else a <code>HashWithIndifferentAccess</code> with locales as keys.</p
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/ParsingEngines/PlainText.html

@@ -563,7 +563,7 @@ returned, else a <code>HashWithIndifferentAccess</code> with locales as keys.</p
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:18 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/ParsingEngines.html

@@ -118,7 +118,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/PublicInterface/ClassMethods.html

@@ -1706,7 +1706,7 @@ The only supported value are:</p>
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/PublicInterface.html

@@ -125,7 +125,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:16 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/RenderingEngines/Base.html

@@ -271,7 +271,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:17 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/RenderingEngines/HtmlPipeline.html

@@ -876,7 +876,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:18 2013 by
+  Generated on Fri Nov 29 10:05:18 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/RenderingEngines.html

@@ -118,7 +118,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Validations/ClassMethods.html

@@ -345,7 +345,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Validations.html

@@ -125,7 +125,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao/Version.html

@@ -149,7 +149,7 @@
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='int'>1</span></pre></dd>
+        <dd><pre class="code"><span class='int'>2</span></pre></dd>
       
         <dt id="STRING-constant" class="">STRING =
           <div class="docstring">
@@ -180,7 +180,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:17 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Mbrao.html

@@ -121,7 +121,7 @@ Licensed under the MIT license, which can be found at http://www.opensource.org/
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:16 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/_index.html

@@ -386,7 +386,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:16 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/file.README.html

@@ -130,7 +130,7 @@ Mbrao::Parser.render(content)
 </div></div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:16 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/index.html

@@ -130,7 +130,7 @@ Mbrao::Parser.render(content)
 </div></div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:16 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Nov 24 16:21:16 2013 by
+  Generated on Fri Nov 29 10:05:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/lib/mbrao/content.rb

@@ -131,6 +131,14 @@ module Mbrao
     attr_accessor :updated_at
     attr_accessor :metadata
 
+    # The allowed string format for a datetime.
+    ALLOWED_DATETIME_FORMATS = [
+      "%Y%m%dT%H%M%S%z", "%Y%m%dT%H%M%S%Z",
+      "%FT%T%z", "%FT%T%Z", "%F %T %Z", "%F %T %z",
+      "%F %T", "%F %H:%M", "%F",
+      "%d/%m/%Y %T", "%d/%m/%Y %H:%M", "%d/%m/%Y"
+    ]
+
     # Creates a new content.
     #
     # @param uid [String] The UID for this content.
@@ -294,7 +302,7 @@ module Mbrao
         content
       end
 
-      # Extract locales from metadata.
+      # Extracts locales from metadata.
       #
       # @param metadata [Hash] The metadata that contains the locales.
       # @return [Array] The locales.
@@ -304,7 +312,7 @@ module Mbrao
         normalize_locales(locales)
       end
 
-      # Normalize locales for further usage.
+      # Normalizes locales for further usage.
       #
       # @param locales [Array] The locales to normalize.
       # @return [Array] The normalized locales.
@@ -325,7 +333,8 @@ module Mbrao
         end
       end
 
-      # Parse a datetime
+      # Parses a datetime.
+      #
       # @param value [String|DateTime|Fixnum] The value to parse.
       # @return [DateTime] The extracted value.
       def parse_datetime(value)
@@ -333,12 +342,29 @@ module Mbrao
           when "DateTime" then value
           when "Date", "Time" then value.to_datetime
           when "Float", "Fixnum" then
-            value.to_float > 0 ? Time.at(value.to_float).to_datetime : nil
-          else DateTime.strptime(value.ensure_string, "%Y%m%dT%H%M%S%z")
+            value.to_float > 0 ? Time.at(value.to_float).to_datetime : raise(ArgumentError.new)
+          else parse_datetime_string(value)
+        end
+      end
+
+      # Parses a datetime string.
+      #
+      # @param value [String] The value to parse.
+      # @return [DateTime] The extracted value.
+      def parse_datetime_string(value)
+        value = value.ensure_string
+
+        catch(:parsed) do
+          ALLOWED_DATETIME_FORMATS.each do |format|
+            rv = DateTime.strptime(value, format) rescue nil
+            throw(:parsed, rv) if rv
+          end
+
+          raise(ArgumentError.new)
         end
       end
 
-      # Extract tags from an array, making sure all the comma separated strings are evaluated.
+      # Extracts tags from an array, making sure all the comma separated strings are evaluated.
       #
       # @param value [String|Array] The string or array to parse.
       # @return [Array] The list of tags.
@@ -354,4 +380,4 @@ module Mbrao
         value.is_a?(Hash)
       end
   end
-end
+end

data/lib/mbrao/version.rb

@@ -17,7 +17,7 @@ module Mbrao
     MINOR = 4
 
     # The patch version.
-    PATCH = 1
+    PATCH = 2
 
     # The current version of mbrao.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

data/spec/mbrao/content_spec.rb

@@ -116,10 +116,43 @@ describe Mbrao::Content do
     end
 
     it "should try to parse everything else as a ISO8601 format" do
-      subject.send("#{attribute}=", "20120808T083000-0200")
+      subject.send("#{attribute}=", "20120808T083045-0200")
       value = subject.send(attribute)
       expect(value).to be_a(DateTime)
-      expect(value.strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T103000+0000")
+      expect(value.strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T103045+0000")
+
+      subject.send("#{attribute}=", "20120808T083045-02:00")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T103045+0000")
+
+      subject.send("#{attribute}=", "2012-08-08T08:30:45-0200")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T103045+0000")
+
+      subject.send("#{attribute}=", "2012-08-08T08:30:45-02:00")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T103045+0000")
+
+      subject.send("#{attribute}=", "2012-08-08 08:30:45 -0200")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T103045+0000")
+
+      subject.send("#{attribute}=", "2012-08-08 08:30:45 -02:00")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T103045+0000")
+
+      subject.send("#{attribute}=", "2012-08-08")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T000000+0000")
+
+      subject.send("#{attribute}=", "2012-08-08 08:30:45")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T083045+0000")
+
+      subject.send("#{attribute}=", "2012-08-08 08:30")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120808T083000+0000")
+
+      subject.send("#{attribute}=", "08/09/2012")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120908T000000+0000")
+
+      subject.send("#{attribute}=", "08/09/2012 08:30:45")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120908T083045+0000")
+
+      subject.send("#{attribute}=", "08/09/2012 08:30")
+      expect(subject.send(attribute).strftime("%Y%m%dT%H%M%S%z")).to eq("20120908T083000+0000")
 
       expect { subject.send("#{attribute}=", "ABC") }.to raise_error(Mbrao::Exceptions::InvalidDate)
       expect { subject.send("#{attribute}=", []) }.to raise_error(Mbrao::Exceptions::InvalidDate)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbrao
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lazier