Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4018f94a5570
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9d3c10df3563
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 6, 2014

  1. Typo fix, each_bytes => each_byte

    @cheald
    cheald committed Nov 6, 2014
    Copy the full SHA
    3f3466b View commit details

  2. Expose Zlib.deflate as a module function

    @cheald
    cheald committed Nov 6, 2014
    Copy the full SHA
    f29649f View commit details

  3. Merge pull request #2114 from cheald/zlib_typo_fix 

    Zlib typo fix
    @headius
    headius committed Nov 6, 2014
    Copy the full SHA
    9d3c10d View commit details
Showing with 2 additions and 3 deletions.
  1. +1 −1 core/src/main/java/org/jruby/ext/zlib/JZlibDeflate.java
  2. +1 −1 core/src/main/java/org/jruby/ext/zlib/RubyZlib.java
  3. +0 −1 test/mri/excludes/TestZlib.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/zlib/JZlibDeflate.java
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ public static IRubyObject s_deflate(IRubyObject recv, IRubyObject[] args) {
checkLevel(runtime, level);
}

RubyClass klass = (RubyClass) recv;
RubyClass klass = (RubyClass)(recv.isClass() ? recv : runtime.getClassFromPath("Zlib::Deflate"));
JZlibDeflate deflate = (JZlibDeflate) klass.allocate();
deflate.init(level, JZlib.DEF_WBITS, 8, JZlib.Z_DEFAULT_STRATEGY);

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/zlib/RubyZlib.java
View file
Original file line number Diff line number Diff line change
@@ -259,7 +259,7 @@ public static IRubyObject inflate(ThreadContext context, IRubyObject recv, IRuby
return JZlibInflate.s_inflate(context, recv, string);
}

@JRubyMethod(required = 1, optional = 1)
@JRubyMethod(required = 1, optional = 1, module = true)
public static IRubyObject deflate(IRubyObject recv, IRubyObject[] args) {
return JZlibDeflate.s_deflate(recv, args);
}
1 change: 0 additions & 1 deletion test/mri/excludes/TestZlib.rb
View file
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
exclude :test_deflate_stream, "needs investigation"