attr_required 0.0.3 → 0.0.4

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby

data/Gemfile

@@ -1 +1,2 @@
+source 'http://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,21 +1,22 @@
 PATH
   remote: .
   specs:
-    attr_required (0.0.2)
+    attr_required (0.0.3)
 
 GEM
+  remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    rake (0.8.7)
+    rake (0.9.0)
     rcov (0.9.9)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.3)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -9,12 +9,4 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov_opts = ['-Ilib -Ispec --exclude spec,gems']
 end
 
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "attr_required #{File.read('VERSION')}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/attr_optional.rb

@@ -14,8 +14,10 @@ module AttrOptional
     end
 
     def attr_optional(*keys)
-      @optional_attributes ||= []
-      @optional_attributes += Array(keys)
+      if defined?(:undef_required_attributes)
+        undef_required_attributes *keys
+      end
+      optional_attributes.concat(keys)
       attr_accessor *keys
     end
 
@@ -24,7 +26,16 @@ module AttrOptional
     end
 
     def optional_attributes
-      Array(@optional_attributes)
+      @optional_attributes ||= []
+    end
+
+    def undef_optional_attributes(*keys)
+      keys.each do |key|
+        if attr_optional?(key)
+          undef_method key, :"#{key}="
+          optional_attributes.delete key
+        end
+      end
     end
 
   end

data/lib/attr_required.rb

@@ -16,17 +16,28 @@ module AttrRequired
     end
 
     def attr_required(*keys)
-      @required_attributes ||= []
-      @required_attributes += Array(keys)
+      if defined?(:undef_optional_attributes)
+        undef_optional_attributes *keys
+      end
+      required_attributes.concat keys
       attr_accessor *keys
     end
 
     def attr_required?(key)
-      required_attributes.include?(key)
+      required_attributes.include? key
     end
 
     def required_attributes
-      Array(@required_attributes)
+      @required_attributes ||= []
+    end
+
+    def undef_required_attributes(*keys)
+      keys.each do |key|
+        if attr_required?(key)
+          undef_method key, :"#{key}="
+          required_attributes.delete key
+        end
+      end
     end
 
   end

data/spec/attr_optional_spec.rb

@@ -1,59 +1,69 @@
 require 'spec_helper.rb'
 
-describe AttrOptional, '.attr_optional' do
+describe AttrOptional do
   before do
-    @a, @b = A.new, B.new
+    @a, @b, @c = A.new, B.new, C.new
   end
 
-  it 'should define accessible attributes' do
-    @a.should respond_to(:attr_optional_a)
-    @a.should respond_to(:attr_optional_a=)
-    @b.should respond_to(:attr_optional_b)
-    @b.should respond_to(:attr_optional_b=)
-  end
+  describe '.attr_optional' do
+    it 'should define accessible attributes' do
+      @a.should respond_to :attr_optional_a
+      @a.should respond_to :attr_optional_a=
+      @b.should respond_to :attr_optional_b
+      @b.should respond_to :attr_optional_b=
+    end
 
-  it 'should be inherited' do
-    @b.should respond_to(:attr_optional_a)
-    @b.should respond_to(:attr_optional_a=)
-  end
-end
+    it 'should be inherited' do
+      @b.should respond_to :attr_optional_a
+      @b.should respond_to :attr_optional_a=
+    end
 
-describe AttrOptional, '.attr_optional?' do
-  it 'should answer whether the attributes is optional or not' do
-    A.attr_optional?(:attr_optional_a).should be_true
-    B.attr_optional?(:attr_optional_a).should be_true
-    B.attr_optional?(:attr_optional_b).should be_true
-    B.attr_optional?(:to_s).should be_false
+    context 'when already required' do
+      it 'should be optional' do
+        @c.attr_required?(:attr_required_b).should be_false
+        @c.attr_optional?(:attr_required_b).should be_true
+      end
+    end
   end
-end
 
-describe AttrOptional, '#attr_optional?' do
-  before do
-    @a, @b = A.new, B.new
+  describe '.attr_optional?' do
+    it 'should answer whether the attributes is optional or not' do
+      A.attr_optional?(:attr_optional_a).should be_true
+      B.attr_optional?(:attr_optional_a).should be_true
+      B.attr_optional?(:attr_optional_b).should be_true
+      B.attr_optional?(:to_s).should be_false
+    end
   end
 
-  it 'should answer whether the attributes is optional or not' do
-    @a.attr_optional?(:attr_optional_a).should be_true
-    @b.attr_optional?(:attr_optional_a).should be_true
-    @b.attr_optional?(:attr_optional_b).should be_true
-    @b.attr_optional?(:to_s).should be_false
+  describe '#attr_optional?' do
+    it 'should answer whether the attributes is optional or not' do
+      @a.attr_optional?(:attr_optional_a).should be_true
+      @b.attr_optional?(:attr_optional_a).should be_true
+      @b.attr_optional?(:attr_optional_b).should be_true
+      @b.attr_optional?(:to_s).should be_false
+    end
   end
-end
 
