motion-prime 0.8.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGVhYzU1YWVlZDBhZTZlMzhkY2VjYjA0Y2ZiMGM4YjAyZTQyZDIyZA==
+    NmUyZDc0MTg4NTY2NDE5MzMwNjI1NDgxMjI2ZDIzYzIwNWEzMWI5Nw==
   data.tar.gz: !binary |-
-    NmFkNjhlMzIyYWRlNzdkYzUxM2VlZGE4ZWZjNDYzYmIwYThhOTZmZQ==
+    ZGJkMWQ4NWM0NjVhMzVhMWI1NzBjMGM2M2EyNTE3ZDllZjhjNjBjMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTJhOGI3ZTNkMzNlY2E4ZTI5Yzk1ZDNlZTYyNTRiNTM4ZjU4NGY2ZDlhOWRk
-    ZGNlNjlhM2FlMDcxNmQ3YWI2Zjk4ZmE5MzY2OTY0ZjRiOTQ5YTU2ODY3YTY4
-    OGYxZmJlN2E4M2MyMjA4MjllODRmNDYyNTFiMGY2NGIyZTYwNTA=
+    MjNjNjNiMGEzMzVlOTAwM2EyNTkxZDlhZGY2YmMwMGE2ZDk2ZTIyNWUwNjYw
+    YmYxNDRjOThiZGJlM2IxNTNkZWNiMzI5ZjcyNDZmY2I3YWEwNjQ0MjYzNmMx
+    MzlmMjk1YjI0MjZjMGE1NTg4NDFkMzlkNTgwZTczZWUwMDZmZDE=
   data.tar.gz: !binary |-
-    MzczYzhkMjM0ZmJjYmExZTcxZTE0ZTExNzFkNDliNDg4NGFjYWFlNTdiOGVk
-    ODE4MzI1OGMxNmI1MDE1NGU0NjEyODY2YWNjMDQ3Zjg0Mjc3ZmVmNTQ4OWE3
-    YzQ0YmU5YjFiNjg3ODIyYTE0ODI4MTBkMDM2MjQ0NjhjY2Q3MDU=
+    NTE1MzZiZDA2NWMwOWQ4YjdjNThmNjMzMmMwOTY2ZGY4Y2IwZGU0OWFmMjc0
+    ZjMxZjg1Yjc4MDkwZGZlYzgwZTlkNDM2YTZiYzE0ODQ5M2FlNGVmZGFhN2Rl
+    MTRjZjMwNzVkMmYyNmM1NzUzZTg3Y2ZkNzczZTI5YjRiNDFiYTM=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+=== 0.8.1
+* renamed submit element in submit field to button element.
+* renamed date_picker element in date_picker field to input element.
+* improved model associations.
+* bug fixes.
+
 === 0.8.0
 * Simpler syntax for using fonts. See prime_bootstrap.
 * All style things moved from default prime template to bootstrap template.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.8.0)
+    motion-prime (0.8.1)
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.4.0)
       cocoapods

data/README.md

@@ -11,19 +11,19 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
 
 ## Getting Started
 
-### 1. Install MotionPrime:
+#### 1. Install MotionPrime:
 
     $ gem install motion-prime
 
-### 2. Create empty MotionPrime project:
-
-    $ prime new myapp
-
-### 3. Or create bootstrap MotionPrime project:
+#### 2a. Create [bootstrap](https://github.com/motionprime/prime_bootstrap) project:
   
     $ prime bootstrap myapp
 
-### 4. Run application
+#### 2b. OR create empty project:
+
+    $ prime new myapp
+
+#### 3. Run application
 
     $ rake
 

data/ROADMAP.md

@@ -1,7 +1,5 @@
-=== 0.8.1
-* rename submit element in submit field to button element
-* rename date_picker element in date_picker field to input element
-* Rename model to data in sections.
+=== 0.8.2
+* Move api_client and model sync mixin to prime_api gem.
 
 === 0.9.0
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text
@@ -21,4 +19,5 @@
 * add cell preload for reverse scrolling table.
 * add computed_options.get(), this will allow to make sure that options is computed.
 * add testing framework
-* add DSL for ViewStyles#setValue conditions
+* add DSL for ViewStyles#setValue conditions
+* add embed/regular has many types. embedded by default.

data/files/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
 
-gem 'motion-prime', '0.7.2'
+gem 'motion-prime', '0.8.1'
 
 # add reside menu for sidebar support
 gem 'prime_reside_menu', '~> 0.1.4'

