dynamics 0.1.3 → 0.2.0

data/base/Rakefile

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift('/Library/RubyMotion/lib')
 
 require 'motion/project'
 require 'rubygems'
-require 'bubble-wrap'
+require 'bubble-wrap/core'
 require 'dynamics'
 
 Motion::Project::App.setup do |app|

data/base/app/application.rb

@@ -7,5 +7,7 @@ class Application < Dynamics::Application
     # self.layout = 'Navigation'
     # self.layout = 'Tab Bar'       
     self.layout = 'Tab Nav' 
+    
+    # self.authentication = true
   end
 end

data/base/app/forms/authentication_form.rb

@@ -0,0 +1,47 @@
+
+class AuthenticationForm < Dynamics::Form
+    
+  def on_submit
+    super 
+    
+    # email = data_source.find('Email')
+    # password = data_source.find('Password')       
+  end
+      
+protected
+  
+  def viewDidLoad
+    super
+    
+    auth_dsl = {
+      controller: self,
+      sections: 
+      [
+        {
+          rows: 
+          [
+            {          
+              name: "Email",
+              type: :string
+            }, 
+            {         
+              name: "Password",
+              type: :string
+            }
+          ]
+        }, 
+        {
+          rows: 
+          [
+            {
+              name: "Login To #{App.name}",
+              type: :submit
+            }
+          ]
+        }
+      ]
+    }
+    self.data_source = Dynamics::DataSource.new(auth_dsl)
+  end
+    
+end

data/base/templates/application.rb

@@ -0,0 +1,34 @@
+
+module Dynamics
+    
+  class Application
+    attr_accessor :authentication, :layout, :window
+  
+    def initialize
+      self.layout = ''
+      self.authentication = false
+    end
+    
+  protected
+        
+    def application(application, didFinishLaunchingWithOptions:launchOptions)
+      @window =  HomeView.alloc.initWithFrame(UIScreen.mainScreen.bounds)  
+      @window.makeKeyAndVisible   
+      case @layout
+      when 'Navigation'
+        # @@Navigation@@
+        # @@End@@       
+      when 'Tab Bar'           
+        # @@Tab Bar@@
+        # @@End@@     
+      when 'Tab Nav'           
+        # @@Tab Nav@@
+        # @@End@@                    
+      else     
+        @window.rootViewController = HomeController.alloc.initWithNibName(nil, bundle: nil)           
+      end  
+      true
+    end    
+  end
+  
+end

data/base/templates/cell.rb

@@ -0,0 +1,13 @@
+
+module Dynamics
+  
+  class Cell
+    attr_accessor :control, :row
+    
+    FIELD_BUFFER = Device.iphone? ? 20 : 64      
+        
+    def initialize(row)
+      self.row = row
+    end    
+  end      
+end

data/base/templates/cell_string.rb

@@ -0,0 +1,36 @@
+
+module Dynamics
+
+  class CellString < Cell
+    TEXT_FIELD_TAG = 1000
+    
+    def build_cell(cell)
+      self.control = UITextField.alloc.initWithFrame(CGRectZero)
+      self.control.tag = TEXT_FIELD_TAG      
+      self.control.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
+      self.control.textAlignment = UITextAlignmentRight
+      
+      cell.swizzle(:layoutSubviews) do
+        def layoutSubviews
+          old_layoutSubviews
+
+          field = viewWithTag(TEXT_FIELD_TAG)
+          field.sizeToFit
+          
+          field_frame = field.frame
+          field_frame.origin.x = textLabel.frame.origin.x + textLabel.frame.size.width + FIELD_BUFFER   
+          field_frame.origin.y = ((frame.size.height - field_frame.size.height) / 2.0).round
+          field_frame.size.width = frame.size.width - field_frame.origin.x - FIELD_BUFFER
+          field.frame = field_frame
+        end
+      end
+            
+      cell.addSubview(control)
+    end
+    
+    def on_select(tableViewDelegate)
+      control.becomeFirstResponder
+    end          
+  end
+  
+end

data/base/templates/cell_submit.rb

