dynamics 0.1.0 → 0.1.1

data/base/app/controllers/main_controller.rb

@@ -1,7 +1,4 @@
 
 class MainController < Dynamics::Controller
-  
-  def load
-  end
     
 end

data/base/app/controllers/sub1_controller.rb

@@ -1,7 +1,4 @@
 
 class Sub1Controller < Dynamics::Controller
-  
-  def load
-  end
     
 end

data/base/app/controllers/sub2_controller.rb

@@ -1,7 +1,4 @@
 
 class Sub2Controller < Dynamics::Controller
-  
-  def load
-  end
     
 end

data/base/templates/dynamics.rb

@@ -2,10 +2,13 @@
 module Dynamics
     
   class Application
+    
+  private
+
     def initialize(layout)
       @layout = layout
     end
-    
+        
     def application(application, didFinishLaunchingWithOptions:launchOptions)
       @window =  MainView.alloc.initWithFrame(UIScreen.mainScreen.bounds)  
       @window.makeKeyAndVisible   
@@ -25,19 +28,12 @@ module Dynamics
   class Controller < UIViewController   
     attr_accessor :next_controller, :next_view
     
-    def load
-    end
-    
     def name
       self.class.name.underscore.split('_')[0].capitalize 
     end
-    
-    def push
-      self.navigationController.pushViewController(@next_controller, animated: true)      
-    end
        
   private
-    
+          
     def loadView
       if @next_view.nil?
         super
@@ -48,7 +44,6 @@ module Dynamics
     
     def viewDidLoad
       super
-      
       if name == 'Main'
         self.title = App.name 
         self.view.backgroundColor = UIColor.whiteColor                 
@@ -56,9 +51,11 @@ module Dynamics
         self.title = name
         self.view.backgroundColor = UIColor.grayColor             
       end     
-      
-      load
     end    
+        
+    def nextScreen
+      self.navigationController.pushViewController(@next_controller, animated: true)      
+    end
   end
   
   class View < UIView

data/lib/dynamics.rb

@@ -19,7 +19,7 @@ module Dynamics
       Dir.mkdir(resources_dir)      
       Dir.mkdir(lib_dir)    
 
-      base_dir = File.join(File.dirname(__FILE__), '..', 'base')
+      base_dir = File.join(path, '..', 'base')
 
       f = File.new(File.join(name, 'Rakefile'), 'w+')   
       code = render_code(File.join(base_dir, 'Rakefile'))
@@ -69,30 +69,25 @@ module Dynamics
       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
-
-      # Lib 
-
-      f = File.new(File.join(lib_dir, 'dynamics.rb'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'templates', 'dynamics.rb')) ) 
-      f.close 
     end
   end
     
   def self.setup_framework(app, path)
-    lib_dir = File.join(path, 'lib')
-    lib_code = render_code(File.join(lib_dir, 'dynamics.rb'))
-    new_code = lib_code
-    lib_code.scan(/# @@.+?@@.+?# @@End@@/m) do |block|
+    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 new_code = new_code.gsub(block, navigation_code(path))
-           when 'Tab Bar' then new_code = new_code.gsub(block, tab_bar_code(path))             
+           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))             
         end      
       end
     end
     f = File.open(File.join(lib_dir, 'dynamics.rb'), 'w+')   
-    f.write(new_code) 
+    f.write(lib_code) 
     f.close
   
     app.files.unshift(File.join(lib_dir, 'dynamics.rb')) 
@@ -125,7 +120,7 @@ private
     code += "        main_controller = MainController.alloc.initWithNibName(nil, bundle: nil)\n"  
     controllers = find_controllers(path)    
     if controllers.size > 0    
-      code += "        main_controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle('#{controllers.first[:name]}', style: UIBarButtonItemStyleBordered, target:main_controller, action:'push')\n"          
+      code += "        main_controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle('#{controllers.first[:name]}', style: UIBarButtonItemStyleBordered, target:main_controller, action:'nextScreen')\n"          
     end
     i = 1
     prev_controller = 'main_controller'
@@ -134,7 +129,7 @@ private
       code += "        sub#{i}_controller.next_view = #{controller[:name]}View.alloc.initWithFrame(UIScreen.mainScreen.bounds)\n"                        
       code += "        #{prev_controller}.next_controller = sub#{i}_controller\n"        
       if controller != controllers.last
-        code += "        sub#{i}_controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle('#{controllers[i][:name]}', style: UIBarButtonItemStyleBordered, target:sub#{i}_controller, action:'push')\n"              
+        code += "        sub#{i}_controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle('#{controllers[i][:name]}', style: UIBarButtonItemStyleBordered, target:sub#{i}_controller, action:'nextScreen')\n"              
         prev_controller = "sub#{i}_controller"     
         i += 1        
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynamics
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ng Say Joe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-22 00:00:00 Z
+date: 2012-08-01 00:00:00 Z
 dependencies: []
 
 description: A framework for developing RubyMotion applications quickly.