motion-prime 0.8.12 → 0.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzc2ZmU1MzkwYjk5OWFlM2M1NmIwMzAyYTM0MGFlMDdhNGU3MWJhZQ==
+    OGI3OGI3YjIzZmQ5OWNlZGU5MzdhOGQ0MjE3NjdlYTU2OGQ5NzlkZA==
   data.tar.gz: !binary |-
-    NWE5MjI2N2UxMGExOTlmZTA0YmVhZTZhMTNlMDk1NTU5YTNmNDc0MA==
+    NDIxOTFhMGFlM2Y4ZTgxM2VjZjQwMmM3MmJhNmQzNmU4MTcxNjk1Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2EyNGQ0OTlhNWViMDlmZmI3YTlmYTVjYjA3M2IzZmRjZGQ3YmVjY2ZlN2Yy
-    YTc1ODkzNmYyMGUxODY2MzA0ZDM0NjM5YTI3ODg3NDM4M2QzMGM3YTBiZWM3
-    ZTViMTM4YmE3ZGQ1NmZkNDFiYWU4ZjJhNWYyNGQzNjJkNmJhNDQ=
+    ZWViNmQ2Yjg5OTlmZGU2ZmZiMjljYzQ1YWQwMjk3MDRiOWU5MWM3Mzc1ZWUx
+    MmEwZDRlMzIwZDU3OWI3NzZkZmIzZTFmOGI0NjZiMjlhYThmY2I5M2Q0YjM2
+    MTYyYzFiOGJkYzE2YjU1YTQ5OTdiOWM3ZWFkNjFmMmNmYjdhZTM=
   data.tar.gz: !binary |-
-    Yjg5ODcwMjcyMTRlYTJhNDAxZjkwMDI2OWY1ZjI0OTUzN2FjYzhiZjBhYzRk
-    YTJlMTFhOWI5YTJiODQwMmQ1ODFkNGFiZTFhNmJjNjAxOTEzYzI1MzJjMzgw
-    MDVhNmIxOWU1OGZkODc4YWRkNzhkOGE2NTRmMjM4MGRkNmZlMTM=
+    NzE3Zjc2YmJkM2Y0ODlhNzJlZGE3NmU4NjY3OGU4OGZjYmJmZjU1N2IzNDJm
+    MWQ4ZTE5NmY3ZDc4Zjc5NGUzYzMyNmI2ZGQ2MDZhZmFhNGYwODc5YjgxMjU1
+    MDI0ZTQ2MDMzMDE1ZGE4OGQ0OWQ0YzkwZTIwZDdlMmM4ZjIyYzE=

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+=== 0.9.0
+* Added generators for model/screen/table.
+* Added scaffold generator.
+* Added ability to open screen with action.
+
+=== 0.8.13
+* Fix issue with deallocating screen if no sidebar is used.
+* motion_require now works inside application.
+
 === 0.8.11 - 0.8.12
 * Ability to send block to after_render/before_render
 * Added ability to get all form field values via `field_values`

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.8.12)
+    motion-prime (0.9.0)
+      activesupport
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.5.0)
       cocoapods
@@ -11,6 +12,7 @@ PATH
       motion-support (~> 0.2.6)
       rm-digest
       sugarcube (~> 1.5.2)
+      thor
 
 GEM
   remote: http://rubygems.org/
@@ -62,6 +64,7 @@ GEM
     rake (10.1.1)
     rm-digest (0.0.2)
     sugarcube (1.5.4)
+    thor (0.18.1)
     xcodeproj (0.14.1)
       activesupport (~> 3.0)
       colored (~> 1.2)

data/ROADMAP.md

@@ -1,7 +1,3 @@
-=== 0.9.0
-* Move api_client and model sync mixin to prime_api gem.
-* Move bind keyboard events to forms.
-
 === 1.0.0
 * bug: content_vertical_alignment conflicts with padding.
 * bug: content_vertical_alignment has not ideal centering.
@@ -10,7 +6,6 @@
 * bug: bind_keyboard_close breaks bind_guesture
 * bug: dealloc of Prime::Section will not be called for cell created in table_data using #map.
 * bug: images does not render after reload table if using draw_with_layer (prerender not enabled).
-* add clone to models to prevent problems when bag_key is overrided
 * add dsl for push notifications
 * add some extensions/middleware system, at least for networking.
 * create "display_network_error" extension.
