bubble-wrap 1.3.0 → 1.4.0

data/spec/motion/core/string_spec.rb

@@ -1,8 +1,8 @@
 describe BubbleWrap::String do
 
-  describe ::String do
+  describe ::NSString do
     it 'should include BubbleWrap::String' do
-      ::String.ancestors.member?(BubbleWrap::String).should == true
+      ::NSString.ancestors.member?(BubbleWrap::String).should == true
     end
   end
 

data/spec/motion/core/time_spec.rb

@@ -17,39 +17,49 @@ describe "Time" do
   describe "parsing an iso8601 formatted time to a Time object" do
     before do
       @time = Time.iso8601("2012-05-31T19:41:33Z")
+      @time_with_timezone = Time.iso8601_with_timezone("1987-08-10T06:00:00+02:00")
     end
 
     it "should be a time" do
       @time.instance_of?(Time).should == true
+      @time_with_timezone.instance_of?(Time).should == true
     end
 
-    # # Crashes Buggy RubyMotion 1.18
-    # it "should be converted to the local timezone automatically" do
-    #   @time.zone.should == Time.now.zone
-    # end
+    # Crashes Buggy RubyMotion 1.18
+    it "should be converted to the local timezone automatically" do
+      local_zone = Time.now.zone
+      @time.zone.should == local_zone
+      @time_with_timezone.zone == local_zone
+    end
 
     it "should have a valid year" do
       @time.utc.year.should == 2012
+      @time_with_timezone.utc.year.should == 1987
     end
 
     it "should have a valid month" do
       @time.utc.month.should == 5
+      @time_with_timezone.utc.month.should == 8
     end
 
     it "should have a valid day" do
       @time.utc.day.should == 31
+      @time_with_timezone.utc.day.should == 10
     end
 
     it "should have a valid hour" do
       @time.utc.hour.should == 19
+      @time_with_timezone.utc.hour.should == 4
     end
 
     it "should have a valid minute" do
       @time.utc.min.should == 41
+      @time_with_timezone.utc.min.should == 0
     end
 
     it "should have a valid second" do
       @time.utc.sec.should == 33
+      @time_with_timezone.utc.sec.should == 0
     end
   end
 

data/spec/motion/core_spec.rb

@@ -54,15 +54,16 @@ describe 'BubbleWrap' do
   describe "Localized string" do
     
     it "loads the string from NSBundle" do
+      key = 'real_key'
+      value = 'Real Key'
+
+      BubbleWrap::localized_string(key, value).should == value
+    end
+
+    it "returns the key if localization not found and no value is given" do
       key = 'fake_key'
-      value = 'fake_value'
-
-      bundle = NSBundle.mainBundle
-      def bundle.arguments; @arguments; end
-      def bundle.localizedStringForKey(key, value:value, table:table); @arguments = [key, value, table]; end
-      
-      BubbleWrap::localized_string(key, value)
-      bundle.arguments.should.equal [key, value, nil]
+
+      BubbleWrap::localized_string(key).should == key
     end
 
   end

data/spec/motion/http/query_spec.rb

@@ -1,5 +1,31 @@
+# -*- coding: utf-8 -*-
 describe BubbleWrap::HTTP::Query do
 
+  describe "json parameter encoding" do
+    before do
+      @json_payload = {"foo" => "bar"}
+      @json_options = {
+        payload: @json_payload,
+        format: :json
+      }
+      @json_query = BubbleWrap::HTTP::Query.new( "http://localhost:3000" , :post, @json_options )
+    end
+
+    it "should generate json body" do
+      BW::JSON.parse(@json_query.request.HTTPBody).should == @json_payload
+    end
+  end
+
+  describe "false value" do
+    before do
+      @query = BubbleWrap::HTTP::Query.new("http://www.google.com", :get, {payload: {following: false}})
+    end
+
+    it "should have right url" do
+      @query.request.URL.absoluteString.should == "http://www.google.com?following=false"
+    end
+  end
+
   before do
     @localhost_url = 'http://localhost'
     @fake_url = 'http://fake.url'
@@ -137,14 +163,14 @@ describe BubbleWrap::HTTP::Query do
         }.should.not.raise NoMethodError
       end
 
-      it "should set the payload in URL only for GET and HEAD requests" do
+      it "should set the payload in URL only for GET/HEAD/OPTIONS requests" do
         [:post, :put, :delete, :patch].each do |method|
           query = BubbleWrap::HTTP::Query.new( @localhost_url , method, { payload: @payload } )
           query.instance_variable_get(:@url).description.should.equal @localhost_url
         end
 
         payload = {name: 'marin'}
