texplay 0.3.5 → 0.4

metadata

@@ -1,46 +1,60 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: texplay
-version: !ruby/object:Gem::Version
-  version: 0.3.5
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: "0.4"
 platform: ruby
-authors:
+authors: 
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-22 00:00:00.000000000 +13:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: gosu
-  requirement: &16942704 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.7.25
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: *16942704
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: &16942356 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
   prerelease: false
-  version_requirements: *16942356
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.9
+  type: :development
+  version_requirements: *id003
 description: TexPlay is a light-weight image manipulation framework for Ruby and Gosu
-email: jrmair@gmail.com
+email: 
+- jrmair@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/texplay/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - Rakefile
 - README.markdown
 - CHANGELOG
@@ -55,17 +69,13 @@ files:
 - ext/texplay/bindings.h
 - ext/texplay/cache.h
 - ext/texplay/compat.h
-- ext/texplay/gen_eval.h
 - ext/texplay/graphics_utils.h
-- ext/texplay/object2module.h
 - ext/texplay/texplay.h
 - ext/texplay/utils.h
 - ext/texplay/actions.c
 - ext/texplay/bindings.c
 - ext/texplay/cache.c
-- ext/texplay/gen_eval.c
 - ext/texplay/graphics_utils.c
-- ext/texplay/object2module.c
 - ext/texplay/texplay.c
 - ext/texplay/utils.c
 - examples/common.rb
@@ -84,7 +94,6 @@ files:
 - examples/example_fill_old.rb
 - examples/example_fluent.rb
 - examples/example_font.rb
-- examples/example_gen_eval.rb
 - examples/example_hash_arguments.rb
 - examples/example_ippa.rb
 - examples/example_light.rb
@@ -126,29 +135,32 @@ files:
 - test/texplay_spec.rb
 - live/live.rb
 - .gemtest
-has_rdoc: true
 homepage: http://banisterfiend.wordpress.com/2008/08/23/texplay-an-image-manipulation-tool-for-ruby-and-gosu/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: TexPlay is a light-weight image manipulation framework for Ruby and Gosu
 test_files: []
+

data/examples/example_gen_eval.rb

@@ -1,32 +0,0 @@
-$LOAD_PATH.unshift File.dirname(File.expand_path(__FILE__))
-require 'common'
-
-
-class W < Gosu::Window
-    def initialize
-        super(500, 500, false, 20)
-        @img = Gosu::Image.new(self, "#{Common::MEDIA}/empty2.png")
-
-        @width = @img.width
-        @height = @img.height
-
-        # turn alpha blending and filling on
-        @img.set_options :alpha_blend => true, :fill => true
-    end
-    def draw
-        
-        # Gen_eval lets us use local instance vars within the block
-        # even though the block appears to be getting instance_eval'd
-        # for more information see gen_eval.c and object2module.c
-        @img.paint {
-            rect @width * rand, @height * rand, @width * rand, @height * rand,
-            :color => [rand, rand ,rand, rand]
-        }  
-        
-        @img.draw 0, 0,1
-    end
-end
-
-w = W.new
-w.show
-        

data/ext/texplay/gen_eval.c

