bubble-wrap 1.1.2 → 1.1.3

data/spec/motion/core/string_spec.rb

@@ -19,6 +19,18 @@ describe BubbleWrap::String do
       end
     end
 
+    describe '.camelize(:upper)' do
+      it "doesn't change the value" do
+        'CamelCase'.camelize(:upper).should == 'CamelCase'
+      end
+    end
+
+    describe '.camelize(:lower)' do
+      it 'lower cases the first character' do
+        'CamelCase'.camelize(:lower).should == 'camelCase'
+      end
+    end
+
     describe '.underscore' do
       it 'converts it to underscores' do
         'CamelCase'.underscore.should == 'camel_case'
@@ -39,6 +51,18 @@ describe BubbleWrap::String do
       end
     end
 
+    describe '.camelize(:upper)' do
+      it "upper cases the first character" do
+        'camelCase'.camelize(:upper).should == 'CamelCase'
+      end
+    end
+
+    describe '.camelize(:lower)' do
+      it "doesn't change the value" do
+        'camelCase'.camelize(:lower).should == 'camelCase'
+      end
+    end
+
     describe '.underscore' do
       it 'converts it to underscores' do
         'camelCase'.underscore.should == 'camel_case'

data/spec/motion/http_spec.rb

@@ -2,6 +2,7 @@ describe "HTTP" do
 
   before do
     @localhost_url = 'http://localhost'
+    @fake_url = 'http://fake.url'
   end
 
   describe "Core HTTP method calls" do
@@ -27,31 +28,29 @@ describe "HTTP" do
       end
     end
 
-    it "uses the block instead of action passed in " do
+    it "uses the block instead of :action if both were given" do
       [:get, :post, :put, :delete, :head, :patch].each do |method|
         called = false
         expected_delegator = Proc.new {|response| called = true }
 
         query = BubbleWrap::HTTP.send(method, @localhost_url, { action: 'not_valid' }, &expected_delegator)
-        query.instance_variable_get(:@delegator).should.equal expected_delegator
         query.connectionDidFinishLoading(query.connection)
+
+        query.instance_variable_get(:@delegator).should.equal expected_delegator
         called.should.equal true
       end
     end
 
-    # [:get, :post, :put, :delete, :head, :patch].each do |verb|
-    #   it "has access to the proper response scope for #{verb} request" do
-    #     class WatchedObj; attr_accessor :test_value end
-    #     @watched_object = WatchedObj.new
-    #     @name = 'Matt'
-    #     query = BubbleWrap::HTTP.send(verb, @localhost_url) do |response|
-    #       @watched_object.test_value = @name
-    #     end
-    #     wait_for_change(@watched_object, 'test_value') do
-    #       @watched_object.test_value.should == 'Matt'
-    #     end
-    #   end
-    # end
+    it "works with classic blocks as well" do
+      [:get, :post, :put, :delete, :head, :patch].each do |method|
+        called = false
+        query = BubbleWrap::HTTP.send(method, @localhost_url, { action: 'not_valid' } ) do |response|
+          called = true
+        end
+        query.connectionDidFinishLoading(query.connection)
+        called.should.equal true
+      end
+    end
 
   end
 
@@ -107,7 +106,7 @@ describe "HTTP" do
         values: ['apple', 'orange', 'peach'],
         credentials: @credentials
       }
-      @action = lambda{|fa, ke|}
+      @action = Proc.new { |response| @real_response = response; @delegator_was_called = true }
       @format = "application/x-www-form-urlencoded"
       @cache_policy = 24234
       @leftover_option = 'trololo'
@@ -150,6 +149,18 @@ describe "HTTP" do
         @query.method.should.equal "GET"
       end
 
+      it "throws an error for invalid/missing URL schemes" do
+        %w(http https file ftp).each do |scheme|
+          lambda {
+            BW::HTTP::Query.new("#{scheme}://example.com", :get) { |r| p r.body.to_str }
+          }.should.not.raise InvalidURLError
+        end
+
+        lambda {
+          BW::HTTP::Query.new("bad://example.com", :get) { |r| p r.body.to_str }
+        }.should.raise InvalidURLError
+      end
+
       it "should set the deleted delegator from options" do
         @query.instance_variable_get(:@delegator).should.equal @action
         @options.should.not.has_key? :action
@@ -185,7 +196,7 @@ describe "HTTP" do
       describe "PAYLOAD / UPLOAD FILES" do
 
         def create_query(payload, files)
-          BubbleWrap::HTTP::Query.new( '', :post, { payload: payload, files: files } )
+          BubbleWrap::HTTP::Query.new( 'http://haha', :post, { payload: payload, files: files } )
         end
 
         def sample_data
@@ -199,13 +210,13 @@ describe "HTTP" do
         end
 
         it "should check if @payload is a hash before generating GET params" do