-        [:get, :head].each do |method|
+        [:get, :head, :options].each do |method|
           query = BubbleWrap::HTTP::Query.new( @localhost_url , method, { payload: payload } )
           query.instance_variable_get(:@url).description.should.equal "#{@localhost_url}?name=marin"
         end
@@ -179,11 +205,10 @@ describe BubbleWrap::HTTP::Query do
         }.should.raise InvalidFileError
       end
 
-      it "sets the HTTPBody DATA to @request for all methods except GET and HEAD" do
+      it "sets the HTTPBody DATA to @request for all methods except GET/HEAD/OPTIONS" do
         payload = { name: 'apple', model: 'macbook'}
         files = { twitter: sample_data, site: "mneorr.com".dataUsingEncoding(NSUTF8StringEncoding) }
 
-        puts "\n"
         [:post, :put, :delete, :patch].each do |method|
           puts "    - #{method}\n"
           query = BubbleWrap::HTTP::Query.new( @fake_url , method, { payload: payload, files: files } )
@@ -192,7 +217,7 @@ describe BubbleWrap::HTTP::Query do
           real_payload.should.equal "--#{uuid}\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\napple\r\n--#{uuid}\r\nContent-Disposition: form-data; name=\"model\"\r\n\r\nmacbook\r\n--#{uuid}\r\nContent-Disposition: form-data; name=\"twitter\"; filename=\"twitter\"\r\nContent-Type: application/octet-stream\r\n\r\ntwitter:@mneorr\r\n--#{uuid}\r\nContent-Disposition: form-data; name=\"site\"; filename=\"site\"\r\nContent-Type: application/octet-stream\r\n\r\nmneorr.com\r\n--#{uuid}--\r\n"
         end
 
-        [:get, :head].each do |method|
+        [:get, :head, :options].each do |method|
           puts "    - #{method}\n"
           query = BubbleWrap::HTTP::Query.new( @fake_url , method, { payload: payload } )
           real_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:NSUTF8StringEncoding)
@@ -202,12 +227,11 @@ describe BubbleWrap::HTTP::Query do
 
       it "sets the payload without conversion to-from NSString if the payload was NSData" do
         data = sample_data
-        lambda { query = create_query(data, nil) }.should.not.raise NoMethodError
+        lambda { create_query(data, nil) }.should.not.raise NoMethodError
       end
 
       it "sets the payload as a string if JSON" do
         json = "{\"foo\":42,\"bar\":\"BubbleWrap\"}"
-        puts "\n"
         [:put, :post, :delete, :patch].each do |method|
           puts "    - #{method}\n"
           query = BubbleWrap::HTTP::Query.new( @fake_url , method, { payload: json } )
@@ -224,6 +248,19 @@ describe BubbleWrap::HTTP::Query do
         real_payload.should.equal "--#{uuid}\r\nContent-Disposition: form-data; name=\"computer[name]\"\r\n\r\napple\r\n--#{uuid}\r\nContent-Disposition: form-data; name=\"computer[model]\"\r\n\r\nmacbook\r\n--#{uuid}--\r\n"
       end
 
+      [["NSUTF8StringEncoding", NSUTF8StringEncoding],
+       ["NSJapaneseEUCStringEncoding", NSJapaneseEUCStringEncoding],
+       ["NSShiftJISStringEncoding", NSShiftJISStringEncoding],
+       ["NSISO2022JPStringEncoding", NSISO2022JPStringEncoding]].each do |enc_name, encoding|
+        it "sets the japanese characters payload encoded in #{enc_name}" do
+          payload = { computer: { name: '名前', model: 'モデル'} }
+          query = BubbleWrap::HTTP::Query.new( @fake_url, :post, { payload: payload, encoding: encoding })
+          uuid = query.instance_variable_get(:@boundary)
+          real_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:encoding)
+          real_payload.should.equal "--#{uuid}\r\nContent-Disposition: form-data; name=\"computer[name]\"\r\n\r\n#{payload[:computer][:name]}\r\n--#{uuid}\r\nContent-Disposition: form-data; name=\"computer[model]\"\r\n\r\n#{payload[:computer][:model]}\r\n--#{uuid}--\r\n"
+        end
+      end
+
     end
 
     it "should set default timeout to 30s or the one from hash" do
@@ -479,6 +516,12 @@ describe BubbleWrap::HTTP::Query do
       @query.response.error_message.should.equal @fake_error.localizedDescription
     end
 