@@ -0,0 +1,20 @@
+
+module Dynamics
+  
+  class CellSubmit < Cell          
+    def build_cell(cell)
+      cell.swizzle(:layoutSubviews) do
+        def layoutSubviews
+          old_layoutSubviews
+
+          self.textLabel.center = CGPointMake(frame.size.width / 2 - (FIELD_BUFFER / 2), textLabel.center.y)
+          self.detailTextLabel.center = CGPointMake(frame.size.width / 2 - (FIELD_BUFFER / 2), detailTextLabel.center.y)
+        end
+      end      
+    end
+        
+    def on_select(tableViewDelegate)
+      tableViewDelegate.controller.on_submit
+    end  
+  end      
+end

data/base/templates/{dynamics.rb → controller.rb}

@@ -1,31 +1,6 @@
 
 module Dynamics
     
-  class Application
-    attr_accessor :layout
-  
-  private
-        
-    def application(application, didFinishLaunchingWithOptions:launchOptions)
-      @window =  HomeView.alloc.initWithFrame(UIScreen.mainScreen.bounds)  
-      @window.makeKeyAndVisible   
-      case @layout
-      when 'Navigation'
-        # @@Navigation@@
-        # @@End@@       
-      when 'Tab Bar'           
-        # @@Tab Bar@@
-        # @@End@@     
-      when 'Tab Nav'           
-        # @@Tab Nav@@
-        # @@End@@                    
-      else     
-        @window.rootViewController = HomeController.alloc.initWithNibName(nil, bundle: nil)           
-      end  
-      true
-    end    
-  end
-  
   class Controller < UIViewController   
     attr_accessor :name, :next_controller, :next_view
        
@@ -33,7 +8,8 @@ module Dynamics
         super
         
         @@index = 0
-        @name = self.class.name.underscore.split('_')[0].capitalize 
+        sub_names = self.class.name.underscore.split('_')
+        @name = sub_names[0, sub_names.size - 1].collect {|x| x.capitalize }.join 
         case App.delegate.layout
         when 'Navigation'
           if @name == 'Home'
@@ -53,7 +29,7 @@ module Dynamics
         self
     end       
     
-  private
+  protected
           
     def loadView
       if @next_view.nil?
@@ -62,33 +38,35 @@ module Dynamics
         self.view = @next_view      
       end
     end
-    
+        
     def viewDidLoad
       super
                
       case App.delegate.layout
       when 'Navigation'
         if !next_controller.nil?
-          navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle(next_controller.name, style: UIBarButtonItemStyleBordered, target: self, action: 'nextScreen')          
+          navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle(next_controller.name, style: UIBarButtonItemStyleBordered, target: self, action: 'next_screen')          
         end
       end
                   
       case @name
       when 'Home'                                      
-        self.view.backgroundColor = UIColor.whiteColor                             
+        self.view.backgroundColor = UIColor.whiteColor    
+        
+        if App.delegate.authentication
+          auth_controller = AuthenticationForm.alloc.init
+          App.delegate.window.addSubview auth_controller.view
+          view.removeFromSuperview     
+        end                                  
       else
         self.view.backgroundColor = UIColor.grayColor             
-      end       
+      end          
     end    
-        
-    def nextScreen
-      navigationController.pushViewController(@next_controller, animated: true)      
-    end
   end
   
-  class View < UIView
-  end
-    
-  class Window < UIWindow
-  end
+private
+  
+  def next_screen
+    navigationController.pushViewController(@next_controller, animated: true)      
+  end  
 end

data/base/templates/data_source.rb

