porcupine 0.1.0 → 0.2.0

data/Jarfile

@@ -1,3 +1,2 @@
-jar 'com.netflix.rxjava:rxjava-jruby:0.10.1'
-jar 'com.netflix.hystrix:hystrix-core:1.3.2'
+jar 'com.netflix.hystrix:hystrix-core:1.3.5'
 jar 'org.slf4j:slf4j-simple:1.7.5'

data/Jarfile.lock

@@ -5,25 +5,22 @@ groups:
     dependencies:
     - com.google.code.findbugs:jsr305:jar:2.0.0
     - com.netflix.archaius:archaius-core:jar:0.4.1
-    - com.netflix.hystrix:hystrix-core:jar:1.3.2
-    - com.netflix.rxjava:rxjava-core:jar:0.10.1
-    - com.netflix.rxjava:rxjava-jruby:jar:0.10.1
+    - com.netflix.hystrix:hystrix-core:jar:1.3.5
+    - com.netflix.rxjava:rxjava-core:jar:0.13.4
     - commons-configuration:commons-configuration:jar:1.8
     - commons-lang:commons-lang:jar:2.6
     - commons-logging:commons-logging:jar:1.1.1
     - org.slf4j:slf4j-api:jar:1.7.5
     - org.slf4j:slf4j-simple:jar:1.7.5
     artifacts:
-    - jar:com.netflix.rxjava:rxjava-jruby:jar:0.10.1:
-        transitive:
-          com.netflix.rxjava:rxjava-core:jar:0.10.1: {}
-    - jar:com.netflix.hystrix:hystrix-core:jar:1.3.2:
+    - jar:com.netflix.hystrix:hystrix-core:jar:1.3.5:
         transitive:
           com.google.code.findbugs:jsr305:jar:2.0.0: {}
           com.netflix.archaius:archaius-core:jar:0.4.1:
             commons-configuration:commons-configuration:jar:1.8:
               commons-logging:commons-logging:jar:1.1.1: {}
               commons-lang:commons-lang:jar:2.6: {}
+          com.netflix.rxjava:rxjava-core:jar:0.13.4: {}
     - jar:org.slf4j:slf4j-simple:jar:1.7.5:
         transitive:
           org.slf4j:slf4j-api:jar:1.7.5: {}

data/README.md

@@ -58,7 +58,9 @@ If you provide an onError function, then the function will receive exceptions ra
 
 ```ruby
 observer = porcupine.observe
-observer.subscribe("onNext" => lambda {}, "onError" => lambda {|exception| puts exception}) # Will puts any exception
+on_next  = lambda {|val| puts "All good: #{val}"}
+on_error = lambda {|exception| puts "Uh oh: #{exception}"}
+observer.subscribe(on_next, on_error)
 ```
 
 ## Contributing

data/lib/porcupine/observable.rb

@@ -3,15 +3,15 @@ require "delegate"
 class Porcupine
   class Observable < SimpleDelegator
     def subscribe(*args, &block)
-      raise ArgumentError unless block_given? || (args.first && args.first["onNext"])
+      raise ArgumentError unless block_given? || args.first
 
       on_next = if block_given?
                   block
                 else
-                  args.first["onNext"]
+                  args.shift
                 end
 
-      on_error = args.first && args.first["onError"]
+      on_error = !block_given? && args.shift
 
       wrapped = lambda do |value_or_exception|
         if value_or_exception.is_a?(Exception)
@@ -21,7 +21,11 @@ class Porcupine
         end
       end
 
-      __getobj__.subscribe("onNext" => wrapped, "onError" => on_error)
+      if on_error
+        __getobj__.subscribe(wrapped, on_error, *args)
+      else
+        __getobj__.subscribe(wrapped)
+      end
     end
   end
 end

data/porcupine.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "porcupine"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Mike Ragalie"]
   spec.email         = ["ragalie@gmail.com"]
   spec.summary       = "JRuby wrapper for Hystrix"

data/spec/observable_spec.rb

@@ -11,59 +11,65 @@ describe Porcupine::Observable do
   describe "#subscribe" do
     let(:on_next) { lambda {|v| "pumpkin" } }
     let(:on_error) { lambda {|v| "apples" } }
-    let(:arguments) { observable.subscribe("onNext" => on_next, "onError" => on_error) }
+    let(:arguments) { observable.subscribe(on_next, on_error) }
 
     describe "arguments" do
       it "accepts a block" do
         observable.subscribe {}
       end
 
-      it "accepts an onNext parameter" do
-        observable.subscribe("onNext" => lambda {})
+      it "accepts a parameter" do
+        observable.subscribe(lambda {})
       end
 
       it "raises otherwise" do
-        expect { observable.subscribe("cat!") }.to raise_error(ArgumentError)
+        expect { observable.subscribe }.to raise_error(ArgumentError)
       end
     end
 
     it "calls subscribe with a block" do
-      object.stub(:subscribe) {|arg| arg}
+      object.stub(:subscribe) {|*args| args}
       observable.subscribe(&on_next)
-      arguments["onNext"].call(1).should == "pumpkin"
+      arguments.first.call(1).should == "pumpkin"
     end
 
     it "calls subscribe with the provided onNext method" do
-      object.stub(:subscribe) {|arg| arg}
-      arguments["onNext"].call(1).should == "pumpkin"
+      object.stub(:subscribe) {|*args| args}
+      arguments.first.call(1).should == "pumpkin"
     end
 
     it "calls subscribe with the provided onError method" do
-      object.stub(:subscribe) {|arg| arg}
-      arguments["onError"].should == on_error
+      object.stub(:subscribe) {|*args| args}
+      arguments[1].should == on_error
     end
 
     describe "onNext method" do
-      before { object.stub(:subscribe) {|arg| arg} }
+      before { object.stub(:subscribe) {|*args| args} }
 
       it "calls the success method" do
-        wrapped = arguments["onNext"]
+        wrapped = arguments.first
 
         on_next.should_receive(:call).with("pony")
         wrapped.call("pony")
       end
 
       it "calls the error method if the value is an exception" do
-        wrapped = arguments["onNext"]
+        wrapped = arguments.first
 
         exception = RuntimeError.new
         on_error.should_receive(:call).with(exception)
         wrapped.call(exception)
       end
 
+      it "passes in the complete method if provided" do
+        on_complete = lambda { "pears" }
+        object.should_receive(:subscribe).with(kind_of(Proc), on_error, on_complete)
+        observable.subscribe(on_next, on_error, on_complete)
+      end
+
       it "does nothing if there's no on_error" do
         arguments = observable.subscribe(&on_next)
-        wrapped = arguments["onNext"]
+        wrapped = arguments.first
 
         exception = RuntimeError.new
         on_error.should_not_receive(:call)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: porcupine
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lock_jar