motion-loco 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzdjMjhmYjA5ZTgzNjEzMTg2ZTQ1ZjcxZjYyOGEwMWRjM2I3NWI2MA==
-  data.tar.gz: !binary |-
-    NTVkY2JlMmE0MzE1NTI0OTk2YmI5YjJiZmJiNmRlZGZlYmEyZDI3Mg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzQ5YTcyNjAxODRlYTU5NGVlMmE1YWU2OTc5MTcxYzVjZmVhNzkxNTk2NmQ3
-    ZDQxMzQ3ZTJlNzczYjYxYWI2OTQ2NTlmY2JlZGUzNzI4ODNiNTI2YjMxNTll
-    ZGZhNDI5MGFhZGM2MzM3ZTYwNWU4Y2NlMDYyODlmYTk2NGQxYTg=
-  data.tar.gz: !binary |-
-    MzlhNDI5ODUzODczZDZlNzgzMDIxOGNkYjkyMGU5YTZiY2M3YWM2NDg3YTNm
-    YWZiZjE2NzE3NWNiZTExNTZkYTAwOGYzY2NmZTlmYTY3MmUxOWVkZjU4NTVk
-    NTVlYzlkMWRkOTRmNWFhNWQxMTU4ZDZjMzQwY2JkODY0NmZhNTQ=
+SHA1:
+  metadata.gz: c98e3096247b7eae3292a67a95d2b51a05683124
+  data.tar.gz: 808638ee1a7b95c5dd44b6758afaade0394526f2
+SHA512:
+  metadata.gz: e3c2603821b5329287281c3f9ea3aeaace0fe69195bddc2bf4122c42db9a37d7ea61aa0993d9eaa658c6ab38ba0201d40ab1b11b9848b6fe4190683faada48e7
+  data.tar.gz: 682dd22c9ec387eacb23d69b9129304e707a00b501d26bf02f9888d42f38325e237aa17090711f0a4470bea3004f02722b86957676a7bacf7adec3fa25afd7d7

data/README.md

@@ -10,7 +10,7 @@ computed properties, and observers. **And Ember-Data inspired [data](#locofixtur
 
 #### 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`.
+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. :)
 

data/lib/motion-loco/adapter.rb

@@ -91,7 +91,7 @@ module Loco
   private
     
     def load(type, records, data)
-      if records.is_a? Array
+      if records.is_a? RecordArray
         if data.is_a? Hash
           data = data[type.to_s.underscore.pluralize]
         end

data/lib/motion-loco/array_controller.rb

@@ -0,0 +1,15 @@
+motion_require 'controller'
+
+module Loco
+  
+  class ArrayController < Controller
+  
+    def self.instance
+      @instance ||= begin
+        new(content: RecordArray.new)
+      end
+    end
+    
+  end
+  
+end

data/lib/motion-loco/associatable.rb