-describe AttrOptional, '.optional_attributes' do
-  it 'should return all optional attributes keys' do
-    A.optional_attributes.should == [:attr_optional_a]
-    B.optional_attributes.should == [:attr_optional_a, :attr_optional_b]
+  describe '.optional_attributes' do
+    it 'should return all optional attributes keys' do
+      A.optional_attributes.should == [:attr_optional_a]
+      B.optional_attributes.should == [:attr_optional_a, :attr_optional_b]
+    end
   end
-end
 
-describe AttrOptional, '#optional_attributes' do
-  before do
-    @a, @b = A.new, B.new
+  describe '#optional_attributes' do
+    it 'should return optional attributes keys' do
+      @a.optional_attributes.should == [:attr_optional_a]
+      @b.optional_attributes.should == [:attr_optional_a, :attr_optional_b]
+    end
   end
 
-  it 'should return optional attributes keys' do
-    @a.optional_attributes.should == [:attr_optional_a]
-    @b.optional_attributes.should == [:attr_optional_a, :attr_optional_b]
+  describe '.undef_optional_attributes' do
+    it 'should undefine accessors and remove from optional attributes' do
+      C.optional_attributes.should_not include :attr_optional_a
+      @c.optional_attributes.should_not include :attr_optional_a
+      @c.should_not respond_to :attr_optional_a
+      @c.should_not respond_to :attr_optional_a=
+    end
   end
 end

data/spec/attr_required_spec.rb

@@ -1,109 +1,107 @@
 require 'spec_helper.rb'
 
-describe AttrRequired, '.attr_required' do
+describe AttrRequired do
   before do
-    @a, @b = A.new, B.new
+    @a, @b, @c = A.new, B.new, C.new
   end
 
-  it 'should define accessible attributes' do
-    @a.should respond_to(:attr_required_a)
-    @a.should respond_to(:attr_required_a=)
-    @b.should respond_to(:attr_required_b)
-    @b.should respond_to(:attr_required_b=)
-  end
-
-  it 'should be inherited' do
-    @b.should respond_to(:attr_required_a)
-    @b.should respond_to(:attr_required_a=)
-  end
-end
-
-describe AttrRequired, '.attr_required?' do
-  it 'should answer whether the attributes is required or not' do
-    A.attr_required?(:attr_required_a).should be_true
-    B.attr_required?(:attr_required_a).should be_true
-    B.attr_required?(:attr_required_b).should be_true
-    B.attr_required?(:to_s).should be_false
-  end
-end
-
-describe AttrRequired, '#attr_required?' do
-  before do
-    @a, @b = A.new, B.new
-  end
+  describe '.attr_required' do
+    it 'should define accessible attributes' do
+      @a.should respond_to :attr_required_a
+      @a.should respond_to :attr_required_a=
+      @b.should respond_to :attr_required_b
+      @b.should respond_to :attr_required_b=
+    end
 
-  it 'should answer whether the attributes is required or not' do
-    @a.attr_required?(:attr_required_a).should be_true
-    @b.attr_required?(:attr_required_a).should be_true
-    @b.attr_required?(:attr_required_b).should be_true
-    @a.attr_required?(:attr_required_b).should be_false
-    @b.attr_required?(:to_s).should be_false
-  end
-end
+    it 'should be inherited' do
+      @b.should respond_to :attr_required_a
+      @b.should respond_to :attr_required_a=
+    end
 
-describe AttrRequired, '#attr_missing?' do
-  before do
-    @a, @b = A.new, B.new
+    context 'when already optional' do
+      it 'should be optional' do
+        @c.attr_required?(:attr_optional_b).should be_true
+        @c.attr_optional?(:attr_optional_b).should be_false
+      end
+    end
   end
 
-  it 'should answer whether any attributes are missing' do
-    @a.attr_missing?.should be_true
-    @b.attr_missing?.should be_true
-    @a.attr_required_a = 'attr_required_a'
-    @b.attr_required_a = 'attr_required_a'
-    @a.attr_missing?.should be_false
-    @b.attr_missing?.should be_true
-    @b.attr_required_b = 'attr_required_b'
-    @b.attr_missing?.should be_false
+  describe '.attr_required?' do
+    it 'should answer whether the attributes is required or not' do
+      A.attr_required?(:attr_required_a).should be_true
+      B.attr_required?(:attr_required_a).should be_true
+      B.attr_required?(:attr_required_b).should be_true
+      B.attr_required?(:to_s).should be_false
+    end
   end
-end
 
-describe AttrRequired, '#attr_missing!' do
-  before do
-    @a, @b = A.new, B.new
+  describe '#attr_required?' do
+    it 'should answer whether the attributes is required or not' do
+      @a.attr_required?(:attr_required_a).should be_true
+      @b.attr_required?(:attr_required_a).should be_true
+      @b.attr_required?(:attr_required_b).should be_true
+      @a.attr_required?(:attr_required_b).should be_false
+      @b.attr_required?(:to_s).should be_false
+    end
   end
 