@@ -0,0 +1,80 @@
+
+module Dynamics
+
+  class DataSource     
+    attr_accessor :controller, :sections, :table     
+
+    def initialize(params = {})
+      self.sections = []
+      self.controller = params[:controller]
+
+      index = 0                  
+      sections = params[:sections] || params["sections"]
+      for section in sections
+        section = create_section(section.merge({index: index}))
+        index += 1
+      end
+
+      self.table = controller.respond_to?(:table_view) ? controller.table_view : controller.tableView
+      self.table.delegate = self
+      self.table.dataSource = self
+      self.table.reloadData      
+    end
+    
+    def find(name)
+      value = nil
+      for section in sections
+        value = section.find(name)
+        if !value.nil?
+          break
+        end
+      end      
+      value
+    end
+    
+  protected
+  
+    def numberOfSectionsInTableView(tableView)  
+      sections.count
+    end    
+
+    def tableView(tableView, cellForRowAtIndexPath: indexPath)
+      row = sections[indexPath.section].rows[indexPath.row]
+      tableView.dequeueReusableCellWithIdentifier(row.identifier) || row.make_cell
+    end
+    
+    def tableView(tableView, commitEditingStyle: editingStyle, forRowAtIndexPath: indexPath)
+      row = row_for_index_path(indexPath)
+      case editingStyle
+      when UITableViewCellEditingStyleInsert
+        row.object.on_insert(tableView, self)
+      when UITableViewCellEditingStyleDelete
+        row.object.on_delete(tableView, self)
+      end
+    end
+        
+    def tableView(tableView, didSelectRowAtIndexPath: indexPath)
+      tableView.deselectRowAtIndexPath(indexPath, animated: true)
+      row = sections[indexPath.section].rows[indexPath.row]
+      row.cell.on_select(self)
+    end
+    
+    def tableView(tableView, numberOfRowsInSection: section)  
+      @sections[section].rows.count
+    end
+
+    def tableView(tableView, titleForHeaderInSection: section)
+      section = @sections[section].name
+    end
+
+  private
+
+    def create_section(hash = {})
+      section = Section.new(hash)
+      section.form = self
+      self.sections << section
+      section
+    end    
+  end
+
+end

data/base/templates/form.rb

@@ -0,0 +1,16 @@
+
+module Dynamics
+    
+  class Form < UITableViewController
+    attr_accessor :data_source   
+
+    def init
+      self.initWithStyle(UITableViewStyleGrouped)
+      self
+    end
+        
+    def on_submit
+    end
+  end
+
+end

data/base/templates/patches.rb

@@ -0,0 +1,7 @@
+
+class Object
+  def swizzle(method, &block)
+    self.class.send(:alias_method, "old_#{method.to_s}".to_sym, method)
+    self.instance_eval &block
+  end
+end

data/base/templates/row.rb

@@ -0,0 +1,38 @@
+
+module Dynamics
+    
+  class Row
+    attr_accessor :cell, :identifier, :index, :name, :section, :type, :value    
+
+    def initialize(params = {})
+      self.index = params[:index]
+      self.name = params[:name]
+      self.type = params[:type]  
+
+      case params[:type]
+      when :string
+        self.cell = CellString.new(self)
+      when :submit
+        self.cell = CellSubmit.new(self)        
+      end    
+    end
+
+    def identifier
+      section.index.to_s + index.to_s
+    end
+
+    def make_cell
+      cell_control = UITableViewCell.alloc.initWithStyle(UITableViewCellStyleSubtitle, reuseIdentifier: identifier)
+      cell_control.accessoryType = UITableViewCellAccessoryNone 
+      cell_control.editingAccessoryType = UITableViewCellAccessoryNone
+      cell_control.textLabel.text = name
+
+      cell.build_cell(cell_control)
+      cell_control
+    end
+    
+    def value
+      cell.control.text
+    end
+  end
+end

data/base/templates/section.rb

@@ -0,0 +1,41 @@
+
+module Dynamics
+
+  class Section 
+    attr_accessor :form, :index, :rows, :name     
+
+    def initialize(params = {})
+      self.rows = [] 
+      self.index = params[:index]      
+      self.name = params[:name]
+
+      index = 0
+      rows = params[:rows] || params["rows"]
+      for row in rows
+        row = create_row(row.merge({index: index}))
+        index += 1
+      end
+    end
+
+    def find(name)
+      value = nil
+      for row in rows
+        if row.name == name
+          value = row.value
+          break
+        end
+      end      
+      value
+    end
+    
+  private
+
+    def create_row(hash = {})
+      row = Row.new(hash)
+      row.section = self
+      self.rows << row
+      row
+    end
+  end
+
+end

data/base/templates/view.rb

@@ -0,0 +1,7 @@
+
+module Dynamics
+  
+  class View < UIView
+  end
+  
+end

data/base/templates/window.rb

@@ -0,0 +1,7 @@
+
+module Dynamics
+    
+  class Window < UIWindow
+  end
+  
+end