@@ -0,0 +1,122 @@
+module Loco
+  
+  module Associatable
+    
+    def initialize(properties={})
+      super
+      initialize_relationships
+      self
+    end
+    
+    def initialize_relationships
+      self.class.get_class_relationships.select{|relationship| relationship[:has_many] }.each do |relationship|
+        has_many_class = relationship[:has_many].to_s.classify.constantize
+        self.send("#{relationship[:has_many]}=", RecordArray.new(item_class: has_many_class, belongs_to: self))
+        self.send("#{relationship[:has_many].to_s.singularize}_ids=", [])
+      end
+    end
+    
+    module ClassMethods
+      
+      def belongs_to(model)
+        attr_accessor model
+        attr_accessor "#{model}_id"
+        
+        define_method "#{model}" do |&block|
+          belongs_to_class = model.to_s.classify.constantize
+          record = instance_variable_get("@#{model}")
+          if record
+            block.call(record) if block.is_a? Proc
+            record
+          else
+            belongs_to_id = self.send("#{model}_id")
+            if belongs_to_id
+              belongs_to_class.find(belongs_to_id) do |record|
+                instance_variable_set("@#{model}", record)
+                block.call(record) if block.is_a? Proc
+              end
+            else
+              block.call(record) if block.is_a? Proc
+              record
+            end
+          end
+        end
+        
+        define_method "#{model}=" do |record|
+          belongs_to_class = model.to_s.classify.constantize
+          raise TypeError, "Expecting a #{belongs_to_class} as defined by #belongs_to :#{model}" unless record.is_a? belongs_to_class
+          instance_variable_set("@#{model}", record)
+          self.send("#{model}_id=", (record.nil? ? nil : record.id))
+          record
+        end
+        
+        relationships = get_class_relationships
+        relationships << { belongs_to: model }
+      end
+      
+      def has_many(model)
+        attr_accessor model
+        attr_accessor "#{model.to_s.singularize}_ids"
+        
+        define_method "#{model}" do |&block|
+          has_many_class = model.to_s.singularize.classify.constantize
+          
+          record_array = instance_variable_get("@#{model}")
+          if record_array.is_loaded
+            block.call(record_array) if block.is_a? Proc
+            record_array
+          else
+            has_many_ids = instance_variable_get("@#{model.to_s.singularize}_ids")
+            if has_many_ids
+              array = has_many_class.find(has_many_ids) do |records|
+                record_array.load(records)
+                instance_variable_set("@#{model}", record_array)
+                block.call(record_array) if block.is_a? Proc
+              end
+              record_array.load(array)
+            else
+              query = {}
+              query["#{self.class.to_s.underscore.singularize}_id"] = self.id
+              array = has_many_class.find(query) do |records|
+                record_array.load(records)
+                instance_variable_set("@#{model}", record_array)
+                block.call(record_array) if block.is_a? Proc
+              end
+              record_array.load(array)
+            end
+            instance_variable_set("@#{model}", record_array)
+            record_array
+          end
+        end
+        
+        define_method "#{model}=" do |records|
+          has_many_class = model.to_s.singularize.classify.constantize
+          
+          if (records.is_a?(RecordArray) || records.is_a?(Array)) && (records.length == 0 || (records.length > 0 && records.first.class == has_many_class))
+            unless records.is_a?(RecordArray)
+              record_array = RecordArray.new(item_class: has_many_class, belongs_to: self)
+              record_array.addObjectsFromArray(records)
+              records = record_array
+            end
+          else
+            raise TypeError, "Expecting a Loco::RecordArray of #{has_many_class} objects as defined by #has_many :#{model}"
+          end
+          
+          instance_variable_set("@#{model}", records)
+          instance_variable_set("@#{model.to_s.singularize}_ids", records.map(&:id))
+          records
+        end
+        
+        relationships = get_class_relationships
+        relationships << { has_many: model }
+      end
+      
+    end
+    
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+    
+  end
+  
+end

data/lib/motion-loco/controller.rb

@@ -4,6 +4,15 @@ module Loco
   
   class Controller
     include Observable
+    property :content
+    
+    def method_missing(method, *args, &block)
+      if self.content.respond_to? method
+        self.content.send(method, *args)
+      else
+        super
+      end
+    end
   
     def self.instance
       @instance ||= new

data/lib/motion-loco/model.rb

@@ -4,178 +4,10 @@ motion_require 'record_array'
 module Loco
   
   class Model
+    include Associatable
     include Observable
+    include Persistable
     property :id, :integer
