motion-support 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b7dcb39d715784b27bfe53021adf4a192003479
-  data.tar.gz: 0655255905f40aa2365bde28c12fd6f35e989e58
+  metadata.gz: 92aedb6bf610b18c1dc1cdcdb855e66e45609c53
+  data.tar.gz: d23e118722a4ab7ef6ae56629e51fe7593f5960f
 SHA512:
-  metadata.gz: e75ec3e05aff72a5892b0789da5dc6a639f72fb8867c421bcaacce6e35876c5c80dc025d6b79b874f1a4d1fc289fc6e6da222c7bbbca8c21f8db4afbb26e8b53
-  data.tar.gz: ca524188bc00a0b8f0617e7a2e18abed2600f3bbd77035a1e196dff74bb8b6e0d74656cc2cd5338bd4a447f7bac0842b7e5e9620443605f7dfb12bb2f7678c51
+  metadata.gz: 6ef05d091c1d0037e3b42c4f458e6a39c6bc4b2d8d4a15d7d5ffd34638b39796ca84813f488c27ed4eb42525b9c5be16216e127c418f9df8c6f989872f132b91
+  data.tar.gz: 45ae5cba23a54f5adec630e5540db9271381cdd2c964f788282538e56072ec817552ba45ffffbe87b077db3c8b50772bf45d165c53f41c092a69f82c45a8c1ed

data/motion/core_ext/date/conversions.rb

@@ -8,9 +8,15 @@ class Date
       day_format = MotionSupport::Inflector.ordinalize(date.day)
       date.strftime("%B #{day_format}, %Y") # => "April 25th, 2007"
     },
-    :rfc822       => '%e %b %Y'
+    :rfc822       => '%e %b %Y',
+    :iso8601      => '%Y-%m-%d',
+    :xmlschema    => '%Y-%m-%dT00:00:00Z'
   }
 
+  def iso8601
+    strftime DATE_FORMATS[:iso8601]
+  end
+
   # Convert to a formatted string. See DATE_FORMATS for predefined formats.
   #
   # This method is aliased to <tt>to_s</tt>.
@@ -34,15 +40,13 @@ class Date
   #   Date::DATE_FORMATS[:month_and_year] = '%B %Y'
   #   Date::DATE_FORMATS[:short_ordinal] = ->(date) { date.strftime("%B #{date.day.ordinalize}") }
   def to_formatted_s(format = :default)
-    if formatter = DATE_FORMATS[format]
-      if formatter.respond_to?(:call)
-        formatter.call(self).to_s
-      else
-        strftime(formatter)
-      end
-    else
-      to_default_s
-    end
+    formatter = DATE_FORMATS[format]
+
+    return to_default_s unless formatter
+
+    return formatter.call(self).to_s if formatter.respond_to?(:call)
+
+    strftime(formatter)
   end
   alias_method :to_default_s, :to_s
   alias_method :to_s, :to_formatted_s
@@ -53,4 +57,8 @@ class Date
   end
   alias_method :default_inspect, :inspect
   alias_method :inspect, :readable_inspect
+
+  def xmlschema
+    strftime DATE_FORMATS[:xmlschema]
+  end
 end

data/motion/core_ext/object/to_json.rb

@@ -3,12 +3,12 @@
 class Object
   # Serializes the object to a hash then the hash using Cocoa's NSJSONSerialization
   def to_json
-    attributes = {}
-
-    self.instance_variables.each do |attribute|
-      key = attribute.to_s.gsub('@', '')
-      attributes[key] = self.instance_variable_get(attribute)
-    end
+    attributes =
+      if respond_to?(:to_hash)
+        to_hash.as_json
+      else
+        instance_values.as_json
+      end
 
     attributes.to_json
   end
@@ -73,7 +73,7 @@ end
 class String
   # Returns JSON-escaped +self+.
   def to_json
-    JSONString.escape self
+    JSONString.escape(self)
   end
 end
 
@@ -91,6 +91,26 @@ class Numeric
   end
 end
 
+class Date
+  def as_json
+    strftime("%Y-%m-%d")
+  end
+
+  def to_json
+    as_json.to_json
+  end
+end
+
+class Time
+  def as_json
+    xmlschema
+  end
+
+  def to_json
+    as_json.to_json
+  end
+end
+
 # For more complex objects (Array/Hash):
 # Convert an object into a "JSON-ready" representation composed of
 # primitives like Hash, Array, String, Numeric, and true/false/nil.

data/motion/core_ext/time/conversions.rb

@@ -13,9 +13,30 @@ class Time
     :rfc822       => lambda { |time|
       offset_format = time.formatted_offset(false)
       time.strftime("%a, %d %b %Y %H:%M:%S #{offset_format}")
-    }
+    },
+    :iso8601      => '%Y-%m-%dT%H:%M:%SZ'
   }
 
+  # Accepts a iso8601 time string and returns a new instance of Time
+  def self.iso8601(time_string)
+    format_string = "yyyy-MM-dd'T'HH:mm:ss"
+
+    # Fractional Seconds
+    format_string += '.SSS' if time_string.include?('.')
+
+    # Zulu (standard) or with a timezone
+    format_string += time_string.include?('Z') ? "'Z'" : 'ZZZZZ'
+
+    cached_date_formatter(format_string).dateFromString(time_string)
+  end
+
+  # Returns an iso8601-compliant string
+  # This method is aliased to <tt>xmlschema</tt>.
+  def iso8601
+    utc.strftime DATE_FORMATS[:iso8601]
+  end
+  alias_method :xmlschema, :iso8601
+
   # Converts to a formatted string. See DATE_FORMATS for builtin formats.
   #
   # This method is aliased to <tt>to_s</tt>.
