rmagick4j 0.3.3-java → 0.3.4-java

data/lib/RMagick.rb

@@ -8,8 +8,8 @@
 #               to the classes.
 #==============================================================================
 
-require 'RMagick.so'
-
+#require 'RMagick.so'
+require "rmagick4j/rmagick4j"
 module Magick
     @@formats = nil
 

data/lib/rmagick4j/rmagick4j.rb

@@ -24,13 +24,18 @@ class Draw
 	end
 
 	def fill= fill
-		@draw.setFill(Magick4J.ColorDatabase.queryDefault(fill))
+		@draw.fill = Magick4J.ColorDatabase.query_default(fill)
+		self
+	end
+
+	def font_family= font_family
+		@draw.font_family = font_family
 		self
 	end
 
 	def font_weight= font_weight
 		font_weight = {BoldWeight => 700, NormalWeight => 400}[font_weight]
-		@draw.setFontWeight(font_weight)
+		@draw.font_weight = font_weight
 	end
 
 	def get_type_metrics(*args)
@@ -129,7 +134,7 @@ class Image
 		# TODO Use info somehow
 		info = Info.new(&add)
 		# TODO multiple images in file
-		[Image.new(Magick4J.MagickImage.fromBlob(blob.to_java_bytes))]
+		[Image.new(Magick4J.MagickImage.from_blob(blob.to_java_bytes))]
 	end
 
 	def self.read(file, &add)
@@ -142,7 +147,7 @@ class Image
 	end
 
 	def columns
-		@image.getWidth
+		@image.width
 	end
 
 	def composite(*args)
@@ -152,9 +157,36 @@ class Image
 		Image.new(@image.composited(*args))
 	end
 
-	def crop(x, y, width, height)
-		Image.new(@image.cropped(x, y, width, height))
-	end
+  def copy
+    Image.new(@image.clone)
+  end
+
+	def crop(*args)
+    copy.crop!(*args)
+	end
+
+  def crop!(*args)
+    # gravity, x, y, width, height, reset_offset
+    # Defaults.
+    gravity = nil
+    x = y = 0
+    reset_offset = false
+    # Find available args.
+    if args.first.is_a? Magick4J::Gravity
+      gravity = args.shift
+    end
+    if [FalseClass, TrueClass].member? args.last.class
+      reset = args.pop
+    end
+    if args.length == 4
+      x, y = args[0..1]
+    end
+    width, height = args[-2..-1]
+    # Call Java.
+    # TODO Why wouldn't we reset offset information? Do we need to use that?
+    @image.crop(gravity, x, y, width, height)
+    self
+  end
 
 	def display
 		@image.display
@@ -214,8 +246,18 @@ class Image
 		Image.new(@image.resized(scale_factor))
 	end
 
-	def rotate(scale_factor)
-		Image.new(@image.rotated(scale_factor))
+  def resize!(scale_factor)
+    @image.resize(scale_factor)
+    self
+  end
+
+	def rotate(amount)
+		Image.new(@image.rotated(amount))
+	end
+
+	def rotate!(amount)
+		@image.rotate(amount)
+		self
 	end
 
 	def rows
@@ -223,12 +265,22 @@ class Image
 	end
 
 	def to_blob(&add)
-		# TODO Use info.
 		info = Info.new(&add)
 		@image.setFormat(info.format) if info.format
 		String.from_java_bytes(@image.toBlob)
 	end
 
+    def watermark(mark, lightness=1.0, saturation=1.0, gravity=nil, x_offset=0, y_offset=0)
+      if gravity.is_a? Numeric
+        # gravity is technically an optional argument in the middle.
+        gravity = nil
+        y_offset = x_offset
+        x_offset = gravity
+      end
+      # TODO Perform watermark.
+      self
+    end
+
 	def write(file, &add)
 		# TODO I'm having trouble finding out how this info is used, so I'll skip using it for now.
 		info = Info.new(&add)

metadata

@@ -1,43 +1,20 @@
 --- !ruby/object:Gem::Specification
-cert_chain: 
-rubygems_version: 0.9.4
-description: RMagick4J is a JRuby back end to support the RMagick library. It bundles
-  a Java library called Magick4J that implements ImageMagick and some RMagick native
-  functionality.
-version: !ruby/object:Gem::Version
-  version: 0.3.3
-requirements: []
-test_files: []
-bindir: bin
-email: jruby-extras-devel@rubyforge.org
-autorequire: 
 extensions: []
-summary: RMagick4J is a JRuby back end for RMagick.
-post_install_message: 
 homepage: http://code.google.com/p/rmagick4j/
-dependencies: []
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement
-  version: 
-  requirements: 
-  - - '>'
-    - !ruby/object:Gem::Version
-      version: 0.0.0
-require_paths: 
-- lib
-signing_key: 
-name: rmagick4j
 executables: []
-rdoc_options: []
+version: !ruby/object:Gem::Version
+  version: 0.3.4
+post_install_message: 
+date: 2008-04-14 22:00:00 +00:00
 files: 
-- lib
-- lib/RMagick.jar
-- lib/RMagick.rb
 - lib/jhlabs-filters.jar
 - lib/magick4j.jar
+- lib/RMagick.jar
+- lib/RMagick.rb
 - lib/rmagick4j
-- lib/rmagick4j/rmagick4j.rb
 - lib/rvg
+- lib/svgsalamander.jar
+- lib/rmagick4j/rmagick4j.rb
 - lib/rvg/clippath.rb
 - lib/rvg/container.rb
 - lib/rvg/deep_equal.rb
@@ -52,12 +29,40 @@ files:
 - lib/rvg/text.rb
 - lib/rvg/transformable.rb
 - lib/rvg/units.rb
-- lib/svgsalamander.jar
+rubygems_version: 1.0.1
+rdoc_options: []
+signing_key: 
+cert_chain: []
+name: rmagick4j
+has_rdoc: false
 platform: java
-rubyforge_project: jruby-extras
-date: 2007-06-05 07:00:00 +00:00
+summary: RMagick4J is a JRuby back end for RMagick.
+default_executable: 
+bindir: bin
+required_rubygems_version: !ruby/object:Gem::Requirement
+  version: 
+  requirements: 
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: !str 0
+required_ruby_version: !ruby/object:Gem::Requirement
+  version: 
+  requirements: 
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: !str 0
+require_paths: 
+- lib
+specification_version: 2
+test_files: []
+dependencies: []
+description: RMagick4J is a JRuby back end to support the RMagick library. It bundles
+  a Java library called Magick4J that implements ImageMagick and some RMagick native
+  functionality.
+email: jruby-extras-devel@rubyforge.org
 authors: 
-- Tom Palmer
+- Tom Palmer & Serabe
 extra_rdoc_files: []
-specification_version: 1
-default_executable: 
+requirements: []
+rubyforge_project: jruby-extras
+autorequire: