sugarcube 3.5.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 19287c88598dd0086ec1cc07a160a663deb94f25
-  data.tar.gz: '085dc95c41fca4414a9df3461aa1a50bc40fb9a1'
+SHA256:
+  metadata.gz: 525bee7443997247ce40ef9b565b1e88bbf830968f8dd7159b65b34f2db8ea65
+  data.tar.gz: df06188beb5ed2d875530b912255a7a4cff36eeb6bd6f7f01c64a39097f43c81
 SHA512:
-  metadata.gz: b130f44edc637cfe2c74a4d124b2019ed24ed69084c879688294135f085716b31b57bd1b541c194302b0dd8445e70866260969ef77a6008cf62259b73f95427c
-  data.tar.gz: ad1770a014a8635baebe718413db4636471454b08784c04256839cba88b5eb38f7b96e22b81b7c7a8ba272a0842a937b951d59e96ccf66f5f3d37d46b37004f5
+  metadata.gz: 1afdfd31581d0bdcf25b932d6abf4fd1d477501021327039bc9431d14e26f60179a31f1a7e384542697352977dfc2c94e68f5fc216c95bd5c995c00531f05328
+  data.tar.gz: ec2fd8153567f360136d11aa001509c0e22497d1a075ca9ed6ceb7be0dcab35330db1a19a430676f63048502c330562a88b74f04a9aa42d30a4f33722937e6f4

data/lib/cocoa/sugarcube-webkit/wkwebview.rb

@@ -0,0 +1,10 @@
+module SugarCube
+  # Evaluating javascript from string
+  module WebView
+
+    def eval_js(str, &block)
+      self.evaluateJavaScript(str, completionHandler:->(id, error){ block.call(id, error) })
+    end
+
+  end
+end

data/lib/ios/sugarcube-webkit/wkwebview.rb

@@ -0,0 +1,3 @@
+class WKWebView
+  include SugarCube::WebView
+end

data/lib/osx/sugarcube-animations/nsview.rb

@@ -1,4 +1,4 @@
-class UIView
+class NSView
 
   class << self
 
@@ -45,7 +45,7 @@ class UIView
       self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawOnSetNeedsDisplay
     end
 
-    UIView.animate(options, &animations)
+    NSView.animate(options, &animations)
     return self
   end
 

data/lib/osx/sugarcube-webkit/wkwebview.rb

@@ -0,0 +1,3 @@
+class WKWebView
+  include SugarCube::WebView
+end

data/lib/sugarcube-animations.rb

@@ -11,3 +11,7 @@ end
 Motion::Project::App.pre_setup do |app|
   SugarCube.add_app_files(app, 'sugarcube-animations')
 end
+
+Motion::Project::App.post_setup do |app|
+  app.frameworks += %w{QuartzCore}
+end

data/lib/sugarcube-attributedstring.rb

@@ -9,3 +9,7 @@ SugarCube.cocoa_only!('attributedstring')
 Motion::Project::App.pre_setup do |app|
   SugarCube.add_app_files(app, 'sugarcube-attributedstring')
 end
+
+Motion::Project::App.post_setup do |app|
+  app.frameworks += %w{CoreText}
+end

data/lib/sugarcube-webkit.rb

@@ -0,0 +1,15 @@
+unless defined?(Motion::Project::Config)
+  raise "The sugarcube gem must be required within a RubyMotion project Rakefile."
+end
+
+
+require 'sugarcube'
+SugarCube.cocoa_only!('webkit')
+
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-webkit')
+end
+
+Motion::Project::App.post_setup do |app|
+  app.frameworks += %w{WebKit}
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '3.5.0'
+  Version = '4.0.0'
 end

data/spec/ios/base64_spec.rb

@@ -3,7 +3,7 @@ describe 'Base64' do
   describe 'UIImage' do
 
     it 'should convert image data (PNG) to base64' do
-      'test'.uiimage.nsdata.to_base64.should == 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAHgCAIAAADrGJBNAAAAAXNSR0IArs4c6QAAABxpRE9UAAAAAgAAAAAAAADwAAAAKAAAAPAAAADwAAAAS9r5uVEAAAAXSURBVEgNYrhrxMAwikfDYDQNDMk0AAAAAP//6TQa9AAAABVJREFUY7hrxMAwikfDYDQNDMk0AACNnfwwqs717AAAAABJRU5ErkJggg=='
+      'test'.uiimage.nsdata.to_base64.should == 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAHgCAIAAADrGJBNAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAAaADAAQAAAABAAAB4AAAAAAnyqA0AAAAHGlET1QAAAACAAAAAAAAAPAAAAAoAAAA8AAAAPAAAABL2vm5UQAAABdJREFUSA1iuGvEwDCKR8NgNA0MyTQAAAAA///pNBr0AAAAFUlEQVRjuGvEwDCKR8NgNA0MyTQAAI2d/DCqzvXsAAAAAElFTkSuQmCC'
     end
 
   end