@@ -1,211 +0,0 @@
-/* gen_eval.c */
-/* (C) John Mair 2009
- * This program is distributed under the terms of the MIT License
- *                                                                */
-
-#include <ruby.h>
-#include "object2module.h"
-#include "compat.h"
-
-VALUE
-retrieve_hidden_self(VALUE duped_context)
-{
-    VALUE thread_id, unique_name, hidden_self;
-    
-    /* retrieve hidden self (if it exists) */
-    thread_id = rb_funcall(rb_obj_id(rb_thread_current()), rb_intern("to_s"), 0);
-    unique_name = rb_str_plus(rb_str_new2("__hidden_self__"), thread_id);
-    
-    hidden_self = rb_ivar_get(duped_context, rb_to_id(unique_name));
-
-    return hidden_self;
-}
-
-void
-set_hidden_self(VALUE duped_context, VALUE hidden_self)
-{
-    VALUE thread_id, unique_name;
-    
-    /* generate a unique (thread safe) name for the hidden self  */
-    thread_id = rb_funcall(rb_obj_id(rb_thread_current()), rb_intern("to_s"), 0);
-    unique_name = rb_str_plus(rb_str_new2("__hidden_self__"), thread_id);
-
-    /* store self in hidden var in duped context */
-    rb_ivar_set(duped_context, rb_to_id(unique_name), hidden_self);
-}
-
-VALUE
-rb_capture(VALUE self) {
-    VALUE hidden_self;
-    VALUE result;
-    
-    rb_need_block();
-    
-    hidden_self = retrieve_hidden_self(self);
-
-    /* 2 cases: (1) if rb_gen_eval is active then instance_eval wrt hidden_self
-                (2) otherwise simply yield to the block
-    */
-    if(!NIL_P(hidden_self))
-        result = rb_obj_instance_eval(0, 0, hidden_self);
-    else
-        result = rb_yield(Qnil);
-
-    /* we want the return value of capture to be the return value of the block */
-    return result;
-}
-
-/** ruby 1.9 funcs **/
-#ifdef RUBY_19
-void
-redirect_iv_for_object(VALUE obj, VALUE dest)
-{
-    if(TYPE(obj) != T_OBJECT)
-        rb_raise(rb_eArgError, "must provide a T_OBJECT");
-
-    if (!(RBASIC(dest)->flags & ROBJECT_EMBED) && ROBJECT_IVPTR(dest)) {
-        rb_raise(rb_eArgError, "im sorry gen_eval does not yet work with this type of ROBJECT");
-    }
-    if (RBASIC(obj)->flags & ROBJECT_EMBED) {
-        rb_raise(rb_eArgError, "im sorry gen_eval does not yet work with ROBJECT_EMBED types");
-    }
-    else {
-        ROBJECT(dest)->as.heap.ivptr = ROBJECT(obj)->as.heap.ivptr;
-        ROBJECT(dest)->as.heap.numiv = ROBJECT(obj)->as.heap.numiv;
-        ROBJECT(dest)->as.heap.iv_index_tbl = ROBJECT(obj)->as.heap.iv_index_tbl;
-        RBASIC(dest)->flags &= ~ROBJECT_EMBED;
-    }
-}
-
-void
-release_iv_for_object(VALUE obj)
-{
-    if(TYPE(obj) != T_OBJECT)
-        rb_raise(rb_eArgError, "must provide a T_OBJECT");
-    
-    ROBJECT(obj)->as.heap.ivptr = (void *) 0;
-    ROBJECT(obj)->as.heap.numiv = 0;
-    ROBJECT(obj)->as.heap.iv_index_tbl = (void *) 0;
-    RBASIC(obj)->flags &= ~ROBJECT_EMBED;
-}
-#endif
-/** end of ruby 1.9 funcs **/
-
-VALUE
-rb_gen_eval(int argc, VALUE * argv, VALUE self) {
-    VALUE duped_context;
-    VALUE is_a_module;
-    VALUE context;
-    VALUE result;
-    
-    rb_need_block();
-        
-    context = rb_funcall(rb_block_proc(), rb_intern("__context__"), 0);
-
-    /* using Class instead of Object (where possible) because Object's iv_tbl setup in 1.9 is weird */
-#ifdef RUBY_19
-    if(TYPE(context) == T_OBJECT)
-        duped_context = rb_funcall(rb_cObject, rb_intern("new"), 0);
-    else 
-        duped_context = rb_funcall(rb_cClass, rb_intern("new"), 0);
-
-#else
-
-    duped_context = rb_funcall(rb_cClass, rb_intern("new"), 0);
-
-#endif    
-    
-    
-    /* the duped_context shares the context's iv_tbl.
-       2 cases: (1) external iv_tbl, (2) local iv_tbl
-       
-       NOTE: we do not need to save original iv_tbl before replacing it, a brand new Class
-       instance does not yet have an iv_tbl (the pointer is set to 0) 
-    */
-    if(FL_TEST(context, FL_EXIVAR)) 
-        RCLASS_IV_TBL(duped_context) = (struct st_table *) rb_generic_ivar_table(context);
-    else {
-#ifdef RUBY_19
-        if(TYPE(context) == T_OBJECT)
-            redirect_iv_for_object(context, duped_context);
-        else {
-            RCLASS_IV_TBL(duped_context) = (struct st_table *) RCLASS_IV_TBL(context);
-        }
-#else
-        RCLASS_IV_TBL(duped_context) = (struct st_table *) RCLASS_IV_TBL(context);
-#endif        
-
-        
-    }
-        
-    /* ensure singleton exists */
-    rb_singleton_class(context);
-    
-    /* set up the class hierarchy for our dup_context */
-    KLASS_OF(duped_context) = rb_singleton_class_clone(context);
-
-    /* if no args then default to mixing in 'self' */
-    if(argc == 0) {
-        argc = 1;
-        argv = &self;
-    }
-
-    /* mix the objects (or self) into the duped context */
-    rb_gen_extend(argc, argv, duped_context);
-
-    /* store self in hidden var in duped context */
-    set_hidden_self(duped_context, self);
-
-    is_a_module = rb_funcall(duped_context, rb_intern("is_a?"), 1, rb_cModule);
-
-    /* eval block wrt duped_context */
-    if(is_a_module == Qtrue)
-        result = rb_mod_module_eval(0, 0, duped_context);
-    else
-        result = rb_obj_instance_eval(0, 0, duped_context);
-
-    /* clean up goes below */
-
-    /* release context's iv_tbl from duped_context. */
-#ifdef RUBY_19
-    if(TYPE(duped_context) == T_OBJECT)
-        release_iv_for_object(duped_context);
-    else {
-        RCLASS_IV_TBL(duped_context) = (struct st_table *) 0;
-    }
-#else
-    RCLASS_IV_TBL(duped_context) = (struct st_table *) 0;
-#endif
-
-    /* delete hidden self */
-    set_hidden_self(duped_context, Qnil);
-    
-    return result;
-}
-
-void
-Init_gen_eval() {
-
-    rb_define_method(rb_cObject, "gen_eval", rb_gen_eval, -1);
-    rb_define_method(rb_cObject, "capture", rb_capture, 0);
-    
-    rb_define_method(rb_cObject, "to_module", rb_to_module , 0);
-    rb_define_method(rb_cObject, "reset_tbls", rb_reset_tbls , 0);
-    rb_define_method(rb_cObject, "gen_extend", rb_gen_extend, -1);
-    rb_define_method(rb_cModule, "gen_include", rb_gen_include, -1);
-
-    /* below is much too hard to achieve in pure C */
-    rb_eval_string("class Proc;"
-                   "    def __context__;"
-                   "        eval('self', self.binding);"
-                   "    end;"
-                   "end;"
-                   );
-    
-    rb_define_alias(rb_cObject, "gen_eval_with", "gen_eval");
-}
-
-    
-    
-
-    

