fortify 0.0.1 → 0.0.2

data/README.rdoc

@@ -59,16 +59,13 @@ First, install fortify by adding the following line to your config/environment.r
 
   config.gem :fortify, :lib => 'fortify', :source => 'http://gemcutter.org'
 
-Next, go back to your book model and add some fortification to it:
+Next, go back to your book model and add some fortification to it. You can do this in one of three ways. Let's first assume that 
+we just want to make sure the Book model has "author", "title", and "genre" attributes.
 
   # app/models/book.rb
   class Book < ActiveResource::Base
-    fortify do |default_attributes|
-      default_attributes.author
-      default_attributes.title
-      default_attributes.genre
-    end
     self.site = ''
+    fortify :author, :title, :genre
   end
 
 Now, your controller / views as you originally specified them will work, since now: 
@@ -77,19 +74,32 @@ Now, your controller / views as you originally specified them will work, since n
   console> b.attributes.inspect
     ==> {:author => nil, :title => nil, :genre => nil}
 
-You could also have provided some default values for your attributes:
+What if, however, we wanted default values for each of those attributes?
  
   # app/models/book.rb
   class Book < ActiveResource::Base
-    fortify do |default_attributes|
-      default_attributes.author = 'Anonymous'
-      default_attributes.title = 'Untitled'
-      default_attributes.genre
-    end
     self.site = ''
+    fortify :author => 'Anonymous', :genre => 'Unknown', :title => 'Untitled'
   end
 
 In this case, a Book.new would give you: 
   console> b = Book.new
   console> b.attributes.inspect
-    ==> {:author => 'Anonymous', :title => 'Untitled', :genre => nil}
+    ==> {:author => 'Anonymous', :title => 'Untitled', :genre => 'Unknown'}
+    
+Lastly, what if we only wanted a default value for the :author attribute? Try this: 
+  # app/models/book.rb
+  class Book < ActiveResource::Base
+    self.site = ''
+    fortify do |attrs|
+      attrs.author = 'Anonymous'
+      attrs.title
+      attrs.genre
+    end
+  end
+
+Console would report something like this: 
+  console> b = Book.new
+  console> b.attributes.inspect
+    ==> {:author => 'Anonymous', :title => nil, :genre => nil}
+

data/lib/fortify/fortify.rb

@@ -26,20 +26,55 @@ ActiveResource::Base.instance_eval do
       name[-1..-1] == '=' ? name[0..-2] : name
     end
   end
+    
+  class BlockArgumentError < ArgumentError; end
   
-  class BlockRequiredError < ArgumentError; end
   
-  class BlockArgumentError < ArgumentError; end
+  def fortify(*args, &block)
+    if block
+      process_block(block)
+    elsif passed_a_hash(args)
+      process_hash(args.first)
+    elsif passed_one_or_more_nonhash_parameters(args)
+      process_symbols(args)
+    end
+  end
   
+  def default_attributes
+    @default_attributes ||= DefaultAttributes.new
+  end
   
-  def fortify(&block)
-    raise BlockRequiredError.new("you must pass a block to fortify") unless block
+  private
+  def process_hash(args)
+    args.each do |attr_name, attr_value|
+      default_attributes.send(
+        (attr_name.to_s + '=').to_sym, 
+        attr_value
+      )
+    end
+  end
+  
+  def process_block(block)
     raise BlockArgumentError.new("the block you pass to fortify must accept one argument") unless block.arity == 1
     block.call default_attributes
   end
   
-  def default_attributes
-    @default_attributes ||= DefaultAttributes.new
+  def passed_a_hash(args)
+    args.length == 1 && args.first.kind_of?(Hash)
+  end
+  
+  def passed_one_or_more_nonhash_parameters(args)
+    args.respond_to?(:length) && 
+    (args.length > 1 || (args.length == 1 && args.first.kind_of?(Symbol)))
+  end
+  
+  def process_symbols(args)
+    raise ArgumentError.new("if you pass several parameters to fortify, they must all be symbols") unless args_are_symbols(args)
+    args.map {|attribute| default_attributes.send attribute}
+  end
+  
+  def args_are_symbols(args)
+    args.inject(true) {|bool, current_arg| bool && current_arg.class == Symbol}    
   end
 end
 

data/spec/lib_specs/fortify_spec.rb

@@ -25,38 +25,112 @@ describe "ActiveResource::Base --" do
   end
   
   describe "fortify class method" do
-    it "should require a block be passed to it" do
-      proc { Book.fortify }.should raise_error(BlockRequiredError)
-    end
+    describe "when passed a block" do
+      it "should not require a block be passed to it" do
+        proc { Book.fortify }.should_not raise_error
+      end
   
