sugar-high 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/sugar-high/alias.rb

@@ -1,5 +1,8 @@
 require 'sugar-high/methods'
 require 'sugar-high/hash'
+require 'sugar-high/arguments'
+require 'sugar-high/array'
+require 'active_support/inflector'
 
 class Module         
   
@@ -52,9 +55,29 @@ class Module
     end
   end
 
+  def alias_hash(hash)
+    pluralize = hash.delete(:pluralize)
+    singularize = hash.delete(:singularize)
+    # option = :pluralize => pluralize, :singularize => singularize
+    
+    hash.each_pair do |original, alias_meth|
+      alias_for original, alias_meth
+      alias_for original.to_s.singularize, alias_meth.to_s.singularize, :singularize => true if singularize
+      alias_for original.to_s.pluralize, alias_meth.to_s.pluralize, :pluralize => true if pluralize
+    end
+  end
+
   def alias_for(original, *aliases)
-    aliases.each do |alias_meth|
-      class_eval "alias_method :#{alias_meth}, :#{original} if respond_to? :#{original}"  
+    pluralize = last_option(aliases)[:pluralize]
+    singularize = last_option(aliases)[:singularize]
+
+    class_eval "alias_method :#{original.to_s.singularize}, :#{original}" if singularize
+    class_eval "alias_method :#{original.to_s.pluralize}, :#{original}" if pluralize
+
+    aliases.flatten.select_labels.each do |alias_meth|
+      class_eval "alias_method :#{alias_meth}, :#{original}"
+      class_eval "alias_method :#{alias_meth.to_s.pluralize}, :#{original}" if pluralize
+      class_eval "alias_method :#{alias_meth.to_s.singularize}, :#{original}" if singularize
     end
   end
   alias_method :aliases_for, :alias_for

data/lib/sugar-high/file.rb

@@ -39,7 +39,7 @@ class File
   # replaces content found at replacement_expr with content resulting from yielding block
   # File.replace_content_from 'myfile.txt', where => /HelloWorld/, with => 'GoodBye'
   def self.replace_content_from file_name, options = {}, &block
-    replacement_expr = options[:where]
+    replacement_expr = options[:where] || options[:content]
     new_content = options[:with]
 
     replacement_expr = case replacement_expr
@@ -48,7 +48,7 @@ class File
     when String
       /#{Regexp.escape(replacement_expr)}/
     else
-      raise ArgumentError, "Content to be replaced must be specified as either a String or Regexp in a :where option"
+      raise ArgumentError, "Content to be replaced must be specified as either a String or Regexp in a :where or :content option"
     end
 
     # get existing file content
@@ -150,7 +150,7 @@ class File
        when String
          args.first
        when Hash
-         options[:content]      
+         options[:content] || yield if block      
        else
          return yield if block
          raise ArgumentError, "You must supply content to insert, either as a String before the options hash, a :content option or a block" 

data/spec/sugar-high/alias_spec.rb

@@ -31,6 +31,54 @@ class Ged
   multi_alias :_before_ => :kristian, :hejsa => :hello, :_direction_ => :reverse  
 end  
 
+class Plural
+  def monster
+    'monster'
+  end
+  
+  alias_for :monster, :pluralize => true
+end  
+
+class Plural2
+  def monster
+    'monster'
+  end
+  
+  alias_for :monster, :beast, :pluralize => true
+end  
+
+
+class Singular
+  def monsters
+    'monsters'
+  end
+  
+  alias_for :monsters, :singularize => true
+end  
+
+class Singular2
+  def monsters
+    'monsters'
+  end
+  
+  alias_for :monsters, :beasts, :singularize => true
+end  
+
+
+class AliasHash
+  def monsters
+    'monsters'
+  end
+
+  def monster
+    'monster'
+  end
+
+  
+  alias_hash :monsters => :beasts, :singularize => true
+end  
+
+
 class Wow
   REGISTRATION_LINKS = {
     :new_registration => :sign_up,
@@ -64,6 +112,29 @@ describe "SugarHigh" do
       Ged.new.respond_to?(:kristian_hejsa).should be_true
     end
 
+    it "should find singularized alias" do
+      Singular.new.respond_to?(:monster).should be_true
+    end
+
+    it "should find singularized alias" do
+      Singular2.new.respond_to?(:beast).should be_true
+    end
+
+    it "should find pluralized alias" do
+      Plural.new.respond_to?(:monsters).should be_true
+    end
+
+    it "should find pluralized alias" do
+      Plural2.new.respond_to?(:beasts).should be_true
+    end
+
+    it "should find nice aliases from using alias_hash" do
+      ah = AliasHash.new
+      ah.beasts.should == 'monsters'
+      ah.beast.should == 'monster'      
+    end
+
+
     it "should find alias methods!" do
       w = Wow.new
       w.respond_to?(:new_registration_link).should be_true

data/spec/sugar-high/file/file_mutate_spec.rb

@@ -22,7 +22,7 @@ describe "SugarHigh::File" do
     end
   end
 
-  describe '#remove_content_from' do    
+  describe '#remove_content_from with :where option' do    
     let(:replace_file)    { fixture_file 'file.txt' }    
   
     it "should remove content from existing file" do      
@@ -34,6 +34,19 @@ describe "SugarHigh::File" do
     end
   end
 
+  describe '#remove_content_from with :content option' do    
+    let(:replace_file)    { fixture_file 'file.txt' }    
+  
+    it "should remove content from existing file" do      
+      File.overwrite(replace_file) do
+        'Hello You'
+      end
+      File.remove_content_from replace_file, :content => 'You'
+      File.read(replace_file).should_not match /You/
+    end
+  end
+
+
   describe '#insert_into' do
     let(:insertion_file)    { fixture_file 'insertion.txt' }    
 
@@ -63,6 +76,13 @@ describe "SugarHigh::File" do
       File.read(insertion_file).should_not match /Hello Goodbye/
     end
 
+    it "should insert Hello before Goodbye using a block as content to insert" do
+      File.insert_into insertion_file, :before => 'Goodbye' do
+        'Hello '
+      end
+      File.read(insertion_file).should_not match /Hello Goodbye/
+    end
+
     it "should insert Hello after Goodbye using a :with option and a Regexp for the after expression" do
       File.insert_into insertion_file, :content => ' Hello', :after => /Goodbye/ 
       File.read(insertion_file).should_not match /Goodbye Hello/

data/sugar-high.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sugar-high}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kristian Mandrup