data/files/app/app_delegate.rb

@@ -1,5 +1,5 @@
 class AppDelegate < Prime::BaseAppDelegate
   def on_load(app, options)
-    open_screen :home, sidebar: true
+    # open_screen :home, sidebar: true
   end
 end

data/motion-prime/elements/base_element.rb

@@ -113,6 +113,13 @@ module MotionPrime
         if is_cell_section
           @styles += compute_cell_style_options(style_sources, has_errors)
         end
+
+         # styles got from mixins option
+        mixin_styles = style_sources.map do |source|
+          normalize_object(source.delete(:mixins), section)
+        end.flatten.map{ |m| :"_mixin_#{m}" }
+        @styles += mixin_styles
+
         # don't use present? here, it's slower, while this method should be very fast
         if section && section.name && section.name != '' && name && name != ''
           # using for base sections
@@ -123,13 +130,7 @@ module MotionPrime
           normalize_object(source.delete(:styles), section)
         end.flatten
 
-        # styles got from mixins option
-        mixin_styles = style_sources.map do |source|
-          normalize_object(source.delete(:mixins), section)
-        end.flatten.map{ |m| :"_mixin_#{m}" }
-
         @styles += custom_styles
-        @styles += mixin_styles
         # puts @view_class.to_s + @styles.inspect, ''
         @styles
       end

data/motion-prime/models/_sync_mixin.rb

@@ -22,9 +22,9 @@ module MotionPrime
     #
     # @param key [Symbol] association name
     # @return url [String] url to use in model association sync
-    def association_sync_url(key, options)
+    def association_sync_url(key, options, sync_options = {})
       url = options[:sync_url]
-      url = url.call(self) if url.is_a?(Proc)
+      url = url.call(self, sync_options) if url.is_a?(Proc)
       normalize_sync_url(url)
     end
 
@@ -228,7 +228,7 @@ module MotionPrime
     def fetch_has_many(key, options = {}, sync_options = {}, &block)
       use_callback = block_given?
       NSLog("SYNC: started sync for #{key} in #{self.class_name_without_kvo}")
-      api_client.get association_sync_url(key, options) do |response, status_code|
+      api_client.get association_sync_url(key, options, sync_options) do |response, status_code|
         data = options[:sync_key] && response ? response[options[:sync_key]] : response
         if data
           fetch_has_many_with_attributes(key, data, sync_options)
@@ -251,7 +251,7 @@ module MotionPrime
           model = old_collection.detect{ |model| model.id == attributes[:id]}
           unless model
             model = model_class.new
-            self.send(:"#{key}_bag") << model
+            self.send(key).add(model)
           end
           model.fetch_with_attributes(attributes, save_associations: sync_options[:save])
           model.save if sync_options[:save] && model.has_changed?
@@ -267,10 +267,10 @@ module MotionPrime
       self.store.save_interval = 1
     end
 
-    def fetch_has_one(key, options = {}, &block)
+    def fetch_has_one(key, options = {}, sync_options = {}, &block)
       use_callback = block_given?
       NSLog("SYNC: started sync for #{key} in #{self.class_name_without_kvo}")
-      api_client.get association_sync_url(key, options) do |response, status_code|
+      api_client.get association_sync_url(key, options, sync_options) do |response, status_code|
         data = options.has_key?(:sync_key) ? response[options[:sync_key]] : response
         if data.present?
           fetch_has_one_with_attributes(key, data, save_associations: sync_options[:save])

data/motion-prime/models/association_collection.rb

@@ -20,64 +20,102 @@ module MotionPrime
       super all(*args)
     end
 
+    # Initialize a new object and add to collection.
+    #
+    # @example:
+    #   project.users.new(name: "Bob", age: 10)
+    #
+    # @params attributes [Hash] attributes beeing assigned to model
+    # @return MotionPrime::Model unsaved model
     def new(attributes = {})
-      model_class.new(attributes).tap do |model|
+      record = model_class.new(attributes).tap do |model|
         set_inverse_relation_for(model)
       end
+      add(record)
     end
 
-    def define_inverse_relation(options)
-      # TODO: handle different relation types (habtm, has_one...)
-      @inverse_relation_name = name = options[:name].to_sym
-      self.class_eval do
-        define_method name do
-          options[:instance]
-        end
-        alias_method :inverse_relation, name
-      end
-
-      @inverse_relation_key = inverse_relation._associations[association_name][:foreign_key].try(:to_sym)
+    # Add model record to association collection.
+    #
+    # @example:
+    #   project.users.new(name: "Bob", age: 10)
+    #
+    # @params record [Prime::Model] model which will be added to collection.
+    # @return MotionPrime::Model model
+    def add(record)
+      self.bag << record
+      record
     end
 
