classx 0.0.5 → 0.0.6

data/lib/classx.rb

@@ -12,7 +12,7 @@ require 'classx/attributes'
 #   end
 #   
 #   class Point3D < Point
-#     has :z, :writable => true, :kind_of => Fixnum, :optional => true
+#     has :z, :kind_of => Fixnum, :optional => true
 #   end
 #   
 #   Point.new(:x => 30, :y => 40)  #=> <# Point @x=30, @y=40 >

data/lib/classx/attribute.rb

@@ -181,7 +181,7 @@ module ClassX
       #   It's because caching as instance_variable in @parent instance for performance.
       def set val
         val = self.class.coerce(val)
-        raise ClassX::InvalidAttrArgument unless self.class.validate? val
+        raise ClassX::InvalidAttrArgument, "#{val.inspect} is not valid for #{self.inspect}" unless self.class.validate? val
         @data = val
 
         self.class.trigger(@parent, val)

data/lib/classx/attributes.rb

@@ -82,10 +82,13 @@ module ClassX
       #   class YourClass
       #     include ClassX
       #     add_attribute :x,
-      #       :writable => true,  # defining accessor scope.
+      #       :writable => false  # defining accessor scope.
       #       :optional => ture,  # defining attribute is required in initialize.
       #       :validate => proc {|val| val.respond_to? :to_s }  # this attribute's value should adopted to this rule.
       #       :default  => proc {|mine| mine.class.to_s.split(/::/).last.downcase } # default value for this attribute.
+      #       :handle   => [ :foo, :bar, :baz ]  # define method :foo, :bar, :baz to delegate x's method.
+      #       :coerce   => { String => proc {|val| val.to_i } } # when it set String value, force convert to Integer.
+      #       :trigger  => proc {|mine,val| mine.y = val } # when this attribute set value, also update y attribute.
       #
       #   end
       #
@@ -118,12 +121,11 @@ module ClassX
 
         define_method "#{name}=" do |val|
           attr_instance = __send__ "attribute_of:#{name}"
-          attr_instance.set val
           @__attribute_data_of ||= {}
-          @__attribute_data_of[name] = val
+          @__attribute_data_of[name] = attr_instance.set val
         end
 
-        unless attr_class.config[:writable]
+        if attr_class.config[:writable] == false
           private "#{name}="
         end
 

data/lib/classx/class_attributes.rb

@@ -133,7 +133,7 @@ module ClassX
             @__class_attribute_data_of[name] = val
           end
 
-          unless attr_class.config[:writable]
+          if attr_class.config[:writable] == false
             private "#{name}="
           end
 

data/lib/classx/validate.rb

@@ -20,20 +20,33 @@
 #
 module ClassX::Validate
   private 
-  def validate hash, &block #:doc:
+  def validate hash, options={}, &block #:doc:
     # FIXME: it's experimental feature for caching validate class.
     # it can use class variable because it use caller[0] as key.
-    @@__validate_cached ||= {}
-    uniq_key = caller[0]
-    unless @@__validate_cached[uniq_key]
-      @@__validate_cached[uniq_key] = Class.new
-      @@__validate_cached[uniq_key].class_eval do
+    if options[:cache_key] != false
+      options[:cache_key] = caller[0]
+    end
+
+    if ( options[:cache_key] )
+      @@__validate_cached ||= {}
+      klass = @@__validate_cached[options[:cache_key]]
+    else
+      klass = nil
+    end
+
+    unless klass
+      klass = Class.new
+      klass.class_eval do
         include ::ClassX
         include ::ClassX::Bracketable
       end
-      @@__validate_cached[uniq_key].class_eval(&block)
+      klass.class_eval(&block)
+
+      if options[:cache_key]
+        @@__validate_cached[options[:cache_key]] = klass
+      end
     end
-    @@__validate_cached[uniq_key].new hash
+    klass.new hash
   end
 
   module_function :validate

data/spec/classx/with_coerce_spec.rb

@@ -90,7 +90,7 @@ describe ClassX do
           @class.class_eval do
             include ClassX
 
