sugar-high 0.5.5 → 0.6.0

data/README.textile

@@ -10,10 +10,9 @@ h2. Usage
 
 See specs for example use
 
-h2. Update June 22, 2011
+h2. Update Aug 21, 2011
 
-file_mutate is now backwards compatible again in order nt to break gems such as cream et. al. that depend on auto inclusion of all File extensions into
-File object
+Extracted *file_mutate* and *sweetloader* gems.
 
 h2. Sugar packs
 
@@ -25,8 +24,6 @@ h2. Sugar packs
 * dsl
 * enumerable
 * file
-* file_mutate (backwards compatible)
-* file_mutation
 * includes
 * kind_of
 * math
@@ -127,30 +124,6 @@ h3. File
 * self.overwrite : overwrite file with new content (mode = 'w')
 * self.append : append to existing file with content or create new (mode = 'w+')
 
-h3. File Mutate
-Adds all File mutation modules to the File class
-
-h3. File Mutation
-
-Various File Mutation modules that can be added to any module or class for some nice benefits. Useful for generators fx.
-
-Mutation modules within SugarHigh::FileMutate
-
-* AppendContent
-* Delete
-* InsertContent
-* OverwriteContent
-* RemoveContent
-* ReplaceContent
-
-To add all mutate modules to the File class, simply:
-
-<pre>File.mutate_ext :all</pre>
-
-Otherwise, simply specify which ones:
-
-<pre>File.mutate_ext :append_content, overwrite_content</pre>
-
 h3. Hash
 
 * hash_revert : Reverse keys and values

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.6.0

data/lib/sugar-high/class_ext.rb

@@ -1,134 +1,3 @@
-require 'sugar-high/kind_of'
-require 'sugar-high/array'
+puts "Please use the new 'sweetloader' gem"
 
-class Module
-  def include_and_extend(the_module, options={})
-    options[:instance_methods] ||= :InstanceMethods
-    options[:class_methods] ||= :ClassMethods
-    # Mainly include but be flexible
-    main_module = const_get(the_module.to_s.to_sym)
-    include main_module # for an extend_and_include method, change this to extend main_module
-    include main_module.const_get(options[:instance_methods]) if main_module.const_defined?(options[:instance_methods])
-    extend main_module.const_get(options[:class_methods]) if main_module.const_defined?(options[:class_methods])
-  end
-
-  def autoload_modules *args
-
-    options = args.extract_options!
-    root = options[:root] || AutoLoader.root || ''
-    path = root.strip.empty? ? self.name.to_s.underscore : [root, self.name.to_s.underscore].join('/')
-    from = options[:from] || path
-
-    # Here also could be adding of the file in top of load_paths like: $:.unshift File.dirname(__FILE__)
-    # It is very useful for situations of having not load_paths built Rails or Gems way.
-    args.each do |req_name|
-      ruby_file = req_name.to_s.underscore
-
-      send :autoload, req_name, AutoLoader.translate("#{from}/#{ruby_file}")
-    end
-  end
-
-end
-
-module AutoLoader
-  @@root = ''
-  @@namespaces = {}
-
-  def self.root
-    @@root
-  end
-
-  def self.namespaces
-    @@namespaces
-  end
-
-  def self.root= root
-    @@root = root
-  end
-
-  def self.namespaces= namespaces
-    @@namespaces = namespaces
-  end
-
-  def self.translate name
-    names = name.split('/')
-    names.map do |name|
-      clazz_name = name.to_s.camelize
-      namespaces[clazz_name.to_sym] ? namespaces[clazz_name.to_sym] : name
-    end.join('/')
-  end
-end
-
-module ClassExt
-  def get_module name
-    # Module.const_get(name)
-    name.to_s.camelize.constantize
-  rescue
-    nil
-  end
-
-  def is_class?(clazz)
-    clazz.is_a?(Class) && (clazz.respond_to? :new)
-  end
-
-  def is_module?(clazz)
-    clazz.is_a?(Module) && !(clazz.respond_to? :new)
-  end
-
-  def class_exists?(name)
-    is_class? get_module(name)
-  rescue
-    return false
-  end
-
-  def module_exists?(name)
-    is_module? get_module(name)
-  rescue NameError
-    return false
-  end
-
-  def try_class name
-    return name if name.kind_of?(Class)
-    found = get_module(name) if name.kind_of_label?
-    return found if found.is_a?(Class)
-  rescue
-    false
-  end
-
-  def try_module name
-    return name if name.kind_of?(Module)
-    found = get_module(name) if name.kind_of_label?
-    return found if found.is_a?(Module)
-  rescue
-    false
-  end
-
-  def try_module_only name
-    return name if is_module?(name)
-    found = get_module(name) if name.kind_of_label?
-    return found if is_module?(found)
-  rescue
-    false
-  end
-
-
-  def find_first_class *names
-    classes = names.flatten.compact.uniq.inject([]) do |res, class_name|
-      found_class = try_class(class_name.to_s.camelize)
-      res << found_class if found_class
-      res
-    end
-    raise "Not one Class for any of: #{names} is currently loaded" if classes.empty?
-    classes.first
-  end
-
-  def find_first_module *names
-    modules = names.flatten.compact.uniq.inject([]) do |res, class_name|
-      found_class = try_module(class_name.to_s.camelize)
-      res << found_class if found_class
-      res
-    end
-    raise "Not one Module for any of: #{names} is currently loaded" if modules.empty?
-    modules.first
-  end
-end 
+require 'sweetloader'

