sugar-high 0.3.6 → 0.3.7

data/README.markdown

@@ -1,6 +1,6 @@
 # Sugar high!
 
-Named in honor of the bailouts after 2008 crisis which led to a temporary 'sugar-high' in the markets. Inspired by the 'zucker' project.
+Inspired by the 'zucker' project.
 
 ## Install
 

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/sugar-high/file.rb

@@ -76,6 +76,11 @@ class String
   def valid_file_command?
     self.to_sym.valid_file_command?
   end
+  
+  def new_file
+    return File.new(self) if File.exist?(self)
+    File.open(self, 'w')    
+  end
 end
 
 class Symbol

data/lib/sugar-high/file_mutate.rb

@@ -135,22 +135,28 @@ class File
       else
         [ :after, options[:after] ]
     end 
-    
 
     marker = Insert.get_marker marker
-
-    return nil if !(File.new(file.path).read =~ /#{Regexp.escape(marker.to_s)}/)
+    marker_found = (File.new(file.path).read =~ /#{marker}/)
+    return nil if !marker_found
     
     Mutate.mutate_file file.path, marker, place do
        content
     end
   end   
 
+  module EscapedString
+    def escaped?
+      true
+    end
+  end
+
   module Insert
    def self.get_marker marker
+     return marker if marker.respond_to?(:escaped?) && marker.escaped?
      marker = case marker
      when String
-       Regexp.escape(marker)
+       Regexp.escape(marker).extend(EscapedString)
      when Regexp
        marker.source  
      end
@@ -179,8 +185,12 @@ class File
        File.open(file, 'wb') { |file| file.write(content) }         
        return
      end
-                 
-     replace_in_file file, /(#{Regexp.escape(marker.to_s)})/mi do |match|
+
+     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
    end  

data/sandbox/test_routes_mutate.rb

@@ -0,0 +1,8 @@
+s = %q{content: Fixtures::Application.routes.draw do
+  resources :users}
+
+marker = 'routes.draw do'
+
+puts "esc marker: #{Regexp.escape(marker.to_s)}"
+  
+puts (s =~ /#{Regexp.escape(marker.to_s)}/)

data/spec/fixtures/routes_file.rb

@@ -0,0 +1,63 @@
+Fixtures::Application.routes.draw do
+  
+  
+  
+  resources :users
+
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id(.:format)))'
+end

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

@@ -6,7 +6,8 @@ describe "SugarHigh::File" do
   let(:non_empty_file)  { fixture_file 'non-empty.txt'} 
   let(:class_file)      { fixture_file 'class_file.rb'} 
   let(:replace_file)    { fixture_file 'file.txt' }
-  let(:file_to_delete)    { fixture_file 'file_to_delete.txt' }
+  let(:file_to_delete)  { fixture_file 'file_to_delete.txt' }
+  let(:routes_file)     { fixture_file 'routes_file.rb' }  
 
   after do
     File.overwrite class_file do
@@ -292,5 +293,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 devise routes statement as first route statement" do
+      File.insert_into routes_file, :after => 'routes.draw do' do
+        'devise :users'
+      end
+      puts File.read(routes_file)
+      File.read(routes_file).should match /routes.draw\s+do\s+devise :users/
+      File.remove_content_from routes_file, :content => 'devise :users'
+    end    
   end 
 end

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

@@ -123,6 +123,21 @@ describe "SugarHigh" do
         Dir.glob(expr).file_names('txt').should include('empty', 'non-empty')
       end
     end
-  end  
+  end 
+  
+  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    
+           
+      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        
+      end
+    end
+  end    
 end
     

data/sugar-high.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sugar-high}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -42,9 +42,11 @@ Gem::Specification.new do |s|
     "lib/sugar-high/rspec/configure.rb",
     "lib/sugar-high/rspec/matchers/have_aliases.rb",
     "lib/sugar-high/string.rb",
+    "sandbox/test_routes_mutate.rb",
     "spec/fixtures/class_file.rb",
     "spec/fixtures/empty.txt",
     "spec/fixtures/non-empty.txt",
+    "spec/fixtures/routes_file.rb",
     "spec/fixtures/search_file.txt",
     "spec/spec_helper.rb",
     "spec/sugar-high/alias_spec.rb",
@@ -69,6 +71,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Ruby convenience sugar packs!}
   s.test_files = [
     "spec/fixtures/class_file.rb",
+    "spec/fixtures/routes_file.rb",
     "spec/spec_helper.rb",
     "spec/sugar-high/alias_spec.rb",
     "spec/sugar-high/arguments_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugar-high
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154945320 !ruby/object:Gem::Requirement
+  requirement: &2158375700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.4.1
   type: :development
   prerelease: false
-  version_requirements: *2154945320
+  version_requirements: *2158375700
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2154944800 !ruby/object:Gem::Requirement
+  requirement: &2158375100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154944800
+  version_requirements: *2158375100
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2154944120 !ruby/object:Gem::Requirement
+  requirement: &2158374580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *2154944120
+  version_requirements: *2158374580
 description: More Ruby sugar - inspired by the 'zuker' project
 email: kmandrup@gmail.com
 executables: []
@@ -78,9 +78,11 @@ files:
 - lib/sugar-high/rspec/configure.rb
 - lib/sugar-high/rspec/matchers/have_aliases.rb
 - lib/sugar-high/string.rb
+- sandbox/test_routes_mutate.rb
 - spec/fixtures/class_file.rb
 - spec/fixtures/empty.txt
 - spec/fixtures/non-empty.txt
+- spec/fixtures/routes_file.rb
 - spec/fixtures/search_file.txt
 - spec/spec_helper.rb
 - spec/sugar-high/alias_spec.rb
@@ -125,6 +127,7 @@ specification_version: 3
 summary: Ruby convenience sugar packs!
 test_files:
 - spec/fixtures/class_file.rb
+- spec/fixtures/routes_file.rb
 - spec/spec_helper.rb
 - spec/sugar-high/alias_spec.rb
 - spec/sugar-high/arguments_spec.rb