motion-loco 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be786608ca687bfacb8732b95724bdd70a4144c8
-  data.tar.gz: e64bf30c3cf9a785335f8790e5a077488adcc79f
+  metadata.gz: 8365d10e57e456f796f6847f82ed4c65d0ca82c1
+  data.tar.gz: aacf5c5adfc39986d23e112c66eb941e900bda0e
 SHA512:
-  metadata.gz: 01a24f5e39072fad6e5c2d42c9f5af640418af29c2922695bca657cc8d38fd5532082f4d20adc1c065335d1babfd55d0493c825dc0d0525821f94a9142d8fab0
-  data.tar.gz: 8da3ec624e6e72a3b99168c4ac4a53f8a4eda39e1c4012d32eafb1cb32cc3fc9be441b997674df2677760e5a94bccecb7301a728f3967e4d701bdb35c77ea096
+  metadata.gz: 993356f6d2402a523fcfb23f1d9f5fd95850a8f286dc71c286e857dba84fc8a11ae0702a42f5e3ed70f28effe34766f053afe1f3a41658114beba2e3186afe57
+  data.tar.gz: 0935b838d4ef0981bd77d1811419e98181592d86cf8d788cd83cd2f1eba3f1408d0ab4bce5563331ba80015a134f7fb7874813e6d7e91c4db0fb69264d1e8637

data/README.md

@@ -106,41 +106,6 @@ PersonController.content = @person
 @label.text # "Brian Pattison"
 ```
 
-### Loco::UI::TableView
-
-A `Loco::UI::TableView` is used for to easily bind a collection of objects
-to a `UITableView` and each item in the collection to a reusable `UITableViewCell`.
-
-```ruby
-class MyTableViewCell < Loco::UI::TableViewCell
-  # The `view_setup` method is called the first time the cell is created.
-  # Bindings can be made to the item assigned to the cell
-  # by binding to `parentView.content`.
-  def view_setup
-    @label = Loco::UI::Label.alloc.initWithFrame(
-      textBinding: 'parentView.content.first_name',
-      height: 30,
-      left: 60,
-      right: 30,
-      top: 5
-    )
-    self.addSubview(@label)
-  end
-end
-
-class MyTableView < Loco::UI::TableView
-  item_view_class MyTableViewCell
-end
-
-@table_view = MyTableView.alloc.initWithFrame(
-  content: [Person.new(first_name: 'Brian'), Person.new(first_name: 'Kirsten')],
-  bottom: 0,
-  left: 0,
-  right: 0,
-  top: 0
-)
-```
-
 ### Loco::FixtureAdapter
 
 ```ruby

data/lib/motion-loco/associatable.rb

@@ -10,20 +10,20 @@ module Loco
     
     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))
+        has_many_class = relationship[:class_name] ? relationship[:class_name].to_s.classify.constantize : relationship[:has_many].to_s.classify.constantize
+        self.send("#{relationship[:has_many]}=", RecordArray.new(relationship: relationship, 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)
+      def belongs_to(model, options={})
         attr_accessor model
         attr_accessor "#{model}_id"
         
         define_method "#{model}" do |&block|
-          belongs_to_class = model.to_s.classify.constantize
+          belongs_to_class = options[:class_name] ? options[:class_name].to_s.classify.constantize : model.to_s.classify.constantize
           record = instance_variable_get("@#{model}")
           if record
             block.call(record) if block.is_a? Proc
@@ -43,24 +43,26 @@ module Loco
         end
         
         define_method "#{model}=" do |record|
-          belongs_to_class = model.to_s.classify.constantize
+          belongs_to_class = options[:class_name] ? options[:class_name].to_s.classify.constantize : 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
         
+        alias_method model.to_s.camelize(:lower), model
+        alias_method "#{model.to_s.camelize(:lower)}=", "#{model}="
+        
         relationships = get_class_relationships
-        relationships << { belongs_to: model }
+        relationships << { belongs_to: model, class_name: options[:class_name] }
       end
       
-      def has_many(model)
+      def has_many(model, options={})
         attr_accessor model
         attr_accessor "#{model.to_s.singularize}_ids"
         
         define_method "#{model}" do |&block|
-          has_many_class = model.to_s.singularize.classify.constantize
-          
+          has_many_class = options[:class_name] ? options[:class_name].to_s.classify.constantize : 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
@@ -76,7 +78,8 @@ module Loco
               record_array.load(array)
             else
               query = {}
-              query["#{self.class.to_s.underscore.singularize}_id"] = self.id
+              foreign_key = options[:foreign_key] ? options[:foreign_key] : "#{self.class.to_s.underscore.singularize}_id"
+              query[foreign_key] = self.id
               array = has_many_class.find(query) do |records|
                 record_array.load(records)
                 instance_variable_set("@#{model}", record_array)
@@ -90,8 +93,7 @@ module Loco
         end
         
         define_method "#{model}=" do |records|
-          has_many_class = model.to_s.singularize.classify.constantize
-          
+          has_many_class = options[:class_name] ? options[:class_name].to_s.classify.constantize : 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)
@@ -107,8 +109,11 @@ module Loco
           records
         end
         
+        alias_method model.to_s.camelize(:lower), model
+        alias_method "#{model.to_s.camelize(:lower)}=", "#{model}="
+        
         relationships = get_class_relationships
-        relationships << { has_many: model }
+        relationships << { has_many: model, class_name: options[:class_name] }
       end
       
     end

data/lib/motion-loco/fixture_adapter.rb

@@ -13,7 +13,8 @@ module Loco
     def find(record, id, &block)
       type = record.class
       error = Pointer.new(:id)
-      file = File.read(File.join(NSBundle.mainBundle.resourcePath, "fixtures", "#{type.to_s.underscore.pluralize}.json"))
+      filename = File.join(NSBundle.mainBundle.resourcePath, "fixtures", "#{type.to_s.underscore.gsub('nskvo_notifying_', '').pluralize}.json")
+      file = File.read(filename)
       data = NSJSONSerialization.JSONObjectWithData(file.to_data, options:JSON_OPTIONS, error:error).find{|obj| obj[:id] == id }
       if data
         load(type, record, data)

data/lib/motion-loco/observable.rb

@@ -20,14 +20,6 @@ module Loco
       self
     end
     
-    # Used to create observable table view cells
-    def initWithStyle(style, reuseIdentifier:reuseIdentifier)
-      super
-      initialize_bindings
-      set_properties({})
-      self
-    end
-    
     # Change one or many properties from a hash of properties with values.
     # @param [Hash] properties_hash
     def set_properties(properties_hash)
@@ -36,6 +28,7 @@ module Loco
         self.send("#{key}=", value)
       end
     end
+    alias_method :setProperties, :set_properties
     
     # Change one or many properties from a hash of properties with values.
     # Only updates attributes defined with #property.
@@ -48,6 +41,7 @@ module Loco
         end
       end
     end
+    alias_method :updateAttributes, :update_attributes
     
     def method_missing(method, *args, &block)
       if method.end_with?('_binding=') || method.end_with?('Binding=')
@@ -143,6 +137,8 @@ module Loco
         
         unless @class_properties.include? name
           attr_accessor name
+          alias_method name.to_s.camelize(:lower), name
+          alias_method "#{name.to_s.camelize(:lower)}=", "#{name}="
         end
         
         if type.is_a? Proc

data/lib/motion-loco/record_array.rb

@@ -9,6 +9,7 @@ module Loco
     property :is_loaded, :string
     property :item_class
     property :length, :integer
+    property :relationship, :hash
     
     def <<(record)
       self.addObjectsFromArray([record])
@@ -56,7 +57,7 @@ module Loco
     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))
+        self.belongs_to.send("#{self.relationship[:has_many].to_s.singularize}_ids=", self.content.map(&:id))
       end
     end
     

data/lib/motion-loco/text_alignable.rb

@@ -0,0 +1,47 @@
+module Loco
+  
+  module TextAlignable
+    
+    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
+  
+end

data/lib/motion-loco/version.rb

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

data/lib/motion-loco/views.rb

@@ -19,46 +19,7 @@ module Loco
     
     class Label < UILabel
       include Resizable
-      
-      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
+      include TextAlignable
     end
     
     class PageControl < UIPageControl