-    
-    def destroy(&block)
-      adapter = self.class.get_class_adapter
-      unless self.new?
-        adapter.delete_record(self) do |record|
-          block.call(record) if block.is_a? Proc
-        end
-      end
-    end
-    
-    def load(id, data)
-      data.merge!({ id: id })
-      self.set_properties(data)
-      self
-    end
-    
-    def new?
-      self.id.nil?
-    end
-    
-    def save(&block)
-      adapter = self.class.get_class_adapter
-      if self.new?
-        adapter.create_record(self) do |record|
-          block.call(record) if block.is_a? Proc
-        end
-      else
-        adapter.update_record(self) do |record|
-          block.call(record) if block.is_a? Proc
-        end
-      end
-    end
-    
-    def serialize(options={})
-      self.class.get_class_adapter.serialize(self, options)
-    end
-    
-    class << self
-      
-      def adapter(adapter_class, *args)
-        if adapter_class.is_a? String
-          @adapter = adapter_class.constantize.new(*args)
-        else
-          @adapter = adapter_class.new(*args)
-        end
-      end
-      
-      def belongs_to(model)
-        attr_accessor model
-        attr_accessor "#{model}_id"
-        
-        belongs_to_class_name = model.to_s.classify
-        
-        define_method "#{model}" do |&block|
-          record = instance_variable_get("@#{model}")
-          if record
-            block.call(record) if block.is_a? Proc
-            record
-          else
-            belongs_to_id = self.send("#{model}_id")
-            if belongs_to_id
-              belongs_to_class_name.constantize.find(belongs_to_id) do |record|
-                instance_variable_set("@#{model}", record)
-                block.call(record) if block.is_a? Proc
-              end
-            else
-              block.call(record) if block.is_a? Proc
-              record
-            end
-          end
-        end
-        
-        define_method "#{model}=" do |record|
-          raise TypeError, "Expecting a #{belongs_to_class_name} as defined by #belongs_to :#{model}" unless record.is_a? belongs_to_class_name.constantize
-          self.send("#{model}_id=", (record.nil? ? nil : record.id))
-          instance_variable_set("@#{model}", record)
-          record
-        end
-        
-        relationships = get_class_relationships
-        relationships << { belongs_to: model }
-      end
-      
-      def has_many(model)
-        attr_accessor model
-        attr_accessor "#{model.to_s.singularize}_ids"
-        
-        has_many_class_name = model.to_s.singularize.classify
-        
-        define_method "#{model}" do |&block|
-          has_many_class = has_many_class_name.constantize
-          records = instance_variable_get("@#{model}")
-          if records
-            block.call(records) if block.is_a? Proc
-            records
-          else
-            has_many_ids = self.send("#{model.to_s.singularize}_ids")
-            if has_many_ids
-              has_many_class.find(has_many_ids) do |records|
-                block.call(records) if block.is_a? Proc
-              end
-            else
-              query = {}
-              query["#{self.class.to_s.underscore.singularize}_id"] = self.id
-              has_many_class.find(query) do |records|
-                block.call(records) if block.is_a? Proc
-              end
-            end
-          end
-        end
-        
-        define_method "#{model}=" do |records|
-          has_many_class = has_many_class_name.constantize
-          if (records.is_a?(RecordArray) || records.is_a?(Array)) && (records.length == 0 || (records.length > 0 && records.first.class == has_many_class))
-            unless records.is_a?(RecordArray)
-              record_array = RecordArray.new
-              record_array.addObjectsFromArray(records)
-              records = record_array
-            end
-          else
-            raise TypeError, "Expecting a Loco::RecordArray of #{has_many_class_name} objects as defined by #has_many :#{model}"
-          end
-          
-          self.send("#{model.to_s.singularize}_ids=", records.map(&:id))
-          instance_variable_set("@#{model}", records)
-        end
-        
-        relationships = get_class_relationships
-        relationships << { has_many: model }
-      end
-      
-      def find(id=nil, &block)
-        adapter = self.get_class_adapter
-        if id.nil?
-          # Return all records
-          records = RecordArray.new
-          adapter.find_all(self, records) do |records|
-            block.call(records) if block.is_a? Proc
-          end
-        elsif id.is_a? Array
-          # Return records with given ids
-          records = RecordArray.new
-          id.each do |i|
-            records << self.new(id: i)
-          end
-          adapter.find_many(self, records, id) do |records|
-            block.call(records) if block.is_a? Proc
-          end
-        elsif id.is_a? Hash
-          # Return records matching query
-          records = RecordArray.new
-          adapter.find_query(self, records, id) do |records|
-            block.call(records) if block.is_a? Proc
-          end
-        else
-          record = self.new(id: id)
-          adapter.find(record, id) do |record|
-            block.call(record) if block.is_a? Proc
-          end
-        end
-      end
-      alias_method :all, :find
-      alias_method :where, :find
-      
-      def get_class_adapter
-        @adapter ||= Adapter.new
-      end
-        
-    end
-    
   end
   
 end

data/lib/motion-loco/persistable.rb

@@ -0,0 +1,96 @@
+module Loco
+  
+  module Persistable
+    
+    def destroy(&block)
+      adapter = self.class.get_class_adapter
+      unless self.new?
+        adapter.delete_record(self) do |record|
+          block.call(record) if block.is_a? Proc
+        end
+      end
+    end
+    
+    def load(id, data)
+      data.merge!({ id: id })
+      self.set_properties(data)
+      self
+    end
+    
+    def new?
+      self.id.nil?
+    end
+    
+    def save(&block)
+      adapter = self.class.get_class_adapter
+      if self.new?
+        adapter.create_record(self) do |record|
+          block.call(record) if block.is_a? Proc
+        end
+      else
+        adapter.update_record(self) do |record|
+          block.call(record) if block.is_a? Proc
+        end
+      end
+    end
+    
+    def serialize(options={})
+      self.class.get_class_adapter.serialize(self, options)
+    end
+    
+    module ClassMethods
+      
+      def adapter(adapter_class, *args)
+        if adapter_class.is_a? String
+          @adapter = adapter_class.constantize.new(*args)
+        else
+          @adapter = adapter_class.new(*args)
+        end
+      end
+      
+      def find(id=nil, &block)
+        adapter = self.get_class_adapter
+        if id.nil?
+          # Return all records
+          records = RecordArray.new(item_class: self.class)
+          adapter.find_all(self, records) do |records|
+            block.call(records) if block.is_a? Proc
+          end
+        elsif id.is_a? Array
+          # Return records with given ids
+          records = RecordArray.new(item_class: self.class)
+          id.each do |i|
+            records << self.new(id: i)
+          end
+          adapter.find_many(self, records, id) do |records|
+            block.call(records) if block.is_a? Proc
+          end
+        elsif id.is_a? Hash
+          # Return records matching query
+          records = RecordArray.new(item_class: self.class)
+          adapter.find_query(self, records, id) do |records|
+            block.call(records) if block.is_a? Proc
+          end
+        else
+          record = self.new(id: id)
+          adapter.find(record, id) do |record|
+            block.call(record) if block.is_a? Proc
+          end
+        end
+      end
+      alias_method :all, :find
+      alias_method :where, :find
+      
+      def get_class_adapter
+        @adapter ||= Adapter.new
+      end
+      
+    end
+    
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+    
+  end
+  
+end

