motion-loco 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c98e3096247b7eae3292a67a95d2b51a05683124
-  data.tar.gz: 808638ee1a7b95c5dd44b6758afaade0394526f2
+  metadata.gz: be786608ca687bfacb8732b95724bdd70a4144c8
+  data.tar.gz: e64bf30c3cf9a785335f8790e5a077488adcc79f
 SHA512:
-  metadata.gz: e3c2603821b5329287281c3f9ea3aeaace0fe69195bddc2bf4122c42db9a37d7ea61aa0993d9eaa658c6ab38ba0201d40ab1b11b9848b6fe4190683faada48e7
-  data.tar.gz: 682dd22c9ec387eacb23d69b9129304e707a00b501d26bf02f9888d42f38325e237aa17090711f0a4470bea3004f02722b86957676a7bacf7adec3fa25afd7d7
+  metadata.gz: 01a24f5e39072fad6e5c2d42c9f5af640418af29c2922695bca657cc8d38fd5532082f4d20adc1c065335d1babfd55d0493c825dc0d0525821f94a9142d8fab0
+  data.tar.gz: 8da3ec624e6e72a3b99168c4ac4a53f8a4eda39e1c4012d32eafb1cb32cc3fc9be441b997674df2677760e5a94bccecb7301a728f3967e4d701bdb35c77ea096

data/README.md