@@ -41,12 +62,28 @@ class Time
   #   Time::DATE_FORMATS[:month_and_year] = '%B %Y'
   #   Time::DATE_FORMATS[:short_ordinal]  = ->(time) { time.strftime("%B #{time.day.ordinalize}") }
   def to_formatted_s(format = :default)
-    if formatter = DATE_FORMATS[format]
-      formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
-    else
-      to_default_s
-    end
+    return iso8601 if format == :iso8601
+
+    formatter = DATE_FORMATS[format]
+
+    return to_default_s unless formatter
+
+    return formatter.call(self).to_s if formatter.respond_to?(:call)
+
+    strftime(formatter)
   end
   alias_method :to_default_s, :to_s
   alias_method :to_s, :to_formatted_s
+
+  private
+
+  def self.cached_date_formatter(dateFormat)
+    Thread.current[:date_formatters] ||= {}
+    Thread.current[:date_formatters][dateFormat] ||=
+      NSDateFormatter.alloc.init.tap do |formatter|
+        formatter.dateFormat = dateFormat
+        formatter.timeZone   = NSTimeZone.timeZoneWithAbbreviation 'UTC'
+      end
+  end
+  private_class_method :cached_date_formatter
 end

data/motion/version.rb

@@ -1,3 +1,3 @@
 module MotionSupport
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/motion-support/core_ext/date/conversion_spec.rb

@@ -1,18 +1,61 @@
-describe "date" do
-  describe "conversions" do
-    it "should convert date to string" do
-      date = Date.new(2005, 2, 21)
-      date.to_s.should == "2005-2-21"
-      date.to_s(:short).should == "21 Feb"
-      date.to_s(:long).should == "February 21, 2005"
-      date.to_s(:long_ordinal).should == "February 21st, 2005"
-      date.to_s(:db).should == "2005-02-21"
-      date.to_s(:rfc822).should == "21 Feb 2005"
+describe 'date' do
+  describe 'conversions' do
+    before { @date = Date.new(2005, 2, 21) }
+
+    describe '#iso8601' do
+      it 'should convert to iso8601 format' do
+        @date.iso8601.should == '2005-02-21'
+      end
     end
-    
-    it "should make inspect readable" do
-      Date.new(2005, 2, 21).readable_inspect.should == "Mon, 21 Feb 2005"
-      Date.new(2005, 2, 21).readable_inspect.should == Date.new(2005, 2, 21).inspect
+
+    describe '#to_s' do
+      it 'should convert to db format by default' do
+        @date.to_s.should == '2005-2-21'
+      end
+
+      it 'should convert to short format' do
+        @date.to_s(:short).should == '21 Feb'
+      end
+
+      it 'should convert to long format' do
+        @date.to_s(:long).should == 'February 21, 2005'
+      end
+
+      it 'should convert to long_ordinal format' do
+        @date.to_s(:long_ordinal).should == 'February 21st, 2005'
+      end
+
+      it 'should convert to db format' do
+        @date.to_s(:db).should == '2005-02-21'
+      end
+
+      it 'should convert to rfc822 format' do
+        @date.to_s(:rfc822).should == '21 Feb 2005'
+      end
+
+      it 'should convert to iso8601 format' do
+        @date.to_s(:iso8601).should == '2005-02-21'
+      end
+
+      it 'should convert to xmlschema format' do
+        @date.to_s(:xmlschema).should == '2005-02-21T00:00:00Z'
+      end
+    end
+
+    describe '#readable_inspect' do
+      it 'should convert to a readable string' do
+        @date.readable_inspect.should == 'Mon, 21 Feb 2005'
+      end
+
+      it 'should also respond to #inspect' do
+        @date.readable_inspect.should == @date.inspect
+      end
+    end
+
+    describe '#xmlschema' do
+      it 'should convert to xmlschema format' do
+        @date.xmlschema.should == '2005-02-21T00:00:00Z'
+      end
     end
   end
 end

data/spec/motion-support/core_ext/object/to_json_spec.rb

@@ -36,9 +36,24 @@ describe ".to_json" do
     end
   end
 
+  describe "Time" do
+    it "should return iso8601" do
+      Time.new(2015, 12, 25, 1, 2, 3, '-05:00').utc.to_json.should == '"2015-12-25T06:02:03Z"'
+    end
+  end
+
+  describe "Date" do
+    it "should return iso8601" do
+      Date.new(2015, 12, 25).to_json.should == '"2015-12-25"'
+    end
+  end
+
   describe "array" do
     it "should convert mixed type array" do
-      [true, false, nil, {:foo => :bar}, 'fizz', ''].to_json.should == '[true,false,null,{"foo":"bar"},"fizz",""]'
+      input = [true, false, nil, {:foo => :bar}, 'fizz', '', Time.new(2015, 12, 25, 1, 2, 3, '-05:00').utc, Date.new(2015, 12, 25)]
+      output = '[true,false,null,{"foo":"bar"},"fizz","","2015-12-25T06:02:03Z","2015-12-25"]'
+
+      input.to_json.should == output
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-support
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Thomas Kadauke