sugar-high 0.5.5 → 0.6.0

data/spec/sugar-high/rails/concerns_spec.rb

@@ -1,10 +1,40 @@
 require 'spec_helper'
 require 'rails'
 require 'sugar-high/rails/concerns'
+require 'active_support/dependencies'
+
+# The same procedure as one that needed for common #require - It should know path.
+$:.unshift File.dirname __FILE__
+
+class FixtureUser
+  concerned_with :scopes, :validations
+  shared_concerns :associations
+  include_shared_concerns :caching
+end
 
 describe "SugarHigh Rails" do
   describe "Concerns pack" do
-    pending 'TODO'
+    describe "#concerned_with" do
+      it 'should require files from #{name.underscore}/#{concern}' do
+        [:scopes, :validations].each do |concern|
+          FixtureUser.new.should respond_to("method_from_#{concern}_concern")
+        end
+      end
+    end 
+    
+    describe "#shared_concerns" do
+      it 'should require files from shared/#{concern}' do
+        pending "How to be with namespaces? Is such raw implementation enough? Or just drop this kind of method?"
+      end
+    end
+   
+    describe "#include_shared_concerns" do
+      it 'should require and include from shared/#{concern}' do
+        FixtureUser.new.should respond_to("method_from_shared_concern")
+      end
+    end
+
   end
 end
 
+

data/spec/sugar-high/rails/fixture_user/scopes.rb

@@ -0,0 +1,4 @@
+class FixtureUser
+  def method_from_scopes_concern
+  end
+end

data/spec/sugar-high/rails/fixture_user/validations.rb

@@ -0,0 +1,4 @@
+class FixtureUser
+  def method_from_validations_concern
+  end
+end

data/spec/sugar-high/rails/shared/associations.rb

@@ -0,0 +1 @@
+puts "+++++++++"

data/spec/sugar-high/rails/shared/caching.rb

@@ -0,0 +1,4 @@
+module Caching
+  def method_from_shared_concern
+  end
+end

data/sugar-high.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sugar-high}
-  s.version = "0.5.5"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-08-19}
+  s.date = %q{2011-08-21}
   s.description = %q{More Ruby sugar - inspired by the 'zuker' project}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -35,15 +35,6 @@ Gem::Specification.new do |s|
     "lib/sugar-high/enumerable.rb",
     "lib/sugar-high/file.rb",
     "lib/sugar-high/file_ext.rb",
-    "lib/sugar-high/file_mutate.rb",
-    "lib/sugar-high/file_mutate/append_content.rb",
-    "lib/sugar-high/file_mutate/delete.rb",
-    "lib/sugar-high/file_mutate/insert_content.rb",
-    "lib/sugar-high/file_mutate/mutate.rb",
-    "lib/sugar-high/file_mutate/overwrite_content.rb",
-    "lib/sugar-high/file_mutate/remove_content.rb",
-    "lib/sugar-high/file_mutate/replace_content.rb",
-    "lib/sugar-high/file_mutation.rb",
     "lib/sugar-high/hash.rb",
     "lib/sugar-high/includes.rb",
     "lib/sugar-high/kind_of.rb",
@@ -60,46 +51,15 @@ 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/auto_load_blank_root.rb",
-    "spec/autoload_blank_root.rb",
-    "spec/autoload_blank_root/hello.rb",
-    "spec/autoload_blank_root/sailor.rb",
-    "spec/fixtures/application_file.rb",
-    "spec/fixtures/autoload_modules.rb",
-    "spec/fixtures/autoload_modules/subdir/first.rb",
-    "spec/fixtures/autoload_modules/subdir/second.rb",
-    "spec/fixtures/autoload_modules/subdir/third.rb",
-    "spec/fixtures/autoload_modules_root.rb",
-    "spec/fixtures/autoload_modules_root/first.rb",
-    "spec/fixtures/autoload_modules_root/second.rb",
-    "spec/fixtures/autoload_modules_root/third.rb",
-    "spec/fixtures/autoload_modulez.rb",
-    "spec/fixtures/autoload_modulez/first.rb",
-    "spec/fixtures/autoload_modulez/second.rb",
-    "spec/fixtures/autoload_modulez/third_one_here.rb",
-    "spec/fixtures/class_file.rb",
-    "spec/fixtures/class_file.txt",
-    "spec/fixtures/content_file.txt",
     "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",
     "spec/sugar-high/arguments_spec.rb",
     "spec/sugar-high/array_spec.rb",
     "spec/sugar-high/blank_spec.rb",
-    "spec/sugar-high/class_ext_spec.rb",
     "spec/sugar-high/dsl_spec.rb",