@@ -18,7 +13,9 @@
 * add size_to_fit support for images.
 
 === 1.1.0
-* add sections/screens/models generator
+* Move api_client and model sync mixin to prime_model_sync gem.
+* Move models to prime_model gem.
+* Move bind keyboard events to forms.
 
 === 1.2.0
 * add cell preload for reverse scrolling table.

data/bin/prime

@@ -3,16 +3,17 @@
 require 'optparse'
 require 'methadone'
 require_relative '../motion-prime/version'
-
 class App
   include Methadone::Main
   include Methadone::CLILogging
   include Methadone::SH
   
-  main do |command, opt|
+  main do |command, *opts|
     case command.to_sym
-    when :new then create_base(opt)
-    when :bootstrap then create_bootstrap(opt)
+    when :new then create_base(*opts)
+    when :bootstrap then create_bootstrap(*opts)
+    when :generate then generate(*opts)
+    when :g then generate(*opts)
     else help
     end
     0
@@ -23,6 +24,10 @@ class App
     info "Commands:"
     info "  new <appname>"
     info "    Creates a new MotionPrime app from a template."
+    info "  generate scaffold <name>"
+    info "    Creates a new MotionPrime scaffold from a template."
+    info "  generate screen|model|table <name>"
+    info "    Creates a new MotionPrime resource from a template."
   end
 
   def self.create_base(name)
@@ -50,6 +55,11 @@ class App
     sh "cd ./#{name}; rake pod:install"
   end
 
+  def self.generate(resource, name)
+    require_relative '../generators/generator'
+    MotionPrime::Generator.factory(resource).generate(name)
+  end
+
   def self.home_path
     ENV['HOME'].split('/')[0..2].join('/')
   end

data/files/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'motion-cocoapods', '~> 1.4.0'
-gem 'motion-prime', '0.8.12'
+gem 'motion-prime', '0.9.0', path: '../'
 
 # add reside menu for sidebar support
 gem 'prime_reside_menu', '~> 0.1.4'

data/generators/generator.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'thor'
+require 'active_support/core_ext'
+class MotionPrime::Generator < Thor
+  include Thor::Actions
+
+  def self.source_root
+    File.dirname(__FILE__) + '/templates'
+  end
+
+  class << self
+    def factory(resource)
+      case resource.to_sym
+      when :screen
+        require_relative './screen_generator'
+        MotionPrime::ScreenGenerator.new
+      when :model
+        require_relative './model_generator'
+        MotionPrime::ModelGenerator.new
+      when :table
+        require_relative './table_generator'
+        MotionPrime::TableGenerator.new
+      when :scaffold
+        require_relative './scaffold_generator'
+        MotionPrime::ScaffoldGenerator.new
+      end
+    end
+  end
+end

data/generators/model_generator.rb

@@ -0,0 +1,7 @@
+class MotionPrime::ModelGenerator < MotionPrime::Generator
+  def generate(name)
+    @name = name.downcase.singularize
+    @class_name = "#{name.camelize}"
+    template 'model.rb', "app/models/#{name}.rb"
+  end
+end

data/generators/scaffold_generator.rb

@@ -0,0 +1,17 @@
+class MotionPrime::ScaffoldGenerator < MotionPrime::Generator
+  def generate(name)
+    @s_name = name.singularize.downcase
+    @p_name = name.pluralize.downcase
+    @s_title = @s_name.titleize
+    @p_title = @p_name.titleize
+    @s_class_name = @s_name.camelize
+    @p_class_name = @p_name.camelize
+    template 'scaffold/screen.rb', "app/screens/#{@p_name}.rb"
+    template 'scaffold/model.rb', "app/models/#{@s_name}.rb"
+    template 'scaffold/table.rb', "app/sections/#{@p_name}/table.rb"
+    template 'scaffold/cell.rb', "app/sections/#{@p_name}/cell.rb"
+    template 'scaffold/form.rb', "app/sections/#{@p_name}/form.rb"
+    template 'scaffold/show.rb', "app/sections/#{@p_name}/show.rb"
+    template 'scaffold/styles.rb', "app/styles/#{@p_name}.rb"
+  end
+end

data/generators/screen_generator.rb

