sugar-high 0.3.7 → 0.4.0

data/Rakefile

@@ -9,10 +9,9 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/sugar-high"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec", ">= 2.4.1"
+    gem.add_development_dependency  "rspec",       ">= 2.4.1"
+    # gem.add_dependency              "require_all", "~> 1.2.0"
 
-    gem.add_dependency "require_all",       "~> 1.2.0"
-    gem.add_dependency "mocha",             ">= 0.9.8"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.4.0

data/lib/sugar-high.rb

@@ -1,2 +0,0 @@
-require 'require_all'
-require File.dirname(__FILE__) + '/sugar-high'

data/lib/sugar-high/blank.rb

@@ -1,24 +1,34 @@
-class NilClass
+class NilClass #:nodoc:
   def blank?
     true
   end
-
-  alias_method :wblank?, :blank?
   alias_method :empty?, :blank?
+end
+
+class FalseClass #:nodoc:
+  def blank?
+    true
+  end
+end
 
-  def any?
+class TrueClass #:nodoc:
+  def blank?
     false
   end
 end
 
+class Array #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class Hash #:nodoc:
+  alias_method :blank?, :empty?
+end
+
 class String
-  def wblank?
-    self.strip == ''
-  end
-  
-  if !defined? ::Rails  
+  if !"".respond_to? :blank
     def blank?
-      self.strip == ''
+      self !~ /\S/
     end
   end
 end  

data/lib/sugar-high/file.rb

@@ -76,10 +76,23 @@ class String
   def valid_file_command?
     self.to_sym.valid_file_command?
   end
+
+  def file
+    return ::File.new(self) if ::File.file?(self)
+    raise "No file found at #{self}"
+  end
+
+  def dir
+    return ::Dir.new(self) if ::File.directory?(self)
+    raise "No file found at #{self}"
+  end
   
   def new_file
-    return File.new(self) if File.exist?(self)
-    File.open(self, 'w')    
+    begin 
+      file
+    rescue
+      File.open(self, 'w')    
+    end
   end
 end
 

data/lib/sugar-high/file_mutate.rb

@@ -140,9 +140,10 @@ class File
     marker_found = (File.new(file.path).read =~ /#{marker}/)
     return nil if !marker_found
     
-    Mutate.mutate_file file.path, marker, place do
+    res = Mutate.mutate_file file.path, marker, place do
        content
     end
+    res
   end   
 
   module EscapedString
@@ -155,11 +156,11 @@ class File
    def self.get_marker marker
      return marker if marker.respond_to?(:escaped?) && marker.escaped?
      marker = case marker
+     when Regexp
+       marker
      when String
        Regexp.escape(marker).extend(EscapedString)
-     when Regexp
-       marker.source  
-     end
+     end       
    end
 
    def self.content options = {}, *args, &block
@@ -187,12 +188,14 @@ class File
      end
 
      marker = Insert.get_marker marker
+
      marker_found = (File.new(file.path).read =~ /#{marker}/)
      return nil if !marker_found
      
      replace_in_file file, /(#{marker})/mi do |match|
        place == :after ? "#{match}\n  #{yield}" : "#{yield}\n  #{match}"         
      end
+     true
    end  
 
    def self.replace_in_file(path, regexp, *args, &block)

data/lib/sugar-high/kind_of.rb

@@ -1,6 +1,10 @@
 require "active_support/inflector"
 
 class Object
+  def kinda_file?
+    any_kind_of?(File, Dir)
+  end
+
   def any_kind_of? *kinds
     kinds.all_kinds.each do |kind| 
       return true if self.kind_of? kind        

data/spec/fixtures/application_file.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Fixtures::Application.initialize!

data/spec/fixtures/routes_file.rb

@@ -2,6 +2,10 @@ Fixtures::Application.routes.draw do
   
   
   
+  
+  
+  
+  
   resources :users
 
   # The priority is based upon order of creation:

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rspec/core'
 require 'sugar-high'
 
 RSpec.configure do |config|
-  config.mock_with :mocha
+  # config.mock_with :mocha
 end
 
 def fixtures_dir

data/spec/sugar-high/blank_spec.rb

@@ -10,25 +10,11 @@ describe "SugarHigh" do
       end
     end
     
-    describe '#wblank' do    
-      it "nil and empty string should be blank" do
-        nil.wblank?.should be_true
-        '  '.wblank?.should be_true
-      end
-    end
-
     describe '#empty' do    
       it "nil and empty string should be empty" do
         nil.empty?.should be_true
         ''.empty?.should be_true
       end
-
-      context 'Array' do
-        it "nil and empty array should not have any" do
-          nil.any?.should be_false
-          [].any?.should be_false
-        end
-      end      
     end
   end
 end

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

@@ -8,6 +8,7 @@ describe "SugarHigh::File" do
   let(:replace_file)    { fixture_file 'file.txt' }
   let(:file_to_delete)  { fixture_file 'file_to_delete.txt' }
   let(:routes_file)     { fixture_file 'routes_file.rb' }  
+  let(:app_file)        { fixture_file 'application_file.rb' }  
 
   after do
     File.overwrite class_file do
@@ -15,7 +16,16 @@ describe "SugarHigh::File" do
   def begin
   end
 end}
-    end   
+    end 
+
+    File.overwrite app_file do    
+      %q{# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Fixtures::Application.initialize!
+}
+    end
   end
 
   before :each do
@@ -31,7 +41,7 @@ end}
       File.exist?(file_to_delete).should be_false 
     end
   end
-
+  
   describe '#delete_file! (class)' do      
     it 'should delete file' do      
       File.overwrite(file_to_delete) do
@@ -41,7 +51,7 @@ end}
       File.exist?(file_to_delete).should be_false 
     end
   end