-    "spec/sugar-high/file/file_dsl_spec.rb",
-    "spec/sugar-high/file_mutate/append_content_spec.rb",
-    "spec/sugar-high/file_mutate/delete_spec.rb",
-    "spec/sugar-high/file_mutate/insert_before_last_spec.rb",
-    "spec/sugar-high/file_mutate/insert_content_spec.rb",
-    "spec/sugar-high/file_mutate/overwrite_content_spec.rb",
-    "spec/sugar-high/file_mutate/remove_content_spec.rb",
-    "spec/sugar-high/file_mutate/replace_content_spec.rb",
     "spec/sugar-high/file_spec.rb",
     "spec/sugar-high/hash_spec.rb",
     "spec/sugar-high/includes_spec.rb",
@@ -110,6 +70,10 @@ Gem::Specification.new do |s|
     "spec/sugar-high/path_spec.rb",
     "spec/sugar-high/properties_spec.rb",
     "spec/sugar-high/rails/concerns_spec.rb",
+    "spec/sugar-high/rails/fixture_user/scopes.rb",
+    "spec/sugar-high/rails/fixture_user/validations.rb",
+    "spec/sugar-high/rails/shared/associations.rb",
+    "spec/sugar-high/rails/shared/caching.rb",
     "spec/sugar-high/regexp_spec.rb",
     "spec/sugar-high/string_spec.rb",
     "sugar-high.gemspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugar-high
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-19 00:00:00.000000000Z
+date: 2011-08-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161732500 !ruby/object:Gem::Requirement
+  requirement: &2155469300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161732500
+  version_requirements: *2155469300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161732020 !ruby/object:Gem::Requirement
+  requirement: &2155468820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2161732020
+  version_requirements: *2155468820
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2161731540 !ruby/object:Gem::Requirement
+  requirement: &2155468340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *2161731540
+  version_requirements: *2155468340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161731060 !ruby/object:Gem::Requirement
+  requirement: &2155467860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2161731060
+  version_requirements: *2155467860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161730580 !ruby/object:Gem::Requirement
+  requirement: &2155467380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2161730580
+  version_requirements: *2155467380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2161730100 !ruby/object:Gem::Requirement
+  requirement: &2155466900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161730100
+  version_requirements: *2155466900
 description: More Ruby sugar - inspired by the 'zuker' project
 email: kmandrup@gmail.com
 executables: []
@@ -103,15 +103,6 @@ files:
 - lib/sugar-high/enumerable.rb
 - lib/sugar-high/file.rb
 - lib/sugar-high/file_ext.rb
-- lib/sugar-high/file_mutate.rb
-- lib/sugar-high/file_mutate/append_content.rb
-- lib/sugar-high/file_mutate/delete.rb
-- lib/sugar-high/file_mutate/insert_content.rb
-- lib/sugar-high/file_mutate/mutate.rb
-- lib/sugar-high/file_mutate/overwrite_content.rb
-- lib/sugar-high/file_mutate/remove_content.rb
-- lib/sugar-high/file_mutate/replace_content.rb
-- lib/sugar-high/file_mutation.rb
 - lib/sugar-high/hash.rb
 - lib/sugar-high/includes.rb
 - lib/sugar-high/kind_of.rb
@@ -128,46 +119,15 @@ 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/auto_load_blank_root.rb
-- spec/autoload_blank_root.rb
-- spec/autoload_blank_root/hello.rb
-- spec/autoload_blank_root/sailor.rb
-- spec/fixtures/application_file.rb
-- spec/fixtures/autoload_modules.rb
-- spec/fixtures/autoload_modules/subdir/first.rb
-- spec/fixtures/autoload_modules/subdir/second.rb
-- spec/fixtures/autoload_modules/subdir/third.rb
-- spec/fixtures/autoload_modules_root.rb
-- spec/fixtures/autoload_modules_root/first.rb
-- spec/fixtures/autoload_modules_root/second.rb
-- spec/fixtures/autoload_modules_root/third.rb
-- spec/fixtures/autoload_modulez.rb
-- spec/fixtures/autoload_modulez/first.rb
-- spec/fixtures/autoload_modulez/second.rb
-- spec/fixtures/autoload_modulez/third_one_here.rb
-- spec/fixtures/class_file.rb
-- spec/fixtures/class_file.txt
-- spec/fixtures/content_file.txt
 - 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
 - spec/sugar-high/arguments_spec.rb
 - spec/sugar-high/array_spec.rb
 - spec/sugar-high/blank_spec.rb
-- spec/sugar-high/class_ext_spec.rb
 - spec/sugar-high/dsl_spec.rb
-- spec/sugar-high/file/file_dsl_spec.rb
-- spec/sugar-high/file_mutate/append_content_spec.rb
-- spec/sugar-high/file_mutate/delete_spec.rb
-- spec/sugar-high/file_mutate/insert_before_last_spec.rb
-- spec/sugar-high/file_mutate/insert_content_spec.rb
-- spec/sugar-high/file_mutate/overwrite_content_spec.rb
-- spec/sugar-high/file_mutate/remove_content_spec.rb
-- spec/sugar-high/file_mutate/replace_content_spec.rb
 - spec/sugar-high/file_spec.rb
 - spec/sugar-high/hash_spec.rb
 - spec/sugar-high/includes_spec.rb