-          query_string_payload = BubbleWrap::HTTP::Query.new( 'nil' , :get,  { payload: "name=apple&model=macbook"} )
+          query_string_payload = BubbleWrap::HTTP::Query.new( @fake_url , :get,  { payload: "name=apple&model=macbook"} )
           query_string_payload.instance_variable_get(:@payload).should.equal 'name=apple&model=macbook'
         end
 
         it "should check if payload is nil" do
           lambda{
-            BubbleWrap::HTTP::Query.new( 'nil' , :post, {} )
+            BubbleWrap::HTTP::Query.new( @fake_url , :post, {} )
           }.should.not.raise NoMethodError
         end
 
@@ -229,15 +240,15 @@ describe "HTTP" do
           puts "\n"
           [:post, :put, :delete, :patch].each do |method|
             puts "    - #{method}\n"
-            query = BubbleWrap::HTTP::Query.new( 'nil' , method, { payload: payload, files: files } )
+            query = BubbleWrap::HTTP::Query.new( @fake_url , method, { payload: payload, files: files } )
             uuid = query.instance_variable_get(:@boundary)
             real_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:NSUTF8StringEncoding)
-            real_payload.should.equal "\r\n--#{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"
+            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|
             puts "    - #{method}\n"
-            query = BubbleWrap::HTTP::Query.new( 'nil' , method, { payload: payload } )
+            query = BubbleWrap::HTTP::Query.new( @fake_url , method, { payload: payload } )
             real_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:NSUTF8StringEncoding)
             real_payload.should.be.empty
           end
@@ -249,11 +260,11 @@ describe "HTTP" do
         end
 
         it "sets the payload as a string if JSON" do
-          json = BW::JSON.generate({foo:42, bar:'BubbleWrap'})
-           puts "\n"
+          json = "{\"foo\":42,\"bar\":\"BubbleWrap\"}"
+          puts "\n"
           [:put, :post, :delete, :patch].each do |method|
             puts "    - #{method}\n"
-            query = BubbleWrap::HTTP::Query.new( 'nil' , method, { payload: json } )
+            query = BubbleWrap::HTTP::Query.new( @fake_url , method, { payload: json } )
             set_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:NSUTF8StringEncoding)
             set_payload.should.equal json
           end
@@ -261,10 +272,10 @@ describe "HTTP" do
 
         it "sets the payload for a nested hash to multiple form-data parts" do
           payload = { computer: { name: 'apple', model: 'macbook'} }
-          query = BubbleWrap::HTTP::Query.new( 'nil', :post, { payload: payload } )
+          query = BubbleWrap::HTTP::Query.new( @fake_url, :post, { payload: payload } )
           uuid = query.instance_variable_get(:@boundary)
           real_payload = NSString.alloc.initWithData(query.request.HTTPBody, encoding:NSUTF8StringEncoding)
-          real_payload.should.equal "\r\n--#{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"
+          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
 
       end
@@ -280,7 +291,7 @@ describe "HTTP" do
       end
 
       it "should delete :headers from options and escape Line Feeds" do
-        escaped_lf = {"User-Agent"=>"Mozilla/5.0 (X11; Linux x86_64; rv:12.0) \\n Gecko/20100101 Firefox/12.0"}
+        escaped_lf = {"User-Agent"=>"Mozilla/5.0 (X11; Linux x86_64; rv:12.0) \r\n Gecko/20100101 Firefox/12.0"}
         @query.instance_variable_get(:@headers).should.equal escaped_lf
       end
 
@@ -338,12 +349,12 @@ describe "HTTP" do
       end
 
       it "should patch the NSURLRequest with done_loading and done_loading!" do
-        @query.request.done_loading.should.equal @query.request.instance_variable_get(:@done_loading)
+        @query.request.done_loading?.should.equal @query.request.instance_variable_get(:@done_loading)
 
         @query.request.instance_variable_set(:@done_loading, false)
-        @query.request.done_loading.should.equal false
+        @query.request.done_loading?.should.equal false
         @query.request.done_loading!
-        @query.request.done_loading.should.equal true
+        @query.request.done_loading?.should.equal true
       end
 
       it "should pass the right arguments when creating new request" do
@@ -362,6 +373,11 @@ describe "HTTP" do
         @post_query = BubbleWrap::HTTP::Query.new(@url_string, :post, {headers: @headers, payload: @payload})
       end
 
+      it "should add default Content Type if no payload is given" do
+        query_without_payload = BubbleWrap::HTTP::Query.new(@url_string, :post, {headers: @headers})
+        query_without_payload.request.allHTTPHeaderFields.should.include? 'Content-Type'
+      end
+
       it "should automatically provide Content-Type if a payload is provided" do
         @post_query.request.allHTTPHeaderFields.should.include?('Content-Type')
       end