@@ -0,0 +1,8 @@
+class MotionPrime::ScreenGenerator < MotionPrime::Generator
+  def generate(name)
+    @name = name.downcase
+    @class_name = "#{name.camelize}Screen"
+    @title = name.titleize
+    template 'screen.rb', "app/screens/#{name}.rb"
+  end
+end

data/generators/table_generator.rb

@@ -0,0 +1,10 @@
+class MotionPrime::TableGenerator < MotionPrime::Generator
+  def generate(name)
+    @name = name.downcase.singularize
+    @model_class_name = "#{name.camelize}"
+    @table_class_name = "#{name.pluralize.camelize}TableSection"
+    @cell_class_name = "#{name.pluralize.camelize}CellSection"
+    template 'table.rb', "app/sections/#{name.pluralize}/table.rb"
+    template 'cell.rb', "app/sections/#{name.pluralize}/cell.rb"
+  end
+end

data/generators/templates/cell.rb

@@ -0,0 +1,3 @@
+class <%= @cell_class_name %> < Prime::Section
+  # element :title, text: proc { model.title }
+end

data/generators/templates/model.rb

@@ -0,0 +1,4 @@
+class <%= @class_name %> < Prime::Model 
+  timestamp_attributes
+  # attribute :title
+end

data/generators/templates/scaffold/cell.rb

@@ -0,0 +1,4 @@
+class <%= @p_class_name %>CellSection < Prime::Section
+  container height: 40
+  element :title, text: proc { model.title }
+end

data/generators/templates/scaffold/form.rb

@@ -0,0 +1,18 @@
+class <%= @p_class_name %>FormSection < Prime::FormSection
+  field :title,
+    label: { text: 'Title' },
+    input: { 
+      text: proc { form.model.title }, 
+      placeholder: "Enter title here"
+    }
+
+  field :submit, type: :submit,
+    button: { title: "Save" },
+    action: :on_submit
+
+  def on_submit
+    model.assign_attributes(field_values)
+    model.save
+    screen.back
+  end
+end

data/generators/templates/scaffold/model.rb

@@ -0,0 +1,4 @@
+class <%= @s_class_name %> < Prime::Model 
+  timestamp_attributes
+  attribute :title
+end

data/generators/templates/scaffold/screen.rb

@@ -0,0 +1,45 @@
+class <%= @p_class_name %>Screen < ApplicationScreen
+  title "<%= @p_title %>"
+
+  # open_screen "<%= @p_name %>#index"
+  def index
+    set_title "<%= @p_title %>"
+    set_navigation_right_button 'New' do
+      open_screen "<%= @p_name %>#new"
+    end
+    set_section :<%= @p_name %>_table
+  end
+
+  # open_screen "<%= @p_name %>#show"
+  def show
+    @model = params[:model]
+    set_title "Show <%= @s_title %>"
+    set_navigation_back_button 'Back'
+    set_navigation_right_button 'Edit' do
+      open_screen "<%= @p_name %>#edit", params: { model: @model }
+    end
+    set_section :<%= @p_name %>_show, model: @model
+  end
+
+  # open_screen "<%= @p_name %>#edit"
+  def edit
+    @model = params[:model]
+    set_title "Edit <%= @s_title %>"
+    set_navigation_back_button 'Cancel'
+    set_section :<%= @p_name %>_form, model: @model
+  end
+
+  # open_screen "<%= @p_name %>#new"
+  def new
+    @model = <%= @s_class_name %>.new
+    set_title "New <%= @s_title %>"
+    set_navigation_back_button 'Cancel'
+    set_section :<%= @p_name %>_form, model: @model
+  end
+
+  def on_return
+    if action?(:index)
+      main_section.reload_data
+    end
+  end
+end

data/generators/templates/scaffold/show.rb

@@ -0,0 +1,3 @@
+class <%= @p_class_name %>ShowSection < Prime::Section
+  element :title, text: proc { model.title }
+end

data/generators/templates/scaffold/styles.rb

@@ -0,0 +1,18 @@
+Prime::Styles.define :<%= @p_name %> do
+  style :cell do
+    style :title,
+      text_color: :app_base,
+      left: 20,
+      top: 10,
+      width: 280,
+      font: :app_base.uifont(16),
+      size_to_fit: true
+  end
+  style :show do
+    style :title,
+      top: 120,
+      left: 0,
+      right: 0,
+      text_alignment: :center
+  end
+end