data/ext/texplay/gen_eval.h

@@ -1,20 +0,0 @@
-/* gen_eval.h */
-
-#ifndef GUARD_GEN_EVAL_H
-#define GUARD_GEN_EVAL_H
-
-#include <ruby.h>
-
-VALUE rb_gen_eval(int argc, VALUE * argv, VALUE self);
-VALUE rb_capture(VALUE self);
-VALUE retrieve_hidden_self(VALUE duped_context);
-void set_hidden_self(VALUE duped_context, VALUE hidden_self);
-
-/* change self to hidden self if __hidden_self__ defined */
-#define ADJUST_SELF(X)                                                    \
-  do {                                                                    \
-      if(!NIL_P(retrieve_hidden_self((X))))                               \
-          (X) = retrieve_hidden_self((X));                                \
-  } while(0)
-        
-#endif

data/ext/texplay/object2module.c

@@ -1,171 +0,0 @@
-/* object2module.c */
-/* (C) John Mair 2009
- * This program is distributed under the terms of the MIT License
- *                                                                */
-
-#include <ruby.h>
-#include "compat.h"
-
-#ifdef RUBY_19
-# include <ruby/st.h>
-#else
-# include <st.h>
-#endif
-
-/* class creation. from class.c in 1.9.1 */
-#ifdef RUBY_19
-static VALUE
-class_alloc(VALUE flags, VALUE klass)
-{
-    rb_classext_t *ext = ALLOC(rb_classext_t);
-    NEWOBJ(obj, struct RClass);
-    OBJSETUP(obj, klass, flags);
-    obj->ptr = ext;
-    RCLASS_IV_TBL(obj) = 0;
-    RCLASS_M_TBL(obj) = 0;
-    RCLASS_SUPER(obj) = 0;
-    RCLASS_IV_INDEX_TBL(obj) = 0;
-    return (VALUE)obj;
-}
-#endif
-
-/* a modified version of include_class_new from class.c */
-static VALUE
-j_class_new(VALUE module, VALUE sup)
-{
-
-#ifdef RUBY_19
-    VALUE klass = class_alloc(T_ICLASS, rb_cClass);
-#else
-    NEWOBJ(klass, struct RClass);
-    OBJSETUP(klass, rb_cClass, T_ICLASS);
-#endif
-
-    if (BUILTIN_TYPE(module) == T_ICLASS) {
-        module = KLASS_OF(module);
-    }
-
-    if (!RCLASS_IV_TBL(module)) {
-
-        RCLASS_IV_TBL(module) = (struct st_table *)st_init_numtable();
-    }
-
-    /* assign iv_tbl, m_tbl and super */
-    RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
-    RCLASS_SUPER(klass) = sup;
-    if(TYPE(module) != T_OBJECT) {
-
-        RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
-    }
-    else {
-        RCLASS_M_TBL(klass) = RCLASS_M_TBL(CLASS_OF(module));
-    }
-
-    /* */
-
-    if (TYPE(module) == T_ICLASS) {
-        KLASS_OF(klass) = KLASS_OF(module);
-    }
-    else {
-        KLASS_OF(klass) = module;
-    }
-
-    if(TYPE(module) != T_OBJECT) {
-        OBJ_INFECT(klass, module);
-        OBJ_INFECT(klass, sup);
-    }
-    return (VALUE)klass;
-}
-
-VALUE
-rb_to_module(VALUE self)
-{
-    VALUE rclass, chain_start, jcur, klass;
-
-    switch(BUILTIN_TYPE(self)) {
-    case T_MODULE:
-        return self;
-    case T_CLASS:
-        klass = self;
-        break;
-    case T_OBJECT:
-    default:
-        klass = rb_singleton_class(self);            
-    }
-            
-    chain_start = j_class_new(klass, rb_cObject);
-
-    KLASS_OF(chain_start) = rb_cModule;
-    RBASIC(chain_start)->flags = T_MODULE;
-
-    jcur = chain_start;
-    for(rclass = RCLASS_SUPER(klass); rclass != rb_cObject;
-        rclass = RCLASS_SUPER(rclass)) {
-                
-        RCLASS_SUPER(jcur) = j_class_new(rclass, rb_cObject);
-        jcur = RCLASS_SUPER(jcur);
-    }
-
-    RCLASS_SUPER(jcur) = (VALUE)NULL;
-
-    return chain_start;
-}
-
-VALUE
-rb_reset_tbls(VALUE self)
-{
-    RCLASS_IV_TBL(self) = (struct st_table *) 0;
-    RCLASS_M_TBL(self) = (struct st_table *) st_init_numtable();
-    return Qnil;
-}
-
-/* cannot simply forward to gen_include as need to invoke 'extended' hook */
-VALUE
-rb_gen_extend(int argc, VALUE * argv, VALUE self)
-{
-    int i;
-
-    if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
-    
-    rb_singleton_class(self);
-
-    for(i = 0; i < argc; i++) {
-        VALUE mod = rb_to_module(argv[i]); 
-        rb_funcall(mod, rb_intern("extend_object"), 1, self);
-        rb_funcall(mod, rb_intern("extended"), 1, self);
-        
-        /* only redirect if argv[i] is not a module */
-        if(argv[i] != mod) rb_reset_tbls(mod);
-    }
-
-    return self;
-}
-
-VALUE
-rb_gen_include(int argc, VALUE * argv, VALUE self)
-{
-    int i;
-
-    if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
-
-    for(i = 0; i < argc; i++) {
-        VALUE mod = rb_to_module(argv[i]); 
-        rb_funcall(mod, rb_intern("append_features"), 1, self);
-        rb_funcall(mod, rb_intern("included"), 1, self);
-        
-        if(argv[i] != mod) rb_reset_tbls(mod);       
-    }
-
-    return self;
-}
- 
-
-void Init_object2module()
-{
-
-    rb_define_method(rb_cObject, "to_module", rb_to_module , 0);
-    rb_define_method(rb_cObject, "gen_extend", rb_gen_extend, -1);
-    rb_define_method(rb_cModule, "gen_include", rb_gen_include, -1);
-    rb_define_method(rb_cModule, "reset_tbls", rb_reset_tbls, 0);
-}
-