ruby_ext 0.4.12 → 0.4.13

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake_ext'
 
 project(
   name: "ruby_ext",
-  version: "0.4.12",
+  version: "0.4.13",
   summary: "Ruby Extensions",
 
   author: "Alexey Petrushin",

data/lib/rake_ext.rb

@@ -1,6 +1,20 @@
 require 'rake'
 require 'fileutils'
 
+# 
+# Code Coverage
+# 
+begin
+  require 'class_loader/tasks'
+rescue LoadError
+end
+desc "Clean temporary files"
+task clean: 'class_loader:clean' do
+  require 'fileutils'
+  FileUtils.rm_r '../*/coverage' if File.exist? '../*/coverage'
+end
+
+
 # 
 # Spec
 # 

data/lib/rspec_ext.rb

@@ -1,3 +1,21 @@
+# 
+# Code Coverage
+# 
+# require 'simplecov'
+# SimpleCov.start do
+#   add_filter "/spec/"
+# end
+# SimpleCov.at_exit do
+#   SimpleCov.result.format!
+#   Kernel.exec 'open ./coverage/index.html'
+# end
+# 
+# CLASS_LOADER_GENERATE_TMP_FILES = true
+
+
+# 
+# Rspec
+# 
 require 'rspec'
 require 'fileutils'
 
@@ -22,15 +40,18 @@ rspec do
 end
 
 rspec do
-  def self.with_load_path *args
-    list = if args.first.is_a? Array
-      args.first
-    else
-      args
+  def self.with_load_path *paths
+    before(:all){paths.each{|path| $LOAD_PATH << path}}
+    after(:all){paths.each{|path| $LOAD_PATH.delete path}}
+  end
+  
+  def with_load_path *paths, &b
+    begin
+      paths.each{|path| $LOAD_PATH << path}
+      b.call
+    ensure
+      paths.each{|path| $LOAD_PATH.delete path}
     end
-    
-    before(:all){list.each{|path| $LOAD_PATH << path}}
-    after(:all){list.each{|path| $LOAD_PATH.delete path}}
   end
   
   def self.with_tmp_spec_dir *args

data/lib/ruby_ext/core/array.rb

@@ -11,5 +11,7 @@ class Array
     Array(value)
   end    
   
+  alias_method :blank?, :empty?
+  
   alias_method :filter, :select
 end

data/lib/ruby_ext/core/false_class.rb

@@ -0,0 +1,3 @@
+class FalseClass
+  def blank?; true end
+end

data/lib/ruby_ext/core/hash.rb

@@ -19,5 +19,6 @@ class Hash
     raise "unknown options :#{unknown_options.join(': ')}!" unless unknown_options.empty?
   end
   
+  alias_method :blank?, :empty?
   alias_method :to_h, :to_hash
 end

data/lib/ruby_ext/core/module.rb

@@ -126,5 +126,11 @@ Module.class_eval do
     m.to_sym
   end
   
+  def require_attr *attrs
+    attrs.each do |attr|
+      define_method(attr){instance_variable_get(:"@#{attr}") || raise("key :#{attr} not defined!")}
+    end
+  end
+    
   public :include, :define_method
 end

data/lib/ruby_ext/core/nil_class.rb

@@ -0,0 +1,3 @@
+class NilClass
+  def blank?; true end
+end

data/lib/ruby_ext/core/open_object.rb

@@ -108,6 +108,22 @@ class OpenObject < Hash
   def respond_to? m
     true
   end
+  
+  def self.initialize_from hash, deep = false
+    unless deep
+      ::OpenObject.new.update hash 
+    else
+      r = ::OpenObject.new
+      hash.each do |k, v|
+        r[k] = if v.is_a? Hash
+          v.to_openobject
+        else
+          v
+        end
+      end
+      r
+    end
+  end
 
   protected
     def method_missing m, arg = nil, &block      
@@ -137,19 +153,7 @@ end
 
 class Hash
   def to_openobject deep = false
-    unless deep
-      OpenObject.new.update self 
-    else
-      r = OpenObject.new
-      each do |k, v|
-        r[k] = if v.is_a? Hash
-          v.to_openobject
-        else
-          v
-        end
-      end
-      r
-    end
+    OpenObject.initialize_from self, deep
   end
   alias_method :to_oo, :to_openobject
   

data/lib/ruby_ext/core/string.rb

@@ -68,4 +68,6 @@ String.class_eval do
     end
     constant
   end
+  
+  alias_method :blank?, :empty?
 end

data/lib/ruby_ext/core/symbol.rb

@@ -18,4 +18,6 @@ Symbol.class_eval do
   def + other
     (self.to_s + other.to_s).to_sym
   end
+  
+  def blank?; to_s.blank? end
 end

data/lib/ruby_ext/core/true_class.rb

@@ -0,0 +1,3 @@
+class TrueClass
+  def blank?; false end
+end

data/lib/ruby_ext/core.rb

@@ -5,6 +5,7 @@ require 'ruby_ext/fixes'
 
 %w(
   basic_object
+  nil_class
   file
   enumerable
   array

data/lib/ruby_ext/more/safe_hash.rb

@@ -10,16 +10,15 @@ class SafeHash < BasicObject
   end
   
   def []= key, value    
-    ::SafeHash.forbidden! key
-    # value = ::SafeHash.new value if value.is_a? ::Hash
-    # @hash[key.to_sym] = value
-  end
-  
-  def set! key, value
     value = ::SafeHash.new value if value.is_a? ::Hash
     @hash[key.to_sym] = value
   end
-  def set *args; raise "you probably mistyped :set! method!" end
+  
+  # def set! key, value
+  #   value = ::SafeHash.new value if value.is_a? ::Hash
+  #   @hash[key.to_sym] = value
+  # end
+  # def set *args; raise "you probably mistyped :set! method!" end
   
   def include? key
     @hash.include? key.to_sym
@@ -68,8 +67,7 @@ class SafeHash < BasicObject
     raise "invalid usage, can't pass block to (:#{m})!" if b
     last = m[-1]    
     if last == '='
-      ::SafeHash.forbidden! m[0..-2]
-      # self[m[0..-2]] = obj
+      self[m[0..-2]] = obj
     else
       self[m, obj]
     end
@@ -87,42 +85,6 @@ class SafeHash < BasicObject
     @hash.delete key.to_sym
   end
   
-  def merge! hash, options = {}
-    # parsing arguments
-    deep = options[:deep] || true
-    override = options[:override] || false
-    blank = options[:blank] || false
-    options.validate_options! :deep, :override, :blank
-    raise "invalid options, can't do both :blank and :override simultaneously!" if blank and override
-      
-    # merging    
-    hash.each do |k, v|
-      k = k.to_sym
-      if @hash.include? k
-        if deep and (old_v = @hash[k]).respond_to(:is_a_safe_hash?) and v.is_a?(::Hash)
-          old_v.merge! v, options
-        else
-          if blank
-            # do nothing
-          elsif override
-            self.set! k, v
-          else
-            raise "can't override :#{k} config value!" unless override
-          end          
-        end
-      else
-        self.set! k, v
-      end
-    end
-  end
-  def merge *args; raise "you probably mistyped :merge! method!" end
-    
-  def merge_if_blank! hash, options = {}
-    options[:blank] = true
-    merge! hash, options
-  end
-  def merge_if_blank *args; raise "you probably mistyped :merge_if_blank method!" end
-  
   # deep conversion, check and converts nested SafeHashes to Hashes
   def to_hash options = {}
     r = {}
@@ -141,6 +103,16 @@ class SafeHash < BasicObject
   def is_a_safe_hash?
     true
   end
+  
+  protected
+    def reinitialize hash
+      @hash = {}
+      hash.each do |k, v|
+        v = ::SafeHash.new v if v.is_a? ::Hash 
+        @hash[k.to_sym] = v
+      end
+      @hash
+    end
     
   
   class SafeNil < BasicObject
@@ -167,8 +139,7 @@ class SafeHash < BasicObject
       raise "invalid usage, can't pass block to (:#{m})!" if b
       last = m[-1]
       if last == '='
-        ::SafeHash.forbidden! m[0..-2]
-        # raise "No key '#{@key}'!"
+        raise "no key '#{@key}'!"
       else
         self[m, if_not_exist]
       end
@@ -197,15 +168,7 @@ class SafeHash < BasicObject
     def inspect
       nil.inspect
     end
-  end
-  
-  
-  class << self
-    def forbidden! key
-      raise "direct modifications of SafeHash is forbidden, use :merge instead (you are trying to assign :#{key} value)!"
-    end
-  end
-  
+  end  
   
   protected
     def p *a

data/spec/more/safe_hash_spec.rb

@@ -27,15 +27,15 @@ describe "SafeHash and SafeNil" do
     h.v!.should == nil
   end
   
-  it "should not allow direct modification of hash" do
+  it "should modify hash" do
     h = SafeHash.new
-    lambda{h.a = 1}.should raise_error(/forbidden/)
-    lambda{h[:a] = 1}.should raise_error(/forbidden/)
-    lambda{h.a.b = 1}.should raise_error(/forbidden/)
+    h.a = 1
+    h.a!.should == 1
+    h[:b] = 1
+    h.b!.should == 1
+    lambda{h.c.d = 1}.should raise_error(/no key/)
   end
   
-  it "should not allo"
-  
   # it "should allow owerride values" do
   #   h = SafeHash.new a: :b
   #   h.b = :c
@@ -76,12 +76,12 @@ describe "SafeHash and SafeNil" do
     lambda{h.j.b.c!}.should raise_error(/no key :c/)
   end
   
-  it "should be able to update itself" do
-    h = SafeHash.new 
-    h.b?.should be_false
-    h.merge! a: :a
-    h.a!.should == :a
-  end
+  # it "should be able to update itself" do
+  #   h = SafeHash.new 
+  #   h.b?.should be_false
+  #   h.merge! a: :a
+  #   h.a!.should == :a
+  # end
   
   it "should implement include?" do
     h = SafeHash.new a: :b
@@ -90,44 +90,12 @@ describe "SafeHash and SafeNil" do
     h.include?(:b).should be_false
 
     h.b.include?(:a).should be_false
-  end
+  end    
   
-  describe "merge" do
-    it "should not override by default" do
-      h = SafeHash.new a: :b
-      lambda{h.merge! a: :c}.should raise_error(/can't override/)            
-    end
-    
-    it "should skip existing if specified" do
-      h = SafeHash.new a: :b
-      h.merge!({a: :c, d: :e}, blank: true)
-      h.a!.should == :b
-      h.d!.should == :e
-    end
-    
-    it "merging hashes should not be countig as overriding" do
-      h = SafeHash.new b: {c: :d}
-      h.merge! b: {e: :f}, override: false
-    end
-    
-    it "should override if specified" do
-      h = SafeHash.new a: {b: :c}
-      h.merge!({a: {b: :c2}}, override: true)
-      h.a!.b!.should == :c2
-    end
-    
-    it "should perform deep merge by default" do
-      h = SafeHash.new a: {b: {c: :d}}
-      h.merge!({a: {b: {c2: :d2}}})
-      h.a!.b!.c?.should be_true
-      h.a!.b!.c2?.should be_true
-    end        
-  end
-  
-  it "merge_if_blank" do
-    h = SafeHash.new a: :b
-    h.merge_if_blank! a: :c, d: :e
-    h.a!.should == :b
-    h.d!.should == :e
-  end
+  # it "merge_if_blank" do
+  #   h = SafeHash.new a: :b
+  #   h.merge_if_blank! a: :c, d: :e
+  #   h.a!.should == :b
+  #   h.d!.should == :e
+  # end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ext
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-12 00:00:00.000000000 +04:00
+date: 2011-07-02 00:00:00.000000000 +04:00
 default_executable: 
 dependencies: []
 description: 
@@ -28,6 +28,7 @@ files:
 - lib/ruby_ext/core/class.rb
 - lib/ruby_ext/core/deep_clone.rb
 - lib/ruby_ext/core/enumerable.rb
+- lib/ruby_ext/core/false_class.rb
 - lib/ruby_ext/core/file.rb
 - lib/ruby_ext/core/hash.rb
 - lib/ruby_ext/core/kernel.rb
@@ -35,11 +36,13 @@ files:
 - lib/ruby_ext/core/module.rb
 - lib/ruby_ext/core/multiple_inheritance.rb
 - lib/ruby_ext/core/must.rb
+- lib/ruby_ext/core/nil_class.rb
 - lib/ruby_ext/core/not_defined.rb
 - lib/ruby_ext/core/object.rb
 - lib/ruby_ext/core/open_object.rb
 - lib/ruby_ext/core/string.rb
 - lib/ruby_ext/core/symbol.rb
+- lib/ruby_ext/core/true_class.rb
 - lib/ruby_ext/core.rb
 - lib/ruby_ext/fixes.rb
 - lib/ruby_ext/gems.rb