sugarcube 1.0.4 → 1.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sugarcube (1.0.4)
+    sugarcube (1.0.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/sugarcube-color/uicolor.rb

@@ -41,8 +41,7 @@ class UIColor
     color = color.uicolor
 
     # make amount between 0 and 1
-    amount = amount > 0 ? amount : 0
-    amount = amount < 1 ? amount : 1
+    amount = [[0, amount].max, 1].min
     # start with precise amounts: 0, 0.5, and 1.
     if amount == 0 && self.alpha == color.alpha
       self

data/lib/sugarcube-nsdate.rb

@@ -12,4 +12,7 @@ Motion::Project::App.setup do |app|
   Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-nsdate/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
+
+  time = File.join(File.dirname(__FILE__), 'sugarcube-numbers/time.rb')
+  app.files.insert(insert_point, file)
 end

data/lib/sugarcube-nsdate/nsdate.rb

@@ -150,7 +150,7 @@ class NSDate
   #  (main)> t.time_array
   #  => [11, 29, 12]
   def time_array
-    return [self.hour, self.send(:min), self.sec]
+    return [self.hour, self.min, self.sec]
   end
 
   #  (main)> t = Time.new
@@ -158,7 +158,7 @@ class NSDate
   #  (main)> t.time_array
   #  => [2012, 9, 12, 11, 29, 12]
   def datetime_array
-    return [self.year, self.month, self.day, self.hour, self.send(:min), self.sec]
+    return [self.year, self.month, self.day, self.hour, self.min, self.sec]
   end
 
   #  (main)> t = Time.new

data/lib/sugarcube-numbers/time.rb

@@ -0,0 +1,81 @@
+class Numeric
+
+  def milliseconds
+    self / 1000.0
+  end
+  alias millisecond milliseconds
+  alias millisecs milliseconds
+  alias millisec milliseconds
+
+  def in_milliseconds
+    self * 1000
+  end
+
+  def seconds
+    self
+  end
+  alias second seconds
+  alias sec seconds
+  alias secs seconds
+
+  def in_seconds
+    self
+  end
+
+  def minutes
+    self * 60
+  end
+  alias minute minutes
+  alias min minutes
+  alias mins minutes
+
+  def in_minutes
+    self / 1.minute.to_f
+  end
+
+  def hours
+    self * 3600
+  end
+  alias hour hours
+
+  def in_hours
+    self / 1.hour.to_f
+  end
+
+  def days
+    self.hours * 24
+  end
+  alias day days
+
+  def in_days
+    self / 1.day.to_f
+  end
+
+  def weeks
+    self.days * 7
+  end
+  alias week weeks
+
+  def in_weeks
+    self / 1.week.to_f
+  end
+
+  def months
+    self.days * 30
+  end
+  alias month months
+
+  def in_months
+    self / 1.month.to_f
+  end
+
+  def years
+    self.days * 365
+  end
+  alias year years
+
+  def in_years
+    self / 1.year.to_f
+  end
+
+end

data/lib/sugarcube-timer.rb

@@ -12,4 +12,7 @@ Motion::Project::App.setup do |app|
   Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-timer/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
+
+  time = File.join(File.dirname(__FILE__), 'sugarcube-numbers/time.rb')
+  app.files.insert(insert_point, file)
 end

data/lib/sugarcube-timer/timer.rb

@@ -1,81 +1,4 @@
 class Numeric
-  def milliseconds
-    self / 1000.0
-  end
-  alias millisecond milliseconds
-  alias millisecs milliseconds
-  alias millisec milliseconds
-
-  def in_milliseconds
-    self * 1000
-  end
-
-  def seconds
-    self
-  end
-  alias second seconds
-  alias sec seconds
-  alias secs seconds
-
-  def in_seconds
-    self
-  end
-
-  def minutes
-    self * 60
-  end
-  alias minute minutes
-  alias min minutes
-  alias mins minutes
-
-  def in_minutes
-    self / 1.minute.to_f
-  end
-
-  def hours
-    self * 3600
-  end
-  alias hour hours
-
-  def in_hours
-    self / 1.hour.to_f
-  end
-
-  def days
-    self.hours * 24
-  end
-  alias day days
-
-  def in_days
-    self / 1.day.to_f
-  end
-
-  def weeks
-    self.days * 7
-  end
-  alias week weeks
-
-  def in_weeks
-    self / 1.week.to_f
-  end
-
-  def months
-    self.days * 30
-  end
-  alias month months
-
-  def in_months
-    self / 1.month.to_f
-  end
-
-  def years
-    self.days * 365
-  end
-  alias year years
-
-  def in_years
-    self / 1.year.to_f
-  end
 
   def later(user_info=nil, &fire)
     NSTimer.scheduledTimerWithTimeInterval(self, target: fire, selector: 'call:', userInfo: user_info, repeats: false)
@@ -84,6 +7,7 @@ class Numeric
   def every(user_info=nil, &fire)
     NSTimer.scheduledTimerWithTimeInterval(self, target: fire, selector: 'call:', userInfo: user_info, repeats: true)
   end
+
 end
 
 

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '1.0.4'
+  Version = '1.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -142,6 +142,7 @@ files:
 - lib/sugarcube-numbers/fixnum.rb
 - lib/sugarcube-numbers/nsstring.rb
 - lib/sugarcube-numbers/numeric.rb
+- lib/sugarcube-numbers/time.rb
 - lib/sugarcube-osx/adjust.rb
 - lib/sugarcube-pipes.rb
 - lib/sugarcube-pipes/pipes.rb