-
+  
   describe '#delete! (instance)' do      
     it 'should delete file' do      
       File.overwrite(file_to_delete) do
@@ -51,7 +61,7 @@ end}
       File.exist?(file_to_delete).should be_false 
     end
   end
-
+  
   describe '#delete_file! (instance)' do      
     it 'should delete file' do      
       File.overwrite(file_to_delete) do
@@ -61,7 +71,7 @@ end}
       File.exist?(file_to_delete).should be_false 
     end
   end
-
+  
   describe '#append with :content option' do    
     let(:append_file)    { fixture_file 'file.txt' }
   
@@ -74,7 +84,7 @@ end}
       content.should match /Hello You/
       content.should match /Appended/      
     end
-
+  
     it 'should append content to existing file - instance method' do      
       File.overwrite(append_file) do
         'Hello You'
@@ -85,7 +95,7 @@ end}
       content.should match /Appended/      
     end
   end
-
+  
   describe '#append with block' do    
     let(:append_file)    { fixture_file 'file.txt' }
   
@@ -100,7 +110,7 @@ end}
       content.should match /Hello You/
       content.should match /Appended/      
     end
-
+  
     it "should append content to existing file using block arg - instance method" do      
       File.overwrite(append_file) do
         'Hello You'
@@ -125,7 +135,7 @@ end}
       File.replace_content_from replace_file, :where => 'You', :with => 'Me'
       File.read(replace_file).should_not match /You/              
     end
-
+  
     it 'should remove content from existing file - instance method #replace_content' do
       File.overwrite(replace_file) do
         'Hello You'
@@ -145,7 +155,7 @@ end}
       File.remove_content_from replace_file, :where => 'You'
       File.read(replace_file).should_not match /You/
     end
-
+  
     it "should remove content from existing file - instance method #remove_content" do      
       File.overwrite(replace_file) do
         'Hello You'
@@ -153,7 +163,7 @@ end}
       File.new(replace_file).remove_content :where => 'You'
       File.read(replace_file).should_not match /You/
     end
-
+  
   end
   
   describe '#remove_content_from with :content option' do    
@@ -166,7 +176,7 @@ end}
       File.remove_content_from replace_file, :content => 'You'
       File.read(replace_file).should_not match /You/
     end
-
+  
     it "should remove content from existing file - instance method #remove_content" do      
       File.overwrite(replace_file) do
         'Hello You'
@@ -208,7 +218,7 @@ end}
       end
       File.read(replace_file).should_not match /You/
     end
-
+  
     it "should remove content from existing file - instance method #remove" do      
       File.overwrite(replace_file) do
         'Hello You'
@@ -223,53 +233,62 @@ end}
   
   describe '#insert_into' do
     let(:insertion_file)    { fixture_file 'insertion.txt' }    
-  
+      
     before :each do
       File.overwrite(insertion_file) do
         'Goodbye'
       end
     end
-  
+      
     after :each do
       File.delete insertion_file if File.file?(insertion_file)
     end
-  
+      
     it "should insert Hello before Goodbye using a block as content" do
       File.insert_into insertion_file, :before => 'Goodbye' do
         'Hello'
       end
       File.read(insertion_file).should match /Hello\s+Goodbye/      
     end
-
+    
     it "should insert Hello before Goodbye using a block as content - instance method #insert" do
       File.new(insertion_file).insert :before => 'Goodbye' do
         'Hello'
       end
       File.read(insertion_file).should match /Hello\s+Goodbye/      
     end
-
-  
+    
+      
     it "should insert Hello before Goodbye using a content string arg" do
       File.insert_into insertion_file, "Hello ", :before => 'Goodbye'
       File.read(insertion_file).should match /Hello\s+Goodbye/
     end
-  
+      
     it "should insert Hello before Goodbye using a :content option" do
       File.insert_into insertion_file, :content => 'Hello', :before => 'Goodbye'
       File.read(insertion_file).should match /Hello\s+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 match /Hello\s+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 match /Goodbye\s+Hello/
     end
+
+    it "should insert Hello after Goodbye using a :with option and a Regexp for the after expression" do
+
+      pattern = Regexp.escape('::Application.initialize!')      
+      File.insert_into app_file, :after => /\w+#{pattern}/ do
+        'hello'
+      end
+      File.read(app_file).should match /hello/
+    end
     
     it "should insert Hello before last end statement" do
       File.insert_into class_file, :content => '  # Hello', :before_last => 'end' 