data/lib/sugar-high/file.rb

@@ -3,33 +3,32 @@ require 'sugar-high/arguments'
 require 'sugar-high/path'
 require 'sugar-high/regexp'
 require 'sugar-high/string'
-require 'sugar-high/file_mutate'
 require 'sugar-high/file_ext'
 
-class File   
+class File
   include SugarHigh::FileExt
-  extend  SugarHigh::FileExt::ClassMethods    
+  extend  SugarHigh::FileExt::ClassMethods
 end
 
 class Symbol
   def as_filename
     self.to_s.underscore
   end
-  
+
   def valid_file_command?
     [:read, :remove, :delete].include? self
   end
-  
+
   def file
     as_filename.file
-  end  
-end                 
+  end
+end
 
 class NilClass
   def valid_file_command?
     false
   end
-end  
+end
 
 class Array
   def file_names ext = '*'
@@ -39,7 +38,7 @@ end
 
 class String
   def as_filename
-    self.underscore  
+    self.underscore
   end
 
   def valid_file_command?
@@ -57,10 +56,10 @@ class String
   end
 
   def new_file
-    begin 
+    begin
       file
     rescue
-      File.open(self, 'w')    
+      File.open(self, 'w')
     end
   end
 end

data/lib/sugar-high/file_ext.rb

@@ -6,17 +6,17 @@ module SugarHigh
         raise ArgumentError, "There is no file at: #{file_name}" if !File.file?(file_name)
         File.zero?(file_name)
       end
-      
+
       def has_content? file_name, content_matcher, &block
         file = get_file file_name
-        file.has_content? content_matcher, &block  
-      end 
-      
+        file.has_content? content_matcher, &block
+      end
+
       def read_from file_name, options = {}, &block
         raise ArgumentError, "File to read from not found or not a file: #{file_name}" if !File.file? file_name
         content = File.read file_name
 
-        if options[:before] 
+        if options[:before]
           begin
             regexp = options[:before].to_regexp
             index = content.match(regexp).offset_before
@@ -26,27 +26,29 @@ module SugarHigh
           end
         end 
 
-        if options[:after]   
+        if options[:after]
           begin
             regexp = options[:after].to_regexp
             index = content.match(regexp).offset_after
-            content = content[index..-1]      
+            content = content[index..-1]
           rescue
             raise ArgumentError, ":after option must be a string or regular expression, was : #{options[:after]}"
-          end      
+          end
         end
         yield content if block
         content
       end
       alias_method :read_content_from, :read_from
-      alias_method :with_content_from, :read_from           
+      alias_method :with_content_from, :read_from
     end
 
+    # instance methods
+
     def blank?
       File.zero?(self.path)
-    end   
+    end
 
-    def has_content? content_matcher = nil, &block  
+    def has_content? content_matcher = nil, &block
       content_matcher ||= yield
       begin
         content_matcher = content_matcher.to_regexp

data/lib/sugar-high/rails/concerns.rb

@@ -1,23 +1,29 @@
-class << Module
+class Module
   def concerned_with(*concerns)
     concerns.each do |concern|
-      require_dependency "#{name.underscore}/#{concern}"
+      require_method "#{name.underscore}/#{concern}"
     end
   end
 
   def shared_concerns(*concerns)
     concerns.each do |concern|
-      require_dependency "shared/#{concern}"
+      require_method "shared/#{concern}"
     end
   end
 
   def include_shared_concerns(*concerns)
     concerns.each do |concern|
-      require_dependency "shared/#{concern}"
+      require_method "shared/#{concern}"
       self.send :include, concern.to_s.camelize.constantize
     end
   end
 
   alias_method :shared_concern, :shared_concerns
   alias_method :include_shared_concern, :include_shared_concerns
+
+  protected
+
+  def require_method path
+    defined?(require_dependency) ? require_dependency(path) : require(path)
+  end
 end

data/spec/sugar-high/file_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'sugar-high/file'
-require 'sugar-high/file_mutate'
 
 describe "SugarHigh" do
   describe "File" do
@@ -23,7 +22,7 @@ describe "SugarHigh" do
       end
     end
 
-    describe '#blank?' do    
+    describe '#blank?' do
       it "should return true for an empty file" do
         File.new(empty_file).blank?.should be_true
       end
@@ -37,7 +36,7 @@ describe "SugarHigh" do
       it "should find content in file using String argument" do
         File.overwrite(search_file) do
           'Find this line right here!'
-        end                
+        end
         File.has_content?(search_file, 'line right').should be_true
         File.has_content?(search_file, 'line left').should be_false
       end
@@ -45,18 +44,18 @@ describe "SugarHigh" do
       it "should find content in file using Regexp argument" do
         File.overwrite(search_file) do
           'Find this line right here!'
-        end                
+        end
         File.has_content?(search_file, /line right/).should be_true
         File.has_content?(search_file, /line left/).should be_false
       end
     end
-    
+
     describe '#read_from' do
 
       it "should read all the content into a block" do
         File.read_from non_empty_file do |content|
           content.should match /blip/
-          content.should match /blup/        
+          content.should match /blup/
         end
       end
 
@@ -75,17 +74,17 @@ describe "SugarHigh" do
       it "should read all the content before a given marker into a block" do
         File.read_from non_empty_file, :before => 'blap' do |content|
           content.should match /blip/
-          content.should_not match /blap/        
+          content.should_not match /blap/
         end
       end
 
       it "should read all the content after a given marker into a block" do
         File.read_from non_empty_file, :after => 'blap' do |content|
           content.should match /blup/
-          content.should_not match /blap/        
+          content.should_not match /blap/
         end
       end
-    end  
+    end
 
     describe '#read_content (instance)' do
       let(:non_empty_file)      { fixture_file 'non-empty.txt' }
@@ -93,56 +92,56 @@ describe "SugarHigh" do
       it "should read all the content into a block" do
         File.new(non_empty_file).read_content do |content|
           content.should match /blip/
-          content.should match /blup/        
+          content.should match /blup/
         end
       end
-    end    
-    
+    end
+
     describe '#read_from (class)' do
       let(:non_empty_file)      { fixture_file 'non-empty.txt' }
 
       it "should read all the content into a block" do
         File.read_from(non_empty_file) do |content|
           content.should match /blip/
-          content.should match /blup/        
+          content.should match /blup/
         end
       end
-    end        
+    end
   end
-  
+
   describe "Array" do
-    describe '#file_names' do 
+    describe '#file_names' do
       let(:replace_file)    { fixture_file 'file.txt' }
-    
+
       before :each do
         File.delete replace_file if File.file?(replace_file)
-      end    
-       
+      end
+
       it "should return all file names of an array of paths to files" do
         expr = fixtures_dir + '/*.txt'
         Dir.glob(expr).file_names('txt').should include('empty', 'non-empty')
       end
     end
-  end 
-  
+  end
+
   describe "String" do
-    describe '#new_file' do 
+    describe '#new_file' do
       let(:class_file)    { fixture_file 'class_file.txt' }
-           
+
       it "should get the existing file" do
         class_file.new_file.path.should =~ /class_file/
       end
     end
-    
-    describe '#file' do 
+
+    describe '#file' do
       let(:class_file)    { fixture_file 'class_file.txt' }
-           
+
       it "should get the file" do
         class_file.file.path.should =~ /class_file/
       end
     end
 
-    describe '#dir' do            
+    describe '#dir' do
       it "should get the dir" do
         fix_path = fixtures_dir.path
         # puts fix_path
@@ -152,4 +151,3 @@ describe "SugarHigh" do
     end
   end
 end
-