Merge pull request #100 from natmark/natmark/access_control

access control

Author: natmark

ProcessingKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ProcessingKit"
-  s.version      = "1.1.0"
+  s.version      = "1.1.1"
   s.summary      = "Visual Designing library for iOS."
   s.description  = <<-DESC
   ProcessingKit is a Visual Designing library for iOS.

ProcessingKit/Core/Color/Color.swift

@@ -20,12 +20,6 @@ public protocol ColorComponentsContract {
     var strokeWeight: CGFloat { get set }
 }
 
-class ColorComponents: ColorComponentsContract {
-    var fill: UIColor = UIColor.white
-    var stroke: UIColor = UIColor.clear
-    var strokeWeight: CGFloat = 1.0
-}
-
 public protocol ColorModelContract {
     func background(_ color: UIColor)
     func background(_ r: CGFloat, _ g: CGFloat, _ b: CGFloat, _ a: CGFloat)
@@ -39,56 +33,62 @@ public protocol ColorModelContract {
     mutating func noStroke()
 }
 
-struct ColorModel: ColorModelContract {
+public class ColorComponents: ColorComponentsContract {
+    public var fill: UIColor = UIColor.white
+    public var stroke: UIColor = UIColor.clear
+    public var strokeWeight: CGFloat = 1.0
+}
+
+public struct ColorModel: ColorModelContract {
     private var contextComponents: ContextComponenetsContract
     private var colorComponents: ColorComponentsContract
     private var frameComponents: FrameComponentsContract
 
-    init(contextComponents: ContextComponenetsContract, colorComponents: ColorComponentsContract, frameComponents: FrameComponentsContract) {
+    public init(contextComponents: ContextComponenetsContract, colorComponents: ColorComponentsContract, frameComponents: FrameComponentsContract) {
         self.contextComponents = contextComponents
         self.colorComponents = colorComponents
         self.frameComponents = frameComponents
     }
 
-    func background(_ color: UIColor) {
+    public func background(_ color: UIColor) {
         let g = self.contextComponents.context()
         g?.clear(self.frameComponents.bounds)
     }
 
-    func background(_ r: CGFloat, _ g: CGFloat, _ b: CGFloat, _ a: CGFloat) {
+    public func background(_ r: CGFloat, _ g: CGFloat, _ b: CGFloat, _ a: CGFloat) {
         self.background(UIColor(red: r / 255.0, green: g / 255.0, blue: b / 255.0, alpha: a / 255.0))
     }
 
-    func clear() {
+    public func clear() {
         let g = self.contextComponents.context()
         g?.clear(self.frameComponents.bounds)
     }
 
-    mutating func fill(_ color: UIColor) {
+    public mutating func fill(_ color: UIColor) {
         self.colorComponents.fill = color
     }
 
-    mutating func fill(_ r: CGFloat, _ g: CGFloat, _ b: CGFloat, _ a: CGFloat) {
+    public mutating func fill(_ r: CGFloat, _ g: CGFloat, _ b: CGFloat, _ a: CGFloat) {
         self.fill(UIColor(red: r / 255.0, green: g / 255.0, blue: b / 255.0, alpha: a / 255.0))
     }
 
-    mutating func stroke(_ color: UIColor) {
+    public mutating func stroke(_ color: UIColor) {
         self.colorComponents.stroke = color
     }
 
-    mutating func stroke(_ r: CGFloat, _ g: CGFloat, _ b: CGFloat, _ a: CGFloat) {
+    public mutating func stroke(_ r: CGFloat, _ g: CGFloat, _ b: CGFloat, _ a: CGFloat) {
         self.stroke(UIColor(red: r / 255.0, green: g / 255.0, blue: b / 255.0, alpha: a / 255.0))
     }
 
-    mutating func strokeWeight(_ weight: CGFloat) {
+    public mutating func strokeWeight(_ weight: CGFloat) {
         self.colorComponents.strokeWeight = weight
     }
 
-    mutating func noFill() {
+    public mutating func noFill() {
         self.colorComponents.fill = UIColor.clear
     }
 
-    mutating func noStroke() {
+    public mutating func noStroke() {
         self.colorComponents.stroke = UIColor.clear
     }
 }

ProcessingKit/Core/Context/Context.swift

@@ -27,8 +27,8 @@ public protocol ContextComponenetsContract {
     func context() -> CGContext?
 }
 
-class ContextComponents: ContextComponenetsContract {
-    func context() -> CGContext? {
+public class ContextComponents: ContextComponenetsContract {
+    public func context() -> CGContext? {
         #if os(iOS)
         return UIGraphicsGetCurrentContext()
         #elseif os(OSX)

ProcessingKit/Core/Environment/Frame.swift

@@ -21,42 +21,42 @@ public protocol FrameComponentsContract {
     var frameCount: UInt64 { get set }
 }
 
-class FrameComponents: FrameComponentsContract {
-    var bounds: CGRect = CGRect.zero
-    var frame: CGRect = CGRect.zero
-    var frameRate: CGFloat = 60.0
-    var frameCount: UInt64 = 0
-}
-
 public protocol FrameModelContract {
     var width: CGFloat { get }
     var height: CGFloat { get }
     var frameRate: CGFloat { get }
     mutating func frameRate(_ fps: CGFloat)
 }
 
-struct FrameModel: FrameModelContract {
+public class FrameComponents: FrameComponentsContract {
+    public var bounds: CGRect = CGRect.zero
+    public var frame: CGRect = CGRect.zero
+    public var frameRate: CGFloat = 60.0
+    public var frameCount: UInt64 = 0
+}
+
+public struct FrameModel: FrameModelContract {
     private var frameComponents: FrameComponentsContract
     private var timer: Timer?
 
-    init(frameComponents: FrameComponentsContract, timer: Timer?) {
+    public init(frameComponents: FrameComponentsContract, timer: Timer?) {
         self.frameComponents = frameComponents
         self.timer = timer
     }
 
-    var width: CGFloat {
+    public var width: CGFloat {
         return self.frameComponents.bounds.size.width
     }
 
-    var height: CGFloat {
+    public var height: CGFloat {
         return self.frameComponents.bounds.size.height
     }
 
-    var frameRate: CGFloat {
+    public var frameRate: CGFloat {
         return self.frameComponents.frameRate
     }
 
-    mutating func frameRate(_ fps: CGFloat) {
+    public mutating func frameRate(_ fps: CGFloat) {
         self.frameComponents.frameRate = fps
     }
 }

ProcessingKit/Core/Image/Image.swift

@@ -22,15 +22,15 @@ public protocol ImageModelContract {
     #endif
 }
 
-struct ImageModel: ImageModelContract {
+public struct ImageModel: ImageModelContract {
     private var contextComponents: ContextComponenetsContract
 
-    init(contextComponents: ContextComponenetsContract) {
+    public init(contextComponents: ContextComponenetsContract) {
         self.contextComponents = contextComponents
     }
 
     #if os(iOS)
-    func image(_ img: UIImage, _ x: CGFloat, _ y: CGFloat) {
+    public func image(_ img: UIImage, _ x: CGFloat, _ y: CGFloat) {
         let g = self.contextComponents.context()
         g?.saveGState()
         g?.translateBy(x: 0.0, y: img.size.height)
@@ -41,7 +41,7 @@ struct ImageModel: ImageModelContract {
         g?.restoreGState()
     }
 
-    func image(_ img: UIImage, _ x: CGFloat, _ y: CGFloat, _ width: CGFloat, _ height: CGFloat) {
+    public func image(_ img: UIImage, _ x: CGFloat, _ y: CGFloat, _ width: CGFloat, _ height: CGFloat) {
         let g = self.contextComponents.context()
         g?.saveGState()
         g?.translateBy(x: 0.0, y: height)
@@ -52,7 +52,7 @@ struct ImageModel: ImageModelContract {
         g?.restoreGState()
     }
     #elseif os(OSX)
-    func drawImage(_ img: NSImage, _ x: CGFloat, _ y: CGFloat) {
+    public func drawImage(_ img: NSImage, _ x: CGFloat, _ y: CGFloat) {
         let g = self.contextComponents.context()
         g?.saveGState()
         g?.translateBy(x: 0.0, y: img.size.height)
@@ -63,7 +63,7 @@ struct ImageModel: ImageModelContract {
         g?.restoreGState()
     }
 
-    func drawImage(_ img: NSImage, _ x: CGFloat, _ y: CGFloat, _ width: CGFloat, _ height: CGFloat) {
+    public func drawImage(_ img: NSImage, _ x: CGFloat, _ y: CGFloat, _ width: CGFloat, _ height: CGFloat) {
         let g = self.contextComponents.context()
         g?.saveGState()
         g?.translateBy(x: 0.0, y: height)

ProcessingKit/Core/Input/Date.swift

@@ -18,41 +18,41 @@ public protocol DateModelContract {
     func year() -> Int
 }
 
-struct DateModel: DateModelContract {
-    var currentDate: Date?
+public struct DateModel: DateModelContract {
+    private var currentDate: Date?
     // for test
-    init(currentDate: Date) {
+    public init(currentDate: Date) {
         self.currentDate = currentDate
     }
 
     init() {
     }
 
-    func millis() -> Int {
+    public func millis() -> Int {
         return self.getMillis()
     }
 
-    func second() -> Int {
+    public func second() -> Int {
         return self.getComponents().second ?? 0
     }
 
-    func minute() -> Int {
+    public func minute() -> Int {
         return self.getComponents().minute ?? 0
     }
 
-    func hour() -> Int {
+    public func hour() -> Int {
         return self.getComponents().hour ?? 0
     }
 
-    func day() -> Int {
+    public func day() -> Int {
         return self.getComponents().day ?? 0
     }
 
-    func month() -> Int {
+    public func month() -> Int {
         return self.getComponents().month ?? 0
     }
 
-    func year() -> Int {
+    public func year() -> Int {
         return self.getComponents().year ?? 0
     }