-            has :x, :isa => Integer, :coerce => { String => proc {|val| val.to_i } }
+            has :x, :isa => Integer, :coerce => { String => proc {|val| val.to_i } }, :writable => true
           end
         end
 
@@ -101,6 +101,12 @@ describe ClassX do
         it 'attrubute :x should not convert  Object to Integer' do
           lambda { @class.new(:x => Object.new ) }.should raise_error(ClassX::InvalidAttrArgument)
         end
+
+        it 'should convert Str to Integer when you rewrite attribute :x' do
+          instance = @class.new(:x => "10")
+          lambda { instance.x = "20" }.should_not raise_error(Exception)
+          instance.x.should == 20
+        end
       end
     end
   end

data/spec/classx/without_anyoption_spec.rb

@@ -17,8 +17,10 @@ describe ClassX do
           lambda { @class.new }.should raise_error(ClassX::AttrRequiredError)
         end
 
-        it 'should define #x= private method to class' do
-          @class.private_instance_methods.map {|meth| meth.to_s }.should include("x=")
+        it 'should be able to rewrite :x attribute' do
+          instance =@class.new(:x => 10)
+          instance.x = 20
+          instance.x.should == 20
         end
     end
   end

data/spec/classx_class_attributes/without_anyoption_spec.rb

@@ -13,8 +13,9 @@ describe ClassX::ClassAttributes do
           end
         end
 
-        it 'should define class.x= private method to class' do
-          @class.private_methods.map {|meth| meth.to_s }.should include("x=")
+        it 'should be able to rewrite :x attribute' do
+          @class.x = 10
+          @class.x.should == 10
         end
     end
   end

data/spec/classx_class_attributes/writable_option_spec.rb

@@ -33,7 +33,7 @@ describe ClassX::ClassAttributes do
         # => This exception was caused by mistake of program. So, in general I think, you should not
         # rascue this error.
         it 'should raise RuntimeError using attr_name(val)' do
-          pending "I don't know how to know call this method from class context or reciever context." do
+          pending do
             lambda { @class.x(20) }.should raise_error(RuntimeError)
           end
         end

data/spec/classx_validate_spec.rb

@@ -2,7 +2,26 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'classx'
 require 'classx/validate'
 
-describe ClassX::Validate do
+describe ClassX::Validate, :shared => true do
+  it 'should raise ArgumentError without param is not kind of Hash instance' do
+    lambda { @class.new.run([]) }.should raise_error(ArgumentError)
+  end
+
+  it 'should raise ClassX::AttrRequiredError' do
+    lambda { @class.new.run({}) }.should raise_error(ClassX::AttrRequiredError)
+  end
+
+  it 'should raise ClassX::InvalidArgumentError with InvalidAttrArgument' do
+    lambda { @class.new.run(:x => 'hoge', :y => 'fuga') }.should raise_error(ClassX::InvalidAttrArgument)
+  end
+
+  it 'should not raise Exception' do
+    lambda { @class.new.run(:x => 10, :y => 20) }.should_not raise_error(Exception)
+  end
+
+end
+
+describe ClassX::Validate, "with cache" do
   before do
     @class = Class.new
     @class.class_eval do
@@ -16,23 +35,30 @@ describe ClassX::Validate do
     end
   end
 
-  it 'should raise ArgumentError without param is not kind of Hash instance' do
-    lambda { @class.new.run([]) }.should raise_error(ArgumentError)
-  end
+  it_should_behave_like "ClassX::Validate"
 
-  it 'should raise ClassX::AttrRequiredError' do
-    lambda { @class.new.run({}) }.should raise_error(ClassX::AttrRequiredError)
+  it 'should be cached auto generated class' do
+    @class.new.run(:x => 10, :y => 20).class.should == @class.new.run(:x => 11, :y => 21).class
   end
+end
 