data/generators/templates/scaffold/table.rb

@@ -0,0 +1,12 @@
+class <%= @p_class_name %>TableSection < Prime::TableSection
+  def table_data
+    <%= @s_class_name %>.all.map do |model|
+      <%= @p_class_name %>CellSection.new(model: model)
+    end
+  end
+
+  def on_click(table, index)
+    section = data[index.row]
+    screen.open_screen '<%= @p_name %>#show', params: { model: section.model }
+  end
+end

data/generators/templates/screen.rb

@@ -0,0 +1,7 @@
+class <%= @class_name %> < ApplicationScreen
+  title "<%= @title %>"
+
+  def render
+    
+  end
+end

data/generators/templates/table.rb

@@ -0,0 +1,8 @@
+class <%= @table_class_name %> < Prime::TableSection
+  def table_data
+    # This method should return Array of sections, e.g:
+    <%= @model_class_name %>.map do |model|
+      <%= @cell_class_name %>.new(model: model)
+    end
+  end
+end

data/lib/motion-prime.rb

@@ -10,6 +10,7 @@ require File.expand_path('../../motion-prime/env.rb', __FILE__)
 require File.expand_path('../../motion-prime/prime.rb', __FILE__)
 
 Motion::Require.all(Dir.glob(File.expand_path('../../motion-prime/**/*.rb', __FILE__)))
+Motion::Require.all
 
 Motion::Project::App.setup do |app|
   app.detect_dependencies = false

data/motion-prime.gemspec

@@ -29,4 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'afmotion', '~> 2.0.0'
   spec.add_dependency "methadone"
   spec.add_dependency "rm-digest" 
+  spec.add_dependency "thor" 
+  spec.add_dependency "activesupport" 
 end

data/motion-prime/delegate/_base_mixin.rb

@@ -0,0 +1,32 @@
+module MotionPrime
+  module DelegateBaseMixin
+    attr_accessor :window
+
+    def application(application, willFinishLaunchingWithOptions:opts)
+      MotionPrime::Config.configure!
+      MotionPrime::Styles.define!
+      Prime.logger.info "Loading Prime application with env: #{Prime.env}"
+      application.setStatusBarStyle UIStatusBarStyleLightContent
+      application.setStatusBarHidden false
+    end
+
+    def application(application, didFinishLaunchingWithOptions:launch_options)
+      on_load(application, launch_options)
+      true
+    end
+
+    def application(application, didRegisterForRemoteNotificationsWithDeviceToken: token)
+      on_apn_register_success(application, token)
+    end
+    def application(application, didFailToRegisterForRemoteNotificationsWithError: error)
+      on_apn_register_fail(application, error)
+    end
+
+    def on_load(application, launch_options)
+    end
+
+    def app_window
+      self.app_delegate.window
+    end
+  end
+end

data/motion-prime/delegate/_navigation_mixin.rb

@@ -0,0 +1,41 @@
+module MotionPrime
+  module DelegateNavigationMixin
+    def open_screen(screen, options = {})
+      screen = prepare_screen_for_open(screen, options)
+      if options[:root] || !self.window
+        open_root_screen(screen, options)
+      else
+        open_content_screen(screen, options)
+      end
+    end
+
+    private
+      def prepare_screen_for_open(screen, options = {})
+        Screen.create_with_options(screen, true, options)
+      end
+
+      def open_root_screen(screen, options = {})
+        screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
+        screen.wrap_in_navigation if screen.respond_to?(:wrap_in_navigation)
+
+        screen = screen.main_controller.strong_ref if screen.respond_to?(:main_controller)
+
+        self.window ||= UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+        if options[:animated]
+          UIView.transitionWithView self.window,
+                  duration: 0.5,
+                   options: UIViewAnimationOptionTransitionFlipFromLeft,
+                animations: proc { self.window.rootViewController = screen },
+                completion: nil
+        else
+          self.window.rootViewController = screen
+        end
+        self.window.makeKeyAndVisible
+        screen
+      end
+
+      def open_content_screen(screen, options = {})
+        open_root_screen(screen)
+      end
+  end
+end

data/motion-prime/delegate/app_delegate.rb