@@ -6,15 +6,9 @@ computed properties, and observers. **And Ember-Data inspired [data](#locofixtur
 
 ## What's New!
 
-### June 23th, 2013
+### September 19th, 2013
 
-#### SQLiteAdapter and Relationships!
-
-I need to write up some better documentation, but be sure to check out the [Loco::SQLiteAdapter](#locosqliteadapter) and the new `has_many` and `belongs_to` relationships in `Loco::Model`.
-
-The relationship stuff needs some major code clean up, so don't copy my code if you're doing anything similar for loading/saving relationship data. :)
-
-The [tests](https://github.com/brianpattison/motion-loco/tree/master/spec) all pass though... so that's something, right?
+Motion-Loco is being actively developed again after a few months of nothing, so yay!
 
 ## Installation
 

data/lib/motion-loco/controller.rb

@@ -19,11 +19,7 @@ module Loco
     end
     
     def self.method_missing(method, *args, &block)
-      if self.instance.respond_to? method
-        self.instance.send(method, *args)
-      else
-        super
-      end
+      self.instance.send(method, *args, &block)
     end
   end
   

data/lib/motion-loco/observable.rb

@@ -20,14 +20,6 @@ module Loco
       self
     end
     
-    # Used to create observable views.
-    def initWithFrame(frame)
-      super
-      initialize_bindings
-      set_properties({})
-      self
-    end
-    
     # Used to create observable table view cells
     def initWithStyle(style, reuseIdentifier:reuseIdentifier)
       super

data/lib/motion-loco/resizable.rb

@@ -1,9 +1,14 @@
 module Loco
   
   module Resizable
-    attr_accessor :parent_view
-    alias_method :parentView, :parent_view
-    alias_method :parentView=, :parent_view=
+    include Observable
+    attr_accessor :parent_view, :parentView
+    
+    # Required for bindings to work for both styles
+    def parent_view=(view)
+      self.parentView = view
+      super
+    end
     
     # The position of the bottom edge,
     # relative to the superview's bottom edge.
@@ -11,8 +16,8 @@ module Loco
     attr_accessor :bottom
     def bottom
       if @bottom.is_a?(String)
-        if self.parentView
-          self.parentView.bounds.size.height  * (@bottom.gsub('%', '').to_f / 100.0)
+        if self.parent_view
+          self.parent_view.bounds.size.height  * (@bottom.gsub('%', '').to_f / 100.0)
         else
           0
         end
@@ -30,7 +35,7 @@ module Loco
     attr_accessor :height
     def height
       if @height.is_a?(String)
-        self.parentView ? self.parentView.bounds.size.height  * (@height.gsub('%', '').to_f / 100.0) : 0
+        self.parent_view ? self.parent_view.bounds.size.height  * (@height.gsub('%', '').to_f / 100.0) : 0
       else
         @height
       end
@@ -46,7 +51,7 @@ module Loco
     attr_accessor :left
     def left
       if @left.is_a?(String)
-        self.parentView ? self.parentView.bounds.size.width  * (@left.gsub('%', '').to_f / 100.0) : 0
+        self.parent_view ? self.parent_view.bounds.size.width  * (@left.gsub('%', '').to_f / 100.0) : 0
       else
         @left
       end
@@ -62,7 +67,7 @@ module Loco
     attr_accessor :right
     def right
       if @right.is_a?(String)
-        self.parentView ? self.parentView.bounds.size.width  * (@right.gsub('%', '').to_f / 100.0) : 0
+        self.parent_view ? self.parent_view.bounds.size.width  * (@right.gsub('%', '').to_f / 100.0) : 0
       else
         @right
       end
@@ -78,7 +83,7 @@ module Loco
     attr_accessor :top
     def top
       if @top.is_a?(String)
-        self.parentView ? self.parentView.bounds.size.height  * (@top.gsub('%', '').to_f / 100.0) : 0
+        self.parent_view ? self.parent_view.bounds.size.height  * (@top.gsub('%', '').to_f / 100.0) : 0
       else
         @top
       end
@@ -93,7 +98,7 @@ module Loco
     attr_accessor :width
     def width
       if @width.is_a?(String)
-        self.parentView ? self.parentView.bounds.size.width  * (@width.gsub('%', '').to_f / 100.0) : 0
+        self.parent_view ? self.parent_view.bounds.size.width  * (@width.gsub('%', '').to_f / 100.0) : 0
       else
         @width
       end
@@ -105,17 +110,17 @@ module Loco
     
     # Create new instance from a hash of properties with values.
     # @param [Object] frame The CGRect or a Hash of properties.
-    def initWithFrame(frame)
-      if frame.is_a? Hash
+    def initWithFrame(properties={})
+      if properties.is_a? Hash
         # Set the initial property values from the given hash
         super(CGRect.new)
-        frame.each do |key, value|
-          self.send("#{key}=", value)
-        end
+        initialize_bindings
+        set_properties(properties)
       else
-        super(frame)
+        super(properties)
       end
       view_setup
+      
       self
     end
     
@@ -293,10 +298,14 @@ module Loco
     
     # Fires when the superview changes.
     def willMoveToSuperview(superview)
-      self.parentView = superview
+      self.parent_view = superview
       refresh_layout(superview)
     end
     
+    def self.included(base)
+      base.extend(Observable::ClassMethods)
+    end
+    
   end
   
 end

data/lib/motion-loco/version.rb

@@ -1,3 +1,3 @@
 module Loco
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/motion-loco/views.rb

@@ -7,22 +7,18 @@ module Loco
   
     class Button < UIButton
       include Resizable
-      include Observable
     end
   
     class DatePicker < UIDatePicker
       include Resizable
-      include Observable
     end
   
     class ImageView < UIImageView
       include Resizable
-      include Observable
     end
     
     class Label < UILabel
       include Resizable
-      include Observable
       
       def text_align
         case self.textAlignment
@@ -67,42 +63,34 @@ module Loco
     
     class PageControl < UIPageControl
       include Resizable
-      include Observable
     end
   
     class PickerView < UIPickerView
       include Resizable
-      include Observable
     end
   
     class ProgressView < UIProgressView
       include Resizable
-      include Observable
     end
   
     class ScrollView < UIScrollView
       include Resizable
-      include Observable
     end
   
     class Slider < UISlider
       include Resizable
-      include Observable
     end
   
     class TextView < UITextView
       include Resizable
-      include Observable
     end
   
     class Toolbar < UIToolbar
       include Resizable
-      include Observable
     end
   
     class View < UIView
       include Resizable
-      include Observable
       
       def border_radius
         self.layer.cornerRadius
@@ -117,7 +105,6 @@ module Loco
   
     class WebView < UIWebView
       include Resizable
-      include Observable
     end
     
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-loco
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Brian Pattison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print_motion