ruby_ext 0.4.23 → 0.4.24

data/lib/ruby_ext/core/file.rb

@@ -12,12 +12,12 @@ File.class_eval do
       end
     end
     
-    def create_directory dir
-      FileUtils.mkdir_p dir unless File.exist? dir
-    end
-    
-    def delete_directory dir
-      FileUtils.rm_r dir, force: true if File.exist? dir
-    end
+    # def create_directory dir
+    #   FileUtils.mkdir_p dir unless File.exist? dir
+    # end
+    # 
+    # def delete_directory dir
+    #   FileUtils.rm_r dir, force: true if File.exist? dir
+    # end
   end
 end

data/lib/ruby_ext/core/string.rb

@@ -7,17 +7,17 @@ String.class_eval do
     File.expand_path(self)
   end
   
-  def to_reader
-    self.to_sym
-  end
+  # def to_reader
+  #   self.to_sym
+  # end
   
-  def to_writer
-    "#{self}=".to_sym
-  end
+  # def to_writer
+  #   "#{self}=".to_sym
+  # end
   
-  def to_iv
-    "@#{self}"
-  end
+  # def to_iv
+  #   "@#{self}"
+  # end
   
   def to_a
     [self]

data/lib/ruby_ext/core/symbol.rb

@@ -3,17 +3,17 @@ Symbol.class_eval do
     self.to_s <=> other.to_s
   end
   
-  def to_reader
-    self
-  end
-  
-  def to_writer
-    "#{self}=".to_sym
-  end
- 
-   def to_iv
-    "@#{self}"
-  end
+  # def to_reader
+  #   self
+  # end
+  # 
+  # def to_writer
+  #   "#{self}=".to_sym
+  # end
+  #  
+  #  def to_iv
+  #   "@#{self}"
+  # end
 
   def + other
     (self.to_s + other.to_s).to_sym

data/lib/ruby_ext/more/open_constructor.rb

@@ -3,11 +3,11 @@ module OpenConstructor
     unless list
       if values.is_a? Hash
         values.each do |k, v|          
-          self.respond_to k.to_writer, v
+          self.respond_to "#{k}=", v
         end
       else
         values.instance_variables.each do |name|
-          accessor = name[1..name.size].to_writer
+          accessor = "#{name[1..name.size]}="
           if self.respond_to? accessor
             self.send accessor, values.instance_variable_get(name)
           end
@@ -16,13 +16,13 @@ module OpenConstructor
     else
       if values.is_a? Hash
         values.each do |k, v|          
-          self.respond_to k.to_writer, v if list.include? k
+          self.respond_to "#{k}=", v if list.include? k
         end
       else
         values.instance_variables.each do |name|
           accessor = name[1..name.size]
           if list.include?(accessor.to_sym) 
-            accessor = accessor.to_writer
+            accessor = "#{accessor}="
             if self.respond_to?(accessor)
               self.send accessor, values.instance_variable_get(name)
             end
@@ -35,7 +35,7 @@ module OpenConstructor
   
   def set! values
     values.each do |k, v|
-      self.send k.to_writer, v      
+      self.send "#{k}=", v      
     end
     return self
   end

data/lib/ruby_ext/more.rb

@@ -6,6 +6,5 @@ require 'ruby_ext/core'
   open_constructor
   synchronize
   tuple