-    def all(*args)
-      return [] unless bag.store.present?
-      find_options = find_options(args[0])
-      sort_options = sort_options(args[1])
-      data = if sort_options.present? # TODO: check bag items count
+    # Return all association records.
+    #
+    # @example:
+    #   project.users.all
+    #   project.users.all(age: 10)
+    #
+    # @params find_options [Hash] finder options.
+    # @params sort_options [Hash] sorting options.
+    # @return Array<MotionPrime::Model> association records
+    def all(find_options = nil, sort_options = nil)
+      find_options = build_find_options(find_options)
+      sort_options = build_sort_options(sort_options)
+
+      data = if bag.store.present?
         bag.find(find_options, sort_options)
       else
-        bag.to_a.select { |entity| find_options.all? { |field, value| entity.send(field) == value } }
+        bag.to_a.select do |entity| 
+          find_options.all? { |field, value| entity.info[field] == value }
+        end
       end
       set_inverse_relation_for(data)
       data
     end
 
-    def set_inverse_relation_for(models)
-      [*models].each do |model|
-        model.send("#{inverse_relation_name}=", inverse_relation)
-      end if model_inverse_relation_name.present?
-    end
-
-    def find_options(options)
-      options ||= {}
-      options.merge!(bag_key: bag.key)
-      if inverse_relation_key.present?
-        {inverse_relation_key => inverse_relation.id}.merge options
-      else
-        options
-      end
-    end
-
-    def sort_options(options)
-      options || {sort: model_class.default_sort_options}
-    end
-
     def model_class
       @model_class ||= @association_name.classify.constantize
     end
 
+    # Remove all association records.
+    #
+    # @example:
+    #   project.users.delete_all
+    #
+    # @return Array<MotionPrime::Model> association records
     def delete_all
       all.each { |obj| obj.delete }
     end
+
+    private
+      def build_find_options(options)
+        options ||= {}
+        options.merge!(bag_key: bag.key)
+        if inverse_relation_key.present?
+          {inverse_relation_key => inverse_relation.id}.merge options
+        else
+          options
+        end
+      end
+
+      def build_sort_options(options)
+        options || {sort: model_class.default_sort_options}
+      end
+
+      def set_inverse_relation_for(models)
+        [*models].each do |model|
+          model.send("#{inverse_relation_name}=", inverse_relation)
+        end if model_inverse_relation_name.present?
+      end
+
+      def define_inverse_relation(options)
+        # TODO: handle different relation types (habtm, has_one...)
+        @inverse_relation_name = name = options[:name].to_sym
+        self.class_eval do
+          define_method name do
+            options[:instance]
+          end
+          alias_method :inverse_relation, name
+        end
+
+        @inverse_relation_key = inverse_relation._associations[association_name][:foreign_key].try(:to_sym)
+      end
   end
 end

data/motion-prime/screens/_sections_mixin.rb

@@ -23,14 +23,15 @@ module MotionPrime
       return unless section_options
       @sections = {}
       section_options.map do |name, options|
-        @sections[name] = create_section(options.clone)
+        section = create_section(options.clone)
+        @sections[name] = section if section
       end
     end
 
     def create_section(options)
       section_class = class_factory("#{options.delete(:name)}_section")
       options = normalize_options(options).merge(screen: self)
-      section_class.new(options)
+      !options.has_key?(:if) || options[:if] ? section_class.new(options) : nil
     end
 
     def render_sections

data/motion-prime/sections/form/date_field_section.rb

@@ -4,14 +4,14 @@ module MotionPrime
     element :label, type: :label do
       default_label_options
     end
-    element :date_picker, type: :date_picker do
+    element :input, type: :date_picker do
       options[:input] || {}
     end
 
-    after_render :bind_date_picker
+    after_render :bind_input
 
-    def bind_date_picker
-      picker = view(:date_picker)
+    def bind_input
+      picker = view(:input)
       picker.setDelegate form
       unless picker.date
         picker.setDate NSDate.date, animated: true
@@ -22,7 +22,7 @@ module MotionPrime
     end
 
     def dealloc
-      picker = view(:date_picker)
+      picker = view(:input)
       picker.setDelegate nil
       super
     end

data/motion-prime/sections/form/submit_field_section.rb