@@ -0,0 +1,28 @@
+motion_require '../helpers/has_authorization'
+motion_require './_base_mixin'
+motion_require './_navigation_mixin'
+module MotionPrime
+  class BaseAppDelegate
+    include HasAuthorization
+    include DelegateBaseMixin
+    include DelegateNavigationMixin
+
+    def on_apn_register_success(application, token)
+    end
+
+    def on_apn_register_fail(application, error)
+    end
+
+    def current_user
+      @current_user ||= if defined?(User) && User.respond_to?(:current)
+        User.current
+      end
+    end
+
+    def reset_current_user
+      user_was = @current_user
+      @current_user = nil
+      NSNotificationCenter.defaultCenter.postNotificationName(:on_current_user_reset, object: user_was)
+    end
+  end
+end

data/motion-prime/screens/_base_mixin.rb

@@ -12,7 +12,7 @@ module MotionPrime
     include MotionPrime::ScreenNavigationMixin
     include MotionPrime::ScreenSectionsMixin
 
-    attr_accessor :parent_screen, :modal, :params, :options, :tab_bar
+    attr_accessor :parent_screen, :modal, :params, :options, :tab_bar, :action
     class_attribute :current_screen
 
     def app_delegate
@@ -30,7 +30,7 @@ module MotionPrime
       unless self.is_a?(UIViewController)
         raise StandardError.new("ERROR: Screens must extend UIViewController.")
       end
-
+      options[:action] ||= 'render'
       self.options = options
       self.params = options[:params] || {}
       options.each do |k, v|
@@ -39,6 +39,10 @@ module MotionPrime
       self
     end
 
+    def action?(action)
+      self.action == action.to_s
+    end
+
     def modal?
       !!self.modal
     end
@@ -51,7 +55,9 @@ module MotionPrime
 
     def title=(new_title)
       self.class.title(new_title)
+      self.navigationItem.title = new_title
     end
+    alias_method :set_title, :title=
 
     def main_controller
       has_navigation? ? navigation_controller : self
@@ -78,9 +84,11 @@ module MotionPrime
       end
       def create_with_options(screen, navigation = true, options = {})
         screen = create_tab_bar(screen, options) if screen.is_a?(Array)
-        if screen.is_a?(Symbol)
+        if screen.is_a?(Symbol) || screen.is_a?(String)
+          screen_name, action_name = screen.to_s.split('#')
+          options[:action] ||= action_name || 'render'
           options[:navigation] = navigation unless options.has_key?(:navigation)
-          screen = class_factory("#{screen}_screen").new(options)
+          screen = class_factory("#{screen_name}_screen").new(options)
         end
         screen
       end

data/motion-prime/screens/_sections_mixin.rb

@@ -24,17 +24,22 @@ module MotionPrime
       return unless section_options
       @sections = {}
       section_options.map do |name, options|
-        section = create_section(options.clone)
+        section = create_section(name, options.clone)
         @sections[name] = section if section
       end
     end
 
-    def create_section(options)
-      section_class = class_factory("#{options.delete(:name)}_section")
+    def create_section(name, options)
+      section_class = class_factory("#{name}_section")
       options = normalize_options(options).merge(screen: self)
       !options.has_key?(:if) || options[:if] ? section_class.new(options) : nil
     end
 
+    def set_section(name, options = {})
+      @main_section = create_section(name, options)
+      @main_section.render
+    end
+
     def render_sections
       return unless @sections
       if all_sections.count > 1
@@ -52,7 +57,7 @@ module MotionPrime
     module ClassMethods
       def section(name, options = {})
         self._section_options ||= {}
-        self._section_options[name.to_sym] = options.merge(name: name)
+        self._section_options[name.to_sym] = options
 
         define_method name do
           @sections[name]

data/motion-prime/screens/extensions/_navigation_bar_mixin.rb

@@ -12,12 +12,12 @@ module MotionPrime
       navigationItem.setRightBarButtonItem(nil, animated: args[:animated])
     end
 
-    def set_navigation_right_button(title, args = {})
-      navigationItem.rightBarButtonItem = create_navigation_button(title, args)
+    def set_navigation_right_button(title, args = {}, &block)
+      navigationItem.rightBarButtonItem = create_navigation_button(title, args, &block)
     end
 