-  safe_hash
   miscellaneous
 ).each{|f| require "ruby_ext/more/#{f}"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_ext
 version: !ruby/object:Gem::Version 
-  version: 0.4.23
+  version: 0.4.24
   prerelease: 
 platform: ruby
 authors: 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 +04:00
+date: 2011-08-08 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -56,7 +56,6 @@ files:
 - lib/ruby_ext/more/miscellaneous.rb
 - lib/ruby_ext/more/observable2.rb
 - lib/ruby_ext/more/open_constructor.rb
-- lib/ruby_ext/more/safe_hash.rb
 - lib/ruby_ext/more/synchronize.rb
 - lib/ruby_ext/more/tuple.rb
 - lib/ruby_ext/more.rb
@@ -78,7 +77,6 @@ files:
 - spec/more/miscellaneous_spec.rb
 - spec/more/observable2_spec.rb
 - spec/more/open_constructor_spec.rb
-- spec/more/safe_hash_spec.rb
 - spec/more/spec_helper.rb
 - spec/more/synchronize_spec.rb
 has_rdoc: true

data/lib/ruby_ext/more/safe_hash.rb

@@ -1,177 +0,0 @@
-# require 'singleton'
-
-class SafeHash < BasicObject
-  attr_reader :hash
-  
-  alias_method :send, :__send__
-  
-  def initialize hash = {}
-    reinitialize hash
-  end
-  
-  def []= key, value    
-    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 include? key
-    @hash.include? key.to_sym
-  end
-  
-  def tap &b
-    b.call self
-    self
-  end
-  
-  def [] key, if_not_exist = ::NotDefined
-    last = key[-1]
-    if last == '!'
-      key = key[0..-2].to_sym
-      if @hash.include? key
-        @hash[key]
-      else
-        raise "no key :#{key}"
-      end
-    elsif last == '?'
-      key = key[0..-2].to_sym
-      @hash.include? key
-    else
-      key = key.to_sym
-      if @hash.include? key
-        @hash[key]
-      elsif if_not_exist == ::NotDefined        
-        SafeNil.new key
-      else        
-        return if_not_exist
-      end
-    end
-  end
-  
-  def reinitialize hash
-    @hash = {}
-    merge! hash
-    # hash.each do |k, v|
-    #   v = ::SafeHash.new v if v.is_a? ::Hash 
-    #   @hash[k.to_sym] = v
-    # end
-    # @hash.freeze
-  end
-  
-  def method_missing m, obj = ::NotDefined, &b
-    raise "invalid usage, can't pass block to (:#{m})!" if b
-    last = m[-1]    
-    if last == '='
-      self[m[0..-2]] = obj
-    else
-      self[m, obj]
-    end
-  end
-  
-  def to_yaml *args
-    @hash.to_yaml *args
-  end
-  
-  def inspect
-    @hash.inspect
-  end
-  
-  def delete key
-    @hash.delete key.to_sym
-  end
-  
-  # deep conversion, check and converts nested SafeHashes to Hashes
-  def to_hash options = {}
-    r = {}
-    @hash.each do |k, v|
-      k = k.to_s if options[:to_s]
-      r[k] = if v.respond_to :is_a_safe_hash?
-        v.to_hash options
-      else
-        v
-      end
-    end
-    r
-  end
-  alias_method :to_h, :to_hash
-    
-  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
-    # include ::Singleton
-    
-    def initialize key
-      @key = key
-    end
-
-    def [] key, if_not_exist = ::NotDefined
-      last = key[-1]
-      if last == '!'
-        raise "no key :#{key}"
-      elsif last == '?'
-        false
-      elsif if_not_exist == ::NotDefined
-        SafeNil.new key
-      else
-        return if_not_exist
-      end
-    end
-
-    def method_missing m, if_not_exist = ::NotDefined, &b
-      raise "invalid usage, can't pass block to (:#{m})!" if b
-      last = m[-1]
-      if last == '='
-        raise "no key '#{@key}'!"
-      else
-        self[m, if_not_exist]
-      end
-    end
-    
-    def include? key
-      false
-    end
-    
-    def to_b
-      false
-    end
-    
-    def to_yaml *args
-      nil.to_yaml *args
-    end
-    
-    def to_h
-      {}
-    end
-    
-    def to_s
-      raise "can't convert SafeNil for key '#{@key}' to String!"
-    end
-    
-    def inspect
-      nil.inspect
-    end
-  end  
-  
-  protected
-    def p *a
-      ::Object.send :p, *a
-    end
-end

data/spec/more/safe_hash_spec.rb

@@ -1,101 +0,0 @@
-require 'more/spec_helper'
-
-describe "SafeHash and SafeNil" do
-  it "should allow check for value presence" do
-    h = SafeHash.new a: :b
-    h.a?.should be_true
-    h.b?.should be_false
-    
-    h.should include(:a)
-    h.should_not include(:b)
-  end
-  
-  it "? should return boolean (from error)" do
-    h = SafeHash.new
-    lambda{raise "" unless h.a?.class.equal?(NilClass)}.should raise_error
-    lambda{raise "" unless h.a.a?.class.equal?(NilClass)}.should raise_error
-  end
-  
-  it "passing block should be threated as invalid usage" do
-    h = SafeHash.new
-    lambda{h.development{}}.should raise_error(/invalid usage/)
-  end
-  
-  it "should treat assigned nil as value (from error)" do
-    h = SafeHash.new v: nil
-    h.v?.should be_true
-    h.v!.should == nil
-  end
-  
-  it "should modify hash" do
-    h = SafeHash.new
-    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 allow owerride values" do
-  #   h = SafeHash.new a: :b
-  #   h.b = :c
-  #   h.b!.should == :c
-  # end
-  
-  it "general behaviour" do
-    h = SafeHash.new key: :value
-    
-    h.key.should == :value
-    h.key(:missing).should == :value
-    
-    h[:key].should == :value
-    h[:key, :missing].should == :value
-    
-    h['key'].should == :value
-    h['key', :missing].should == :value
-        
-    h.a.b.c[:d].e('missing').should == 'missing'
-    h.a.b.c[:d][:e, 'missing'].should == 'missing'
-  end
-  
-  it "should build hierarchies of SafeHash" do
-    h = SafeHash.new a: {a: :b}
-    
-    h.a.a.should == :b
-    h.a.missing.b.c('missing').should == 'missing'
-  end
-  
-  it "should require setting if ! used" do
-    h = SafeHash.new a: :v, b: {c: :v}
-    
-    h.a!.should == :v
-    h.b.c!.should == :v
-    h.b!.c!.should == :v
-    
-    lambda{h.j!}.should raise_error(/no key :j/) 
-    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 implement include?" do
-    h = SafeHash.new a: :b
-    h.include?(:a).should be_true
-    h.include?('a').should be_true
-    h.include?(:b).should be_false
-
-    h.b.include?(:a).should be_false
-  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