-  it 'should raise AttrMissing error when any attributes are missing' do
-    lambda { @a.attr_missing! }.should raise_error(AttrRequired::AttrMissing)
-    lambda { @b.attr_missing! }.should raise_error(AttrRequired::AttrMissing)
-    @a.attr_required_a = 'attr_required_a'
-    @b.attr_required_a = 'attr_required_a'
-    lambda { @a.attr_missing! }.should_not raise_error(AttrRequired::AttrMissing)
-    lambda { @b.attr_missing! }.should raise_error(AttrRequired::AttrMissing)
-    @b.attr_required_b = 'attr_required_b'
-    lambda { @b.attr_missing! }.should_not raise_error(AttrRequired::AttrMissing)
+  describe '#attr_missing?' do
+    it 'should answer whether any attributes are missing' do
+      @a.attr_missing?.should be_true
+      @b.attr_missing?.should be_true
+      @a.attr_required_a = 'attr_required_a'
+      @b.attr_required_a = 'attr_required_a'
+      @a.attr_missing?.should be_false
+      @b.attr_missing?.should be_true
+      @b.attr_required_b = 'attr_required_b'
+      @b.attr_missing?.should be_false
+    end
   end
-end
 
-describe AttrRequired, '#attr_missing' do
-  before do
-    @a, @b = A.new, B.new
+  describe '#attr_missing!' do
+    it 'should raise AttrMissing error when any attributes are missing' do
+      lambda { @a.attr_missing! }.should raise_error(AttrRequired::AttrMissing)
+      lambda { @b.attr_missing! }.should raise_error(AttrRequired::AttrMissing)
+      @a.attr_required_a = 'attr_required_a'
+      @b.attr_required_a = 'attr_required_a'
+      lambda { @a.attr_missing! }.should_not raise_error(AttrRequired::AttrMissing)
+      lambda { @b.attr_missing! }.should raise_error(AttrRequired::AttrMissing)
+      @b.attr_required_b = 'attr_required_b'
+      lambda { @b.attr_missing! }.should_not raise_error(AttrRequired::AttrMissing)
+    end
   end
 
-  it 'should return missing attributes keys' do
-    @a.attr_missing.should == [:attr_required_a]
-    @b.attr_missing.should == [:attr_required_a, :attr_required_b]
-    @a.attr_required_a = 'attr_required_a'
-    @b.attr_required_a = 'attr_required_a'
-    @a.attr_missing.should == []
-    @b.attr_missing.should == [:attr_required_b]
+  describe '#attr_missing' do
+    it 'should return missing attributes keys' do
+      @a.attr_missing.should == [:attr_required_a]
+      @b.attr_missing.should == [:attr_required_a, :attr_required_b]
+      @a.attr_required_a = 'attr_required_a'
+      @b.attr_required_a = 'attr_required_a'
+      @a.attr_missing.should == []
+      @b.attr_missing.should == [:attr_required_b]
+    end
   end
-end
 
-describe AttrRequired, '.required_attributes' do
-  it 'should return all required attributes keys' do
-    A.required_attributes.should == [:attr_required_a]
-    B.required_attributes.should == [:attr_required_a, :attr_required_b]
+  describe '.required_attributes' do
+    it 'should return all required attributes keys' do
+      A.required_attributes.should == [:attr_required_a]
+      B.required_attributes.should == [:attr_required_a, :attr_required_b]
+    end
   end
-end
 
-describe AttrRequired, '#required_attributes' do
-  before do
-    @a, @b = A.new, B.new
+  describe '#required_attributes' do
+    it 'should return required attributes keys' do
+      @a.required_attributes.should == [:attr_required_a]
+      @b.required_attributes.should == [:attr_required_a, :attr_required_b]
+    end
   end
 
-  it 'should return required attributes keys' do
-    @a.required_attributes.should == [:attr_required_a]
-    @b.required_attributes.should == [:attr_required_a, :attr_required_b]
+  describe '.undef_required_attributes' do
+    it 'should undefine accessors and remove from required attributes' do
+      C.required_attributes.should_not include :attr_required_a
+      @c.required_attributes.should_not include :attr_required_a
+      @c.should_not respond_to :attr_required_a
+      @c.should_not respond_to :attr_required_a=
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 require 'attr_required'
 require 'attr_optional'
 require 'rspec'
@@ -15,3 +12,10 @@ class B < A
   attr_required :attr_required_b
   attr_optional :attr_optional_b
 end
+
+class C < B
+  undef_required_attributes :attr_required_a
+  undef_optional_attributes :attr_optional_a
+  attr_optional :attr_required_b
+  attr_required :attr_optional_b
+end

metadata

@@ -1,79 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: attr_required
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-06 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70189917584400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70189917584400
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70189917581600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70189917581600
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70189917580580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70189917580580
 description: attr_required and attr_optional
 email: nov@matake.jp
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -86,43 +67,32 @@ files:
 - spec/attr_optional_spec.rb
 - spec/attr_required_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/nov/attr_required
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: attr_required and attr_optional
-test_files: 
+test_files:
 - spec/attr_optional_spec.rb
 - spec/attr_required_spec.rb
 - spec/spec_helper.rb