ProMotion 2.8.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff88ba12cf5f2a7fed1cf73a74215e9c0e58423df7e906d8ae14e3f65cf10033
-  data.tar.gz: 1d555e3974f3e502acaaa2a36ac54fab97e9b3c432ef6bedafec7d2fb1be66f1
+  metadata.gz: e8ab6f66bcfc437f402e9c8271b367626306a4d1a1cbe2e5cf7994abcf7570e4
+  data.tar.gz: 48619b0b60edff79951538f03a28a895c48a0b489c61d904f1f082c1d02faa6f
 SHA512:
-  metadata.gz: 7367fe943641a5ec31e131bcb08eac656738cdcda01ee5122419822963a652864807e41f47fd93c2b5fa02d428a846632df75dd3178e1527cb982c58f084838f
-  data.tar.gz: 247b1bee69acec4810af44199f90e2b8130ce2786cd18a7eb5ff969a4e5ba722ebd57b7b38be025f4a2de88d98908e6e1be39697bc9e6910347ae702f506be07
+  metadata.gz: 7dfe0a34fe391efdf62bc11873c2c6bb45bfb0697eb91716df58bb60aaec40d18480adba66eedb585ed68c4f85b8214f404eca85828237c5ddac014b076603c2
+  data.tar.gz: 84291ed23351a205df87ef74a39e71adb2d1c885902358ec132e3395cfb436b22bc32ed14f30bffceeab09bba1f2831f5a454ab1d7626ba16d1574c2a67f2802

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://img.shields.io/gem/v/ProMotion.svg?style=flat)](https://rubygems.org/gems/ProMotion)
 [![Build Status](https://img.shields.io/travis/infinitered/ProMotion.svg?style=flat)](https://travis-ci.org/infinitered/ProMotion)
-[![Code Climate](https://img.shields.io/codeclimate/github/infinitered/ProMotion.svg?style=flat)](https://codeclimate.com/github/infinitered/ProMotion)
 
 ProMotion was created by [Infinite Red](http://infinite.red), a web and mobile development company based in Portland, OR and San Francisco, CA. While you're welcome to use ProMotion, please note that we rely on the community to maintain it. We are happy to merge pull requests and release new versions but are no longer driving primary development.
 
@@ -76,8 +75,6 @@ end
 |---|---|---|
 |[![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/1534507/0edb8dd4-4c96-11e3-9896-d4583d0ed161.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20SplitScreen/)|[![MapScreen](https://f.cloud.github.com/assets/1479215/1534628/f7dbf7e8-4c97-11e3-8817-4c2a58824771.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20MapScreen/)|[![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/1534631/ffe1b36a-4c97-11e3-8c8f-c7b14e26182d.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20WebScreen/)|
 
-**NEW** [Live reloading!](http://promotion.readthedocs.org/en/master/Guides/Live Screen Reloading/) Use `pm_live` to enable it, and `on_live_reload` in your screen to refresh things.
-
 #### ...and much more.
 
 ## Getting Started

data/lib/ProMotion.rb

@@ -12,63 +12,4 @@ Motion::Project::App.setup do |app|
     app.files.insert(insert_point, file)
   end
 
-  app.development do
-    app.info_plist["ProjectRootPath"] ||= File.absolute_path(app.project_dir)
-  end
-
-  # For compatibility with libraries that don't use detect_dependencies. :-(
-  app.files_dependencies({
-    "#{core_lib}/version.rb" => [ "#{core_lib}/pro_motion.rb" ],
-    "#{core_lib}/cocoatouch/table_view_cell.rb" => [ "#{core_lib}/table/cell/table_view_cell_module.rb" ],
-    "#{core_lib}/table/cell/table_view_cell_module.rb" => [ "#{core_lib}/styling/styling.rb" ],
-    "#{core_lib}/cocoatouch/collection_view_cell.rb" => [ "#{core_lib}/collection/cell/collection_view_cell_module.rb" ],
-    "#{core_lib}/collection/collection_screen.rb" => [
-       "#{core_lib}/cocoatouch/collection_view_controller.rb",
-       "#{core_lib}/screen/screen_module.rb",
-       "#{core_lib}/collection/collection_builder.rb",
-       "#{core_lib}/collection/collection.rb",
-       "#{core_lib}/collection/cell/collection_view_cell_module.rb",
-    ],
-    "#{core_lib}/collection/cell/collection_view_cell_module.rb" => [ "#{core_lib}/styling/styling.rb" ],
-    "#{core_lib}/delegate/delegate.rb" => [ "#{core_lib}/delegate/delegate_parent.rb" ],
-    "#{core_lib}/delegate/delegate_parent.rb" => [ "#{core_lib}/delegate/delegate_module.rb" ],
-    "#{core_lib}/delegate/delegate_module.rb" => [
-       "#{core_lib}/support/support.rb",
-       "#{core_lib}/tabs/tabs.rb",
-       "#{core_lib}/ipad/split_screen.rb"
-    ],
-    "#{core_lib}/screen/screen.rb" => [ "#{core_lib}/screen/screen_module.rb" ],
-    "#{core_lib}/screen/screen_navigation.rb" => [ "#{core_lib}/support/support.rb", ],
-    "#{core_lib}/screen/screen_module.rb" => [
-       "#{core_lib}/styling/styling.rb",
-       "#{core_lib}/tabs/tabs.rb",
-       "#{core_lib}/screen/nav_bar_module.rb",
-       "#{core_lib}/screen/screen_navigation.rb",
-       "#{core_lib}/ipad/split_screen.rb",
-    ],
-    "#{core_lib}/table/data/table_data.rb" => [
-       "#{core_lib}/table/data/table_data_builder.rb",
-       "#{core_lib}/table/table.rb"
-    ],
-    "#{core_lib}/collection/data/collection_data.rb" => [
-       "#{core_lib}/collection/data/collection_data_builder.rb",
-       "#{core_lib}/collection/collection.rb",
-       "#{core_lib}/table/table_utils.rb"
-    ],
-    "#{core_lib}/table/table.rb" => [
-       "#{core_lib}/table/table_class_methods.rb",
-       "#{core_lib}/table/table_builder.rb",
-       "#{core_lib}/table/table_utils.rb",
-       "#{core_lib}/table/extensions/searchable.rb",
-       "#{core_lib}/table/extensions/refreshable.rb",
-       "#{core_lib}/table/extensions/indexable.rb",
-       "#{core_lib}/table/extensions/longpressable.rb"
-    ],
-    "#{core_lib}/collection/collection.rb" => [
-       "#{core_lib}/collection/collection_class_methods.rb",
-       "#{core_lib}/collection/collection_builder.rb",
-       "#{core_lib}/table/table_utils.rb"
-    ],
-    "#{core_lib}/web/web_screen.rb" => [ "#{core_lib}/web/web_screen_module.rb" ],
-    })
 end

data/lib/ProMotion/screen/screen_module.rb

@@ -81,11 +81,6 @@ module ProMotion
       mp "Received memory warning in #{self.inspect}. You should implement on_memory_warning in your screen.", force_color: :red
     end
 
-    def on_live_reload
-      self.view.subviews.each(&:removeFromSuperview)
-      on_load
-    end
-
     def should_rotate(orientation)
       case orientation
       when UIInterfaceOrientationPortrait

data/lib/ProMotion/table/table.rb

@@ -23,10 +23,6 @@ module ProMotion
       set_up_row_height
     end
 
-    def on_live_reload
-      update_table_data
-    end
-
     def check_table_data
       mp("Missing #table_data method in TableScreen #{self.class.to_s}.", force_color: :red) unless self.respond_to?(:table_data)
     end
@@ -125,7 +121,8 @@ module ProMotion
 
     def delete_row(index_paths, animation = nil)
       deletable_index_paths = []
-      Array(index_paths).each do |index_path|
+      index_paths = [index_paths] if index_paths.kind_of?(NSIndexPath)
+      index_paths.each do |index_path|
         delete_cell = false
 
         delete_cell = trigger_action(:on_cell_deleted, cell_at(index_path: index_path), index_path) if respond_to?(:on_cell_deleted)

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "2.8.2" unless defined?(ProMotion::VERSION)
+  VERSION = "3.0.0" unless defined?(ProMotion::VERSION)
 end

data/lib/ProMotion/web/ui_web_screen_module.rb

@@ -0,0 +1,78 @@
+module ProMotion
+  module UIWebScreenModule
+    def web_view_setup
+      self.webview = add UIWebView.new, {
+        frame: CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height),
+        delegate: self,
+        data_detector_types: data_detector_types
+      }
+
+      self.webview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
+      self.webview.scalesPageToFit = self.scale_to_fit
+      self.webview.scrollView.decelerationRate = UIScrollViewDecelerationRateNormal
+    end
+
+    def evaluate(js)
+      self.webview.stringByEvaluatingJavaScriptFromString(js)
+    end
+
+    def evaluate_async(js, &block)
+      Dispatch::Queue.concurrent.async do
+        result = evaluate(js)
+        Dispatch::Queue.main.async do
+          block.call result
+        end
+      end
+    end
+
+    def go_to_item(item)
+      # self.webview.goToBackForwardListItem(item)
+      PM.logger.warn "`go_to_item` is not implemented with the older UIWebView, which doesn't support it."
+      false
+    end
+
+    def back_forward_list
+      # self.webview.backForwardList
+      PM.logger.warn "`back_forward_list` is not implemented with the older UIWebView, which doesn't support it."
+      false
+    end
+
+    def progress
+      # self.webview.estimatedProgress
+      PM.logger.warn "`progress` is not implemented with the older UIWebView, which doesn't support it."
+      false
+    end
+
+    # CocoaTouch methods
+
+    def webView(in_web, shouldStartLoadWithRequest:in_request, navigationType:in_type)
+      if %w(http https).include?(in_request.URL.scheme)
+        if self.external_links == true && in_type == UIWebViewNavigationTypeLinkClicked
+          if defined?(OpenInChromeController)
+            open_in_chrome in_request
+          else
+            open_in_safari in_request
+          end
+          return false # don't allow the web view to load the link.
+        end
+      end
+
+      load_request_enable = true #return true on default for local file loading.
+      load_request_enable = !!on_request(in_request, in_type) if self.respond_to?(:on_request)
+      load_request_enable
+    end
+
+    def webViewDidStartLoad(webView)
+      load_started if self.respond_to?(:load_started)
+    end
+
+    def webViewDidFinishLoad(webView)
+      load_finished if self.respond_to?(:load_finished)
+    end
+
+    def webView(webView, didFailLoadWithError:error)
+      load_failed(error) if self.respond_to?("load_failed:")
+    end
+
+  end
+end

data/lib/ProMotion/web/web_screen_module.rb

@@ -1,5 +1,7 @@
 module ProMotion
   module WebScreenModule
+    include WKWebScreenModule if defined?(WKWebView)
+    include UIWebScreenModule unless defined?(WKWebView)
 
     attr_accessor :webview, :external_links, :detector_types, :scale_to_fit
 
@@ -17,17 +19,6 @@ module ProMotion
       # TODO: Remove in 3.0
     end
 
-    def web_view_setup
-      self.webview ||= add UIWebView.new, {
-        frame: CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height),
-        delegate: self,
-        data_detector_types: data_detector_types
-      }
-      self.webview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
-      self.webview.scalesPageToFit = self.scale_to_fit
-      self.webview.scrollView.decelerationRate = UIScrollViewDecelerationRateNormal
-    end
-
     def web
       self.webview
     end
@@ -49,7 +40,6 @@ module ProMotion
       if File.exists? content_path
         content_string = File.read content_path
         content_base_url = NSURL.fileURLWithPath NSBundle.mainBundle.resourcePath
-
         self.web.loadHTMLString(convert_retina_images(content_string), baseURL:content_base_url)
       else
         # We assume the user wants to load an arbitrary string into the web view
@@ -58,10 +48,7 @@ module ProMotion
     end
 
     def open_url(url)
-      request = NSURLRequest.requestWithURL(
-        url.is_a?(NSURL) ? url : NSURL.URLWithString(url)
-      )
-      web.loadRequest request
+      web.loadRequest NSURLRequest.requestWithURL(url.to_url)
     end
 
     def convert_retina_images(content)
@@ -85,16 +72,12 @@ module ProMotion
       mp("Missing #content method in WebScreen #{self.class.to_s}.", force_color: :red) unless self.respond_to?(:content)
     end
 
-    def html
-      evaluate("document.documentElement.outerHTML")
-    end
-
-    def evaluate(js)
-      self.webview.stringByEvaluatingJavaScriptFromString(js)
+    def html(&block)
+      evaluate('document.documentElement.outerHTML', &block)
     end
 
-    def current_url
-      evaluate('document.URL')
+    def current_url(&block)
+      evaluate('document.URL', &block)
     end
 
     # Navigation
@@ -119,36 +102,6 @@ module ProMotion
       UIApplication.sharedApplication.openURL(in_request.URL)
     end
 
-    # UIWebViewDelegate Methods - Camelcase
-    def webView(in_web, shouldStartLoadWithRequest:in_request, navigationType:in_type)
-      if %w(http https).include?(in_request.URL.scheme)
-        if self.external_links == true && in_type == UIWebViewNavigationTypeLinkClicked
-          if defined?(OpenInChromeController)
-            open_in_chrome in_request
-          else
-            open_in_safari in_request
-          end
-          return false # don't allow the web view to load the link.
-        end
-      end
-
-      load_request_enable = true #return true on default for local file loading.
-      load_request_enable = !!on_request(in_request, in_type) if self.respond_to?(:on_request)
-      load_request_enable
-    end
-
-    def webViewDidStartLoad(webView)
-      load_started if self.respond_to?(:load_started)
-    end
-
-    def webViewDidFinishLoad(webView)
-      load_finished if self.respond_to?(:load_finished)
-    end
-
-    def webView(webView, didFailLoadWithError:error)
-      load_failed(error) if self.respond_to?("load_failed:")
-    end
-
     protected
 
     def data_detector_types
@@ -166,6 +119,5 @@ module ProMotion
         all:      UIDataDetectorTypeAll
       }[symbol] || UIDataDetectorTypeNone
     end
-
   end
 end

data/lib/ProMotion/web/wk_web_screen_module.rb

@@ -0,0 +1,87 @@
+module ProMotion
+  module WKWebScreenModule
+    def web_view_setup
+      configuration = WKWebViewConfiguration.alloc.init
+      configuration.dataDetectorTypes = data_detector_types
+      frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height)
+      # FIXME: get this working: wkwebview = WKWebView.alloc.initWithFrame(frame, configuration: configuration)
+      wkwebview = WKWebView.alloc.initWithFrame(frame)
+      self.webview = add(wkwebview)
+      self.webview.UIDelegate = self
+      self.webview.navigationDelegate = self
+      self.webview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
+      self.webview.scrollView.decelerationRate = UIScrollViewDecelerationRateNormal
+    end
+
+    def evaluate(js, &block)
+      if block
+        evaluate_async(js) do |result, error|
+          block.call(result) # ignore error
+        end
+        return
+      end
+      res = nil
+      semaphore = Dispatch::Semaphore.new(0)
+      # FIXME: this  blocks and never returns
+      evaluate_async(js) do |result, error|
+        res = result
+        semaphore.signal
+      end
+      semaphore.wait(Dispatch::TIME_FOREVER)
+      return res
+    end
+
+    def evaluate_async(js, &block)
+      self.webview.evaluateJavaScript(js, completionHandler: -> (result, error) {
+        block.call(result, error)
+      })
+    end
+
+    def go_to_item(item)
+      self.webview.goToBackForwardListItem(item)
+    end
+
+    def back_forward_list
+      self.webview.backForwardList
+    end
+
+    def progress
+      self.webview.estimatedProgress
+    end
+
+    # CocoaTouch methods
+
+    def webView(view, decidePolicyForNavigationAction: navigationAction, decisionHandler: decisionHandler)
+      request = navigationAction.request
+      nav_type = navigationAction.navigationType
+      
+      if %w(http https).include?(request.URL.scheme)
+        if self.external_links == true && nav_type == WKNavigationTypeLinkActivated
+          if defined?(OpenInChromeController)
+            open_in_chrome(request)
+          else
+            open_in_safari(request)
+          end
+          decisionHandler.call(WKNavigationActionPolicyCancel) # don't allow the web view to load the link
+          return
+        end
+      end
+      
+      load_request_enable = true # return true by default for local file loading
+      load_request_enable = !!on_request(request, nav_type) if self.respond_to?(:on_request)
+      decisionHandler.call(load_request_enable ? WKNavigationActionPolicyAllow : WKNavigationActionPolicyCancel)
+    end
+    
+    def webView(view, didCommitNavigation: navigation)
+      navigation_started(navigation) if self.respond_to?("navigation_started")
+    end
+
+    def webView(view, didFailNavigation: navigation, withError: error)
+      navigation_failed(navigation, error) if self.respond_to?("navigation_failed")
+    end
+
+    def webView(view, didFinishNavigation: navigation)
+      navigation_finished(navigation) if self.respond_to?("navigation_finished")
+    end
+  end
+end

data/spec/functional/func_table_screen_cell_spec.rb

@@ -64,6 +64,7 @@ describe "ProMotion::TableScreen functionality" do
       table_screen.tableView.scrollToRowAtIndexPath(ip, atScrollPosition: UITableViewScrollPositionTop, animated: false)
 
       cell = views(TestCell).first
+      cell.prepare_for_reuse_time.should.not.be.nil
       cell.prepare_for_reuse_time.should < cell.on_reuse_time
     end
   end

data/spec/functional/func_web_screen_spec.rb

@@ -1,11 +1,12 @@
 describe "ProMotion::TestWebScreen functionality" do
-  extend WebStub::SpecHelpers
+  # NOTE: webstub doesn't support stubbing WKWebView requests
+  # extend WebStub::SpecHelpers
 
   before do
-    disable_network_access!
+    # disable_network_access!
     UIView.setAnimationDuration 0.01
   end
-  after   { enable_network_access! }
+  # after { enable_network_access! }
 
   def controller
     @controller ||= TestWebScreen.new(nav_bar: true)
@@ -18,32 +19,41 @@ describe "ProMotion::TestWebScreen functionality" do
   it "should have the proper html content" do
     file_name = "WebScreen.html"
 
-    controller.mock!(:load_finished) do
+    controller.mock!(:navigation_finished) do |nav|
       loaded_file = File.read(File.join(NSBundle.mainBundle.resourcePath, file_name))
-      controller.html.delete("\n").should == loaded_file.delete("\n")
-      resume
+      controller.html do |html|
+        html.should.not.be.nil
+        html.delete("\n").should == loaded_file.delete("\n")
+        resume
+      end
     end
     controller.set_content(file_name)
     wait_max 8 {}
   end
 
   it "should allow you to navigate to a website" do
-    stub_request(:get, "https://www.google.com/").
-      to_return(body: %q{Google! <form action="/search">%}, content_type: "text/html")
-
-    controller.mock!(:load_finished) do
-      controller.html.should.include('<form action="/search"')
-      resume
+    # NOTE: webstub can't stub WKWebView requests
+    # stub_request(:get, "https://www.google.com/").
+    #   to_return(body: %q{Google! <form action="/search">%}, content_type: "text/html")
+
+    controller.mock!(:navigation_finished) do |nav|
+      controller.html do |html|
+        html.should.include('<form action="/search"')
+        resume
+      end
     end
-    controller.open_url(NSURL.URLWithString("https://www.google.com/"))
+    controller.open_url('https://www.google.com/') # LIVE request!
     wait_max 8 {}
   end
 
   it "should manipulate the webscreen contents with javascript" do
-    controller.mock!(:load_finished) do
-      controller.evaluate('document.getElementById("cool").innerHTML = "Changed"')
-      controller.html.should =~ /<h1 id="cool">Changed<\/h1>/
-      resume
+    controller.mock!(:navigation_finished) do |nav|
+      controller.evaluate_async('document.getElementById("cool").innerHTML = "Changed"') do |result, error|
+        controller.html do |html|
+          html.should =~ /<h1 id="cool">Changed<\/h1>/
+          resume
+        end
+      end
     end
     controller.set_content('<h1 id="cool">Something Cool</h1>')
     wait_max 8 {}

data/spec/unit/tables/table_view_cell_spec.rb

@@ -79,11 +79,11 @@ describe "PM::TableViewCellModule" do
   end
 
   it "should allow attributed title" do
-    @attributed_subject.textLabel.attributedText.mutableString.should == "Attributed Title"
+    @attributed_subject.textLabel.attributedText.string.should == "Attributed Title"
   end
 
   it "should allow attributed subtitle" do
-    @attributed_subject.detailTextLabel.attributedText.mutableString.should == "Attributed Subtitle"
+    @attributed_subject.detailTextLabel.attributedText.string.should == "Attributed Subtitle"
   end
 
   it "should have the right subtitle" do

data/spec/unit/web_spec.rb

@@ -1,63 +1,85 @@
 describe "web screen properties" do
-  extend WebStub::SpecHelpers
-
-  before  { disable_network_access! }
-  after   { enable_network_access! }
+  # NOTE: webstub doesn't work with WKWebView
+  # extend WebStub::SpecHelpers
+  # before { disable_network_access! }
+  # after  { enable_network_access! }
 
   it "should leave on_init available as a hook" do
-    webscreen = TestWebScreen.new()
+    webscreen = TestWebScreen.new
     webscreen.on_init_available?.should == true
   end
 
-  describe "when open web page with http request" do
+  it "can perform asynchronous javascript execution" do
+    webscreen = TestWebScreen.new
+    js = 'document.documentElement.innerHTML = "test"; document.documentElement.outerHTML'
+    webscreen.evaluate_async(js) do |result, error|
+      result.should == '<html><head></head><body>test</body></html>'
+      resume
+    end
+    wait_max 2 {}
+  end
+
+  it "can perform synchronous javascript execution" do
+    webscreen = TestWebScreen.new
+    js = 'document.documentElement.innerHTML = "test"; document.documentElement.outerHTML'
+    wait_max(2) do
+      result = webscreen.evaluate(js)
+      result.should == '<html><head></head><body>test</body></html>'
+    end
+  end
+
+  describe "opening a web page using an http request" do
     before do
       class TestWebScreenWithHTTPRequest < TestWebScreen
-        attr_accessor :on_request, :on_request_args
+        attr_accessor :on_request_called, :on_request_args
+        # NOTE: this hook is for deciding whether or not the request should continue
         def on_request(request, type)
           self.on_request_args = [request, type]
-          self.on_request = true
+          self.on_request_called = true
+          false # cancel request since we can't stub it
         end
       end
-      stub_request(:get, "http://mixi.jp/").
-        to_return(body: "<html><body>[mixi]</body></html>", content_type: "text/html")
+      
+      # NOTE: webstub doesn't support stubbing WKWebView requests
+      #stub_request(:get, "https://mixi.jp/").
+      #  to_return(body: "<html><body>[mixi]</body></html>", content_type: "text/html")
+
       # Simulate AppDelegate setup of web screen
       @webscreen = TestWebScreenWithHTTPRequest.new modal: true, nav_bar: true, external_links: false
     end
+    
+    it "should call on_request hook" do
+      @webscreen.open_url('https://mixi.jp/')
 
-    it "should get the current url" do
-      @webscreen.open_url(NSURL.URLWithString('http://mixi.jp/'))
-
-      wait_for_change @webscreen, 'is_load_finished' do
-        @webscreen.current_url.should == 'http://mixi.jp/'
+      wait_for_change @webscreen, 'on_request_called' do
+        @webscreen.on_request_called.should == true
       end
     end
     
     it "should open web page via NSMutableURLRequest" do
-      nsurl = NSURL.URLWithString('http://mixi.jp/')
+      nsurl = NSURL.URLWithString('https://mixi.jp/')
       @webscreen.web.loadRequest NSMutableURLRequest.requestWithURL(nsurl)
 
-      wait_for_change @webscreen, 'is_load_finished' do
-        @webscreen.current_url.should == 'http://mixi.jp/'
+      wait_for_change @webscreen, 'on_request_called' do
+        request = @webscreen.on_request_args.first
+        request.should.be.a.kind_of NSURLRequest
+        request.URL.absoluteString.should == 'https://mixi.jp/'
       end
     end
 
     it "should open web page by url string" do
-      @webscreen.open_url('http://mixi.jp/')
-      wait_for_change @webscreen, 'is_load_finished' do
-        @webscreen.html.should =~ /mixi/
-      end
-    end
-
-    it "should call on_request hook" do
-      @webscreen.open_url(NSURL.URLWithString('http://mixi.jp/'))
+      @webscreen.open_url('https://mixi.jp/')
 
-      wait_for_change @webscreen, 'on_request' do
-        @webscreen.on_request_args[0].is_a?(NSURLRequest).should == true
-        # on_request is called when @webscreen request for some iframe
-        @webscreen.on_request_args[0].URL.absoluteString.should =~ %r|https?://.*|
+      wait_for_change @webscreen, 'on_request_called' do
+        request = @webscreen.on_request_args.first
+        request.should.be.a.kind_of NSURLRequest
+        request.URL.absoluteString.should == 'https://mixi.jp/'
       end
     end
 
+    # TODO: these features used to be supported prior to WKWebView migration
+    # it "can synchronously return the current page html"
+    # it "can synchronously return the current page url"
   end
 
   describe "when loading a static html file" do
@@ -68,16 +90,20 @@ describe "web screen properties" do
     end
 
     it "should get the url of content" do
-      @webscreen.current_url.should == 'about:blank'
+      @webscreen.current_url do |url|
+        url.should == 'about:blank'
+        resume
+      end
+      wait_max 1 {}
     end
 
-    it "should have a UIWebView as the primary view" do
-      @webscreen.web.class.should == UIWebView
+    it "should have a WKWebView as the primary view" do
+      @webscreen.web.class.should == WKWebView
     end
 
     it "should load the about html page" do
-      wait_for_change @webscreen, 'is_load_finished' do
-        @webscreen.is_load_finished.should == true
+      wait_for_change @webscreen, 'is_nav_finished', 3 do
+        @webscreen.is_nav_finished.should == true
       end
     end
   end
@@ -85,29 +111,25 @@ describe "web screen properties" do
   describe "when setting attributes" do
     it "should have a default values" do
       webscreen = TestWebScreen.new()
-      webscreen.web.dataDetectorTypes.should == UIDataDetectorTypeNone
-      webscreen.web.scalesPageToFit.should == false
+      webscreen.web.configuration.dataDetectorTypes.should == UIDataDetectorTypeNone
       webscreen.external_links.should == false
     end
 
-    it "should set a single data detector" do
-      webscreen = TestWebScreen.new(detector_types: :phone)
-      webscreen.web.dataDetectorTypes.should == UIDataDetectorTypePhoneNumber
-    end
+# FIXME: these should work after getting initWithFrame:configuration: to work.
+#    it "should set a single data detector" do
+#      webscreen = TestWebScreen.new(detector_types: :phone)
+#      webscreen.web.configuration.dataDetectorTypes.should == UIDataDetectorTypePhoneNumber
+#    end
 
-    it "should set multiple data detectors" do
-      webscreen = TestWebScreen.new(detector_types: [:phone, :link])
-      webscreen.web.dataDetectorTypes.should == UIDataDetectorTypePhoneNumber | UIDataDetectorTypeLink
-    end
-
-    it "should set the scaling mode of the screen" do
-      webscreen = TestWebScreen.new(scale_to_fit: true)
-      webscreen.web.scalesPageToFit.should == true
-    end
+#    it "should set multiple data detectors" do
+#      webscreen = TestWebScreen.new(detector_types: [:phone, :link])
+#      webscreen.web.configuration.dataDetectorTypes.should == UIDataDetectorTypePhoneNumber | UIDataDetectorTypeLink
+#    end
 
     it "should have the ability to open links externally" do
       webscreen = TestWebScreen.new(external_links: true)
       webscreen.external_links.should == true
+      # TODO: test that link click opens Safari
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -132,8 +132,6 @@ files:
 - lib/ProMotion/ipad/split_screen.rb
 - lib/ProMotion/logger/logger.rb
 - lib/ProMotion/pro_motion.rb
-- lib/ProMotion/repl/live_reloader.rb
-- lib/ProMotion/repl/repl.rb
 - lib/ProMotion/screen/nav_bar_module.rb
 - lib/ProMotion/screen/screen.rb
 - lib/ProMotion/screen/screen_module.rb
@@ -159,8 +157,10 @@ files:
 - lib/ProMotion/table/table_utils.rb
 - lib/ProMotion/tabs/tabs.rb
 - lib/ProMotion/version.rb
+- lib/ProMotion/web/ui_web_screen_module.rb
 - lib/ProMotion/web/web_screen.rb
 - lib/ProMotion/web/web_screen_module.rb
+- lib/ProMotion/web/wk_web_screen_module.rb
 - spec/functional/func_screen_spec.rb
 - spec/functional/func_split_screen_spec.rb
 - spec/functional/func_table_screen_cell_spec.rb
@@ -213,8 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ProMotion is a fast way to get started building RubyMotion apps. Instead

data/lib/ProMotion/repl/live_reloader.rb

@@ -1,76 +0,0 @@
-class LiveReloader
-  attr_reader :path_query, :opts
-
-  def initialize(path, opts={})
-    @path_query = path
-    @opts = opts
-  end
-
-  def watch(&callback)
-    log path_query
-    log live_file_paths
-
-    @live_reload_timer = every(opts[:interval] || 0.5) do
-      live_files.each do |live_file, modified_date|
-        if File.exist?(live_file) && File.mtime(live_file) > modified_date
-          new_code = File.read(live_file)
-          eval(new_code)
-          callback.call *[live_file, new_code, parse_class_names(new_code)].first(callback.arity)
-          reload_live_files
-        end
-      end
-    end
-
-    log "Watching #{path_query}."
-    self
-  end
-
-  def stop
-    @live_reload_timer.invalidate if @live_reload_timer
-    @live_reload_timer = nil
-    log "Stopped."
-    self
-  end
-
-  def debug?
-    @opts[:debug]
-  end
-
-  private
-
-  def every(interval, &callback)
-    NSTimer.scheduledTimerWithTimeInterval(interval, target: callback, selector: 'call:', userInfo: nil, repeats: true)
-  end
-
-  def live_files
-    @live_files ||= live_file_paths.inject({}) do |out, live_file_path_file|
-      out[live_file_path_file] = File.mtime(live_file_path_file)
-      out
-    end
-  end
-
-  def reload_live_files
-    @live_files = nil
-    live_files
-  end
-
-  def log(s)
-    puts s.inspect if debug?
-    s
-  end
-
-  def project_root_path
-    NSBundle.mainBundle.infoDictionary["ProjectRootPath"]
-  end
-
-  def live_file_paths
-    log Dir.glob("#{project_root_path}/#{path_query}").to_a
-  end
-
-  def parse_class_names(code)
-    log code.split("\n").map do |code_line|
-      matched = code_line.match(/^\s*class\s+(\S+)\s+</)
-      matched[1] if matched
-    end.to_a.compact.to_a
-  end
-end

data/lib/ProMotion/repl/repl.rb

@@ -1,95 +0,0 @@
-if RUBYMOTION_ENV == "development"
-  puts "Type `pm_live` to enable ProMotion's live reload system."
-  module Kernel
-
-    @live_reloaders ||= []
-
-    def register_live_reloader watcher
-      @live_reloaders << watcher
-    end
-
-    def pm_live(opts={})
-
-      @watchers.each {|watcher| watcher.stop} if @watchers
-
-      if opts == false || opts.to_s.downcase == "off"
-        @watchers = nil
-        "Live reloading of PM screens is now off."
-      else
-        @watchers = live_reloaders.collect {|reloader| reloader.(opts)}
-        mp @watchers if opts[:debug]
-
-        watching = @watchers.collect {|watcher| watcher.path_query}
-        "Live reloading of #{watching.join(", ")} is now on."
-      end
-    end
-
-    alias_method :pm_live_screens, :pm_live
-
-
-    private
-
-    def live_reloaders
-      Kernel.instance_variable_get(:@live_reloaders)
-    end
-
-    def screen_watcher
-      lambda do | opts |
-        LiveReloader.new("app/screens/**/*.rb", opts).watch do |reloaded_file, new_code, class_names|
-          vcs = pm_all_view_controllers(UIApplication.sharedApplication.delegate.window.rootViewController)
-          vcs.each do |vc|
-            if pm_is_in_ancestry?(vc, class_names)
-              puts "Sending :on_live_reload to #{vc.inspect}." if opts[:debug]
-              vc.send(:on_live_reload) if vc.respond_to?(:on_live_reload)
-            end
-          end
-        end
-      end
-    end
-
-    register_live_reloader screen_watcher
-
-    def view_watcher
-      lambda do | opts |
-        LiveReloader.new("app/views/**/*.rb", opts).watch do |reloaded_file, new_code, class_names|
-          views = pm_all_views(UIApplication.sharedApplication.delegate.window)
-          views.each do |view|
-            if pm_is_in_ancestry?(view, class_names)
-              puts "Sending :on_live_reload to #{view.inspect}." if opts[:debug]
-              view.send(:on_live_reload) if view.respond_to?(:on_live_reload)
-            end
-          end
-        end
-      end
-    end
-
-    register_live_reloader view_watcher
-
-    # Very permissive. Might get unnecessary reloads. That's okay.
-    def pm_is_in_ancestry?(vc, screen_names)
-      screen_names.any? do |screen_name|
-        vc.class.to_s.include?(screen_name) ||
-        vc.class.ancestors.any? do |ancestor|
-          screen_name.include?(ancestor.to_s)
-        end
-      end
-    end
-
-    def pm_all_view_controllers(root_view_controller)
-      vcs = [ root_view_controller ]
-      if root_view_controller.respond_to?(:viewControllers)
-        vcs = vcs + root_view_controller.viewControllers.map{|vc| pm_all_view_controllers(vc) }
-      end
-      if root_view_controller.respond_to?(:childViewControllers)
-        vcs = vcs + root_view_controller.childViewControllers.map{|vc| pm_all_view_controllers(vc) }
-      end
-      vcs.flatten.uniq
-    end
-
-    def pm_all_views(root_view)
-      views = [ root_view ]
-      views = views + views.map{|v| v.subviews.map{|sv| pm_all_views(sv) } }
-      views.flatten.uniq
-    end
-  end
-end