data/spec/ios/wkwebview_spec.rb

@@ -0,0 +1,37 @@
+describe "Sugarcube::WebView" do
+
+  describe WKWebView do
+    tests UIViewController
+
+    before do
+      @view = UIView.alloc.initWithFrame([[1,2],[3,4]])
+      controller.view.addSubview(@view)
+
+      @webview = WKWebView.alloc.init
+      @view << @webview
+
+      @webview.eval_js('') {|id, error| ;; }    # NOOP
+    end
+
+    after do
+      @view = @webview = nil
+    end
+
+    [["1 + 1", 2.0],
+     ["null", nil],
+     ["(function(x) { return x * x; })(4)", 16.0]].each do |str, expected|
+      it "should eval '#{str}'" do
+        @res = ''
+
+        @webview.eval_js(str) do |id, error|
+          @res = id
+        end
+
+        wait 5.0 do
+          @res.should == expected
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description
@@ -98,6 +98,7 @@ files:
 - lib/cocoa/sugarcube-to_s/nsurl.rb
 - lib/cocoa/sugarcube-ui/calayer.rb
 - lib/cocoa/sugarcube-ui/frameable.rb
+- lib/cocoa/sugarcube-webkit/wkwebview.rb
 - lib/cocoa/sugarcube/log.rb
 - lib/ios/sugarcube-568/uiimage.rb
 - lib/ios/sugarcube-animations/animation_chain.rb
@@ -158,7 +159,7 @@ files:
 - lib/ios/sugarcube-ui/uipickerview.rb
 - lib/ios/sugarcube-ui/uiview.rb
 - lib/ios/sugarcube-ui/uiviewcontroller.rb
-- lib/ios/sugarcube-ui/uiwebview.rb
+- lib/ios/sugarcube-webkit/wkwebview.rb
 - lib/osx/sugarcube-animations/nsview.rb
 - lib/osx/sugarcube-attributedstring/nsattributedstring.rb
 - lib/osx/sugarcube-color/fixnum.rb
@@ -181,6 +182,7 @@ files:
 - lib/osx/sugarcube-ui/nsstring.rb
 - lib/osx/sugarcube-ui/nsview.rb
 - lib/osx/sugarcube-ui/symbol.rb
+- lib/osx/sugarcube-webkit/wkwebview.rb
 - lib/sugarcube-568.rb
 - lib/sugarcube-all.rb
 - lib/sugarcube-animations.rb
@@ -220,6 +222,7 @@ files:
 - lib/sugarcube-ui.rb
 - lib/sugarcube-uikit.rb
 - lib/sugarcube-unholy.rb
+- lib/sugarcube-webkit.rb
 - lib/sugarcube.rb
 - lib/sugarcube_pre_setup.rb
 - lib/version.rb
@@ -291,8 +294,8 @@ files:
 - spec/ios/uiview_attr_updates_spec.rb
 - spec/ios/uiview_spec.rb
 - spec/ios/uiviewcontroller_spec.rb
-- spec/ios/uiwebview_spec.rb
 - spec/ios/unholy_spec.rb
+- spec/ios/wkwebview_spec.rb
 - spec/osx/base64_spec.rb
 - spec/osx/color_components_spec.rb
 - spec/osx/color_other_representations_spec.rb
@@ -321,8 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Extensions for Ruby to make Rubymotion development more enjoyable, and hopefully
@@ -344,7 +346,6 @@ test_files:
 - spec/ios/color_other_representations_spec.rb
 - spec/ios/nsdate_upto_spec.rb
 - spec/ios/image_uiimage_filters_spec.rb
-- spec/ios/uiwebview_spec.rb
 - spec/ios/nsstring_files_spec.rb
 - spec/ios/nsorderedset_spec.rb
 - spec/ios/nsdata_spec.rb
@@ -373,6 +374,7 @@ test_files:
 - spec/ios/image_scale_spec.rb
 - spec/ios/color_spec.rb
 - spec/ios/uiimage_spec.rb
+- spec/ios/wkwebview_spec.rb
 - spec/ios/color_components_spec.rb
 - spec/ios/fixnum_spec.rb
 - spec/ios/uifont_spec.rb

data/lib/ios/sugarcube-ui/uiwebview.rb

@@ -1,7 +0,0 @@
-class UIWebView
-
-  def eval_js(str)
-    self.stringByEvaluatingJavaScriptFromString str
-  end
-
-end

data/spec/ios/uiwebview_spec.rb

@@ -1,11 +0,0 @@
-describe "UIWebView" do
-
-  [["1 + 1", "2"],
-   ["null", ""],
-   ["(function(x) { return x * x; })(4)", "16"]].each do |str, expected|
-    it "should eval '#{str}'" do
-      UIWebView.alloc.init.eval_js(str).should == expected
-    end
-  end
-
-end