data/lib/motion-loco/record_array.rb

@@ -2,22 +2,64 @@ motion_require 'observable'
 
 module Loco
   
-  class RecordArray < Array
+  class RecordArray
     include Observable
+    property :belongs_to
+    property :content
+    property :is_loaded, :string
+    property :item_class
+    property :length, :integer
     
-    def load(type, data)
-      self.removeAllObjects
-      data.each do |item_data|
-        self.addObject(type.new(item_data))
+    def <<(record)
+      self.addObjectsFromArray([record])
+    end
+    
+    def addObjectsFromArray(objects)
+      objects.each do |object|
+        object.send("#{self.belongs_to.class.to_s.underscore}=", self.belongs_to) if self.belongs_to
       end
+      self.content.addObjectsFromArray(objects)
+      update_properties
       self
     end
     
     def initialize(properties={})
-      self.init
+      super
+      self.content = Array.new
+      self.length = 0
+      self
+    end
+    
+    def load(type, data=nil)
+      if type.is_a? RecordArray
+        self.content = type.content
+      else
+        self.item_class = type      
+        self.content.removeAllObjects
+        data.each do |item_data|
+          self.content.addObject(type.new(item_data))
+        end
+      end
+      
+      update_properties
+      self.is_loaded = true
+      
       self
     end
     
+    def method_missing(method, *args, &block)
+      self.content.send(method, *args, &block)
+    end
+    
+  private
+  
+    def update_properties
+      self.length = self.content.length
+      if self.belongs_to
+        self.belongs_to.send("#{self.item_class.to_s.underscore.singularize}_ids=", self.content.map(&:id))
+      end
+    end
+    
   end
   
 end

data/lib/motion-loco/resizable.rb

@@ -9,6 +9,17 @@ module Loco
     # relative to the superview's bottom edge.
     # @return [Integer]
     attr_accessor :bottom
+    def bottom
+      if @bottom.is_a?(String)
+        if self.parentView
+          self.parentView.bounds.size.height  * (@bottom.gsub('%', '').to_f / 100.0)
+        else
+          0
+        end
+      else
+        @bottom
+      end
+    end
     def bottom=(bottom)
       super
       refresh_layout
@@ -17,6 +28,13 @@ module Loco
     # The height of the view.
     # @return [Integer]
     attr_accessor :height
+    def height
+      if @height.is_a?(String)
+        self.parentView ? self.parentView.bounds.size.height  * (@height.gsub('%', '').to_f / 100.0) : 0
+      else
+        @height
+      end
+    end
     def height=(height)
       super
       refresh_layout
@@ -26,6 +44,13 @@ module Loco
     # relative to the superview's left edge.
     # @return [Integer]
     attr_accessor :left
+    def left
+      if @left.is_a?(String)
+        self.parentView ? self.parentView.bounds.size.width  * (@left.gsub('%', '').to_f / 100.0) : 0
+      else
+        @left
+      end
+    end
     def left=(left)
       super
       refresh_layout
@@ -35,6 +60,13 @@ module Loco
     # relative to the superview's right edge.
     # @return [Integer]
     attr_accessor :right
+    def right
+      if @right.is_a?(String)
+        self.parentView ? self.parentView.bounds.size.width  * (@right.gsub('%', '').to_f / 100.0) : 0
+      else
+        @right
+      end
+    end
     def right=(right)
       super
       refresh_layout
@@ -44,6 +76,13 @@ module Loco
     # relative to the superview's top edge.
     # @return [Integer]
     attr_accessor :top
+    def top
+      if @top.is_a?(String)
+        self.parentView ? self.parentView.bounds.size.height  * (@top.gsub('%', '').to_f / 100.0) : 0
+      else
+        @top
+      end
+    end
     def top=(top)
       super
       refresh_layout
