subtype 0.0.2 → 0.0.3

data/lib/subtype.rb

@@ -18,8 +18,8 @@
 #++
 
 class ::Subtle::Sublet
-  def use(str)
-    self.instance_eval(str) if str.is_a?(String)
+  def use (klass)
+    klass.included(self)
   end
 end
 
@@ -61,95 +61,101 @@ module SubType
     end
   end
 
-  Rotate = <<-EOF
-  alias __set_data__ data=
-  alias __get_data__ data
-  alias __on__ on
-
-  self.rotation = SubType::RotationType.new('', self.config[:length])
-  self.thread = Thread.start(self) {|s|
-    loop {
-      s.__set_data__(s.data.pre + s.data.next + s.data.post)
-      sleep 0.1
-    }
-  }
-
-  def data=(str)
-    self.rotation.update(str)
-    str
-  end
-
-  def data
-    self.rotation
-  end
-
-  def on(meth, &blk)
-    case meth
-    when :unload
-      __on__(meth) {|s|
-        blk.call(s)
-        s.thread.kill
+  module Rotate
+    def self.included (klass)
+      klass.instance_eval {
+        alias __set_data__ data=
+        alias __get_data__ data
+        alias __on__ on
+
+        self.rotation = SubType::RotationType.new('', self.config[:length])
+        self.thread = Thread.start(self) {|s|
+          loop {
+            s.__set_data__(s.data.pre + s.data.next + s.data.post)
+            sleep 0.1
+          }
+        }
+
+        def data=(str)
+          self.rotation.update(str)
+          str
+        end
+
+        def data
+          self.rotation
+        end
+
+        def on(meth, &blk)
+          case meth
+          when :unload
+            __on__(meth) {|s|
+              blk.call(s)
+              s.thread.kill
+            }
+          else
+            __on__(meth, &blk)
+          end
+        end
       }
-    else
-      __on__(meth, &blk)
     end
   end
-EOF
-
-  Expand = <<-EOF
-  helper do
-    def __refresh
-      begin
-        self.data = self.respond_to?(:refresh) ? self.refresh : ''
-      rescue
-        self.data = 'ERROR'
-      end
-    end
-  end
-
-  on :run do |s|
-    s.type = s.type ? s.type : :short
-    s.__refresh
-  end
 
-  on :mouse_over do |s|
-    s.type = :long
-    s.__refresh
-  end
-
-  on :mouse_out do |s|
-    s.type = :short
-    s.__refresh
-  end
-
-  alias __on__ on
-
-  def on(meth, &blk)
-    case meth
-    when :run
-      __on__(meth) {|s|
-        s.type = s.type ? s.type : :short
-        blk.call(s)
-        s.__refresh
-      }
-    when :mouse_over
-      __on__(meth) {|s|
-        blk.call(s)
-        s.type = :long
-        s.__refresh
-      }
-    when :mouse_out
-      __on__(meth) {|s|
-        blk.call(s)
-        s.type = :short
-        s.__refresh
-      }
-    else
-      __on__(meth) {|*args|
-        blk.call(*args)
-        args.last.__refresh
+  module Expand
+    def self.included (klass)
+      klass.instance_eval {
+        helper do
+          def __refresh
+            self.data = self.respond_to?(:refresh) ? self.refresh : ''
+          rescue
+            self.data = 'ERROR'
+          end
+        end
+
+        on :run do |s|
+          s.type = s.type ? s.type : :short
+          s.__refresh
+        end
+
+        on :mouse_over do |s|
+          s.type = :long
+          s.__refresh
+        end
+
+        on :mouse_out do |s|
+          s.type = :short
+          s.__refresh
+        end
+
+        alias __on__ on
+
+        def on(meth, &blk)
+          case meth
+          when :run
+            __on__(meth) {|s|
+              s.type = s.type ? s.type : :short
+              blk.call(s)
+              s.__refresh
+            }
+          when :mouse_over
+            __on__(meth) {|s|
+              blk.call(s)
+              s.type = :long
+              s.__refresh
+            }
+          when :mouse_out
+            __on__(meth) {|s|
+              blk.call(s)
+              s.type = :short
+              s.__refresh
+            }
+          else
+            __on__(meth) {|*args|
+              blk.call(*args)
+              args.last.__refresh
+            }
+          end
+        end
       }
     end
   end
-EOF
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - shura
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +02:00
+date: 2011-06-23 00:00:00 +02:00
 default_executable: 
 dependencies: []