@@ -388,11 +404,6 @@ describe "HTTP" do
         @post_query.request.allHTTPHeaderFields['CONTENT-TYPE'].should.equal @headers['CONTENT-TYPE']
       end
 
-      it "should not add additional headers if no payload is given" do
-        @post_query = BubbleWrap::HTTP::Query.new(@url_string, :post, {headers: @headers})
-        @post_query.request.allHTTPHeaderFields.should.equal @headers
-      end
-
     end
 
     describe "Generating payloads" do
@@ -467,9 +478,9 @@ describe "HTTP" do
       end
 
       it "should set request_done to true" do
-        @query.request.done_loading.should == false
+        @query.request.done_loading?.should == false
         @query.connection(nil, didFailWithError:@fake_error)
-        @query.request.done_loading.should == true
+        @query.request.done_loading?.should == true
       end
 
       it "should set the error message to response object" do
@@ -502,10 +513,10 @@ describe "HTTP" do
       end
 
       it "should set request_done to true" do
-        @query.request.done_loading.should == false
+        @query.request.done_loading?.should == false
 
         @query.connectionDidFinishLoading(nil)
-        @query.request.done_loading.should == true
+        @query.request.done_loading?.should == true
       end
 
       it "should set response_body to @received data if not nil" do
@@ -539,35 +550,36 @@ describe "HTTP" do
 
     describe "when connection:willSendRequest:redirectResponse:" do
       before do
-        @request = NSURLRequest.requestWithURL NSURL.URLWithString('http://fakehost.local/')
+        @request = NSMutableURLRequest.requestWithURL NSURL.URLWithString('http://fakehost.local/')
       end
 
-      it "should make a mutableCopy of passed in request and set headers from @headers" do
-        expected_headers = { new_header: 'should_be_here' }
-        @query.instance_variable_set(:@headers, expected_headers)
+      it "should forward the new request for 30 times/redirections" do
+        1.upto(35) do |numbah|
+          request = @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
+          request.should.equal numbah < 30 ? @request : nil
+        end
+      end
 
-        new_request = @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
+      describe "after 30 redirects" do
+        before do
+          31.times do
+            @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
+          end
+        end
 
-        @query.request.should.not.be.equal @request
-        new_request.URL.description.should.equal @request.URL.description
-        new_request.allHTTPHeaderFields.should.equal expected_headers
-      end
+        it "sets the error message on response" do
+          @real_response.error_message.should.equal "Too many redirections"
+        end
 
-      it "should create a new Connection with the request passed in" do
-        old_connection = @query.connection
-        @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
-        old_connection.should.not.equal @query.connection
-      end
+        it "sets the request.done_loading" do
+          @query.request.done_loading?.should.equal true
+        end
 
-      it "should set itself as a delegate of new NSURLConnection" do
-        @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
-        @query.connection.delegate.should.equal @query
+        it "calls the delegator block" do
+          @delegator_was_called.should.equal true
+        end
       end
 
-      it "should pass the new request in the new connection" do
-        @query.connection(nil, willSendRequest:@request, redirectResponse:nil)
-        @query.connection.request.URL.description.should.equal @request.URL.description
-      end
     end
 
     describe "didReceiveAuthenticationChallenge" do

data/spec/motion/media/player_spec.rb

@@ -0,0 +1,77 @@
+describe BubbleWrap::Media::Player do
+  describe ".play" do
+    before do
+      @player = BW::Media::Player.new
+      @local_file = NSURL.fileURLWithPath(File.join(App.resources_path, 'test.mp3'))
+    end
+
+    it "should raise error if not modal and no callback given" do
+      should.raise(BW::Media::Error::NilPlayerCallback) do
+        @player.play(@local_file)
+      end
+    end
+
+    it "should yield to a block if not modal" do
+      @did_yield = false
+      @player.play(@local_file) do |_player|
+        @did_yield = true
+      end
+
+      @did_yield.should == true
+      @player.stop
+    end
+
+    it "should use the MPMoviePlayerController option overrides" do
+      @player.play(@local_file, allows_air_play: true) do |_player|
+        @did_yield = true
+      end
+      @player.media_player.allowsAirPlay.should == true
+    end
+  end
+
+  describe ".play_modal" do
+    before do
+      @player = BW::Media::Player.new
+      @local_file = NSURL.fileURLWithPath(File.join(App.resources_path, 'test.mp3'))
+    end
+
+    it "should present a modalViewController on root if no controller given" do
+      @controller = UIApplication.sharedApplication.keyWindow.rootViewController
+
+      @player.play_modal(@local_file)
+
+      wait 1 do
+        @controller.modalViewController.should.not == nil
+
+        @player.stop
+        wait 1 do
+          @controller.modalViewController.should == nil
+          @controller = nil
+          @player = nil
+        end
+      end
+    end
+
+    it "should present a modalViewController if controller given" do
+      @controller = UIViewController.alloc.initWithNibName(nil, bundle:nil)
+
+      # .presentMoviePlayerViewControllerAnimated detects whether or not
+      # @controller.view is part of a hierarchy, I guess. if you remove this
+      # then the test fails.
+      UIApplication.sharedApplication.keyWindow.rootViewController.view.addSubview(@controller.view)
+
+      @player.play_modal(@local_file, controller: @controller)
+
+      wait 1 do
+        @controller.modalViewController.should.not == nil
+
+        @player.stop
+        wait 1 do
+          @controller.modalViewController.should == nil
+          @controller = nil
+          @player = nil
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bubble-wrap
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70216781507520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.11.4
   type: :development
   prerelease: false
