RubyExt 0.1.1 → 0.1.2

data/README

@@ -1,6 +1,20 @@
 === Readme ===
-{TODO}
-
+For docs go to spec.
+
+Most usefull classes are: ClassLoader, Cache, Localization, Synchronizer, Path, 
+module.rb, assert.rb.
+
+=== Memo ====
+I'm new to Git and this is shome memo for me :).
+ssh-add axyd
+git remote add origin git@github.com:alexeypetrushin/RubyExt.git
+git pull origin master
+git push origin master
+http://jonas.nitro.dk/git/quick-reference.html
+
+=== Copyright ===
+Copyright (c) 2009, Alexey Petrushin
+All rights reserved.
 
 === License (LGPL) ===
 

data/lib/RubyExt/Config.rb

@@ -0,0 +1,23 @@
+class Config
+	attr_reader :runtime, :config, :default
+	
+	def initialize runtime, config, default		
+		@runtime, @config, @default = runtime, config, default
+	end
+	
+	def [] key
+		value = @runtime[key]
+		value = @config[key] if value.equal? nil
+		value = @default[key] if value.equal? nil			
+		raise "There is no key #{key}!" if value.equal? nil
+		return value
+	end
+	
+	def []= key, value
+		@runtime[key] = value
+	end
+	
+	def include? key
+		(@runtime[key] != nil) or (@config[key] != nil) or (@default[key] != nil)
+	end
+end

data/lib/RubyExt/Log.rb

@@ -54,6 +54,6 @@ module Log
 end
 
 module Log
-	config = Dir.getwd + "config/log.xml" 
+	config = Dir.getwd + "/config/log.xml" 
 	Log4r::Configurator.load_xml_string(File.read(config)) if File.exist? config
 end

data/lib/RubyExt/Resource/file_system_provider.rb

@@ -3,7 +3,7 @@ module RubyExt
 		attr_accessor :directories
 		
 		def initialize directories = lambda{[File.expand_path('.')]}
-			@directories, @files, @cache = directories, {}, {}		
+			@directories = directories
 		end
 		
 		def class_get class_name
@@ -33,7 +33,7 @@ module RubyExt
 			end
 			
 			length = File.write(path, data)
-			remember_file path
+			FileSystemProvider.remember_file path
 			return length
 		end
 		
@@ -81,7 +81,7 @@ module RubyExt
 			end
 			
 			length =  File.write path, data
-			remember_file path
+			FileSystemProvider.remember_file path
 			return length
 		end
 		
@@ -90,43 +90,7 @@ module RubyExt
 			raise Resource::NotExist unless class_path
 			
 			real_resource_path(class_name, resource_name) != nil
-		end
-		
-		
-		def check_for_changed_files
-			changed = []
-			v = @directories.call
-			@directories.call.inject([]){|list, dir| list + Dir.glob("#{dir}/**/**")}.each do |path|
-				if file_changed? path
-					remember_file path
-					changed << file_changed(path)							
-				end
-			end
-			return changed
-		end
-		
-		def reset_changed_files
-			@files = {}
-			@directories.call.inject([]){|list, dir| list + Dir.glob("#{dir}/**/**")}.each do |path|
-				remember_file path
-			end
-		end
-		
-		# Different Providers can use different class path interpretation.
-		# So we return virtual path only if this path really exist.
-		def class_to_virtual_file class_name
-			path = nil
-			if @cache.include? class_name
-				path = @cache[class_name]
-			else
-				path = real_class_path class_name								
-				raise Resource::NotExist, "Class '#{class_name}' doesn't Exist!" unless path
-				
-				@cache[class_name] = path
-			end						
-			
-			File.expand_path path
-		end
+		end						
 		
 		#		def class_to_virtual_path class_name
 		#			result = nil
@@ -158,6 +122,112 @@ module RubyExt
 		#			end
 		#		end
 		
