elevate 0.6.0 → 0.7.0

data/spec/operation_spec.rb

@@ -1,56 +1,19 @@
 describe Elevate::ElevateOperation do
   before do
-    @target = lambda { @result }
-    @operation = Elevate::ElevateOperation.alloc.initWithTarget(@target, args: {})
+    @target = lambda { 42 }
+    @operation = Elevate::ElevateOperation.alloc.initWithTarget(@target, args: {}, channel: [])
     @queue = NSOperationQueue.alloc.init
   end
 
   after do
-    @queue.waitUntilAllOperationsAreFinished()
-  end
-
-  it "subclasses NSOperation" do
-    @operation.class.ancestors.should.include NSOperation
-  end
-
-  describe "#on_finish=" do
-    it "invokes it after #on_started" do
-      @lock = NSLock.alloc.init
-      @value = []
-
-      @operation.on_start = lambda do
-        @lock.lock()
-        if @value == []
-          @value << 1
-        end
-        @lock.unlock()
-      end
-
-      @operation.on_finish = lambda do |result, exception|
-        @lock.lock()
-        if @value == [1]
-          @value << 2
-        end
-        @lock.unlock()
-
-        Dispatch::Queue.main.sync { resume }
-      end
-
-      @queue.addOperation(@operation)
-
-      wait_max 1.0 do
-        @lock.lock()
-        @value.should == [1,2]
-        @lock.unlock()
-      end
-    end
+    @queue.waitUntilAllOperationsAreFinished
   end
 
   describe "#exception" do
     describe "when no exception is raised" do
       it "returns nil" do
         @queue.addOperation(@operation)
-        @operation.waitUntilFinished()
+        @operation.waitUntilFinished
 
         @operation.exception.should.be.nil
       end
@@ -59,10 +22,10 @@ describe Elevate::ElevateOperation do
     describe "when an exception is raised" do
       it "returns the exception" do
         @target = lambda { raise IndexError }
-        @operation = Elevate::ElevateOperation.alloc.initWithTarget(@target, args: {})
+        @operation = Elevate::ElevateOperation.alloc.initWithTarget(@target, args: {}, channel: nil)
 
         @queue.addOperation(@operation)
-        @operation.waitUntilFinished()
+        @operation.waitUntilFinished
 
         @operation.exception.should.not.be.nil
       end
@@ -72,7 +35,7 @@ describe Elevate::ElevateOperation do
   describe "#result" do
     before do
       @target = lambda { 42 }
-      @operation = Elevate::ElevateOperation.alloc.initWithTarget(@target, args: {})
+      @operation = Elevate::ElevateOperation.alloc.initWithTarget(@target, args: {}, channel: nil)
     end
 
     describe "before starting the operation" do
@@ -83,10 +46,10 @@ describe Elevate::ElevateOperation do
 
     describe "when the operation has been cancelled" do
       it "returns nil" do
-        @operation.cancel()
+        @operation.cancel
 
         @queue.addOperation(@operation)
-        @operation.waitUntilFinished()
+        @operation.waitUntilFinished
 
         @operation.result.should.be.nil
       end
@@ -95,7 +58,7 @@ describe Elevate::ElevateOperation do
     describe "when the operation has finished" do
       it "returns the result of the lambda" do
         @queue.addOperation(@operation)
-        @operation.waitUntilFinished()
+        @operation.waitUntilFinished
 
         @operation.result.should == 42
       end

data/spec/task_context_spec.rb

@@ -0,0 +1,12 @@
+describe Elevate::TaskContext do
+  describe "#execute" do
+    it "runs the specified block" do
+      result = {}
+
+      context = Elevate::TaskContext.new(->{ result[:ret] = true }, [], {})
+      context.execute
+
+      result[:ret].should.be.true
+    end
+  end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: elevate
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Matt Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webstub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 description: Distill the essence of your RubyMotion app
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -55,9 +55,9 @@ files:
 - app/app_delegate.rb
 - elevate.gemspec
 - lib/elevate.rb