-  version_requirements: *70216781507520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: mocha-on-bacon
-  requirement: &70216781507100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70216781507100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70216781506640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70216781506640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70216781506220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +71,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70216781506220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more
   Ruby like, one API at a time. Fork away and send your pull request.
 email:
@@ -87,6 +107,8 @@ extra_rdoc_files:
 - motion/http.rb
 - motion/location/location.rb
 - motion/location/pollute.rb
+- motion/media/media.rb
+- motion/media/player.rb
 - motion/reactor.rb
 - motion/reactor/default_deferrable.rb
 - motion/reactor/deferrable.rb
@@ -122,6 +144,7 @@ extra_rdoc_files:
 - spec/motion/core_spec.rb
 - spec/motion/http_spec.rb
 - spec/motion/location/location_spec.rb
+- spec/motion/media/player_spec.rb
 - spec/motion/reactor/eventable_spec.rb
 - spec/motion/reactor_spec.rb
 - spec/motion/rss_parser_spec.rb
@@ -148,6 +171,7 @@ files:
 - lib/bubble-wrap/http.rb
 - lib/bubble-wrap/loader.rb
 - lib/bubble-wrap/location.rb
+- lib/bubble-wrap/media.rb
 - lib/bubble-wrap/reactor.rb
 - lib/bubble-wrap/requirement.rb
 - lib/bubble-wrap/requirement/path_manipulation.rb
@@ -174,6 +198,8 @@ files:
 - motion/http.rb
 - motion/location/location.rb
 - motion/location/pollute.rb
+- motion/media/media.rb
+- motion/media/player.rb
 - motion/reactor.rb
 - motion/reactor/default_deferrable.rb
 - motion/reactor/deferrable.rb
@@ -190,6 +216,13 @@ files:
 - motion/ui/ui_control.rb
 - motion/ui/ui_view_controller.rb
 - resources/atom.xml
+- resources/test.mp3
+- samples/camera/Gemfile
+- samples/camera/README.md
+- samples/camera/Rakefile
+- samples/camera/app/app_delegate.rb
+- samples/camera/app/controllers/camera_controller.rb
+- samples/camera/spec/main_spec.rb
 - samples/gesture/.gitignore
 - samples/gesture/Gemfile
 - samples/gesture/Gemfile.lock
@@ -201,6 +234,14 @@ files:
 - samples/gesture/app/views/drawing/gesture_view.rb
 - samples/gesture/app/views/drawing/rect_view.rb
 - samples/gesture/spec/main_spec.rb
+- samples/location/.gitignore
+- samples/location/Gemfile
+- samples/location/README.md
+- samples/location/Rakefile
+- samples/location/app/app_delegate.rb
+- samples/location/app/controllers/image_list_controller.rb
+- samples/location/app/models/places.rb
+- samples/location/spec/main_spec.rb
 - spec/lib/bubble-wrap/ext/motion_project_app_spec.rb
 - spec/lib/bubble-wrap/ext/motion_project_config_spec.rb
 - spec/lib/bubble-wrap/requirement/path_manipulation_spec.rb
@@ -224,6 +265,7 @@ files:
 - spec/motion/core_spec.rb
 - spec/motion/http_spec.rb
 - spec/motion/location/location_spec.rb
+- spec/motion/media/player_spec.rb
 - spec/motion/reactor/eventable_spec.rb
 - spec/motion/reactor_spec.rb
 - spec/motion/rss_parser_spec.rb
@@ -241,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4073507284193479358
+      hash: 4493023769486268840
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -250,10 +292,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4073507284193479358
+      hash: 4493023769486268840
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more Ruby
@@ -282,6 +324,7 @@ test_files:
 - spec/motion/core_spec.rb
 - spec/motion/http_spec.rb
 - spec/motion/location/location_spec.rb
+- spec/motion/media/player_spec.rb
 - spec/motion/reactor/eventable_spec.rb
 - spec/motion/reactor_spec.rb
 - spec/motion/rss_parser_spec.rb