bubble-wrap 1.2.0 → 1.3.0.osx

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWZlNDIwNzliYTA3ODMxZGQ2ZTc4NWQzMjhhMmM5YjU1Y2VmYzg4ZA==
+    MmE3N2Q1N2NjYTZmY2ZmYTU5OWU3YjMwMDk3OGM4OTU5MTc1MzY3ZA==
   data.tar.gz: !binary |-
-    NTY4OGY5MjU0MjE2YjFiYTQ0YzY2MWFmY2M1OGYzYTQ2YjM3YWNkNg==
+    MGM1YzNkMmZlZTExMTRlM2RkMmFlZmNkNGUxY2ExN2E2NjgzY2QwMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjcyZmVjNzFlMGNjYzBjMmY2NDY3ZWEzY2NhZTg5MzQzYjVhNGU1NjcyYzQ3
-    NWEzNzc2OWE4MjE5MzlmMTA1MmY0NTJmMGU0MjNiZjI2OTA0NGM0MWQwOGI3
-    M2NhM2Y1Y2NlNDg2NzJhNDFiZWVkNGY4ZTE0YzNiNjYxZjJmOTk=
+    NGM0ZjAzMzU5MDBmMGRjMDIyNGFiN2IwZWVkZDY1YjczZTM1Yjk4NjExMjgz
+    ZDZmOTlhMmYyZmQwNDc1MzcyYTIxMmE2NjNlMjA5MDhjMWM2M2I3MmExMjgy
+    OWIxMTBkNzg2NDMzZDUyYjJlM2I5M2I0Y2M4ZDUyNmI2NGRhY2M=
   data.tar.gz: !binary |-
-    NDgwN2NiOTY5ZDg2NTE5ZDRhNGIzYTlkNzdlOGJiMzBjNTBhOTg2YWVlNjI1
-    ZTE3OTlmMzI3MzllNmJmNjQwZDI4NTNhMzU2MWRkNGVhNzc2NjIzYjA4OGQ1
-    NDFkYjg3ODE5N2RhYTA5M2ZhZDFjNDc2NTZkYTQ3MmJkMTNmYjc=
+    N2VhOWU4ZTE1NWRkYmZjMWIzM2E2NjA0NmUzZmZjMDA2MDc4NzY0OTMzOTMy
+    OTg3YTI4ODE3MmZjNjBlMjMyODM5ZTYxOWZjNjljYzJlODAzNDFjYTQ2MTRj
+    ZWNhZTU4MTUwMmNmM2EzNTRlNTE1OWE0NDMwNDU0M2FmZjhkNWE=

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 ## Unreleased
 
-## 1.2.0.pre
+[Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.2.0...master)
 
-[Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.2...master)
+## 1.2.0
+
+[Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.1.5...v1.2.0)
 
 * Added `BW::UIBarButtonItem`, a factory-esque wrapper for `UIBarButtonItem` ([#202](https://github.com/rubymotion/BubbleWrap/pull/202))
 * Added `BW::Font`, a wrapper for creating `UIFont` objects ([#206](https://github.com/rubymotion/BubbleWrap/pull/206))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bubble-wrap (1.2.0)
+    bubble-wrap (1.3.0.osx)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -413,7 +413,11 @@ end
 
 ### UIBarButtonItem
 
-`BW::UIBarButtonItem` provides an idiomatic Ruby syntax for instantiating `UIBarButtonItem` objects.  Instead of a target-action pair, each method accepts a block.  When the button is tapped, the block is executed.  As a convenience, the block is optional.
+`BW::UIBarButtonItem` is a subclass of `UIBarButtonItem` with an natural Ruby syntax.
+
+#### Constructors
+
+Instead specifying a target-action pair, each constructor method accepts an optional block.  When the button is tapped, the block is executed.
 
 ```ruby
 BW::UIBarButtonItem.system(:save) do
@@ -443,21 +447,21 @@ end
 # NOTE: The block is attached to the view as a single tap gesture recognizer.
 ```
 
-Alternatively, `BW::UIBarButtonItem` provides a flexible, builder-style syntax for dynamically instantiating `UIBarButtonItem` objects.
+The `.new` constructor provides a flexible, builder-style syntax.
 
 ```ruby
 options = { :system => :save }
-BW::UIBarButtonItem.build(options) do
+BW::UIBarButtonItem.new(options) do
   # ...
 end
 
 options = { :styled => :plain, :title => "Friends" }
-BW::UIBarButtonItem.build(options) do
+BW::UIBarButtonItem.new(options) do
   # ...
 end
 
 options = { :styled => :bordered, :image => UIImage.alloc.init }
-BW::UIBarButtonItem.build(options) do
+BW::UIBarButtonItem.new(options) do
   # ...
 end
 
@@ -466,17 +470,19 @@ options = {
   :image     => UIImage.alloc.init,
   :landscape => UIImage.alloc.init
 }
-BW::UIBarButtonItem.build(options) do
+BW::UIBarButtonItem.new(options) do
   # ...
 end
 
 options = { :custom => UIView.alloc.init }
-BW::UIBarButtonItem.build(options) do
+BW::UIBarButtonItem.new(options) do
   # ...
 end
 # NOTE: The block is attached to the view as a single tap gesture recognizer.
 ```
 
+#### Button types
+
 The `.styled` button types are:
 
 ```ruby
@@ -514,6 +520,184 @@ And the `.system` button types are:
 :page_curl
 ```
 
+### UIAlertView
+
+`BW::UIAlertView` is a subclass of `UIAlertView` with an natural Ruby syntax.
+
+#### Default alert
+
+The `.default` constructor accepts an optional `Hash` of options and returns a `BW::UIAlertView` instance in the `UIAlertViewStyleDefault` style.  The instance can then be given an `#on_click` callback to be executed when it's button is clicked.  For example:
+
+![iOS Simulator Screen shot Apr 24 2013 10 54 28 AM](https://f.cloud.github.com/assets/5688/421437/59a5376c-ad08-11e2-9ccc-0df83eb360e0.png)
+
+```ruby
+options = { :title => "Are you ready?" }
+ready_alert = BW::UIAlertView.default(options).on_click do |alert|
+  # ...
+end
+
+ready_alert.show
+```
+
+#### Input alerts
+
+`BW::UIAlertView` has constructors for input alerts too.
+
+`.plain_text_input` returns an instance in the `UIAlertViewStylePlainTextInput` style.
+
+![iOS Simulator Screen shot Apr 24 2013 10 58 27 AM](https://f.cloud.github.com/assets/5688/421453/a6c15698-ad08-11e2-9bef-a755732e9b91.png)
+
+```ruby
+options = { :title => "Replicator" }
+replicator_alert = BW::UIAlertView.plain_text_input(options).on_click do |alert|
+  alert.plain_text_field.text    #=> "Tea. Early Grey. Hot."
+end
+
+replicator_alert.show
+```
+
+`.secure_text_input` returns an instance in the `UIAlertViewStyleSecureTextInput` style.
+
+![iOS Simulator Screen shot Apr 24 2013 11 09 43 AM](https://f.cloud.github.com/assets/5688/421503/396084dc-ad0a-11e2-9e09-c778d2a6cdc4.png)
+
+```ruby
+options = { :title => "Authorization" }
+replicator_alert = BW::UIAlertView.secure_text_input(options).on_click do |alert|
+  alert.secure_text_field.text   #=> "Theta2997"
+end
+
+replicator_alert.show
+```
+
+And `.login_and_password_input` returns an instance in the `UIAlertViewStyleLoginAndPasswordInput` style.
+
+![iOS Simulator Screen shot Apr 24 2013 11 27 20 AM](https://f.cloud.github.com/assets/5688/421608/b26ab51c-ad0c-11e2-8356-d73fd20c8d7f.png)
+
+```ruby
+options = { :title => "Authorization" }
+auth_alert = BW::UIAlertView.login_and_password_input(options).on_click do |alert|
+  alert.login_text_field.text    #=> "La Forge"
+  alert.password_text_field.text #=> "Theta2997"
+end
+
+auth_alert.show
+```
+
+#### Buttons
+
+Each alert style has sane, default button titles.  Yet they're fully customizable by providing either a `String` to the constructor's `:buttons` argument
+
+![iOS Simulator Screen shot Apr 24 2013 11 34 12 AM](https://f.cloud.github.com/assets/5688/421633/ac364106-ad0d-11e2-9b0a-ec1692da0c7f.png)
+
+```ruby
+alert = BW::UIAlertView.default(:title => "BubbleWrap is", :buttons => "Awesome")
+
+alert.show
+```
+
+Or an `Array` of strings to the constructor's `:buttons` argument.
+
+![iOS Simulator Screen shot Apr 24 2013 11 35 36 AM](https://f.cloud.github.com/assets/5688/421640/ce9e4d9c-ad0d-11e2-96bd-ca5327570f4d.png)
+
+```ruby
+options = {
+  :title   => "Dinner this Friday?",
+  :message => "My treat!",
+  :buttons => ["No", "Maybe", "Yes"]
+}
+alert = BW::UIAlertView.default(options)
+
+alert.show
+```
+
+Inside a callback, the `#clicked_button` method contains the `index` and `title` of the clicked button.
+
+![iOS Simulator Screen shot Apr 24 2013 11 43 26 AM](https://f.cloud.github.com/assets/5688/421755/d3bf35cc-ad10-11e2-995d-ca45adaad504.png)
+
+```ruby
+options = {
+  :title   => "Warp Engine Online",
+  :message => "Plot a course for Starbase 118.  Warp 7.",
+  :buttons => ["Cancel", "Engage"],
+}
+warp_alert = BW::UIAlertView.default(options).on_click do |alert|
+  if alert.clicked_button.index == 0
+    # ...
+  else
+    # ...
+  end
+
+  if alert.clicked_button.title == "Cancel"
+    # ...
+  else
+    # ...
+  end
+end
+
+warp_alert.show
+```
+
+When the constructor's `:cancel_button_index` argument is provided, the `clicked_button` knows whether or not it's a `cancel?` button.  Conveniently, the argument is automatically set to `0` for all constructors **EXCEPT** `.default` and `.new`.
+
+![iOS Simulator Screen shot Apr 24 2013 11 43 26 AM](https://f.cloud.github.com/assets/5688/421755/d3bf35cc-ad10-11e2-995d-ca45adaad504.png)
+
+```ruby
+options = {
+  :title               => "Warp Engine Online",
+  :message             => "Plot a course for Starbase 118.  Warp 7.",
+  :buttons             => ["Cancel", "Engage"],
+  :cancel_button_index => 0 # set for all constructors EXCEPT `.default` and `.new`
+}
+warp_alert = BW::UIAlertView.default(options).on_click do |alert|
+  # NOTE: uses the :cancel_button_index argument
+  if alert.clicked_button.cancel?
+    # ...
+  else
+    # ...
+  end
+end
+
+warp_alert.show
+```
+
+#### Callbacks
+
+`BW::UIAlertView` instances are their own delegate.  The complete `UIAlertViewDelegte` protocol is available via callbacks.
+
+```ruby
+alert = BW::UIAlertView.default
+
+alert.will_present do |alert|
+  # aka willPresentAlertView:
+end
+
+alert.did_present do |alert|
+  # aka didPresentAlertView:
+end
+
+alert.on_click do |alert|
+  # aka alertView:clickedButtonAtIndex:
+end
+
+alert.will_dismiss do |alert|
+  # aka alertView:willDismissWithButtonIndex:
+end
+
+alert.did_dismiss do |alert|
+  # aka alertView:didDismissWithButtonIndex:
+end
+
+alert.on_system_cancel do |alert|
+  # aka alertViewCancel:
+end
+
+alert.enable_first_other_button? do |alert|
+  # aka alertViewShouldEnableFirstOtherButton:
+  # NOTE: must return a boolean
+  true
+end
+```
+
 ## HTTP
 
 `BW::HTTP` wraps `NSURLRequest`, `NSURLConnection` and friends to provide Ruby developers with a more familiar and easier to use API.
@@ -557,6 +741,32 @@ would be a Proc that takes two arguments: a float representing the
 amount of data currently received and another float representing the
 total amount of data expected.
 
+### Gotchas
+
+Because of how RubyMotion currently works, you sometimes need to assign objects as `@instance_variables` in order to retain their callbacks.
+
+For example:
+
+```ruby
+class HttpClient
+  def get_user(user_id, &callback)
+    BW::HTTP.get(user_url(user_id)) do |response|
+      # ..
+    end
+  end 
+end
+```
+
+This class should be invoked in your code as:
+
+```ruby
+@http_client = HttpClient.new
+@http_client.get_user(user_id) do |user|
+  # ..
+end
+```
+
+(instead of doing an instance-variable-less `HttpClient.new.get_user`)
 
 ## RSS Parser
 **Since: > version 1.0.0**

data/Rakefile

@@ -1,16 +1,37 @@
 require "bundler/gem_tasks"
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+if ENV['osx']
+  require 'motion/project/template/osx'
+else
+  require 'motion/project/template/ios'
+end
 Bundler.setup
 Bundler.require
 
 require 'bubble-wrap/all'
 require 'bubble-wrap/test'
 
+module Motion; module Project
+  class Config
+    def spec_files=(spec_files)
+      @spec_files = spec_files
+    end
+  end
+end; end
+
 Motion::Project::App.setup do |app|
   app.name = 'testSuite'
   app.identifier = 'io.bubblewrap.testSuite'
   app.specs_dir = './spec/motion'
+  app.spec_files
+  if Motion::Project::App.osx?
+    app.spec_files -= Dir.glob("./spec/motion/**/ios/**.rb")
+    ["font", "location", "media", "ui"].each do |package|
+      app.spec_files -= Dir.glob("./spec/motion/#{package}/**/*.rb")
+    end
+  else
+    app.spec_files -= Dir.glob("./spec/motion/**/osx/**.rb")
+  end
   app.version = '1.2.3'
 end
 
@@ -22,4 +43,4 @@ namespace :spec do
   task :motion => 'spec'
 
   task :all => [:lib, :motion]
-end
+end

data/lib/bubble-wrap/camera.rb

@@ -1,8 +1,12 @@
 require 'bubble-wrap/loader'
-BubbleWrap.require('motion/util/constants.rb')
-BubbleWrap.require('motion/core/device.rb')
-BubbleWrap.require('motion/core/device/**/*.rb') do
-  file('motion/core/device/camera_wrapper.rb').depends_on 'motion/core/device/camera.rb'
-  file('motion/core/device/camera.rb').depends_on ['motion/core/device.rb', 'motion/util/constants.rb']
-  file('motion/core/device/screen.rb').depends_on 'motion/core/device.rb'
+
+BubbleWrap.require_ios("camera") do
+  BubbleWrap.require('motion/util/constants.rb')
+  BubbleWrap.require('motion/core/device.rb')
+  BubbleWrap.require('motion/core/device/*.rb')
+  BubbleWrap.require('motion/core/device/ios/*.rb') do
+    file('motion/core/device/ios/camera_wrapper.rb').depends_on 'motion/core/device/ios/camera.rb'
+    file('motion/core/device/ios/camera.rb').depends_on ['motion/core/ios/device.rb', 'motion/util/constants.rb']
+    file('motion/core/device/ios/screen.rb').depends_on 'motion/core/ios/device.rb'
+  end
 end

data/lib/bubble-wrap/core.rb

@@ -1,7 +1,20 @@
 require 'bubble-wrap/loader'
+
 BubbleWrap.require('motion/core.rb')
-BubbleWrap.require('motion/core/**/*.rb') do
+BubbleWrap.require('motion/core/*.rb') do
   file('motion/core/pollute.rb').depends_on 'motion/core/ns_index_path.rb'
 end
+BubbleWrap.require('motion/core/device/*.rb')
+
+BubbleWrap.require_ios do
+  BubbleWrap.require('motion/core/ios/**/*.rb')
+  BubbleWrap.require('motion/core/device/ios/**/*.rb')
+end
+
+BubbleWrap.require_osx do
+  BubbleWrap.require('motion/core/osx/**/*.rb')
+  BubbleWrap.require('motion/core/device/osx/**/*.rb')
+end
+
 require 'bubble-wrap/camera'
 require 'bubble-wrap/ui'

data/lib/bubble-wrap/ext/motion_project_app.rb

@@ -19,7 +19,15 @@ module BubbleWrap
       end
 
     end
+
+    module Platforms
+      def osx?
+        self.respond_to?(:template) && self.template == :osx
+      end
+    end
   end
 end
 
 Motion::Project::App.extend(BubbleWrap::Ext::BuildTask)
+
+Motion::Project::App.extend(BubbleWrap::Ext::Platforms)

data/lib/bubble-wrap/font.rb

@@ -1,2 +1,4 @@
 require 'bubble-wrap/loader'
-BubbleWrap.require('motion/font/font.rb')
+BubbleWrap.require_ios("font") do
+  BubbleWrap.require('motion/font/font.rb')
+end

data/lib/bubble-wrap/http.rb

@@ -2,3 +2,5 @@ require 'bubble-wrap/loader'
 BubbleWrap.require('motion/core/ns_url_request.rb')
 BubbleWrap.require('motion/core.rb')
 BubbleWrap.require('motion/http.rb')
+BubbleWrap.require('motion/http/query.rb')
+BubbleWrap.require('motion/http/response.rb')

data/lib/bubble-wrap/loader.rb

@@ -4,8 +4,8 @@ end
 
 unless defined?(BubbleWrap::LOADER_PRESENT)
   require 'bubble-wrap/version' unless defined?(VERSION)
-  if BubbleWrap::minor_version(Motion::Version) < BubbleWrap::minor_version(BubbleWrap::MIN_MOTION_VERSION)
-    raise "BubbleWrap #{BubbleWrap::VERSION} requires at least rubymotion #{BubbleWrap::MIN_MOTION_VERSION}"
+  if Gem::Version.new(Motion::Version) < Gem::Version.new(BubbleWrap::MIN_MOTION_VERSION)
+    raise "BubbleWrap #{BubbleWrap::VERSION} requires at least RubyMotion #{BubbleWrap::MIN_MOTION_VERSION}"
   end
 
   require 'bubble-wrap/ext'
@@ -24,6 +24,21 @@ unless defined?(BubbleWrap::LOADER_PRESENT)
       Requirement.scan(caller.first, file_spec, &block)
     end
 
+    def require_ios(requirement = nil, &callback)
+      if !Motion::Project::App.osx?
+        callback.call
+      else
+        puts "bubble-wrap/#{requirement} requires iOS to use." if requirement
+      end
+    end
+
+    def require_osx(requirement = nil, &callback)
+      if Motion::Project::App.osx?
+        callback.call
+      else
+        puts "bubble-wrap/#{requirement} requires OS X to use." if requirement
+      end
+    end
   end
 
   BW = BubbleWrap unless defined?(BW)