@@ -178,6 +138,10 @@ files:
 - spec/sugar-high/path_spec.rb
 - spec/sugar-high/properties_spec.rb
 - spec/sugar-high/rails/concerns_spec.rb
+- spec/sugar-high/rails/fixture_user/scopes.rb
+- spec/sugar-high/rails/fixture_user/validations.rb
+- spec/sugar-high/rails/shared/associations.rb
+- spec/sugar-high/rails/shared/caching.rb
 - spec/sugar-high/regexp_spec.rb
 - spec/sugar-high/string_spec.rb
 - sugar-high.gemspec
@@ -195,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 965949854900223012
+      hash: -2156933571915273099
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/sugar-high/file_mutate.rb

@@ -1,2 +0,0 @@
-require 'sugar-high/file_mutation'
-File.mutate_ext :all

data/lib/sugar-high/file_mutate/append_content.rb

@@ -1,17 +0,0 @@
-module SugarHigh
-  module FileMutate
-    module AppendContent
-      def append content=nil, &block
-        File.append self.path, content, &block
-      end
-
-      module ClassMethods
-        def append path, content=nil, &block
-          File.open(path, 'a') do |f|
-            f.puts content ||= yield
-          end
-        end 
-      end
-    end
-  end
-end

data/lib/sugar-high/file_mutate/delete.rb

@@ -1,29 +0,0 @@
-require 'sugar-high/blank'
-require 'sugar-high/arguments'
-require 'sugar-high/path'
-require 'sugar-high/regexp'
-require 'sugar-high/string'
-require 'sugar-high/file'
-
-module SugarHigh
-  module FileMutate
-    module Delete
-      module ClassMethods
-        def delete! name
-          return nil if !File.exist?(name)
-          File.delete name
-        end
-        alias_method :delete_file!, :delete!
-      end
-      
-      def delete!
-        File.delete(self.path)
-      end
-      alias_method :delete_file!, :delete!
-
-      def mutate marker, place, &block
-        File.mutate_file self.path, marker, place, &block
-      end
-    end      
-  end
-end

data/lib/sugar-high/file_mutate/insert_content.rb

@@ -1,62 +0,0 @@
-module SugarHigh
-  module FileMutate
-    module InsertContent
-      def insert *args, &block
-        File.insert_into self.path, *args, &block
-      end
-
-      module ClassMethods
-        # insert_into 'my_file.txt', :after => 'Blip', :content => 'Hello
-        # insert_into 'my_file.txt', 'Hello', :after => 'Blip' 
-        # insert_into 'my_file.txt', :after => 'Blip' do 
-        #  'Hello'
-        # end  
-        def insert_into file_name, *args, &block
-          options = last_option args
-          content = insertion_content options, *args, &block
-
-          # no content to insert?
-          return nil if content.blank? 
-
-          file = begin
-            get_file(file_name)
-          rescue
-            return nil
-          end
-
-          # already inserted?
-          return nil if !options[:repeat] && file.has_content?(content)
-
-          # find where to insert
-          place, marker = if options[:before] 
-              [ :before, options[:before] ]
-            elsif options[:before_last]
-              [ :before_last, options[:before_last] ]
-            else
-              [ :after, options[:after] ]
-          end 
-
-          return nil if !file.has_content?(marker)
-
-          # do mutation
-          res = file.mutate marker, place do
-             content
-          end
-          res
-        end
-
-        def insertion_content options = {}, *args, &block
-          case args.first
-          when String
-            args.first
-          when Hash
-            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" 
-          end     
-        end
-      end
-    end
-  end
-end

data/lib/sugar-high/file_mutate/mutate.rb

@@ -1,57 +0,0 @@
-module SugarHigh
-  module FileMutate
-    module Mutate
-      module ClassMethods
-        def mutate_file file, marker, place, &block
-         raise ArgumentError, "You must define a replacement marker for a :before, :before_last or :after key" if !marker 
-
-         file = File.get_file(file)
-
-         if place == :before_last
-           content = file.read
-           content = content.insert_before_last yield, marker
-           file.overwrite content
-           return
-         end
-
-         marker_found = file.has_content? 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 replace_in_file(file, regexp, *args, &block)
-         file = File.get_file(file)
-         content = file.read.gsub(regexp, *args, &block)
-         file.overwrite content
-        end    
-
-
-        def get_file file_name
-          case file_name
-          when PathString, String 
-            File.new file_name
-          when File
-            file_name
-          else
-            raise ArgumentError, "Could not be converted to a File object: #{file_name}"
-          end
-        end  
-
-        def get_filepath file
-          case file
-          when PathString, String 
-            file
-          when File
-            file.path
-          else
-            raise ArgumentError, "Could not be converted to a file path: #{file_name}"
-          end
-        end
-      end 
-    end  
-  end
-end