-    def set_navigation_left_button(title, args = {})
-      navigationItem.leftBarButtonItem = create_navigation_button(title, args)
+    def set_navigation_left_button(title, args = {}, &block)
+      navigationItem.leftBarButtonItem = create_navigation_button(title, args, &block)
     end
 
     def set_navigation_back_button(title, args = {})
@@ -40,9 +40,9 @@ module MotionPrime
       navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithCustomView(view)
     end
 
-    def create_navigation_button(title, args = {})
+    def create_navigation_button(title, args = {}, &block)
       args[:style]  ||= UIBarButtonItemStylePlain
-      args[:action] ||= nil
+      args[:action] ||= block || nil
       # TODO: Find better place for this code, may be just create custom control
       if title.is_a?(UIButton)
         title.on :touch do
@@ -53,17 +53,21 @@ module MotionPrime
       elsif args[:image]
         create_navigation_button_with_image(title, args)
       elsif args[:icon]
-        create_navigation_button_with_icon(title, args)
+        create_navigation_button_with_title(title, args)
       else
-        UIBarButtonItem.alloc.initWithTitle(title,
-          style: args[:style], target: args[:target] || self, action: args[:action])
+        if args[:action].is_a?(Proc)
+          create_navigation_button_with_title(title, args)
+        else
+          UIBarButtonItem.alloc.initWithTitle(title,
+            style: args[:style], target: args[:target] || self, action: args[:action])
+        end
       end
     end
 
-    def create_navigation_button_with_icon(title, args)
-      image = args[:icon].uiimage
+    def create_navigation_button_with_title(title, args)
+      image = args[:icon].uiimage if args[:icon]
       face = UIButton.buttonWithType UIButtonTypeCustom
-      face.setImage(image, forState: UIControlStateNormal)
+      face.setImage(image, forState: UIControlStateNormal) if args[:icon]
       face.setTitle(title, forState: UIControlStateNormal)
       face.setContentHorizontalAlignment UIControlContentHorizontalAlignmentLeft
       face.sizeToFit

data/motion-prime/screens/screen.rb

@@ -36,7 +36,9 @@ module MotionPrime
       @on_appear_happened ||= {}
       unless @on_appear_happened[view.object_id]
         setup view, styles: default_styles do
-          run_callbacks :render { render }
+          run_callbacks :render do 
+            send((action).to_sym)
+          end
         end
       end
       @on_appear_happened[view.object_id] = true
@@ -58,7 +60,7 @@ module MotionPrime
     end
 
     def visible?
-      @visible
+      !!@visible
     end
   end
 end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.8.12"
+  VERSION = "0.9.0"
 end

data/spec/features/screens/open_screen.rb

@@ -0,0 +1,51 @@
+describe "open screen" do
+  describe "from app delegate with default options" do
+    before do
+      App.delegate.open_screen :sample
+      @controller = App.delegate.window.rootViewController
+    end
+    it "should open with navigation by default" do
+      @controller.is_a?(UINavigationController).should.be.true
+    end
+
+    it "should open screen" do
+      @controller.childViewControllers.first.is_a?(SampleScreen).should.be.true
+      @controller.childViewControllers.first.visible?.should.be.true
+    end
+  end
+
+  describe "from app delegate with navigation false" do
+    before do
+      App.delegate.open_screen :sample, navigation: false
+      @controller = App.delegate.window.rootViewController
+    end
+    it "should open screen" do
+      @controller.is_a?(SampleScreen).should.be.true
+      @controller.visible?.should.be.true
+    end
+  end
+
+  describe "from another screen with navigation: true" do
+    before do
+      @parent_screen = SampleScreen.new(navigation: true)
+      @child_screen = SampleScreen.new(navigation: true)
+
+      App.delegate.open_screen @parent_screen
+      @parent_screen.open_screen @child_screen
+      @controller = App.delegate.window.rootViewController
+
+      # we should call it because will_appear will happen async
+      @child_screen.will_appear
+      @parent_screen.will_disappear
+    end
+
+    it "should open child screen navigational" do
+      @controller.childViewControllers.last.should == @child_screen
+      @child_screen.visible?.should.be.true
+    end
+
+    it "should make parent screen invisible" do
+      @parent_screen.visible?.should.be.false
+    end
+  end
+end

data/spec/helpers/delegates.rb

