ProMotion-formotion 0.0.9 → 0.1.1

data/ProMotion-formotion.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |gem|
   gem.name          = "ProMotion-formotion"
   gem.require_paths = ["lib"]
   gem.version       = ProMotion::Formotion::VERSION
-  gem.add_runtime_dependency("ProMotion", ">= 0.4.1")
-  gem.add_runtime_dependency("formotion", ">= 1.1.4")
+  gem.add_runtime_dependency("ProMotion", ">= 1.1.0")
+  gem.add_runtime_dependency("formotion", ">= 1.6.0")
+  gem.add_runtime_dependency("motion-require", ">= 0.0.6")
 end
 

data/README.md

@@ -4,6 +4,9 @@ ProMotion Formotion Screen
 
 Made a gem from the ProMotion formotion example at https://github.com/clearsightstudio/ProMotion#using-your-own-uiviewcontroller
 
+Now with 100% more motion_require
+
+
 ## Setup
 
 Add this gem to your project, in Gemfile `gem 'ProMotion-formotion'`,
@@ -11,40 +14,40 @@ then `bundle update`
 
 Create a Formotion Screen with:
 ```ruby
-class MyFormotionScreen < ProMotion::Formotion::FormotionScreen
-	title "Formotion Example"
-  
+class LoginScreen < PM::FormotionScreen
+
+  title "Login"
+
   def on_submit(_form)
-    # Submit pressed
-    if Data.saved?
-      close(saved: true)
-    end
+   
   end
-  
-  def form_data
+
+  def table_data
     {
       sections: [{
-        title: "Test",
+        title: "Credentials",
         rows: [{
-          title: "Name",
-          key: :name,
-          placeholder: "tag name",
+          title: "Email",
+          key: :email,
+          placeholder: "example@kohactive.com",
           type: :string,
           auto_correction: :no,
           auto_capitalization: :none
         },
         {
-          title: "Photo",
-          key: :photo,
-          placeholder: "photo name",
-          type: :image,
+          title: "Password",
+          key: :password,
+          placeholder: "",
+          type: :string,
           auto_correction: :no,
           auto_capitalization: :none
         },
-      ],
+      ]
       }]
     }
   end
 
+
+
 end
 ``` 

data/lib/ProMotion/formotion/formotion_screen.rb

@@ -1,71 +1,89 @@
 module ProMotion
-  module Formotion
-  
-class FormotionScreen < ::Formotion::FormController # Can also be < UIViewController
-  include ::ProMotion::ScreenModule # Not TableScreenModule since we're using Formotion for that
+  if defined?(Formotion) && defined?(Formotion::FormController)
+    class FormotionScreen < Formotion::FormController
+      include ProMotion::ScreenModule
 
-  # Required functions for ProMotion to work properly
+      def self.new(args = {})
+        s = self.alloc.initWithStyle(UITableViewStyleGrouped)
+        s.on_create(args) if s.respond_to?(:on_create)
 
-  def form_data
-    {}
-  end
+        if s.respond_to?(:table_data)
+          s.form = s.table_data
+        elsif args[:form]
+          s.form = args[:form]
+        else
+          PM.logger.error "PM::FormotionScreen requires a `table_data` method or form: to be passed into `new`."
+        end
+
+        t = s.title # Formotion kills the title when you request tableView.
+        s.tableView.allowsSelectionDuringEditing = true
+        s.title = t
 
-  def self.new(args = {})
-    s = self.alloc
-    s.on_create(args) if s.respond_to?(:on_create)
-    @local_form=s.form_data
-    @local_form=::Formotion::Form.new(@local_form) if @local_form.class==Hash
-    if s.respond_to?(:on_submit)
-      @local_form.on_submit do |form|
-        s.on_submit(form.render)
+        s.form.on_submit { |form| s.on_submit(form) if s.respond_to?(:on_submit) }
+
+        s
       end
-    end
-    s.initWithForm(@local_form)
-    s.update_table_data if s.respond_to?(:update_table_data)
-    s
-  end
 
-  def viewDidLoad
-    super
-    self.view_did_load if self.respond_to?(:view_did_load)
-  end
+      # emulate the ProMotion table update for formotion
+      def update_table_data
+        self.form            = table_data
+        self.form.controller = self
+        self.tableView.reloadData
+      end
 
-  def viewWillAppear(animated)
-    super
-    self.view_will_appear(animated) if self.respond_to?("view_will_appear:")
-  end
+      def screen_setup
+        self.title = self.class.send(:get_title)
+      end
 
-  def viewDidAppear(animated)
-    super
-    self.view_did_appear(animated) if self.respond_to?("view_did_appear:")
-  end
+      def loadView
+        super
+        self.send(:on_load) if self.respond_to?(:on_load)
+      end
 
-  def viewWillDisappear(animated)
-    self.view_will_disappear(animated) if self.respond_to?("view_will_disappear:")
-    super
-  end
+      def viewDidLoad
+        super
+        self.view_did_load if self.respond_to?(:view_did_load)
+      end
 
-  def viewDidDisappear(animated)
-    self.view_did_disappear(animated) if self.respond_to?("view_did_disappear:")
-    super      
-  end
+      def viewWillAppear(animated)
+        super
+        self.view_will_appear(animated) if self.respond_to?("view_will_appear:")
+      end
 
-  def shouldAutorotateToInterfaceOrientation(orientation)
-    self.should_rotate(orientation)
-  end
+      def viewDidAppear(animated)
+        super
+        self.view_did_appear(animated) if self.respond_to?("view_did_appear:")
+      end
 
-  def shouldAutorotate
-    self.should_autorotate
-  end
+      def viewWillDisappear(animated)
+        self.view_will_disappear(animated) if self.respond_to?("view_will_disappear:")
+        super
+      end
 
-  def willRotateToInterfaceOrientation(orientation, duration:duration)
-    self.will_rotate(orientation, duration)
-  end
+      def viewDidDisappear(animated)
+        if self.respond_to?("view_did_disappear:")
+          self.view_did_disappear(animated)
+        end
+        super
+      end
 
-  def didRotateFromInterfaceOrientation(orientation)
-    self.on_rotate
-  end
-end
+      def shouldAutorotateToInterfaceOrientation(orientation)
+        self.should_rotate(orientation)
+      end
 
-end
+      def shouldAutorotate
+        self.should_autorotate
+      end
+
+      def willRotateToInterfaceOrientation(orientation, duration:duration)
+        self.will_rotate(orientation, duration)
+      end
+
+      def didRotateFromInterfaceOrientation(orientation)
+        self.on_rotate
+      end
+    end
+  else
+    throw "Unable to find Formotion"
+  end
 end

data/lib/ProMotion/formotion/version.rb

@@ -1,5 +1,5 @@
 module ProMotion
   module Formotion
-    VERSION = "0.0.9" unless defined?(ProMotion::Formotion::VERSION)
+    VERSION = "0.1.1" unless defined?(ProMotion::Formotion::VERSION)
   end
 end

data/lib/ProMotion-formotion.rb

@@ -2,8 +2,8 @@ unless defined?(Motion::Project::Config)
   raise "This file must be required within a RubyMotion project Rakefile."
 end
 
+require "formotion"
+require "motion-require"
 require "ProMotion/formotion/version"
 
-Motion::Project::App.setup do |app|
-  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')) | app.files
-end
+Motion::Require.all(Dir.glob(File.expand_path('../ProMotion/**/*.rb', __FILE__)))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-formotion
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: formotion
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: motion-require
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 description: ProMotion-formotion bind ProMotion and formotion together.
 email:
 - stephan@rheoli.net