data/lib/dynamics.rb

@@ -13,12 +13,14 @@ module Dynamics
       build_dir = File.join(name, 'build')      
       resources_dir = File.join(name, 'resources')     
       lib_dir = File.join(name, 'lib')   
-
+      dynamics_dir = File.join(lib_dir, 'dynamics') 
+      
       Dir.mkdir(app_dir) 
       Dir.mkdir(build_dir)       
       Dir.mkdir(resources_dir)      
       Dir.mkdir(lib_dir)    
-
+      Dir.mkdir(dynamics_dir)  
+      
       base_dir = File.join(path, '..', 'base')
 
       f = File.new(File.join(name, 'Rakefile'), 'w+')   
@@ -40,88 +42,87 @@ module Dynamics
 
       controllers_dir = File.join(app_dir, 'controllers')    
       Dir.mkdir(controllers_dir)    
+      
+      base_controllers_dir = File.join(base_dir, 'app', 'controllers')      
+      Dir.foreach(base_controllers_dir) do |controller|
+        if controller.include?('.rb')
+          f = File.new(File.join(controllers_dir, controller), 'w+')   
+          f.write(render_code(File.join(base_controllers_dir, controller))) 
+          f.close          
+        end
+      end
 
-      f = File.new(File.join(controllers_dir, 'home_controller.rb'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'app', 'controllers', 'home_controller.rb'))) 
-      f.close    
-
-      f = File.new(File.join(controllers_dir, 'sub1_controller.rb'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'app', 'controllers', 'sub1_controller.rb'))) 
-      f.close
-
-      f = File.new(File.join(controllers_dir, 'sub2_controller.rb'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'app', 'controllers', 'sub2_controller.rb'))) 
-      f.close
+      # Forms
 
+      forms_dir = File.join(app_dir, 'forms')  
+      Dir.mkdir(forms_dir)
+      
+      base_forms_dir = File.join(base_dir, 'app', 'forms')
+      Dir.foreach(base_forms_dir) do |form|
+        if form.include?('.rb')
+          f = File.new(File.join(forms_dir, form), 'w+')   
+          f.write(render_code(File.join(base_forms_dir, form))) 
+          f.close          
+        end
+      end
+      
       # Views
 
       views_dir = File.join(app_dir, 'views')  
       Dir.mkdir(views_dir)
-
-      f = File.new(File.join(views_dir, 'home_view.rb'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'app', 'views', 'home_view.rb'))) 
-      f.close
-
-      f = File.new(File.join(views_dir, 'sub1_view.rb'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'app', 'views', 'sub1_view.rb'))) 
-      f.close
-
-      f = File.new(File.join(views_dir, 'sub2_view.rb'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'app', 'views', 'sub2_view.rb'))) 
-      f.close
       
-      # Resources
-
-      f = File.new(File.join(resources_dir, 'icon-57.png'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'resources', 'icon@57.png'))) 
-      f.close      
-      
-      f = File.new(File.join(resources_dir, 'icon-74.png'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'resources', 'icon@74.png'))) 
-      f.close
-         
-      f = File.new(File.join(resources_dir, 'icon-114.png'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'resources', 'icon@114.png'))) 
-      f.close
-             
-      f = File.new(File.join(resources_dir, 'icon-144.png'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'resources', 'icon@144.png'))) 
-      f.close
-                      
-      f = File.new(File.join(resources_dir, 'home.png'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'resources', 'home.png'))) 
-      f.close
+      base_views_dir = File.join(base_dir, 'app', 'views')
+      Dir.foreach(base_views_dir) do |view|
+        if view.include?('.rb')
+          f = File.new(File.join(views_dir, view), 'w+')   
+          f.write(render_code(File.join(base_views_dir, view))) 
+          f.close          
+        end
+      end
       
-      f = File.new(File.join(resources_dir, 'sub1.png'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'resources', 'sub1.png'))) 
-      f.close
+      # Resources
       
