ProMotion 2.0.0.rc3 → 2.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bc46b2fce8940f383e15d567a97406d86695677
-  data.tar.gz: 3a11bc409b27339f4df881c5d1e5bd3a7b64b2b3
+  metadata.gz: ea6af0484e34faeafec191a216b90c86b55e98e8
+  data.tar.gz: 35f7327f1bc729c3d2735c7f4f2964c524787bc7
 SHA512:
-  metadata.gz: 9dcc94f58b16ecf592701ca0d5061eea10afa1caed1d9f6733e2825375eba6273bcb8808c340b7306d4a174c768d6c147b9557a1aa3f99dfa4e36673b5bd581a
-  data.tar.gz: 15a08781adb01444520577850cd274ef2f803a4bc7a7f17ba0b81153de4e78dbdd6f470e91c352453d79549f69dfa31f9cb1bee3669a15a50c3e52b7bdfdd323
+  metadata.gz: d23b14a0edb28445c4f2299997e680c2a998416c6028c7a0fd1496fa814e321400d603953d02e5edf9c5bad6802b5aa337e0d6553ca21f7479ec938d2b644ff6
+  data.tar.gz: 8fbd692e984a128801f617ec9833af4a753a028dcb14a916eb7f4fa4730626e4964867fb14b9d8ef412684129dfcdb1aaee92c5a33b72d3971ff1124fc9f3ef2

data/lib/ProMotion/screen/nav_bar_module.rb

@@ -44,7 +44,7 @@ module ProMotion
     def add_nav_bar(args = {})
       self.navigationController ||= begin
         self.first_screen = true if self.respond_to?(:first_screen=)
-        nav = NavigationController.alloc.initWithRootViewController(self)
+        nav = (args[:nav_controller] || NavigationController).alloc.initWithRootViewController(self)
         nav.setModalTransitionStyle(args[:transition_style]) if args[:transition_style]
         nav.setModalPresentationStyle(args[:presentation_style]) if args[:presentation_style]
         nav

data/lib/ProMotion/screen/screen_navigation.rb

@@ -42,6 +42,7 @@ module ProMotion
       args[:animated] = true unless args.has_key?(:animated)
 
       if self.modal?
+        close_nav_screen args if self.navigationController
         close_modal_screen args
 
       elsif self.navigationController
@@ -144,10 +145,8 @@ module ProMotion
       else
         self.navigationController.popViewControllerAnimated(args[:animated])
       end
+      self.navigationController = nil
     end
 
   end
 end
-
-
-

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "2.0.0.rc3" unless defined?(ProMotion::VERSION)
+  VERSION = "2.0.0.rc4" unless defined?(ProMotion::VERSION)
 end

data/lib/ProMotion/web/web_screen_module.rb

@@ -21,10 +21,10 @@ module ProMotion
 
       self.webview ||= add UIWebView.new, {
         frame: CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height),
-        resize: [ :width, :height ],
         delegate: self,
         data_detector_types: self.detector_types
       }
+      self.webview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
       self.webview.scalesPageToFit = self.scale_to_fit
       self.webview.scrollView.decelerationRate = UIScrollViewDecelerationRateNormal
       set_initial_content

data/spec/unit/screen_spec.rb

@@ -125,14 +125,20 @@ describe "screen properties" do
 
   describe "navigation controller behavior" do
 
-    it "should have a nav bar" do
-      @screen.nav_bar?.should == true
+    it "should let the instance set the nav_controller" do
+      screen = HomeScreen.new nav_bar: true, nav_controller: CustomNavigationController
+      screen.on_load
+      screen.navigationController.should.be.instance_of CustomNavigationController
     end
 
     it "#navigationController should return a navigation controller" do
       @screen.navigationController.should.be.instance_of ProMotion::NavigationController
     end
 
+    it "should have a nav bar" do
+      @screen.nav_bar?.should == true
+    end
+
     it "have a right bar button item" do
       @screen.navigationItem.rightBarButtonItem.should.not == nil
     end
@@ -260,4 +266,5 @@ describe "screen with toolbar" do
     screen.set_toolbar_button([{title: "Testing Toolbar"}], false)
     screen.navigationController.toolbarHidden?.should == false
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone