motion-bundler 0.1.1 → 0.1.2

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 = MotionBundler CHANGELOG
 
+== Version 0.1.2 (May 20, 2013)
+
+* Updated mocked HTTParty module:
+
+  * Support passing block when sending request
+  * Support asynchronous requests
+
 == Version 0.1.1 (May 15, 2013)
 
 * Fixed device/core_ext.rb when running `rake device`

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/motion-bundler/mocks/httparty.rb

@@ -18,24 +18,24 @@ module HTTParty
   end
 
   def get(path, options = {}, &block)
-    send_request path, :get
+    send_request path, :get, options, &block
   end
 
   def post(path, options = {}, &block)
-    send_request path, :post
+    send_request path, :post, options, &block
   end
 
   def put(path, options = {}, &block)
-    send_request path, :put
+    send_request path, :put, options, &block
   end
 
   def delete(path, options = {}, &block)
-    send_request path, :delete
+    send_request path, :delete, options, &block
   end
 
 private
 
-  def send_request(path, method, options = {})
+  def send_request(path, method, options = {}, &block)
     path   = "#{@base_uri}/#{path}" if @base_uri && !path.match(/^\w+:\/\//)
     path   = path.stringByAddingPercentEscapesUsingEncoding NSUTF8StringEncoding
     method = method.to_s.upcase
@@ -63,9 +63,17 @@ private
 
     response = Pointer.new :object
     error    = Pointer.new :object
-    data     = NSURLConnection.sendSynchronousRequest request, returningResponse: response, error: error
 
-    HTTParty::Response.new response, data, {:format => @format, :error => error}
+    if options[:async]
+      queue = NSOperationQueue.alloc.init
+      NSURLConnection.sendAsynchronousRequest request, queue: queue, completionHandler: proc { |response, data, error|
+        block.call HTTParty::Response.new(response, data, {:format => @format || options[:format], :error => error})
+      }
+    else
+      data = NSURLConnection.sendSynchronousRequest request, returningResponse: response, error: error
+      response = HTTParty::Response.new(response.value, data, {:format => @format || options[:format], :error => error})
+      block_given? ? block.call(response) : response
+    end
   end
 
   def payload_to_query_string(payload_hash)
@@ -98,7 +106,7 @@ module HTTParty
   class Response
 
     def initialize(response, data, options = {})
-      @cached_response = NSCachedURLResponse.alloc.initWithResponse response.value, data: data
+      @cached_response = NSCachedURLResponse.alloc.initWithResponse response, data: data
       @options = options
     end
 

data/lib/motion-bundler/version.rb

@@ -1,7 +1,7 @@
 module MotionBundler #:nodoc:
   MAJOR = 0
   MINOR = 1
-  TINY  = 1
+  TINY  = 2
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/lib/motion-bundler.rb

@@ -36,8 +36,8 @@ module MotionBundler
     argv.include? "device"
   end
 
-  def default_files
-    [File.expand_path("../motion-bundler/#{simulator? ? "simulator" : "device"}/boot.rb", __FILE__)]
+  def boot_file
+    File.expand_path "../motion-bundler/#{simulator? ? "simulator" : "device"}/boot.rb", __FILE__
   end
 
 private
@@ -67,9 +67,7 @@ private
   def tracer_require(files, files_dependencies, required)
     Require.trace do
       require MOTION_BUNDLER_FILE
-      default_files.each do |file|
-        require file
-      end
+      require boot_file
       Bundler.require :motion
       app_requires.delete_if do |file|
         require file, "APP"
@@ -88,8 +86,7 @@ private
     files_dependencies.merge!(
       Require.files_dependencies.tap do |dependencies|
         (dependencies.delete("BUNDLER") || []).each do |file|
-          dependencies[file] ||= []
-          dependencies[file] = default_files + dependencies[file]
+          (dependencies[file] ||= []).unshift boot_file
         end
         dependencies.delete("APP")
         dependencies.delete(__FILE__)

data/sample_app/Rakefile

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 $:.unshift "/Library/RubyMotion/lib"
-require "motion/project"
+require "motion/project/template/ios"
 
 # Require and prepare Bundler
 require "bundler"

data/sample_app/app/controllers/app_controller.rb

@@ -20,6 +20,7 @@ class AppController < UIViewController
     p s.read(17)
 
     # Testing StringScanner
+
     s = StringScanner.new "ab"
     p s.getch
     p s.getch

data/test/.gemfiles/simulator/test_setup.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/paulengel/Sources/motion-bundler
   specs:
-    motion-bundler (0.1.0)
+    motion-bundler (0.1.1)
       colorize
 
 PATH

data/test/motion/device/test_core_ext.rb

@@ -14,9 +14,7 @@ module Motion
           last_loaded_feature = nil
 
           assert_output "" do
-            MotionBundler.default_files.each do |default_file|
-              require default_file
-            end
+            require MotionBundler.boot_file
             last_loaded_feature = $LOADED_FEATURES.last
 
             assert_nil require("a")

data/test/motion/simulator/test_core_ext.rb

@@ -17,10 +17,7 @@ module Motion
           last_loaded_feature = nil
           fu = Fu.new
 
-          MotionBundler.default_files.each do |default_file|
-            require default_file
-          end
-
+          require MotionBundler.boot_file
           last_loaded_feature = $LOADED_FEATURES.last
 
           assert_nil require("a")

data/test/unit/test_motion-bundler.rb

@@ -19,10 +19,10 @@ module Unit
 
       it "should determine Motion::Project::App default files" do
         MotionBundler.expects(:simulator?).returns(true)
-        assert_equal [motion_bundler_file("motion-bundler/simulator/boot.rb")], MotionBundler.default_files
+        assert_equal motion_bundler_file("motion-bundler/simulator/boot.rb"), MotionBundler.boot_file
 
         MotionBundler.expects(:simulator?).returns(false)
-        assert_equal [motion_bundler_file("motion-bundler/device/boot.rb")], MotionBundler.default_files
+        assert_equal motion_bundler_file("motion-bundler/device/boot.rb"), MotionBundler.boot_file
       end
 
       it "should be able to touch MotionBundler::MOTION_BUNDLER_FILE" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-bundler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4515734510727804082
+      hash: 3167972286108752732
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4515734510727804082
+      hash: 3167972286108752732
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25