@@ -1,14 +1,14 @@
 module MotionPrime
   class SubmitFieldSection < BaseFieldSection
-    element :submit, type: :button do
+    element :button, type: :button do
       {title: options[:name].to_s.titleize}.merge(options[:button] || {})
     end
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
 
-    after_render :bind_submit
+    after_render :bind_button
 
-    def bind_submit
-      view(:submit).on :touch do
+    def bind_button
+      view(:button).on :touch do
         form.send(options[:action]) if options[:action]
       end
     end

data/motion-prime/sections/form.rb

@@ -9,7 +9,7 @@ module MotionPrime
     # == Basic Sample
     # class MyLoginForm < MotionPrime::FormSection
     #   field :email, label: { text: 'E-mail' },  input: { placeholder: 'Your E-mail' }
-    #   field :submit, title: 'Login', type: :submit
+    #   field :submit, button: { title: 'Login' }, type: :submit, action: :on_submit
     #
     #   def on_submit
     #     email = view("email:input").text

data/motion-prime/styles/base.rb

@@ -46,11 +46,6 @@ MotionPrime::Styles.define :base do
   style :google_map,
     top: 0, left: 0, right: 0, bottom: 0
 
-  style :date_picker, :form_field_date_picker,
-    width: 300,
-    height: 150,
-    top: 30, left: 0
-
   style :spinner,
     annular: true,
     center: proc { screen.view.center }, width: 37, height: 37,

data/motion-prime/styles/form.rb

@@ -63,6 +63,11 @@ MotionPrime::Styles.define :base_form do
     top: 30,
     bottom: 0
 
+  style :date_field_input,
+    width: 300,
+    height: 150,
+    top: 30, left: 0
+
   style :select_field_button,
     background_color: :white,
     left: 0,

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/helpers/models.rb

@@ -33,6 +33,15 @@ class Autobot < MotionPrime::Model
   attribute :name
 end
 
+class Organization < MotionPrime::Model
+  attribute :name
+  has_many :projects
+end
+
+class Project < MotionPrime::Model
+  attribute :title
+end
+
 module CustomModule; end
 class CustomModule::Car < MotionPrime::Model
   attribute :name
@@ -40,8 +49,9 @@ class CustomModule::Car < MotionPrime::Model
 end
 Car = CustomModule::Car
 
-def stub_user(name, age, created_at)
+def stub_user(name, age, created_at, id = nil)
   user = User.new
+  user.id = id || 1
   user.name = name
   user.age  = age
   user.created_at = created_at

data/spec/models/association_collection_spec.rb

@@ -0,0 +1,57 @@
+describe "Prime::AssociationCollection" do
+   before do
+    MotionPrime::Store.connect
+  end
+
+  after do
+    MotionPrime::Store.shared_store.clear
+  end
+
+  describe "#new" do
+    before do
+      @organization = Organization.new
+      @project = @organization.projects.new(title: 'test')
+    end
+
+    it "should instanciate model with given attributes" do
+      @project.title.should == 'test'
+    end
+
+    it "should add model to association collection" do
+      @organization.projects.include?(@project).should.be.true
+    end
+  end
+
+  describe "#add" do
+    before do
+      @organization = Organization.new
+      @project = Project.new(title: 'test')
+      @organization.projects.add(@project)
+    end
+
+    it "should add model to association collection" do
+      @organization.projects.include?(@project).should.be.true
+    end
+  end
+
+  describe "#all" do
+    before do
+      @organization = Organization.new
+      puts "count 1: #{@organization.projects.count}"
+      project = Project.new(title: 'test 1')
+      @organization.projects.add(project)
+      puts "count 2: #{@organization.projects.count}"
+      project = Project.new(title: 'test 2')
+      @organization.projects.add(project)
+      puts "count 3: #{@organization.projects.count}"
+    end
+
+    it "should return all records by default" do
+      @organization.projects.all.count.should == 2
+    end
+
+    it "should return filter records by first hash" do
+      @organization.projects.all(title: 'test 1').count.should == 1
+    end
+  end
+end

data/spec/models/finder_spec.rb

@@ -3,7 +3,7 @@ describe "Prime::Model Finder" do
     MotionPrime::Store.connect
     @store = MotionPrime::Store.shared_store
 
-    user = stub_user("Bob", 10, Time.now)
+    user = stub_user("Bob", 10, Time.now, 15)
     user.save
 
     user2 = stub_user("Amy", 11, Time.now)
