versionub 0.0.1 → 0.0.2

data/lib/versionub/type.rb

@@ -23,6 +23,24 @@ module Versionub
 
 class Type
   class Instance
+    def self.parser (&block)
+      if block
+        @parser = Class.new(Parslet::Parser)
+        @parser.class_eval(&block)
+      end
+
+      @parser
+    end
+
+    def self.transformer (&block)
+      if block
+        @transformer = Class.new(Parslet::Transform)
+        @transformer.class_eval(&block)
+      end
+
+      @transformer
+    end
+
     attr_reader :type
 
     def initialize (type, text, data)
@@ -46,41 +64,19 @@ class Type
     @name     = name
     @instance = Class.new(Instance)
 
-    instance_eval &block
+    @instance.instance_eval &block
   end
 
   def parse (text)
-    data = parser.new.parse(text)
+    data = @instance.parser.new.parse(text)
 
-    if transformer
-      data = transformer.apply(data)
+    if @instance.transformer
+      data = @instance.transformer.apply(data)
     end
 
     @instance.new(name, text, data)
   end
 
-  def parser (&block)
-    if block
-      @parser = Class.new(Parslet::Parser)
-      @parser.class_eval(&block)
-    end
-
-    @parser
-  end
-
-  def transformer (&block)
-    if block
-      @transformer = Class.new(Parslet::Transform)
-      @transformer.class_eval(&block)
-    end
-
-    @transformer
-  end
-
-  def callbacks (&block)
-    @instance.class_eval &block
-    @instance.instance_methods
-  end
 end
 
 end

data/lib/versionub/types/standard.rb

@@ -44,85 +44,83 @@ Versionub.register :standard do
     root :version
   end
 
-  callbacks do
-    def major
-      @data[:major].to_s if @data[:major]
-    end
-
-    def minor
-      @data[:minor].to_s if @data[:minor]
-    end
+  def major
+    @data[:major].to_s if @data[:major]
+  end
 
-    def bugfix
-      @data[:bugfix].to_s if @data[:bugfix]
-    end
+  def minor
+    @data[:minor].to_s if @data[:minor]
+  end
 
-    def release_candidate
-      @data[:rc].is_a?(Array) ? '0' : @data[:rc].to_s
-    end; alias rc release_candidate
+  def bugfix
+    @data[:bugfix].to_s if @data[:bugfix]
+  end
 
-    def development
-      @data[:development].is_a?(Array) ? '0' : @data[:development].to_s
-    end; alias d development; alias dev development;
+  def release_candidate
+    @data[:rc].is_a?(Array) ? '0' : @data[:rc].to_s
+  end; alias rc release_candidate
 
-    def alpha
-      @data[:alpha].is_a?(Array) ? '0' : @data[:alpha].to_s
-    end; alias a alpha; alias alfa alpha
+  def development
+    @data[:development].is_a?(Array) ? '0' : @data[:development].to_s
+  end; alias d development; alias dev development;
 
-    def beta
-      @data[:beta].is_a?(Array) ? '0' : @data[:beta].to_s
-    end; alias b beta
+  def alpha
+    @data[:alpha].is_a?(Array) ? '0' : @data[:alpha].to_s
+  end; alias a alpha; alias alfa alpha
 
-    def release_candidate?
-      !!@data[:rc]
-    end
+  def beta
+    @data[:beta].is_a?(Array) ? '0' : @data[:beta].to_s
+  end; alias b beta
 
-    def development?
-      !!@data[:development]
-    end
+  def release_candidate?
+    !!@data[:rc]
+  end
 
-    def alpha?
-      !!@data[:alpha]
-    end
+  def development?
+    !!@data[:development]
+  end
 
-    def beta?
-      !!@data[:beta]
-    end
+  def alpha?
+    !!@data[:alpha]
+  end
 
-    include Comparable
+  def beta?
+    !!@data[:beta]
+  end
 
-    def <=> (value)
-      value = Versionub.parse(value)
+  include Comparable
 
-      if release_candidate? && value.release_candidate? && (tmp = (rc <=> value.rc))
-        return tmp
-      end
+  def <=> (value)
+    value = Versionub.parse(value)
 
-      if development? && value.development? && (tmp = (development <=> value.development))
-        return tmp
-      end
+    if release_candidate? && value.release_candidate? && (tmp = (rc <=> value.rc))
+      return tmp
+    end
 
-      if alpha? && value.alpha? && (tmp = (alpha <=> value.alpha))
-        return tmp
-      end
+    if development? && value.development? && (tmp = (development <=> value.development))
+      return tmp
+    end
 
-      if beta? && value.beta? && (tmp = (beta <=> value.beta))
-        return tmp
-      end
+    if alpha? && value.alpha? && (tmp = (alpha <=> value.alpha))
+      return tmp
+    end
 
-      if (tmp = (bugfix <=> value.bugfix)) != 0
-        return tmp
-      end
+    if beta? && value.beta? && (tmp = (beta <=> value.beta))
+      return tmp
+    end
 
-      if (tmp = (minor <=> value.minor)) != 0
-        return tmp
-      end
+    if (tmp = (bugfix <=> value.bugfix)) != 0
+      return tmp
+    end
 
-      if (tmp = (major <=> value.major)) != 0
-        return tmp
-      end
+    if (tmp = (minor <=> value.minor)) != 0
+      return tmp
+    end
 
-      0
+    if (tmp = (major <=> value.major)) != 0
+      return tmp
     end
+
+    0
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: versionub
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - meh.