@@ -1,3 +1,10 @@
+# motion_require '../../motion-prime/helpers/has_authorization'
+# motion_require './../motion-prime/delegate/_base_mixin'
+# motion_require './../motion-prime/delegate/_navigation_mixin'
+AppDelegate.send :include, MotionPrime::HasAuthorization
+AppDelegate.send :include, MotionPrime::DelegateBaseMixin
+AppDelegate.send :include, MotionPrime::DelegateNavigationMixin
+
 class BaseDelegate < MotionPrime::BaseAppDelegate
   def on_load(app, options)
     self.was_loaded = true

data/spec/helpers/screens.rb

@@ -6,4 +6,13 @@ class BaseScreen < MotionPrime::Screen
     self.was_rendered = true
     set_navigation_right_button "Test", action: :test, type: UIBarButtonItemStyleDone
   end
+end
+
+class SampleScreen < MotionPrime::Screen
+  title 'Sample'
+
+  def render
+    @main_section = SampleSection.new(screen: self)
+    @main_section.render
+  end
 end

data/spec/helpers/sections.rb

@@ -0,0 +1,3 @@
+class SampleSection < Prime::Section
+  element :description, text: "Lorem Ipsum"
+end

data/spec/{delegate → unit/delegate}/delegate_spec.rb

@@ -1,4 +1,4 @@
-describe MotionPrime::BaseAppDelegate do
+describe MotionPrime::BaseDelegate do
 
   before { @subject = BaseDelegate.new }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.9.0
 platform: ruby
 authors:
 - Iskander Haziev
@@ -179,6 +179,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RubyMotion apps development framework
 email:
 - gvalmon@gmail.com
@@ -240,14 +268,32 @@ files:
 - files/resources/Default.png
 - files/resources/Default@2x.png
 - files/resources/Icon.png
+- generators/generator.rb
+- generators/model_generator.rb
+- generators/scaffold_generator.rb
+- generators/screen_generator.rb
+- generators/table_generator.rb
+- generators/templates/cell.rb
+- generators/templates/model.rb
+- generators/templates/scaffold/cell.rb
+- generators/templates/scaffold/form.rb
+- generators/templates/scaffold/model.rb
+- generators/templates/scaffold/screen.rb
+- generators/templates/scaffold/show.rb
+- generators/templates/scaffold/styles.rb
+- generators/templates/scaffold/table.rb
+- generators/templates/screen.rb
+- generators/templates/table.rb
 - lib/motion-prime.rb
 - motion-prime.gemspec
 - motion-prime/api_client.rb
-- motion-prime/app_delegate.rb
 - motion-prime/config/base.rb
 - motion-prime/config/config.rb
 - motion-prime/core_ext/kernel.rb
 - motion-prime/core_ext/time.rb
+- motion-prime/delegate/_base_mixin.rb
+- motion-prime/delegate/_navigation_mixin.rb
+- motion-prime/delegate/app_delegate.rb
 - motion-prime/elements/_content_padding_mixin.rb
 - motion-prime/elements/_content_text_mixin.rb
 - motion-prime/elements/_text_mixin.rb
@@ -357,24 +403,26 @@ files:
 - motion-prime/views/view_styler.rb
 - resources/Default-568h@2x.png
 - resources/Icon.png
-- spec/config/store_spec.rb
-- spec/delegate/delegate_spec.rb
+- spec/features/screens/open_screen.rb
 - spec/helpers/delegates.rb
 - 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/dirty_spec.rb
-- spec/models/errors_spec.rb
-- spec/models/finder_spec.rb
-- spec/models/json.rb
-- spec/models/model_spec.rb
-- spec/models/store_extension_spec.rb
-- spec/models/store_spec.rb
-- spec/prime/env.rb
-- spec/screens/screen_spec.rb
+- spec/helpers/sections.rb
+- spec/unit/config/store_spec.rb
+- spec/unit/delegate/delegate_spec.rb
+- spec/unit/models/association_collection_spec.rb
+- spec/unit/models/associations_spec.rb
+- spec/unit/models/bag_spec.rb
+- spec/unit/models/dirty_spec.rb
+- spec/unit/models/errors_spec.rb
+- spec/unit/models/finder_spec.rb
+- spec/unit/models/json.rb
+- spec/unit/models/model_spec.rb
+- spec/unit/models/store_extension_spec.rb
+- spec/unit/models/store_spec.rb
+- spec/unit/prime/env.rb
+- spec/unit/screens/screen_spec.rb
 - travis.sh
 homepage: ''
 licenses:
@@ -401,21 +449,23 @@ signing_key:
 specification_version: 4
 summary: RubyMotion apps development framework
 test_files:
-- spec/config/store_spec.rb
-- spec/delegate/delegate_spec.rb
+- spec/features/screens/open_screen.rb
 - spec/helpers/delegates.rb
 - 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/dirty_spec.rb
-- spec/models/errors_spec.rb
-- spec/models/finder_spec.rb
-- spec/models/json.rb
-- spec/models/model_spec.rb
-- spec/models/store_extension_spec.rb
-- spec/models/store_spec.rb
-- spec/prime/env.rb
-- spec/screens/screen_spec.rb
+- spec/helpers/sections.rb
+- spec/unit/config/store_spec.rb
+- spec/unit/delegate/delegate_spec.rb
+- spec/unit/models/association_collection_spec.rb
+- spec/unit/models/associations_spec.rb
+- spec/unit/models/bag_spec.rb
+- spec/unit/models/dirty_spec.rb
+- spec/unit/models/errors_spec.rb
+- spec/unit/models/finder_spec.rb
+- spec/unit/models/json.rb
+- spec/unit/models/model_spec.rb
+- spec/unit/models/store_extension_spec.rb
+- spec/unit/models/store_spec.rb
+- spec/unit/prime/env.rb
+- spec/unit/screens/screen_spec.rb

data/motion-prime/app_delegate.rb

@@ -1,92 +0,0 @@
-motion_require './helpers/has_authorization'
-motion_require './helpers/has_class_factory'
-module MotionPrime
-  class BaseAppDelegate
-    include HasAuthorization
-
-    attr_accessor :window
-
-    def application(application, willFinishLaunchingWithOptions:opts)
-      MotionPrime::Config.configure!
-      MotionPrime::Styles.define!
-      Prime.logger.info "Loading Prime application with env: #{Prime.env}"
-      application.setStatusBarStyle UIStatusBarStyleLightContent
-      application.setStatusBarHidden false
-    end
-
-    def application(application, didFinishLaunchingWithOptions:launch_options)
-      on_load(application, launch_options)
-      true
-    end
-
-    def application(application, didRegisterForRemoteNotificationsWithDeviceToken: token)
-      on_apn_register_success(application, token)
-    end
-    def application(application, didFailToRegisterForRemoteNotificationsWithError: error)
-      on_apn_register_fail(application, error)
-    end
-
-    def on_load(application, launch_options)
-    end
-
-    def on_apn_register_success(application, token)
-    end
-
-    def on_apn_register_fail(application, error)
-    end
-
-    def app_window
-      self.app_delegate.window
-    end
-
-    def open_screen(screen, options = {})
-      screen = prepare_screen_for_open(screen, options)
-      if options[:root] || !self.window
-        open_root_screen(screen, options)
-      else
-        open_content_screen(screen, options)
-      end
-    end
-
-    def current_user
-      @current_user ||= if defined?(User) && User.respond_to?(:current)
-        User.current
-      end
-    end
-
-    def reset_current_user
-      user_was = @current_user
-      @current_user = nil
-      NSNotificationCenter.defaultCenter.postNotificationName(:on_current_user_reset, object: user_was)
-    end
-
-    private
-      def prepare_screen_for_open(screen, options = {})
-        Screen.create_with_options(screen, true, options)
-      end
-
-      def open_root_screen(screen, options = {})
-        screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
-        screen.wrap_in_navigation if screen.respond_to?(:wrap_in_navigation)
-
-        screen = screen.main_controller if screen.respond_to?(:main_controller)
-
-        self.window ||= UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-        if options[:animated]
-          UIView.transitionWithView self.window,
-                  duration: 0.5,
-                   options: UIViewAnimationOptionTransitionFlipFromLeft,
-                animations: proc { self.window.rootViewController = screen },
-                completion: nil
-        else
-          self.window.rootViewController = screen
-        end
-        self.window.makeKeyAndVisible
-        screen
-      end
-
-      def open_content_screen(screen, options = {})
-        open_root_screen(screen)
-      end
-  end
-end