@@ -18,8 +18,8 @@ describe "Prime::Model Finder" do
   end
 
   describe "::find" do
-    it "search object traditional way: supply key, operator and value" do
-      users = User.find(:name, NSFEqualTo, "Bob")
+    it "search object traditional way using id" do
+      users = User.find(15)
       users.should.not.be.nil
       users.is_a?(Array).should.be.true
 
@@ -100,31 +100,16 @@ describe "Prime::Model Finder" do
       user.age.should.be == 59
     end
 
-    it "find object" do
-      users = User.find(:name, NSFEqualTo, "Bob")
-      users.size.should == 1
-
-      user = users.first
-      user.name.should == "Bob"
-      user.class.should == User
-    end
-
     it "find object with quote" do
       stub_user("Bob'd", 49, Time.now).save
 
-      users = User.find(:name, NSFEqualTo, "Bob'd")
+      users = User.find(:name => { NSFEqualTo => "Bob'd"})
       users.size.should == 1
 
       user = users.first
       user.name.should == "Bob'd"
       user.class.should == User
     end
-
-    it "only return objects of the class" do
-      car = Car.create(:name => "Honda")
-      Car.find.size.should == 1
-      Car.find.first.key.should == car.key
-    end
   end
 
   describe "::find_by_key" do
@@ -173,7 +158,9 @@ describe "Prime::Model Finder" do
       Car.all.size.should == 1
       Car.all.first.key.should == car.key
     end
+  end
 
+  describe "::find_keys" do
     it "only return objects of the class" do
       car = Car.create(:name => "Honda")
       Car.find_keys.size.should == 1

data/spec/models/model_spec.rb

@@ -102,22 +102,22 @@ describe MotionPrime::Model do
     end
 
     it "update existing objects" do
-      user = stub_user("Bob", 10, Time.now)
+      user = stub_user("Bob", 10, Time.now, 15)
       user.save
 
-      user1 = User.find(:name, NSFEqualTo, "Bob").first
+      user1 = User.find(15).first
       user1.name = "Dom"
       user1.save
 
-      user2 = User.find(:name, NSFEqualTo, "Dom").first
+      user2 = User.find(15).first
       user2.key.should == user.key
     end
 
     it "create with nil field" do
-      user = stub_user("Bob", 10, nil)
+      user = stub_user("Bob", 10, nil, 15)
       user.save
 
-      user1 = User.find(:name, NSFEqualTo, "Bob").first
+      user1 = User.find(15).first
       user1.name.should == "Bob"
       user1.created_at.should.be.nil
     end
@@ -125,10 +125,10 @@ describe MotionPrime::Model do
     it "create model in file store" do
       MotionPrime::Store.connect(:file)
 
-      user = stub_user("Bob", 10, nil)
+      user = stub_user("Bob", 10, nil, 15)
       user.save
 
-      user1 = User.find(:name, NSFEqualTo, "Bob").first
+      user1 = User.find(15).first
       user1.name.should == "Bob"
       user1.created_at.should.be.nil
 
@@ -142,6 +142,9 @@ describe MotionPrime::Model do
     end
 
     describe "without id" do
+      before do
+        @user.id = nil
+      end
       it "should not be persisted" do
         @user.persisted?.should == false
       end
@@ -167,15 +170,15 @@ describe MotionPrime::Model do
 
   describe "#delete" do
     it "delete object" do
-      user = stub_user("Bob", 10, Time.now)
+      user = stub_user("Bob", 10, Time.now, 15)
       user.save
 
-      users = User.find(:name, NSFEqualTo, "Bob")
+      users = User.find(15)
       users.should.not.be.nil
       users.count.should == 1
 
       user.delete
-      users = User.find(:name, NSFEqualTo, "Bob")
+      users = User.find(15)
       users.should.not.be.nil
       users.count.should == 0
       User.count.should == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -355,6 +355,7 @@ files:
 - spec/helpers/init.rb
 - spec/helpers/models.rb
 - spec/helpers/screens.rb
+- spec/models/association_collection_spec.rb
 - spec/models/associations_spec.rb
 - spec/models/bag_spec.rb
 - spec/models/errors_spec.rb
@@ -397,6 +398,7 @@ test_files:
 - spec/helpers/init.rb
 - spec/helpers/models.rb
 - spec/helpers/screens.rb
+- spec/models/association_collection_spec.rb
 - spec/models/associations_spec.rb
 - spec/models/bag_spec.rb
 - spec/models/errors_spec.rb