@@ -52,6 +91,13 @@ module Loco
     # The width of the view.
     # @return [Integer]
     attr_accessor :width
+    def width
+      if @width.is_a?(String)
+        self.parentView ? self.parentView.bounds.size.width  * (@width.gsub('%', '').to_f / 100.0) : 0
+      else
+        @width
+      end
+    end
     def width=(width)
       super
       refresh_layout
@@ -235,6 +281,7 @@ module Loco
         view.refresh_layout(self) if view.is_a? Resizable
       end
     end
+    alias_method :refreshLayout, :refresh_layout
     
     def view_setup
       viewSetup
@@ -249,6 +296,7 @@ module Loco
       self.parentView = superview
       refresh_layout(superview)
     end
+    
   end
   
 end

data/lib/motion-loco/sqlite_adapter.rb

@@ -14,6 +14,7 @@ module Loco
       end
       save_data_for_type(type)
       load(type, record, data)
+      save_has_many(record)
       block.call(record) if block.is_a? Proc
       record
     end
@@ -73,6 +74,7 @@ module Loco
         end
         save_data_for_type(type)
         load(type, record, data)
+        save_has_many(record)
         block.call(record) if block.is_a? Proc
         record
       else
@@ -186,6 +188,15 @@ module Loco
       raise "Error when saving #{type}: #{error[0].description}" unless context(type).save(error)
     end
     
+    def save_has_many(record)
+      record.class.get_class_relationships.select{|relationship| relationship[:has_many] }.each do |relationship|
+        related = record.send("#{relationship[:has_many]}")
+        related.each do |r|
+          r.save
+        end
+      end
+    end
+    
     def transform_data(type, data)
       if data.is_a? Array
         super(type, data.map{|object|

data/lib/motion-loco/version.rb

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

data/lib/motion-loco/views.rb

@@ -23,6 +23,51 @@ module Loco
     class Label < UILabel
       include Resizable
       include Observable
+      
+      def text_align
+        case self.textAlignment
+        when NSTextAlignmentLeft
+          'left'
+        when NSTextAlignmentCenter
+          'center'
+        when NSTextAlignmentRight
+          'right'
+        when NSTextAlignmentJustified
+          'justified'
+        when NSTextAlignmentNatural
+          'natural'
+        end
+      end
+      alias_method :textAlign, :text_align
+      
+      def text_align=(alignment)
+        case alignment
+        when 'left'
+          self.textAlignment = NSTextAlignmentLeft
+        when 'center'
+          self.textAlignment = NSTextAlignmentCenter
+        when 'right'
+          self.textAlignment = NSTextAlignmentRight
+        when 'justified'
+          self.textAlignment = NSTextAlignmentJustified
+        when 'natural'
+          self.textAlignment = NSTextAlignmentNatural
+        end
+      end
+      alias_method :textAlign=, :text_align=
+      
+      def textAlignment=(alignment)
+        if alignment.is_a? String
+          self.text_align = alignment
+        else
+          super
+        end
+      end
+    end
+    
+    class PageControl < UIPageControl
+      include Resizable
+      include Observable
     end
   
     class PickerView < UIPickerView
@@ -58,6 +103,16 @@ module Loco
     class View < UIView
       include Resizable
       include Observable
+      
+      def border_radius
+        self.layer.cornerRadius
+      end
+      alias_method :borderRadius, :border_radius
+      
+      def border_radius=(radius)
+        self.layer.cornerRadius = radius
+      end
+      alias_method :borderRadius=, :border_radius=
     end
   
     class WebView < UIWebView

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-loco
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Brian Pattison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print_motion
@@ -70,17 +70,17 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "Motion-Loco is a library for RubyMotion that includes Ember.js inspired\n
+description: "Motion-Loco is a library for RubyMotion that includes Ember.js inspired\n
   \                         bindings, computed properties, and observers.\n                          Also
   included is a set of views that are easier to position and size.\n                        "
 email:
@@ -91,11 +91,14 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/motion-loco/adapter.rb
+- lib/motion-loco/array_controller.rb
+- lib/motion-loco/associatable.rb
 - lib/motion-loco/controller.rb
 - lib/motion-loco/convenience_methods.rb
 - lib/motion-loco/fixture_adapter.rb
 - lib/motion-loco/model.rb
 - lib/motion-loco/observable.rb
+- lib/motion-loco/persistable.rb
 - lib/motion-loco/proc.rb
 - lib/motion-loco/record_array.rb
 - lib/motion-loco/resizable.rb
@@ -116,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Library for RubyMotion that includes Ember.js inspired bindings, computed