-    it "should require the block passed to it accept one argument" do
-      proc { Book.fortify {} }.should raise_error(BlockArgumentError)
+      it "should require the block passed to it accept one argument" do
+        proc { Book.fortify {} }.should raise_error(BlockArgumentError)
+      end
+    
+      it "should pass a default attributes class to the block" do
+        Book.fortify do |default_attributes|
+          default_attributes.class.should == DefaultAttributes
+        end
+      end
     end
     
-    it "should pass a default attributes class to the block" do
-      Book.fortify do |default_attributes|
-        default_attributes.class.to_s.should == "DefaultAttributes"
+    describe "when passed one or more nonhash parameters" do
+      it "should throw an error unless all the paramters are symbols" do
+        proc { Book.fortify :author, :genre, :isbn }.should_not raise_error
+        proc { Book.fortify :author, :isbn, :genre => 'fiction'}.should raise_error(ArgumentError)
+        proc { Book.fortify :author}.should_not raise_error
+      end
+      
+      it "should add nil default attributes for each symbol passed to it" do
+        Book.fortify :author, :genre, :isbn
+        Book.default_attributes.attributes.has_key?(:author).should be_true
+        Book.default_attributes.attributes[:author].should be_nil
+        Book.default_attributes.attributes.has_key?(:genre).should be_true
+        Book.default_attributes.attributes[:genre].should be_nil
+        Book.default_attributes.attributes.has_key?(:isbn).should be_true
+        Book.default_attributes.attributes[:isbn].should be_nil
+      end
+    end
+    
+    describe "when passed a single hash" do
+      it "should not throw an error" do
+        proc {Book.fortify :author => 'Anonymous'}.should_not raise_error
+      end
+      
+      it "should add default attributes based on the hash" do
+        Book.fortify :author => 'Anonymous', :genre => 'fiction'
+        Book.default_attributes.attributes.has_key?(:author).should be_true
+        Book.default_attributes.attributes[:author].should == 'Anonymous'
+        Book.default_attributes.attributes.has_key?(:genre).should be_true
+        Book.default_attributes.attributes[:genre].should == 'fiction'
       end
     end
   end
   
   describe "new" do
-    it "should use the default attributes created via fortify" do
-      Book.fortify do |default_attributes|
-        default_attributes.author = 'Anonymous'
-        default_attributes.genre  = 'Fiction'
-        default_attributes.isbn  
+    describe "when fortified with a block" do
+      before do
+        Book.fortify do |default_attributes|
+          default_attributes.author = 'Anonymous'
+          default_attributes.genre  = 'Fiction'
+          default_attributes.isbn  
+        end        
       end
       
-      b = Book.new
+      it "should use the default attributes created via fortify" do
+        b = Book.new
+
+        proc {b.author}.should_not raise_error
+        b.author.should == 'Anonymous'
+        proc {b.genre}.should_not raise_error
+        b.genre.should == 'Fiction'
+        proc {b.isbn}.should_not raise_error
+        b.isbn.should be_nil
+        proc {b.attribute_not_appearing_in_this_test}.should raise_error
+      end
+    end
+    
+    describe "when fortified with symbols" do
+      before do
+        Book.fortify :author, :genre, :isbn
+      end
+      
+      it "should use the default attributes created via fortify" do
+        b = Book.new
+        proc {b.author}.should_not raise_error
+        b.author.should be_nil
+        proc {b.genre}.should_not raise_error
+        b.genre.should be_nil
+        proc {b.isbn}.should_not raise_error
+        b.isbn.should be_nil
+        proc {b.attribute_not_appearing_in_this_test}.should raise_error
+      end
+    end
+    
+    describe "when fortified with a hash" do
+      before do
+        Book.fortify :author => 'Anonymous', :genre => 'Fiction', :isbn => '0000'
+      end
       
-      proc {b.author}.should_not raise_error
-      b.author.should == 'Anonymous'
-      proc {b.genre}.should_not raise_error
-      b.genre.should == 'Fiction'
-      proc {b.isbn}.should_not raise_error
-      b.isbn.should be_nil
-      proc {b.attribute_not_appearing_in_this_test}.should raise_error
+      it "should use the default attributes created via fortify" do
+        b = Book.new
+
+        proc {b.author}.should_not raise_error
+        b.author.should == 'Anonymous'
+        proc {b.genre}.should_not raise_error
+        b.genre.should == 'Fiction'
+        proc {b.isbn}.should_not raise_error
+        b.isbn.should == '0000'
+        proc {b.attribute_not_appearing_in_this_test}.should raise_error
+      end
     end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fortify
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Matt Parker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -05:00
+date: 2009-12-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency