rubyshop 0.0.2 → 0.3.1

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Corban Brook
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -0,0 +1,191 @@
+                                  
+                                  RComposite
+
+RComposite is an RMagick abstraction library to easily manipulate and composite 
+images through the use of a canvas, layers, layer masks, adjustment layers, fill
+layers, and layer sets (much like in Photoshop).
+
+
+Install:
+
+Add the github repository to your gem sources:
+
+  sudo gem sources -a http://gems.github.com
+
+Install the gem from github:
+
+  sudo gem install corbanbrook-rcomposite
+
+Require:
+
+  require 'rubygems'
+  require 'rcomposite'
+
+  include RComposite # optional: if you wish to have the RComposite module in your project scope
+
+  ...
+
+
+Class Summary:
+
+* Layers: There are 4 types of Layer Models,
+
+  * Layer: The base layer model. Can load an image from disk, blob,
+    or RMagick Image object. Contains methods to transform, change layer mode,
+    change opacity level, and more.
+
+  * FillLayer: A solid color, gradient, or pattern fill layer.
+
+  * AdjustmentLayer: Invert, Threshold, Levels, Blur adjustment layer.
+    Applies layer effect over everything under it in the layer stack.
+
+  * LayerMask: Mask any of the above layer types. LayerMasks are a special
+    type of layer which is a Alpha Channel mask that can be applied to any
+    layer type. Since LayerMask is also a layer, it can also be transformed
+    in any way.
+
+  * LayerSets: 2 types of LayerSet Models,
+
+    * LayerSet: The LayerSet is a container, or directory in which to bundle
+      layers. LayerSet contains methods to do group transforms on its bundled
+      layers. Transforms like rotation, movement and scaling are performed on
+      all the layers it contains while maintaining each layer on a seperate plane
+      without merging.
+
+    * Canvas: The canvas is a special LayerSet which is a blank workspace containing
+      other layers and layer sets.
+
+
+Usage:
+
+* Creating a blank canvas:
+
+    canvas = RComposite::Canvas.new(640, 480)
+
+  Canvas also accepts an optional block for easily adding layers to the stack
+
+    canvas = Rcomposite::Canvas.new(640, 480) do
+      layer :file => 'butterfly.png'
+    end
+
+* Creating a layer:
+
+    photo = RComposite::Layer.new :file => 'photo.jpg'
+
+* Creating a fill layer:
+
+    blue = RCompisite::FillLayer.new '#000090'
+
+* Changing a Layers properties:
+
+    blue.opacity 40
+    blue.mode Multiply
+
+* Adding layers to the canvas. (Whatever is added first will be on top):
+
+    canvas.layer blue
+    canvas.layer photo
+
+* Saving the canvas:
+
+    canvas.save_as 'bluesky.jpg'
+
+* Adding an alpha channel mask to a layer:
+
+  Masks are used to punch holes into layers to add transparency.
+
+    blue.layer_mask :file => 'alpha_channel.png'
+
+  You can add layer options to the mask just like it was a normal layer.
+
+    fill_layer SolidColor, '#f83898FF' do
+      layer_mask :file => 'butterfly-mask.png' do
+        offset -30, -30
+        rotate 40
+      end
+    end
+
+
+The real power of RComposite lies in its use of blocks and simplified syntax.
+Take a look at the following examples:
+
+* Just like the Canvas, all layer types also accept an optional block parametre for setting layer options:
+
+    butterfly = RComposite::Layer :file => 'butterfly.png' do 
+      offset 100, 100 # moves the layer on the canvas
+      rotate 25
+    end
+
+  or..
+
+    canvas.layer :file => 'butterfly.png' do 
+      ..
+    end
+
+* DSL Example
+
+    Canvas.new(320,240) do
+
+      layer_set :slides do
+        layer :file => 'slide1.png' do
+          opacity 65
+          offset 12, 12
+          mode Lighten
+        end
+
+        adjustment_layer Blur, 0.5, 1.5 do
+          layer_mask :file => 'butterfly-mask.png'
+        end
+
+        layer :file => 'slide2.png' do
+          offset 28, 28
+          opacity 30
+          mode Darken
+        end
+
+        rotate 45
+        offset 70, 50
+        scale 80, 80
+      end
+
+      fill_layer SolidColor, '#f83898FF' do
+        opacity 70
+        mode Multiply
+
+        layer_mask :file => 'butterfly-mask.png' do
+          offset -30, -30
+          image.rotate! 40
+        end
+      end
+
+      fill_layer Gradient, 0, 0, 0, 50, '#606', '#033' do
+        opacity 90
+        mode Overlay
+
+        layer_mask :file => 'butterfly-mask.png' do
+          offset -20, -20
+        end
+      end
+
+      layer :file => 'background.png' do
+        image.resize!(320, 240)
+      end
+
+      save_as 'composite.jpg'
+    end
+
+
+The nice thing about RComposite is that it doesnt hide the underlaying RMagick
+Image object from you. It is always available through the image accessor
+
+  layer :file => 'photo.jpg' do
+    image.crop_resized!(100,300) # crop_resized! is a RMagick method
+  end
+
+
+
+@corban                                                    weare.buildingsky.net
+________________________________________________________________________________
+
+       Copyright (c) 2009 Corban Brook, released under the MIT license
+                                                                                  

data/lib/rcomposite.rb

@@ -0,0 +1,9 @@
+require 'rmagick'
+
+require 'rcomposite/layerset'
+require 'rcomposite/layer'
+require 'rcomposite/canvas'
+require 'rcomposite/filllayer'
+require 'rcomposite/adjustmentlayer'
+require 'rcomposite/layermask'
+

data/lib/{rubyshop → rcomposite}/adjustmentlayer.rb

@@ -1,4 +1,4 @@
-module Rubyshop
+module RComposite
   Levels = 1
   Curves = 2
   ColorBalance = 3

data/lib/{rubyshop → rcomposite}/canvas.rb

@@ -1,4 +1,4 @@
-module Rubyshop
+module RComposite
   class Canvas < LayerSet
     attr_reader :width, :height
     attr_accessor :image
@@ -7,8 +7,8 @@ module Rubyshop
       @image = Magick::Image.new width, height
       @width = width
       @height = height
-      $RubyshopCanvasWidth = @width
-      $RubyshopCanvasHeight = @height
+      $RCompositeCanvasWidth = @width
+      $RCompositeCanvasHeight = @height
 
       super(:canvas, &block)
     end

data/lib/{rubyshop → rcomposite}/filllayer.rb

@@ -1,4 +1,4 @@
-module Rubyshop
+module RComposite
   # Fill layer types
 
   SolidColor = 0
@@ -32,7 +32,7 @@ module Rubyshop
           fill = Magick::TextureFill.new(image)
       end
 
-      @image = Magick::Image.new($RubyshopCanvasWidth, $RubyshopCanvasHeight, fill)
+      @image = Magick::Image.new($RCompositeCanvasWidth, $RCompositeCanvasHeight, fill)
 
       @image.matte = true
       @mode = Normal

data/lib/{rubyshop → rcomposite}/layer.rb

@@ -1,4 +1,4 @@
-module Rubyshop
+module RComposite
   # Layer mode constants 
   #   some of photoshops layer modes are directly equvilent to RMagick 
   #   some are not, and some arent supported at all.
@@ -80,6 +80,10 @@ module Rubyshop
       @offset_y = y
     end
 
+    def rotate(degrees)
+      @image.rotate!(degrees)
+    end
+
     def opacity(percent)
       @opacity_percent = percent
       # intercept original alpha channel with pixel intensity

data/lib/{rubyshop → rcomposite}/layermask.rb

@@ -1,4 +1,4 @@
-module Rubyshop
+module RComposite
   class LayerMask < Layer
     def apply(layer)
       # apply layer mask to layer before merging down

data/lib/{rubyshop → rcomposite}/layerset.rb

@@ -1,11 +1,10 @@
-module Rubyshop
+module RComposite
   class LayerSet
     attr_accessor :layers
     attr_reader :min_x, :min_y, :max_x, :max_y, :bounding_width, :bounding_height, :name
     
     def initialize(name, &block)
       @layers = []
-      @layer_sets = {}
 
       bounding_box
       @name = name
@@ -13,23 +12,25 @@ module Rubyshop
       self.instance_eval &block if block_given?
     end
 
-    def layer_set(set_or_name, &block) 
-      if set_or_name.is_a? Rubyshop::LayerSet
-        # referencing a previously instanstiated LayerSet and adding to Canvas.
-        set = set_or_name
-        @layers << set
-        @layer_sets[set.name] = set 
-      
-      elsif @layer_sets[set_or_name]
-        # referencing a previously added LayerSet.
-        set = @layer_sets[set_or_name]
-      
+    def stack(&block)
+      self.instance_eval &block if block_given?
+    end
+
+    def layer_set(ref, position = :bottom, &block) 
+      if ref.is_a? RComposite::LayerSet
+        # referencing a previously instanstiated LayerSet.
+        set = ref 
       else    