+    it "should set the error object to response object" do
+      @query.response.error.should.equal nil
+      @query.connection(nil, didFailWithError:@fake_error)
+      @query.response.error.code.should.equal @fake_error.code
+    end
+
     it "should check if there's a callback block and pass the response in" do
       expected_response = BubbleWrap::HTTP::Response.new
       real_response = nil
@@ -577,8 +620,9 @@ describe BubbleWrap::HTTP::Query do
         end
       end
 
-      it "sets the error message on response" do
+      it "sets the error message/code on response" do
         @real_response.error_message.should.equal "Too many redirections"
+        @real_response.error.code.should.equal NSURLErrorHTTPTooManyRedirects
       end
 
       it "sets the request.done_loading" do
@@ -608,10 +652,18 @@ describe BubbleWrap::HTTP::Query do
       @query.connection(nil, didReceiveAuthenticationChallenge:@challenge)
     end
 
-    it "should cancel the authentication if the failure count was not 0" do
-      @challenge.previousFailureCount = 1
-      @query.connection(nil, didReceiveAuthenticationChallenge:@challenge)
-      @challenge.sender.was_cancelled.should.equal true
+    describe "given the failure count was not 0" do
+      before { @challenge.previousFailureCount = 1 }
+
+      it "should cancel the authentication" do
+        @query.connection(nil, didReceiveAuthenticationChallenge:@challenge)
+        @challenge.sender.was_cancelled.should.equal true
+      end
+
+      it "should set the response fields" do
+        @query.connection(nil, didReceiveAuthenticationChallenge:@challenge)
+        @query.response.status_code.should.equal @challenge.failureResponse.statusCode
+      end
     end
 
     it "should pass in Credentials and the challenge itself to the sender" do
@@ -633,6 +685,23 @@ describe BubbleWrap::HTTP::Query do
 
   end
 
+  describe 'cancel' do
+    before do
+      @doa_query = BubbleWrap::HTTP::Query.new(@localhost_url, :get)
+      @doa_query.cancel
+    end
+
+    it "should cancel the connection" do
+      @doa_query.connection.was_cancelled.should.equal true
+    end
+
+    if App.ios?
+      it "should turn off the network indicator" do
+        UIApplication.sharedApplication.isNetworkActivityIndicatorVisible.should.equal false
+      end
+    end
+  end
+
   describe "empty payload" do
 
     before do
@@ -695,11 +764,15 @@ describe BubbleWrap::HTTP::Query do
   end
 
   class FakeChallenge
-    attr_accessor :previousFailureCount
+    attr_accessor :previousFailureCount, :failureResponse
 
     def sender
       @fake_sender ||= FakeSender.new
     end
+
+    def failureResponse
+      @failureResponse ||= FakeURLResponse.new(401, { bla: "123" }, 123)
+    end
   end
 
   class BubbleWrap::HTTP::Query
@@ -707,7 +780,7 @@ describe BubbleWrap::HTTP::Query do
   end
 
   class FakeURLConnection < NSURLConnection
-    attr_reader :delegate, :request, :was_started
+    attr_reader :delegate, :request, :was_started, :was_cancelled
     def initialize(request, delegate)
       @request = request
       @delegate = delegate
@@ -715,8 +788,12 @@ describe BubbleWrap::HTTP::Query do
     end
     def start
       @was_started = true
+      @was_cancelled = false
       super
     end
+    def cancel
+      @was_cancelled = true
+    end
   end
 
   class FakeURLResponse < NSHTTPURLResponse
@@ -728,4 +805,4 @@ describe BubbleWrap::HTTP::Query do
     end
   end
 
-end
+end

data/spec/motion/http/response_spec.rb

@@ -9,12 +9,12 @@ describe BubbleWrap::HTTP::Response do
     @response.instance_variable_get(:@url).should == 'http://localhost'
   end
 
-  it "says OK status code 20x" do
+  it "says OK status code 2xx" do
     @response.ok?.should.equal true
-    (200..209).each do |code|
+    (200..211).each do |code|
       BubbleWrap::HTTP::Response.new(status_code: code).ok?.should.be.true
     end
-    [100..101, 300..307, 400..417, 500..505].inject([]){|codes, rg| codes += rg.to_a}.each do |code|
+    [100..101, 300..307, 400..417, 500..505].inject([]){|codes, rg| codes + rg.to_a}.each do |code|
       BubbleWrap::HTTP::Response.new(status_code: code).ok?.should.be.false
     end
   end
@@ -39,6 +39,7 @@ describe BubbleWrap::HTTP::Response do
     @response.should.respond_to :url
     @response.should.respond_to :status_code=
     @response.should.respond_to :error_message=