-      f = File.new(File.join(resources_dir, 'sub2.png'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'resources', 'sub2.png'))) 
-      f.close                  
+      base_resources_dir = File.join(base_dir, 'resources')
+      Dir.foreach(base_resources_dir) do |resource|
+        if resource.include?('.png')
+          f = File.new(File.join(resources_dir, resource), 'w+')   
+          f.write(render_code(File.join(base_resources_dir, resource))) 
+          f.close        
+        end
+      end            
     end
   end
     
-  def self.setup_framework(app, path)
-    lib_dir = File.join(path, 'lib')    
-    templates_dir = File.join(Gem.bin_path('dynamics', 'dynamics').gsub(File.join('bin', 'dynamics'), ''), 'base', 'templates')
-   
-    template_code = lib_code = render_code(File.join(templates_dir, 'dynamics.rb'))
-    template_code.scan(/# @@.+?@@.+?# @@End@@/m) do |block|
-      block.scan(/^# @@.+?@@/) do |placeholder|
-        layout = placeholder.gsub('# @@', '').gsub('@', '')
-        case layout
-           when 'Navigation' then lib_code = lib_code.gsub(block, navigation_code(path))
-           when 'Tab Bar' then lib_code = lib_code.gsub(block, tab_bar_code(path))        
-           when 'Tab Nav' then lib_code = lib_code.gsub(block, tab_nav_code(path))                       
-        end      
+  def self.setup_framework(app, path)    
+    offset = app.files.find_index("./app/application.rb")
+        
+    lib_dir = File.join(path, 'lib', 'dynamics')    
+    templates_dir = File.join(Gem.bin_path('dynamics', 'dynamics').gsub(File.join('bin', 'dynamics'), ''), 'base', 'templates') 
+    Dir.foreach(templates_dir) do |template|
+      if template.include?('.rb')
+        lib_code = render_code(File.join(templates_dir, template))
+        if template == 'application.rb'
+          template_code = lib_code
+          template_code.scan(/# @@.+?@@.+?# @@End@@/m) do |block|
+            block.scan(/^# @@.+?@@/) do |placeholder|
+              layout = placeholder.gsub('# @@', '').gsub('@', '')
+              case layout
+                 when 'Navigation' then lib_code = lib_code.gsub(block, navigation_code(path))
+                 when 'Tab Bar' then lib_code = lib_code.gsub(block, tab_bar_code(path))        
+                 when 'Tab Nav' then lib_code = lib_code.gsub(block, tab_nav_code(path))                       
+              end      
+            end
+          end
+        end
+        f = File.open(File.join(lib_dir, template), 'w+')   
+        f.write(lib_code) 
+        f.close
+        app.files.insert(offset, File.join(lib_dir, template))
+        if template.include?('cell_')     
+          app.files_dependencies(File.join(lib_dir, template) => File.join(lib_dir, 'cell.rb'))              
+        end   
       end
     end
-    f = File.open(File.join(lib_dir, 'dynamics.rb'), 'w+')   
-    f.write(lib_code) 
-    f.close
-  
-    app.files.unshift(File.join(lib_dir, 'dynamics.rb')) 
   end
   
 private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynamics
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ng Say Joe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-19 00:00:00 Z
+date: 2012-09-05 00:00:00 Z
 dependencies: []
 
 description: A framework for developing RubyMotion applications quickly.
@@ -33,6 +33,7 @@ files:
 - base/app/controllers/home_controller.rb
 - base/app/controllers/sub1_controller.rb
 - base/app/controllers/sub2_controller.rb
+- base/app/forms/authentication_form.rb
 - base/app/views/home_view.rb
 - base/app/views/sub1_view.rb
 - base/app/views/sub2_view.rb
@@ -43,7 +44,18 @@ files:
 - base/resources/icon@74.png
 - base/resources/sub1.png
 - base/resources/sub2.png
-- base/templates/dynamics.rb
+- base/templates/application.rb
+- base/templates/cell.rb
+- base/templates/cell_string.rb
+- base/templates/cell_submit.rb
+- base/templates/controller.rb
+- base/templates/data_source.rb
+- base/templates/form.rb
+- base/templates/patches.rb
+- base/templates/row.rb
+- base/templates/section.rb
+- base/templates/view.rb
+- base/templates/window.rb
 - bin/dynamics
 homepage: http://www.dynamics.io/
 licenses: []