-        # creating a new LayerSet and adding to Canvas.
-        set = LayerSet.new set_or_name  
-        @layers << set
-        @layer_sets[set_or_name] = set
+        # creating a new LayerSet
+        set = LayerSet.new ref  
       end     
+      
+      # Add layer set to render pipeline
+      if position == :bottom
+        @layers << set
+      elsif position == :top
+        @layers.unshift set
+      end
 
       # tie floating block methods (layer, rotate, offset, etc) to LayerSet object.
       set.instance_eval &block if block_given?
@@ -38,11 +39,13 @@ module Rubyshop
     end
     
     def layer(options, &block) 
-      if options.is_a? Rubyshop::Layer
+      if options.is_a? RComposite::Layer
         layer = options
       else
         layer = Layer.new options
       end
+
+      # Add layer to render pipeline
       @layers << layer
 
       # tie floating block methods (opacity, mode, offset, etc) to Layer object.
@@ -76,7 +79,6 @@ module Rubyshop
       
       # clear layers and sets
       @layers.clear
-      @layer_sets.clear
 
       # only 1 flattened layer now   
       @layers << Layer.new(flattened_image)
@@ -89,9 +91,9 @@ module Rubyshop
     def composite_layers(image, layers) 
       layers.reverse.each do |layer| 
         case layer
-          when Rubyshop::LayerSet
+          when RComposite::LayerSet
             image = composite_layers image, layer.layers
-          when Rubyshop::Layer
+          when RComposite::Layer
             layer.merge_down image
         end     
       end     
@@ -114,7 +116,7 @@ module Rubyshop
       @layers.delete(layer)
       bounding_box
     end
-    
+
     def bounding_box
       if @layers.size > 0
         x1 = []
@@ -181,7 +183,7 @@ module Rubyshop
         new_mid_x = ((layer_mid_x * cos) - (layer_mid_y * sin)).round
         new_mid_y = ((layer_mid_x * sin) + (layer_mid_y * cos)).round
       
-        layer.image.rotate!(degrees)
+        layer.rotate(degrees)
 
         new_offset_x = new_mid_x - (layer.width/2.0).round + @min_x + bounding_mid_x
         new_offset_y = new_mid_y * -1 - (layer.height/2.0).round + @min_y + bounding_mid_y

metadata

@@ -1,62 +1,73 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: rubyshop
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2006-11-10 00:00:00 -05:00
-summary: Powerful layer based image compositing made easy as pie.
-require_paths: 
-- lib
-email: corbanbrook@gmail.com
-homepage: http://schf.uc.org
-rubyforge_project: rubyshop
-description: 
-autorequire: rubyshop
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.3.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Corban Brook
-files: 
-- lib/rubyshop.rb
-- lib/rubyshop/adjustmentlayer.rb
-- lib/rubyshop/canvas.rb
-- lib/rubyshop/filllayer.rb
-- lib/rubyshop/layer.rb
-- lib/rubyshop/layermask.rb
-- lib/rubyshop/layerset.rb
-- lib/rubyshop/rubyshop.rb
-- LICENSE
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2009-08-13 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 2.0.0
     version: 
+description: RComposite (formally Rubyshop) is an RMagick abstraction library to easily manipulate and composite images through the use of a canvas, layers, layer masks, adjustment layers, fill layers, and layer sets (much like in Photoshop)
+email: corbanbrook@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- MIT-LICENSE
+files: 
+- README
+- MIT-LICENSE
+- lib/rcomposite.rb
+- lib/rcomposite/layer.rb
+- lib/rcomposite/layerset.rb
+- lib/rcomposite/adjustmentlayer.rb
+- lib/rcomposite/filllayer.rb
+- lib/rcomposite/canvas.rb
+- lib/rcomposite/layermask.rb
+has_rdoc: true
+homepage: http://github.com/corbanbrook/rcomposite
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: An RMagick abstration layer for easy image compositing
+test_files: []
+

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2006, Corban Riley
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-  * Neither the name of the Corban Riley nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/rubyshop.rb

@@ -1,8 +0,0 @@
-require 'rmagick'
-
-require 'rubyshop/layerset'
-require 'rubyshop/layer'
-require 'rubyshop/canvas'
-require 'rubyshop/filllayer'
-require 'rubyshop/adjustmentlayer'
-require 'rubyshop/layermask'

data/lib/rubyshop/rubyshop.rb

@@ -1,7 +0,0 @@
-require 'rmagick'
-
-require 'rubyshop/canvas'
-require 'rubyshop/layerset'
-require 'rubyshop/layer'
-require 'rubyshop/filllayer'
-require 'rubyshop/adjustmentlayer'