+		# Different Providers can use different class path interpretation.
+		# So we return virtual path only if this path really exist.
+		def class_to_virtual_file class_name
+			path = nil
+			if FileSystemProvider.cache.include? class_name
+				path = FileSystemProvider.cache[class_name]
+			else
+				path = real_class_path class_name								
+				raise Resource::NotExist, "Class '#{class_name}' doesn't Exist!" unless path
+				
+				FileSystemProvider.cache[class_name] = path
+			end						
+			
+			File.expand_path path
+		end
+		
+		# Reloading
+		@files, @cache = {}, {}
+		class << self
+			attr_reader :cache
+			
+			def start_watching interval = 2, directories = Dir.glob("**/lib")
+				stop_watching
+				@watch_thread = Thread.new do					
+					reset_changed_files directories
+					while true
+						sleep interval
+						begin
+							check_for_changed_files(directories).each do |type, klass, res|												
+								Resource.notify_observers :update_resource, type, klass, res
+							end							
+						rescue Exception => e
+							warn e
+						end
+					end
+				end
+			end
+			
+			def stop_watching
+				if @watch_thread
+					@watch_thread.kill
+					@watch_thread = nil
+				end
+			end
+			
+			def remember_file path			
+				@files[path] = File.mtime(path)
+			end
+			
+			protected
+			def check_for_changed_files directories
+				changed = []
+				directories.inject([]){|list, dir| list + Dir.glob("#{dir}/**/**")}.each do |path|
+					if file_changed? path, directories
+						remember_file path
+						changed << file_changed(path, directories)							
+					end
+				end
+				return changed
+			end
+			
+			def reset_changed_files directories
+				@files = {}
+				directories.inject([]){|list, dir| list + Dir.glob("#{dir}/**/**")}.each do |path|
+					remember_file path
+				end
+			end						
+			
+			def file_changed? path, directories
+				old_time = @files[path]
+				old_time == nil or old_time != File.mtime(path)
+			end
+			
+			def file_changed path, directories
+				begin
+					if path =~ /\.rb$/
+						path = path.sub(/\.rb$/, "")
+						class_name = path_to_class(path, directories)
+						
+						# ClassLoader.reload_class()
+						klass = eval class_name, TOPLEVEL_BINDING, __FILE__, __LINE__
+						cache.delete class_name
+						return :class, klass, nil
+					else		
+						if path =~ /\.res/
+							class_path = path.sub(/\.res.+/, "")
+							resource_name3 = path.sub("#{class_path}.res/", "")
+							class_name = path_to_class class_path, directories
+						else
+							resource_name3 = path.sub(/.+\./, "")
+							class_name = path_to_class path.sub(/\.#{resource_name3}$/, ""), directories
+						end			
+						klass = eval class_name, TOPLEVEL_BINDING, __FILE__, __LINE__
+						return :resource, klass, resource_name3
+					end
+				rescue Exception => e
+					warn "Can't reload file '#{path}' #{e.message}!"																				
+				end
+			end
+			
+			def path_to_class path, directories
+				base_dir = directories.select{|f| path.include? f}.max{|a, b| a.size <=> b.size}
+				path.gsub(/^#{base_dir}\//, "").gsub("/", "::")
+			end
+		end
+		
 		protected	
 		def real_class_path class_name
 			path = class_to_files(class_name).find{|f| File.exist? f}
@@ -180,48 +250,7 @@ module RubyExt
 		def class_to_basefiles class_name
 			relative = class_name.gsub("::", "/")
 			return @directories.call.collect{|dir| "#{dir}/#{relative}"}
-		end
-		
-		def remember_file path
-			@files[path] = File.mtime(path)
-		end
-		
-		def file_changed? path
-			old_time = @files[path]
-			old_time == nil or old_time != File.mtime(path)
-		end
-		
-		def file_changed path
-			begin
-				if path =~ /\.rb$/
-					path = path.sub(/\.rb$/, "")
-					class_name = path_to_class(path)
-					
-					# ClassLoader.reload_class()
-					klass = eval class_name, TOPLEVEL_BINDING, __FILE__, __LINE__
-					@cache.delete class_name
-					return :class, klass, nil
-				else
-					if path =~ /\.res/
-						class_path = path.sub(/\.res.+/, "")
-						resource_name = path.sub("#{class_path}.res/", "")
-						class_name = path_to_class class_path
-					else
-						resource_name = path.sub(/.+\./, "")
-						class_name = path_to_class path.sub(/\.#{resource_name}$/, "")
-					end			
-					klass = eval class_name, TOPLEVEL_BINDING, __FILE__, __LINE__
-					return :resource, klass, resource_name			
-				end
-			rescue Exception => e
-				warn "Can't reload file '#{path}' #{e.message}!"																				
-			end
-		end
-		
-		def path_to_class path
-			base_dir = @directories.call.select{|f| path.include? f}.max{|a, b| a.size <=> b.size}
-			path.gsub(/^#{base_dir}\//, "").gsub("/", "::")
-		end
+		end		
 		
 		#			Doesn't make Sense for Virtual Resource System
 		#			def resource_path class_name, resource_name

data/lib/RubyExt/_require.rb

@@ -0,0 +1,56 @@
+require 'RubyExt/require_base'
+
+# Ruby Classes extensions
+%w{
+symbol string array false_class true_class nil_class
+}.each{|n| require "RubyExt/#{n}"}
+
+Path = RubyExt::Path
+Log = RubyExt::Log
+Observable = RubyExt::Observable
+OpenConstructor = RubyExt::OpenConstructor
+Cache = RubyExt::Cache
+
+# Facets
+require 'facets/elementor'
+require 'facets/blankslate'
+# Dictionary, Crypt, BiCrypt, Duration, LRUCache, LinkedList, Timer, Memoizer,
+# Recorder, attr_validator
+# "TreeTop" - cool Ruby Parser DSL.
+
+# ResourceProcessing
+require 'yaml'
+module RubyExt
+	Resource.register_resource_extension(
+	".yaml",
+	lambda{|data, klass, name| YAML.load(data)}, 
+	lambda{|data, klass, name| YAML.dump(data)}
+	)
+	
+	Resource.register_resource_extension(
+	".rb",
+	lambda{|data, klass, name|
+		script = ClassLoader.wrap_inside_namespace(klass, data)
+		eval script, TOPLEVEL_BINDING, "#{klass.name}/#{name}"
+	}, 
+	lambda{|data, klass, name| raise "Writing '.rb' Resource isn't supported!"}
+	)	
+end
+
+# Cache
+Cache.cached_with_params :class, Module, :resource_exist?, :[]
+
+# Others
+require 'fileutils'
+# Undef
+#[
+#:select, :autoload, :autoload?, :chomp, :chomp!, :chop, :chop!, :fail, :format, :gsub,
+#:gsub!, :iterator?, :open, :print, :printf, :puts, :putc, :readline, :readlines, :scan,
+#:split, :sub, :sub!, :test, :trap, :warn
+#].each do |m|
+#	Kernel.send :undef_method, m
+#end
+
+# select
+
+require 'RubyExt/debug'

data/lib/RubyExt/_require_base.rb

@@ -0,0 +1,35 @@
+require 'monitor'
+require 'singleton'
+require 'set'
+
+class NotDefined; end
+
+# Core Classes, can't be excluded.
+%w{
+kernel module object class file
+}.each{|n| require "RubyExt/#{n}"}
+
+require 'RubyExt/assert'
+require 'RubyExt/observable'
+
+require 'RubyExt/resource'
+require 'RubyExt/Resource/file_system_provider'
+
+# Need this complex loading for correct work of 'raise_without_self''
+module RubyExt
+	#	libraries_in_working_dir = Dir.glob("*/**/lib").select{|f| File.directory? f}.collect{|f| File.expand_path f}
+	#	specs_in_working_dir = Dir.glob("*/**/spec").select{|f| File.directory? f}.collect{|f| File.expand_path f}
+	directories = lambda do 
+		$LOAD_PATH.select{|f| ![/site_ruby/, /vendor_ruby/, /bin$/].any?{|re| f =~ re}}\
+		.collect{|f| File.expand_path f}
+		#		$LOAD_PATH.select{|dir| dir =~ /gems.+lib/}
+		#		$LOAD_PATH.select{|dir| dir =~ /gems.+spec/} + 
+		#		[Dir.getwd] + 
+		#		libraries_in_working_dir
+		#		specs_in_working_dir
+	end
+	Resource.add_resource_provider FileSystemProvider.new(directories)
+	
+	script = Resource.class_get "RubyExt::ClassLoader"
+	eval script, TOPLEVEL_BINDING, Resource.class_to_virtual_file("RubyExt::ClassLoader")  
+end

data/lib/RubyExt/require.rb

@@ -1,56 +1 @@
-require 'RubyExt/require_base'
-
-# Ruby Classes extensions
-%w{
-symbol string array false_class true_class nil_class
-}.each{|n| require "RubyExt/#{n}"}
-
-Path = RubyExt::Path
-Log = RubyExt::Log
-Observable = RubyExt::Observable
-OpenConstructor = RubyExt::OpenConstructor
-Cache = RubyExt::Cache
-
-# Facets
-require 'facets/elementor'
-require 'facets/blankslate'
-# Dictionary, Crypt, BiCrypt, Duration, LRUCache, LinkedList, Timer, Memoizer,
-# Recorder, attr_validator
-# "TreeTop" - cool Ruby Parser DSL.
-
-# ResourceProcessing
-require 'yaml'
-module RubyExt
-	Resource.register_resource_extension(
-	".yaml",
-	lambda{|data, klass, name| YAML.load(data)}, 
-	lambda{|data, klass, name| YAML.dump(data)}
-	)
-	
-	Resource.register_resource_extension(
-	".rb",
-	lambda{|data, klass, name|
-		script = ClassLoader.wrap_inside_namespace(klass, data)
-		eval script, TOPLEVEL_BINDING, "#{klass.name}/#{name}"
-	}, 
-	lambda{|data, klass, name| raise "Writing '.rb' Resource isn't supported!"}
-	)	
-end
-
-# Cache
-Cache.cached_with_params :class, Module, :resource_exist?, :[]
-
-# Others
-require 'fileutils'
-# Undef
-#[
-#:select, :autoload, :autoload?, :chomp, :chomp!, :chop, :chop!, :fail, :format, :gsub,
-#:gsub!, :iterator?, :open, :print, :printf, :puts, :putc, :readline, :readlines, :scan,
-#:split, :sub, :sub!, :test, :trap, :warn
-#].each do |m|
-#	Kernel.send :undef_method, m
-#end
-
-# select
-
-require 'RubyExt/debug'
+require 'RubyExt/_require'

data/lib/RubyExt/require_base.rb

@@ -1,35 +1 @@
-require 'monitor'
-require 'singleton'
-require 'set'
-
-class NotDefined; end
-
-# Core Classes, can't be excluded.
-%w{
-kernel module object class file
-}.each{|n| require "RubyExt/#{n}"}
-
-require 'RubyExt/assert'
-require 'RubyExt/observable'
-
-require 'RubyExt/resource'
-require 'RubyExt/Resource/file_system_provider'
-
-# Need this complex loading for correct work of 'raise_without_self''
-module RubyExt
-	#	libraries_in_working_dir = Dir.glob("*/**/lib").select{|f| File.directory? f}.collect{|f| File.expand_path f}
-	#	specs_in_working_dir = Dir.glob("*/**/spec").select{|f| File.directory? f}.collect{|f| File.expand_path f}
-	directories = lambda do 
-		$LOAD_PATH.select{|f| ![/site_ruby/, /vendor_ruby/, /bin$/].any?{|re| f =~ re}}\
-		.collect{|f| File.expand_path f}
-		#		$LOAD_PATH.select{|dir| dir =~ /gems.+lib/}
-		#		$LOAD_PATH.select{|dir| dir =~ /gems.+spec/} + 
-		#		[Dir.getwd] + 
-		#		libraries_in_working_dir
-		#		specs_in_working_dir
-	end
-	Resource.add_resource_provider FileSystemProvider.new(directories)
-	
-	script = Resource.class_get "RubyExt::ClassLoader"
-	eval script, TOPLEVEL_BINDING, Resource.class_to_virtual_file("RubyExt::ClassLoader")  
-end
+require 'RubyExt/_require_base'

data/lib/RubyExt/resource.rb

@@ -142,33 +142,7 @@ module RubyExt
 						p.resource_exist? klass.name, resource_name
 					end
 				end
-			end						
-			
-			def start_watching interval = 2
-				stop_watching
-				@watch_thread = Thread.new do
-					providers.each{|p| p.reset_changed_files}
-					while true
-						sleep interval
-						begin
-							providers.each do |p| 
-								p.check_for_changed_files.each do |type, klass, res|			
-									notify_observers :update_resource, type, klass, res
-								end
-							end
-						rescue Exception => e
-							warn e
-						end
-					end
-				end
-			end
-			
-			def stop_watching
-				if @watch_thread
-					@watch_thread.kill
-					@watch_thread = nil
-				end
-			end
+			end												
 			
 			def class_to_virtual_file class_name
 				@monitor.synchronize do				

data/rakefile

@@ -3,6 +3,7 @@ require 'spec/rake/spectask'
 
 Dir.chdir File.dirname(__FILE__)	
 
+# Specs
 task :default => :spec
 
 Spec::Rake::SpecTask.new('spec') do |t|
@@ -10,13 +11,14 @@ Spec::Rake::SpecTask.new('spec') do |t|
 	t.libs = ["lib", "spec"]
 end
 
+# Gem
 require 'rake/clean'
 require 'rake/gempackagetask'
 require 'fileutils'
 
 spec = Gem::Specification.new do |s|
 	s.name = "RubyExt"
-	s.version = "0.1.1"
+	s.version = "0.1.2"
 	s.summary = "A set of Ruby language extensions, mainly for ActivePoint Project"
 	s.description = "A set of Ruby language extensions, mainly for ActivePoint Project"
 	s.author = "Alexey Petrushin"
@@ -32,13 +34,14 @@ spec = Gem::Specification.new do |s|
 	.select{|f| f !~ /^\./}
 	#	s.executables = ['restclient']
 	#	s.add_dependency("BlueCloth", ">= 0.0.4")
+	s.add_dependency "facets"
 	
 	s.require_path = "lib"
 end
 
 Rake::GemPackageTask.new(spec) do |p|
 	package_dir = "#{File.expand_path File.dirname(__FILE__)}/../build"
-	FileUtils.mkdir package_dir unless File.exist? package_dir	
+#	FileUtils.mkdir package_dir unless File.exist? package_dir	
 	p.need_tar = true if RUBY_PLATFORM !~ /mswin/
 	p.need_zip = true
 	p.package_dir = package_dir

data/spec/RubyExt/ForResource/ResourceTest/Test.rb

@@ -1 +1,11 @@
-class Test; end
+require 'ActivePoint/require'
+
+#y({:en => WGUIExt::Editors::RichTextData.new})
+
+v = ObjectModel::Types::ObjectType.yaml_load %{--- 
+:en: !ruby/object:WGUIExt::Editors::RichTextData 
+  resources: []
+
+  text: ""}
+
+p v

data/spec/config_spec.rb

@@ -0,0 +1,37 @@
+require 'RubyExt/require'
+require 'spec'
+
+module RubyExt
+	describe 'Config' do
+		it "Use Case" do
+			runtime = {1 => 1}
+			config = {1 => 2, 2 => 2}
+			default = {1 => 3, 2 => 3, 3 => 3}			
+			
+			c = RubyExt::Config.new runtime, config, default
+			c[1].should == 1
+			c[2].should == 2
+			c[3].should == 3
+			
+			lambda{c[:unknown]}.should raise_error(/key/)
+		end
+		
+		it "set runtime key" do
+			c = RubyExt::Config.new({}, {}, {})
+			lambda{c[:key]}.should raise_error(/key/)
+			c[:key] = :value
+			c[:key].should == :value
+		end
+		
+		it "shouold correct works with false" do
+			runtime = {1 => false, 2 => false}
+			config = {2 => true}
+			
+			c = RubyExt::Config.new runtime, config, {}
+			c.should include(1)
+			c.should include(2)
+			c[1].should == false
+			c[2].should == false			
+		end
+	end	
+end

data/spec/resource_spec.rb

@@ -1,4 +1,5 @@
 require 'RubyExt/require_base'
+require 'fileutils'
 require 'spec'
 Thread.abort_on_exception=true
 
@@ -97,7 +98,7 @@ module RubyExt
 			Resource.add_observer obs
 			
 			begin
-				Resource.start_watching(1)
+				FileSystemProvider.start_watching(1, [File.dirname __FILE__])
 				
 				sleep 0.1
 				base = "#{File.dirname(__FILE__)}/RubyExt/ForResource"
@@ -106,8 +107,8 @@ module RubyExt
 				File.write("#{base}/ChangedClass.res/Text.txt", "")
 				sleep 1.5
 			ensure
-				Resource.stop_watching
-			end
+				FileSystemProvider.stop_watching
+			end			
 			
 			obs.classes.size.should == 3
 			obs.classes.all?{|k| k == ForResource::ChangedClass}.should be_true
@@ -126,7 +127,7 @@ end}
 		end
 		
 		it "ResourceExtension" do
-			require "#{File.expand_path(File.dirname(__FILE__))}/../lib/RubyExt/require"
+			require "RubyExt/require"
 			Resource.resource_set RubyExt::ForResource::ResourceExtension, "Data.yaml", {:value => true}
 			res = Resource.resource_get RubyExt::ForResource::ResourceExtension, "Data.yaml"
 			res.should == {:value => true}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RubyExt
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -04:00
+date: 2009-06-15 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: facets
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A set of Ruby language extensions, mainly for ActivePoint Project
 email: 
 executables: []
@@ -43,8 +52,10 @@ files:
 - lib/RubyExt/kernel.rb
 - lib/RubyExt/debug.rb
 - lib/RubyExt/class.rb
+- lib/RubyExt/_require.rb
 - lib/RubyExt/ExtraBlankSlate.rb
 - lib/RubyExt/observable.rb
+- lib/RubyExt/_require_base.rb
 - lib/RubyExt/Cache.res
 - lib/RubyExt/Cache.res/single_version_with_args.txt
 - lib/RubyExt/Cache.res/multiple_version_without_args.txt
@@ -59,7 +70,7 @@ files:
 - lib/RubyExt/nil_class.rb
 - lib/RubyExt/ImportAll.rb
 - lib/RubyExt/true_class
-- lib/RubyExt/ideas.txt
+- lib/RubyExt/Config.rb
 - lib/RubyExt/StateMashine.rb
 - lib/RubyExt/false_class.rb
 - lib/RubyExt/require_base.rb
@@ -144,6 +155,7 @@ files:
 - spec/synchronizer_spec.rb
 - spec/localization_spec.rb
 - spec/path_spec.rb
+- spec/config_spec.rb
 has_rdoc: true
 homepage: http://www.bos-tec.com
 post_install_message: 

data/lib/RubyExt/ideas.txt

@@ -1,17 +0,0 @@
-CRITICAL
-- Reloading resourses in ClassXXX.res folder doesn't works.
-- Change 'raise_without_self' to caller.delete(SomePackage)
-
-MEDIUM
-	 
-LOW
-- Add macros functionality to Ruby. (for example replace all '!=' with 'not_equal')
-- Create project 'Flawless Ruby' (macros != to not_equal, and so on)
-- Automatically evaluate extension for resources, use Class["res"] instead of Class["res.yaml"]
-
-DONE
-- Add resource providers chaining.
-- Resource providers should be abstract (also for ObjectModel storage).
-- Cashe implementation    
-- Resource reloading doesn't works (fix and add spec).
-- Add raise_withoud_self 'bla-bla', [excludeAclass, excludeBclass]