classx 0.0.2 → 0.0.3

data/lib/classx.rb

@@ -1,7 +1,15 @@
 require 'classx/attribute'
 require 'classx/attributes'
 
-class ClassX
+module ClassX
+  autoload :Validate,    'classx/validate'
+  autoload :Commandable, 'classx/commandable'
+  autoload :Declare,     'classx/declare'
+  autoload :Util,        'classx/util'
+  module Role
+    autoload :Logger,    'classx/role/logger'
+  end
+
   class InstanceException < Exception; end
   class AttrRequiredError < InstanceException; end
   class InvalidAttrArgument < InstanceException; end
@@ -9,7 +17,9 @@ class ClassX
   class OptionalAttrShouldBeWritable < Exception; end
   class RequiredAttrShouldNotHaveDefault < Exception; end
 
-  extend Attributes
+  def self.included klass
+    klass.extend(Attributes)
+  end
 
   def initialize *args
     hash = before_init(*args)

data/lib/classx/attribute.rb

@@ -1,4 +1,4 @@
-class ClassX
+module ClassX
   class AttributeFactory
     def self.create args
       klass = Class.new
@@ -109,7 +109,11 @@ class ClassX
             when Proc
               args[:default].call(parent)
             else
-              args[:default]
+              begin
+                args[:default].dup
+              rescue Exception
+                args[:default]
+              end
             end
           end
 
@@ -123,6 +127,9 @@ class ClassX
             return args[:lazy]
           end
 
+          define_method :inspect do
+            "ClassX::Attribute[#{self.config.inspect}]"
+          end
         end
         __send__ :extend, tmp_mod
 
@@ -168,7 +175,7 @@ class ClassX
         end
 
         define_method :inspect do
-          "<#ClassX::Attribute #{self.class.config.inspect}:#{object_id} #{ @data.nil? ? '' : '@data=' + @data.inspect } >"
+          "<#ClassX::Attribute:#{object_id} #{ @data.nil? ? '@data=nil' : '@data=' + @data.inspect } config=#{self.class.config.inspect}>"
         end
       end
 

data/lib/classx/attributes.rb

@@ -1,4 +1,4 @@
-class ClassX
+module ClassX
   module Attributes
     ATTRIBUTE_REGEX = /\Aattribute_of:(\w+)\z/
 
@@ -18,6 +18,12 @@ class ClassX
       def define_attribute name, attribute
         klass_attribute = ClassX::AttributeFactory.create(attribute)
         mod = Module.new
+        begin
+          mod = self.const_get('ClassMethods')
+        rescue NameError => e
+          mod = Module.new
+          const_set('ClassMethods', mod)
+        end
         mod.module_eval do
           define_method "attribute_of:#{name}" do
             klass_attribute
@@ -26,7 +32,7 @@ class ClassX
           private "attribute_of:#{name}"
         end
         self.extend(mod)
-        @__attribute_of ||= {}
+        @__attribute_of ||= self.attribute_of
         @__attribute_of[name] = klass_attribute
 
         define_method "attribute_of:#{name}" do
@@ -77,8 +83,9 @@ class ClassX
 
       alias has add_attribute
 
+      # hook for module to ClassX base class.
       def included klass
-        klass.extend self
+        klass.extend(self.const_get('ClassMethods'))
       end
 
   end

data/lib/classx/commandable.rb

@@ -2,7 +2,7 @@ require 'optparse'
 
 $ClassXCommandableMappingOf = {}
 
-class ClassX
+module ClassX
   module Commandable
     class MissingCoerceMapping < Exception; end
 
@@ -11,25 +11,45 @@ class ClassX
         begin
           opt.banner = "#{$0} [options]"
           value_of = {}
-          attribute_of.each do |key, val|
+          short_option_of = {}
+          attribute_of.keys.sort.each do |key|
+            val = attribute_of[key]
+            next if val.config[:no_cmd_option]
             
-            val_format = val.value_class ? val.value_class : "VAL"
+            val_format = val.value_class ? "#{val.value_class}" : "VAL"
             if val.optional?