-  it 'should raise ClassX::InvalidArgumentError with InvalidAttrArgument' do
-    lambda { @class.new.run(:x => 'hoge', :y => 'fuga') }.should raise_error(ClassX::InvalidAttrArgument)
-  end
+describe ClassX::Validate, "with no cache" do
+  before do
+    @class = Class.new
+    @class.class_eval do
 
-  it 'should not raise Exception' do
-    lambda { @class.new.run(:x => 10, :y => 20) }.should_not raise_error(Exception)
+      def run params
+        ClassX::Validate.validate params, :cache_key => false do
+          has :x
+          has :y, :kind_of => Integer
+        end
+      end
+    end
   end
 
-  it 'should be cached auto generated class' do
-    @class.new.run(:x => 10, :y => 20).class.should == @class.new.run(:x => 11, :y => 21).class
+  it_should_behave_like "ClassX::Validate"
+
+  it 'should not be cached auto generated class' do
+    @class.new.run(:x => 10, :y => 20).class.should_not == @class.new.run(:x => 11, :y => 21).class
   end
 end

data/tasks/basic_config.rake

@@ -2,7 +2,7 @@ AUTHOR            = "Keiji, Yoshimi"
 EMAIL             = "walf443 at gmail.com"
 RUBYFORGE_PROJECT = "akasakarb"
 RUBYFORGE_PROJECT_ID = 4314
-HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
+HOMEPATH          = "http://walf443.github.com/classx/"
 RDOC_OPTS = [
 	"--charset", "utf-8",
 	"--opname", "index.html",

data/tasks/basic_tasks.rake

@@ -92,19 +92,24 @@ task :uninstall => [:clean] do
 	sh %{sudo gem uninstall #{NAME}}
 end
 
-
-Rake::RDocTask.new do |rdoc|
-	rdoc.rdoc_dir = 'html'
-	rdoc.options += RDOC_OPTS
-	rdoc.template = "resh"
-	#rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-	if ENV['DOC_FILES']
-		rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
-	else
-		rdoc.rdoc_files.include('README', 'ChangeLog')
-		rdoc.rdoc_files.include('lib/**/*.rb')
-		rdoc.rdoc_files.include('ext/**/*.c')
-	end
+begin
+  allison_path = `allison --path`.chomp
+  Rake::RDocTask.new do |rdoc|
+    rdoc.rdoc_dir = 'html'
+    rdoc.options += RDOC_OPTS
+    rdoc.template = allison_path
+    if ENV['DOC_FILES']
+      rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
+    else
+      rdoc.rdoc_files.include('README', 'ChangeLog')
+      rdoc.rdoc_files.include('lib/**/*.rb')
+      rdoc.rdoc_files.include('ext/**/*.c')
+    end
+  end
+rescue Exception => e
+  warn e
+  warn "skipping rdoc task"
+ensure
 end
 
 desc "Publish to RubyForge"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: classx
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Keiji, Yoshimi
@@ -9,7 +9,7 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 +09:00
+date: 2008-12-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,17 @@ files:
 - spec/classx_validate_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- doc/output
+- doc/output/coverage
+- doc/output/coverage/index.html
+- doc/output/coverage/lib-classx-attribute_rb.html
+- doc/output/coverage/lib-classx-attributes_rb.html
+- doc/output/coverage/lib-classx-bracketable_rb.html
+- doc/output/coverage/lib-classx-class_attributes_rb.html
+- doc/output/coverage/lib-classx-commandable_rb.html
+- doc/output/coverage/lib-classx-declare_rb.html
+- doc/output/coverage/lib-classx-validate_rb.html
+- doc/output/coverage/lib-classx_rb.html
 - bench/attribute_get.rb
 - bench/attribute_set.rb
 - bench/define_attribute.rb
@@ -86,7 +97,7 @@ files:
 - tasks/basic_config.rake
 - tasks/basic_tasks.rake
 has_rdoc: true
-homepage: http://akasakarb.rubyforge.org
+homepage: http://walf443.github.com/classx/
 post_install_message: 
 rdoc_options: 
 - --charset
@@ -120,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: akasakarb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Meta Framework extending and flexible attribute like Moose ( perl )