@@ -80,6 +41,28 @@ module Loco
     class Slider < UISlider
       include Resizable
     end
+    
+    class TableView < UITableView
+      include Resizable
+    end
+    
+    class TableViewCell < UITableViewCell
+      include Observable
+
+      property :content
+
+      def initWithStyle(style, reuseIdentifier:reuseIdentifier)
+        initialize_bindings
+        set_properties({})
+        view_setup # Needed because it's not Loco::Resizable
+        self
+      end
+    end
+    
+    class TextField < UITextField
+      include Resizable
+      include TextAlignable
+    end
   
     class TextView < UITextView
       include Resizable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-loco
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Pattison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print_motion
@@ -104,7 +104,7 @@ files:
 - lib/motion-loco/resizable.rb
 - lib/motion-loco/rest_adapter.rb
 - lib/motion-loco/sqlite_adapter.rb
-- lib/motion-loco/table_view.rb
+- lib/motion-loco/text_alignable.rb
 - lib/motion-loco/version.rb
 - lib/motion-loco/view_controller.rb
 - lib/motion-loco/views.rb
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Library for RubyMotion that includes Ember.js inspired bindings, computed

data/lib/motion-loco/table_view.rb

@@ -1,114 +0,0 @@
-motion_require 'observable'
-motion_require 'resizable'
-
-module Loco
-  
-  module UI
-  
-    class TableViewCell < UITableViewCell
-      include Observable
-    
-      property :content
-    
-      def initWithStyle(style, reuseIdentifier:reuseIdentifier)
-        if super
-          view_setup # Needed because it's not Loco::Resizable
-        end
-        self
-      end
-    
-      def select
-        Loco.debug("Override #{self.class}#select with the action to take when the row is selected")
-      end
-    
-      def view_controller(superview=nil)
-        if superview
-          view_controller = superview.nextResponder
-        else
-          view_controller = self.superview.nextResponder
-        end
-        if view_controller.is_a? UIViewController
-          view_controller
-        elsif view_controller.is_a? UIView
-          self.view_controller(view_controller)
-        end
-      end
-      alias_method :viewController, :view_controller
-    
-      def view_setup
-        viewSetup
-      end
-    
-      def viewSetup
-        Loco.debug("Override #{self.class}#viewSetup or #{self.class}#view_setup to customize the view")
-      end
-    end
-  
-    class TableView < UITableView
-      include Resizable
-      include Observable
-    
-      property :content
-    
-      def content=(value)
-        super
-        self.reloadData
-      end
-    
-      def cell_id
-        @cell_id ||= "CELL_#{self.object_id}"
-      end
-    
-      def initWithFrame(frame)
-        super(frame)
-        self.dataSource = self.delegate = self
-      end
-      
-      def item_view_class
-        self.class.get_item_view_class
-      end
-      
-      # UITableViewDelegate implementation for returning the cell at a given indexPath.
-      # @return [Loco::TableViewCell]
-      def tableView(tableView, cellForRowAtIndexPath:indexPath)
-        cell = tableView.dequeueReusableCellWithIdentifier(cell_id) 
-        unless cell
-          cell = self.item_view_class.alloc.initWithStyle(UITableViewCellStyleDefault, reuseIdentifier:cell_id)
-        end
-        cell.content = self.content[indexPath.row]
-        cell
-      end
-    
-      # UITableViewDelegate implementation for selecting a cell at a given indexPath.
-      def tableView(tableView, didSelectRowAtIndexPath:indexPath)
-        cell = tableView.cellForRowAtIndexPath(indexPath)
-        cell.select
-      end
-    
-      # UITableViewDelegate implementation for returning the number of rows in a section.
-      # @return [Integer]
-      def tableView(tableView, numberOfRowsInSection:section)
-        if self.content.is_a? Array
-          self.content.length
-        else
-          0
-        end
-      end
-    
-      class << self
-      
-        def item_view_class(view_class)
-          @item_view_class = view_class
-        end
-        alias_method :itemViewClass, :item_view_class
-      
-        def get_item_view_class
-          @item_view_class ||= TableViewCell
-        end
-      
-      end
-    end
-    
-  end
-  
-end