-              val_format = "[ #{val_format} ]"
+              val_format = "[#{val_format}]"
+            end
+
+            short_option = key.split(//).first
+            unless short_option_of[short_option]
+              short_option_of[short_option] = key
             end
 
             if val.value_class
               begin
-                opt.on("--#{key} #{val_format}", val.value_class, val.desc) {|v| value_of[key] = v }
+                if short_option_of[short_option] == key
+                  opt.on("-#{short_option}", "--#{key} #{val_format}", val.value_class, val.desc) {|v| value_of[key] = v }
+                else
+                  opt.on("--#{key} #{val_format}", val.value_class, val.desc) {|v| value_of[key] = v }
+                end
               rescue Exception => e
                 if $ClassXCommandableMappingOf[val.value_class]
-                  opt.on("--#{key} #{val_format}", $ClassXCommandableMappingOf[val.value_class], val.desc) {|v| value_of[key] = v }
+                  if short_option_of[short_option] == key
+                    opt.on("-#{short_option}", "--#{key} #{$ClassXCommandableMappingOf[val.value_class]}", $ClassXCommandableMappingOf[val.value_class], val.desc) {|v| value_of[key] = v }
+                  else
+                    opt.on("--#{key} #{$ClassXCommandableMappingOf[val.value_class]}", $ClassXCommandableMappingOf[val.value_class], val.desc) {|v| value_of[key] = v }
+                  end
                 else
                   raise MissingCoerceMapping, "missing coerce rule. please specify $ClassXCommandableMappingOf"
                 end
               end
             else
-              opt.on("--#{key} #{val_format}") {|v| value_of[key] = v }
+              if short_option_of[short_option] == key
+                opt.on("-#{short_option}", "--#{key} #{val_format}") {|v| value_of[key] = v }
+              else
+                opt.on("--#{key} #{val_format}") {|v| value_of[key] = v }
+              end
             end
           end
 

data/lib/classx/declare.rb

@@ -0,0 +1,12 @@
+module ClassX
+  module Declare
+    def classx name, &block
+      klass = Class.new
+      klass.class_eval do
+        include(ClassX)
+      end
+      klass.class_eval &block
+      eval "::#{name.capitalize} = klass"
+    end
+  end
+end

data/lib/classx/role/logger.rb

@@ -0,0 +1,70 @@
+require 'logger'
+
+module ClassX
+  module Role
+    # SYNOPSIS
+    #
+    #   require 'classx/role/logger'
+    #   class YourApp < ClassX
+    #     extends ClassX::Commandable
+    #     include ClassX::Role::Logger
+    #   
+    #     def run
+    #       logger.debug("debug!!")
+    #       # do something
+    #     end
+    #   end
+    #
+    # and run following:
+    #
+    #   $ your_app.rb --logfile log/debug.log --log_level debug
+    #
+    # SEE ALSO: +ClassX::Commandable+
+    #
+    module Logger
+      extend ClassX::Attributes
+
+      module ToLogLevel
+        def to_log_level str=self.get
+          ::Logger::Severity.const_get(str.upcase)
+        end
+
+        alias to_i to_log_level
+      end
+
+      has :logger, 
+        :lazy          => true, 
+        :optional      => true,
+        :no_cmd_option => true,
+        :default       => proc {|mine|
+          logger = ::Logger.new(mine.logfile)
+          logger.level = mine.attribute_of['log_level'].to_i
+          logger.progname = $0
+
+          logger
+        }
+
+      has :log_level, 
+        :kind_of    => String,
+        :desc       => 'log_level (debug|info|warn|error|fatal) (default info)',
+        :optional   => true,
+        :default    => 'info',
+        :include    => ToLogLevel,
+        :validate   => proc {|val|
+          begin
+            ::Logger::Severity.const_get(val.upcase)
+          rescue NameError => e
+            return false
+          end
+          true
+        }
+
+      has :logfile,
+        :kind_of    => String,
+        :desc       => 'output logfile. (default STDERR)',
+        :optional   => true,
+        :default    => $stderr # hmm, is name bad?
+
+    end
+  end
+end

data/lib/classx/validate.rb

@@ -5,8 +5,8 @@ module ClassX::Validate
   #
   #   require 'classx/validate'
   #
-  #   class YourClass < ClassX
-  #     include Validate
+  #   class YourClass
+  #     include ClassX::Validate
   #
   #     def run params
   #       validate params do
@@ -27,7 +27,10 @@ module ClassX::Validate
     @@__validate_cached ||= {} 
     uniq_key = caller[0]
     unless @@__validate_cached[uniq_key]
-      @@__validate_cached[uniq_key] = Class.new(ClassX)
+      @@__validate_cached[uniq_key] = Class.new
+      @@__validate_cached[uniq_key].class_eval do
+        include ::ClassX
+      end
       @@__validate_cached[uniq_key].class_eval(&block)
     end
     @@__validate_cached[uniq_key].new hash 

data/spec/classx/default_option_spec.rb

@@ -6,8 +6,9 @@ describe ClassX do
     describe 'with :default option' do
       describe 'when value is Proc' do
         before do
-          @class = Class.new(ClassX)
+          @class = Class.new
           @class.class_eval do
+            include ClassX
             has :x, :default => proc { Object.new }
           end
         end
@@ -34,8 +35,9 @@ describe ClassX do
 
       describe 'when value is not Proc' do
         before do
-          @class = Class.new(ClassX)
+          @class = Class.new
           @class.class_eval do
+            include ClassX
             has :x, :default => []
           end
         end
@@ -43,17 +45,14 @@ describe ClassX do
         it 'should have any value when instanciate' do
           @class.new.x.should == []
         end
-
-        it 'should have the same object_id between some instance' do
-          @class.new.x.should equal(@class.new.x)
-        end
       end
     end
 
     describe 'with :optional is false' do
       before do
-        @class = Class.new(ClassX)
+        @class = Class.new
         @class.class_eval do
+          include ClassX
           has :x, :optional => false
         end
       end
@@ -74,8 +73,9 @@ describe ClassX do
     describe ':optional is false and with :default option' do
       it 'should raise ClassX::RequiredAttrShouldNotHaveDefault' do
         lambda {
-          klass = Class.new(ClassX)
+          klass = Class.new
           klass.class_eval do
+            include ClassX
             has :x, :optional => false, :default => 1
           end
         }.should raise_error(ClassX::RequiredAttrShouldNotHaveDefault)
@@ -84,8 +84,9 @@ describe ClassX do
 
     describe 'declare attribute without :optional and :default option' do
       before do
-        @class = Class.new(ClassX)
+        @class = Class.new
         @class.class_eval do
+          include ClassX
           has :x, :kind_of => Integer
         end
       end
@@ -97,8 +98,9 @@ describe ClassX do
 
     describe ':optional is true and without :default option' do
       before do
-        @class = Class.new(ClassX)
+        @class = Class.new
         @class.class_eval do
+          include ClassX
           has :x, :optional => true, :kind_of => Integer
         end
       end
@@ -111,8 +113,9 @@ describe ClassX do
     describe 'with :optional is true' do
       describe 'without :writable option' do
         before do
-          @class = Class.new(ClassX)
+          @class = Class.new
           @class.class_eval do 
+            include ClassX
             has :x, :optional => true
           end
         end
@@ -124,8 +127,9 @@ describe ClassX do
 
     describe 'not attribute param exist in #initialize argument' do
       before do
-          @class = Class.new(ClassX)
+          @class = Class.new
           @class.class_eval do 
+            include ClassX
             has :x
           end
       end

data/spec/classx/handles_spec.rb

@@ -5,8 +5,9 @@ describe ClassX do
   describe '#has' do
     describe 'with handles option as Hash' do
       before do
-        @class1 = Class.new(ClassX)
+        @class1 = Class.new
         @class1.class_eval do
+          include ClassX
           has :x, :handles => { :x_inspect => :inspect }
         end
       end
@@ -24,8 +25,10 @@ describe ClassX do
 
     describe 'with handles option as Array' do
       before do
-        @class1 = Class.new(ClassX)
+        @class1 = Class.new
         @class1.class_eval do
+          include ClassX
+
           has :x, :handles => [ :length ]
         end
       end

data/spec/classx/with_coerce.rb

@@ -6,8 +6,10 @@ describe ClassX do
     describe 'with coece' do
       describe 'when Array is value' do
         before do
-          @class = Class.new(ClassX)
+          @class = Class.new
           @class.class_eval do
+            include ClassX
+
             has :x, :isa => Integer, :coerce => [
               { proc {|val| val.respond_to? :to_i } => proc {|val| val.to_i } },
               { proc {|val| val.respond_to? :to_s } => proc {|val| val.to_s } },
@@ -26,8 +28,10 @@ describe ClassX do
 
       describe 'when Proc is key' do
         before do
-          @class = Class.new(ClassX)
+          @class = Class.new
           @class.class_eval do
+            include ClassX
+
             has :x, :isa => Integer, :coerce => { proc {|val| val.respond_to? :to_i } => proc {|val| val.to_i } }
           end
         end
@@ -43,8 +47,10 @@ describe ClassX do
 
       describe 'when Symbol is key' do
         before do
-          @class = Class.new(ClassX)
+          @class = Class.new
           @class.class_eval do
+            include ClassX
+
             has :x, :isa => Integer, :coerce => { :to_i => proc {|val| val.to_i } }
           end
         end
@@ -60,8 +66,10 @@ describe ClassX do
 
       describe 'when Module or Class is key' do
         before do
-          @class = Class.new(ClassX)
+          @class = Class.new
           @class.class_eval do
+            include ClassX
+
             has :x, :isa => Integer, :coerce => { String => proc {|val| val.to_i } }
           end
         end

data/spec/classx/with_extend.rb

@@ -5,7 +5,7 @@ describe ClassX do
   describe '#has' do
     describe 'with extend' do
       before do
-        @class = Class.new(ClassX)
+        @class = Class.new
         mod = Module.new
         mod.module_eval do
           define_method :test do
@@ -13,6 +13,8 @@ describe ClassX do
           end
         end
         @class.class_eval do
+          include ClassX
+
           has :x, :extend => mod
         end
       end