@@ -277,14 +296,14 @@ end}
       File.read(class_file).should match /end\s+# Hello\s+end/
       File.remove_content_from class_file, :content => '  # Hello'
     end    
-  
+      
     it "should insert Hello before last end statement but don't repeat" do
       File.insert_into class_file, :content => '  # Hello', :before_last => 'end', :repeat => true 
       puts File.read(class_file)
       File.read(class_file).should match /end\s+# Hello\s+end/
       File.remove_content_from class_file, :content => '  # Hello'
     end    
-  
+      
     it "should insert Hello before last end statement - block" do
       File.insert_into class_file, :before_last => 'end' do
         '  # Hello'
@@ -293,7 +312,7 @@ end}
       File.read(class_file).should match /end\s+# Hello\s+end/
       File.remove_content_from class_file, :content => '  # Hello'
     end    
-
+    
     it "should insert devise routes statement as first route statement" do
       File.insert_into routes_file, :after => 'routes.draw do' do
         'devise :users'

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

@@ -112,7 +112,7 @@ describe "SugarHigh" do
   
   describe "Array" do
     describe '#file_names' do 
-      let(:replace_file)    { fixture_file 'file.txt' }        
+      let(:replace_file)    { fixture_file 'file.txt' }
     
       before :each do
         File.delete replace_file if File.file?(replace_file)
@@ -127,17 +127,29 @@ describe "SugarHigh" do
   
   describe "String" do
     describe '#new_file' do 
-      let(:replace_file)    { fixture_file 'file.txt' }        
-
-      after :each do
-        File.delete replace_file if File.file?(replace_file)
-      end    
+      let(:class_file)    { fixture_file 'class_file.txt' }
            
-      it "should return all file names of an array of paths to files" do
-        replace_file.new_file
-        File.exist?(replace_file).should be_true        
+      it "should get the existing file" do
+        class_file.new_file.path.should =~ /class_file/
+      end
+    end
+    
+    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            
+      it "should get the dir" do
+        fix_path = fixtures_dir.path
+        # puts fix_path
+        # puts fix_path.dir
+        fix_path.dir.path.should =~ /fixtures/
       end
     end
-  end    
+  end
 end
     

data/sugar-high.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sugar-high}
-  s.version = "0.3.7"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2011-03-02}
   s.description = %q{More Ruby sugar - inspired by the 'zuker' project}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -43,7 +43,9 @@ Gem::Specification.new do |s|
     "lib/sugar-high/rspec/matchers/have_aliases.rb",
     "lib/sugar-high/string.rb",
     "sandbox/test_routes_mutate.rb",
+    "spec/fixtures/application_file.rb",
     "spec/fixtures/class_file.rb",
+    "spec/fixtures/class_file.txt",
     "spec/fixtures/empty.txt",
     "spec/fixtures/non-empty.txt",
     "spec/fixtures/routes_file.rb",
@@ -67,9 +69,10 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/kristianmandrup/sugar-high}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Ruby convenience sugar packs!}
   s.test_files = [
+    "spec/fixtures/application_file.rb",
     "spec/fixtures/class_file.rb",
     "spec/fixtures/routes_file.rb",
     "spec/spec_helper.rb",
@@ -94,17 +97,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 2.4.1"])
-      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<mocha>, [">= 0.9.8"])
     else
       s.add_dependency(%q<rspec>, [">= 2.4.1"])
-      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 2.4.1"])
-    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugar-high
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-28 00:00:00.000000000 +01:00
+date: 2011-03-02 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158375700 !ruby/object:Gem::Requirement
+  requirement: &2164404920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,29 +22,7 @@ dependencies:
         version: 2.4.1
   type: :development
   prerelease: false
-  version_requirements: *2158375700
-- !ruby/object:Gem::Dependency
-  name: require_all
-  requirement: &2158375100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2158375100
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &2158374580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-  type: :runtime
-  prerelease: false
-  version_requirements: *2158374580
+  version_requirements: *2164404920
 description: More Ruby sugar - inspired by the 'zuker' project
 email: kmandrup@gmail.com
 executables: []
@@ -79,7 +57,9 @@ files:
 - lib/sugar-high/rspec/matchers/have_aliases.rb
 - lib/sugar-high/string.rb
 - sandbox/test_routes_mutate.rb
+- spec/fixtures/application_file.rb
 - spec/fixtures/class_file.rb
+- spec/fixtures/class_file.txt
 - spec/fixtures/empty.txt
 - spec/fixtures/non-empty.txt
 - spec/fixtures/routes_file.rb
@@ -121,11 +101,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Ruby convenience sugar packs!
 test_files:
+- spec/fixtures/application_file.rb
 - spec/fixtures/class_file.rb
 - spec/fixtures/routes_file.rb
 - spec/spec_helper.rb