+    @response.should.respond_to :error=
   end
 
 end

data/spec/motion/location/location_spec.rb

@@ -162,7 +162,7 @@ describe BubbleWrap::Location do
     end
 
     it "should use significant update functions with get_significant" do
-      BW::Location.get_significant do |result|
+      BW::Location.get_significant do
       end
 
       BW::Location.stop

data/spec/motion/mail/mail_spec.rb

@@ -0,0 +1,125 @@
+# Mocking the presentViewController
+class MailViewController < UIViewController
+  attr_accessor :expectation
+  
+  def presentModalViewController(modal, animated: animated)
+    expectation.call modal, animated
+  end
+end
+
+# Monkey-patching MFMailComposeViewController
+# So we can access the values that are set.
+# This of course breaks MFMailComposeViewController from actually working,
+# but it's testable.
+class MFMailComposeViewController
+  attr_accessor :toRecipients, :ccRecipients, :bccRecipients, :subject, :message, :html
+  
+  def setToRecipients(r)
+    self.toRecipients = r
+  end
+  
+  def setCcRecipients(r)
+    self.ccRecipients = r
+  end
+  
+  def setBccRecipients(r)
+    self.bccRecipients = r
+  end
+  
+  def setSubject(r)
+    self.subject = r
+  end
+  
+  def setMessageBody(message, isHTML: html)
+    self.message = message
+    self.html = html
+  end
+end
+
+describe BW::Mail do
+  describe ".compose" do
+    before do
+      @view_controller = MailViewController.new
+      @standard_mail_options = {
+        delegate: @view_controller,
+        to: [ "tom@example.com" ],
+        cc: [ "itchy@example.com", "scratchy@example.com" ],
+        bcc: [ "jerry@example.com" ],
+        html: false,
+        subject: "My Subject",
+        message: "This is my message. It isn't very long.",
+        animated: false
+      }
+    end
+    
+    it "should open the mail controller in a modal" do
+      @view_controller.expectation = lambda { |mail_controller, animated|
+        mail_controller.should.be.kind_of(MFMailComposeViewController)
+      }
+      
+      BubbleWrap::Mail.compose @standard_mail_options
+    end
+    
+    it "should create a mail controller with the right to: address set" do
+      @view_controller.expectation = lambda { |mail_controller, animated|
+        mail_controller.toRecipients.should.be.kind_of(Array)
+        mail_controller.toRecipients.should == @standard_mail_options[:to]
+      }
+      
+      BubbleWrap::Mail.compose @standard_mail_options
+    end
+
+    it "should create a mail controller with the right cc: address set" do
+      @view_controller.expectation = lambda { |mail_controller, animated|
+        mail_controller.ccRecipients.should.be.kind_of(Array)
+        mail_controller.ccRecipients.should == @standard_mail_options[:cc]
+      }
+      
+      BubbleWrap::Mail.compose @standard_mail_options
+    end
+
+    it "should create a mail controller with the right bcc: address set" do
+      @view_controller.expectation = lambda { |mail_controller, animated|
+        mail_controller.bccRecipients.should.be.kind_of(Array)
+        mail_controller.bccRecipients.should == @standard_mail_options[:bcc]
+      }
+      
+      BubbleWrap::Mail.compose @standard_mail_options
+    end
+
+    it "should create a mail controller with the right subject: set" do
+      @view_controller.expectation = lambda { |mail_controller, animated|
+        mail_controller.subject.should.be.kind_of(String)
+        mail_controller.subject.should == @standard_mail_options[:subject]
+      }
+      
+      BubbleWrap::Mail.compose @standard_mail_options
+    end
+
+    it "should create a mail controller with the right message: set" do
+      @view_controller.expectation = lambda { |mail_controller, animated|
+        mail_controller.message.should.be.kind_of(String)
+        mail_controller.message.should == @standard_mail_options[:message]
+      }
+      
+      BubbleWrap::Mail.compose @standard_mail_options
+    end
+
+    it "should create a mail controller with the right html: set" do
+      @view_controller.expectation = lambda { |mail_controller, animated|
+        mail_controller.html.should == @standard_mail_options[:html]
+      }
+      
+      BubbleWrap::Mail.compose @standard_mail_options
+    end
+
+    it "should create a mail controller with the right animation" do
+      @view_controller.expectation = lambda { |mail_controller, animated|
+        animated.should.be.false
+      }
+      
+      BubbleWrap::Mail.compose @standard_mail_options
+    end
+
+  end
+end