-- lib/elevate/callback.rb
-- lib/elevate/dsl.rb
+- lib/elevate/channel.rb
 - lib/elevate/elevate.rb
+- lib/elevate/future.rb
 - lib/elevate/http.rb
 - lib/elevate/http/activity_indicator.rb
 - lib/elevate/http/base64.rb
@@ -69,10 +69,10 @@ files:
 - lib/elevate/http/uri.rb
 - lib/elevate/io_coordinator.rb
 - lib/elevate/operation.rb
-- lib/elevate/promise.rb
+- lib/elevate/task.rb
 - lib/elevate/task_context.rb
+- lib/elevate/task_definition.rb
 - lib/elevate/version.rb
-- spec/callback_spec.rb
 - spec/elevate_spec.rb
 - spec/http/activity_indicator_spec.rb
 - spec/http/http_client_spec.rb
@@ -80,8 +80,10 @@ files:
 - spec/http_spec.rb
 - spec/io_coordinator_spec.rb
 - spec/operation_spec.rb
+- spec/task_context_spec.rb
 homepage: http://github.com/mattgreen/elevate
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -89,22 +91,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Distill the essence of your RubyMotion app
 test_files:
-- spec/callback_spec.rb
 - spec/elevate_spec.rb
 - spec/http/activity_indicator_spec.rb
 - spec/http/http_client_spec.rb
@@ -112,3 +113,4 @@ test_files:
 - spec/http_spec.rb
 - spec/io_coordinator_spec.rb
 - spec/operation_spec.rb
+- spec/task_context_spec.rb

data/lib/elevate/callback.rb

@@ -1,22 +0,0 @@
-module Elevate
-  class Callback
-    def initialize(controller, block)
-      @controller = controller
-      @block = block
-    end
-
-    def call(*args)
-      if NSThread.isMainThread
-        invoke(*args)
-      else
-        Dispatch::Queue.main.sync { invoke(*args) }
-      end
-    end
-
-    private
-
-    def invoke(*args)
-      @controller.instance_exec(*args, &@block)
-    end
-  end
-end

data/lib/elevate/dsl.rb

@@ -1,49 +0,0 @@
-module Elevate
-  class DSL
-    def initialize(&block)
-      instance_eval(&block)
-    end
-
-    attr_reader :finish_callback
-    attr_reader :start_callback
-    attr_reader :task_callback
-    attr_reader :update_callback
-
-    attr_reader :timeout_callback
-    attr_reader :timeout_interval
-
-    def on_finish(&block)
-      raise "on_finish blocks must accept two parameters" unless block.arity == 2
-
-      @finish_callback = block
-    end
-
-    def on_start(&block)
-      raise "on_start blocks must accept zero parameters" unless block.arity == 0
-
-      @start_callback = block
-    end
-
-    def on_timeout(&block)
-      raise "on_timeout blocks must accept zero parameters" unless block.arity == 0
-
-      @timeout_callback = block
-    end
-
-    def on_update(&block)
-      @update_callback = block
-    end
-
-    def task(&block)
-      raise "task blocks must accept zero parameters" unless block.arity == 0
-
-      @task_callback = block
-    end
-
-    def timeout(seconds)
-      raise "timeout argument must be a number" unless seconds.is_a?(Numeric)
-
-      @timeout_interval = seconds
-    end
-  end
-end

data/spec/callback_spec.rb

@@ -1,22 +0,0 @@
-describe Elevate::Callback do
-  describe "#call" do
-    describe "on the main thread" do
-      it "invokes the block within the provided context" do
-        callback = Elevate::Callback.new(self, lambda { |v| @value = v })
-        callback.call(42)
-
-        @value.should == 42
-      end
-    end
-
-    describe "on a background thread" do
-      it "invokes the block within the provided context on the main thread" do
-        callback = Elevate::Callback.new(self, lambda { @thread = NSThread.currentThread })
-        callback.call
-
-        @thread.should == NSThread.mainThread
-      end
-    end
-  end
-end
-