ov 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzE1ZGI3NDVhMmZjZjYzOGM0MmMxNzQyZDc5OTA2NWNjN2E2NDk1Ng==
+    NmM0ZWU4ODJhZGE2NjA2ZjE4ZGU3YWQ5NWJlOGUwOWRmNWU2OWYwNg==
   data.tar.gz: !binary |-
-    NjI0YTcwZDQ5MWZlYmRhZjhmOGE5OTY5YTk0YjhmZTgxYWMwODczMA==
+    N2UxYWIzMGI2ZGVmMTU4NjM4MDJiMDBiNWYyMjcyZTcxNjU2OGI3Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZTBhZGEwMmJhNjM3NTE4ZTczMmY4ZmY3MDdjY2I1NzAxMTE2MTkzMjk2M2M5
-    MjllZjU3NjA0Y2Q3YzEwZWI5OGE4ODgxNDNlZDg0MDBiNzc3ZGUzZjc1ODQ5
-    NzgyNGU1ZWNiNDRlNTQzMjk4YTQ2YzZmY2U5M2I2MzY1NGU1ZmI=
+    ZDA1ZTBkNGQ3OWMzMTVkNDFkZWFkNGI5OTc3MGM1Mjg1ZTI2OTIyZWIwOTJk
+    MWNhMWExM2ZkMWNhODAxZjllZTJkNGZjOTEyZmQxOGQ1YTRjYjc1NzIwNmQ3
+    OTBjMjhhNzljMmI5OWFmOWE2OWEzMTVkNDBiOGQ1YjNkOTQyNmY=
   data.tar.gz: !binary |-
-    ODUzZTZmOWZjMDlkNGIyMjIzODM4YzY1MzMyMjVmY2M3YTcwZTc3NjQxYjBi
-    MDMyYzI2NzY3N2I2MWYxMjZkZGUxZGQ2YjFmNDVlZGU2NTQ3MTEzODFiZmJm
-    NGIyYzhhZDQxYTNlZmI4ZDQ3ZjE0ODBkYzE4MzA4ZDhkODg1Y2M=
+    OWI2OTcyOWZkZmMzM2JkMGFkMGU2M2I1ZTBkZmVmNjZjYTQ2OGE5NWJiNzY3
+    MWQ0NjMxNzZjMDY1ODhhYTkzYjAyODI1MTZlN2NhZDU5ZmQxNDJkYjgzZWYy
+    NWQ0MmM1YzVlOWIyY2U5ZTRmMThjNDM3M2Q2N2E3ZWRhZjNjNGM=

data/.gitignore

@@ -17,3 +17,5 @@ test/version_tmp
 tmp
 .rspec
 .swp
+.redcar/
+

data/README.md

@@ -21,16 +21,16 @@ Or install it yourself as:
 Firstly include `Ov` in you class
 
 ```ruby 
-class MyClass        
+class MyClass 
   include Ov 
 end
-```  
+```
 
 After define method with types:
 
-```ruby  
+```ruby
 class MyClass
-  include Ov   
+  include Ov
   
   #with Fixnum type 
   let :cool_method, Fixnum do |num|
@@ -46,13 +46,34 @@ end
 #And now
 my_class = MyClass.new
 my_class.cool_method(3)     # => 300
-my_class.cool_method("foo") # => foo!  
+my_class.cool_method("foo") # => foo! 
+```
+
+Class Methods
+--------------
+
+```ruby
+class MyClass
+  self << class
+    let :cool_method, Fixnum do |f|
+      f + 1
+    end
+    let :cool_method, String do |s|
+      "{s}"
+    end
+  end
+end 
+
+
+MyClass.cool_method(1)      #=> 2
+MyClass.cool_method("test") #=> "test"
 ```
 
+
 Any Type
 ----------
 
-```ruby  
+```ruby
 class MyClass 
   include Ov
   let :cool_method, Any do |any|

data/lib/ov.rb

@@ -56,18 +56,37 @@ require "ov/exception"
 # Is the same so ruby `def` 
 #
 #
+# == Define as class methods
+# 
+#   class MyClass
+#     self << class
+#       let :cool_method, Fixnum do |f|
+#         f + 1
+#       end
+#       let :cool_method, String do |s|
+#         "{s}"
+#       end
+#     end
+#   end 
+#
+#
+#   MyClass.cool_method(1)      #=> 2
+#   MyClass.cool_method("test") #=> "test"
+#
 module Ov
+  
   def self.included(base) # :nodoc:
     base.extend(self)
     base.class_eval do
-      class_variable_set(:@@__overridable_methods, OA.new)
+      class_variable_set(:@@__overridable_methods, OA.new) if !class_variable_defined?(:@@__overridable_methods)
     end
   end
-
+  
   def __overridable_methods # :nodoc:
     send(:class_variable_get, :@@__overridable_methods)
   end
-
+  
+  private :__overridable_methods
   ##
   # Create new method with +name+ and +types+
   # When method called +block+ will be executed
@@ -82,23 +101,28 @@ module Ov
     
     if !self.method_defined?(name)
       self.instance_exec do
-        message = if self.class == Module 
+        message = if self.class == Module
           :define_singleton_method
         else
           :define_method
-        end  
+        end
+        
         self.send(message, name) do |*args, &block|
           types = *args.map(&:class)
           owner = if self.class == Module
             self
+          elsif self.respond_to?(:ancestors) && self == ancestors.first
+            self.singleton_class
           else
             self.class
           end
-            
+          
           method = OverrideMethod.new(name, types, owner) 
-
-          z = owner.__overridable_methods.where(method)
-          raise NotImplementError.new("Method `#{name}` in `#{self}` class with types `#{types}` not implemented.") if z.nil?
+          z = owner.send(:__overridable_methods).where(method) 
+          
+          if z.nil?
+            raise NotImplementError.new("Method `#{name}` in `#{self}` class with types `#{types.join(', ')}` not implemented.") 
+          end
           instance_exec(*args, &z.body)  
         end
       end

data/lib/ov/ov_array.rb

@@ -26,19 +26,5 @@ module Ov
     end
 
     alias :get :result
-
-    private 
-    
-    def compare(a, b)
-      return false if a.size != b.size
-      !a.zip(b).map do |arr| 
-        first, last = arr 
-        true if (first == Ov::Any) || (last == Ov::Any) || (first == last)  
-      end.include?(nil)
-    end
-
-    def compare0(a, b)
-
-    end
   end
 end

data/lib/ov/ov_method.rb

@@ -12,25 +12,25 @@ module Ov
       end 
     end
 
-    def eql?(other)
+    def eql?(other) #:nodoc:
       return true if @name == other.name && @types == other.types && @owner == other.owner
       false
     end
 
-    def eql0?(other)
-      @ancestors.find{|a|  
+    def eql0?(other) #:nodoc:
+      @ancestors.find{|a|
         a.__overridable_methods.find{|m| 
           m.name == other.name && m.types == other.types 
         }
       }
     end
 
-    def like?(other)
-      return compare?(types, other.types) if @name == other.name
+    def like?(other) #:nodoc:
+      return compare?(types, other.types) if @name == other.name 
       false
     end
 
-    def like0?(other)
+    def like0?(other) #:nodoc:
       @ancestors.find{|a| 
         a.__overridable_methods.find{|m| 
           m.like?(other) 

data/lib/ov/version.rb

@@ -1,3 +1,3 @@
 module Ov
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/samples/class_methods.rb

@@ -0,0 +1,23 @@
+require 'ov'
+
+
+class A
+  include Ov
+  let :test0, String do |s|
+    s  
+  end
+  class << self
+    include Ov
+    
+    let :test0, String do |s|
+      s  
+    end
+    let :test0, Fixnum do |f|
+      f
+    end
+  end
+end
+
+p A.test0("das")
+p A.test0(1)
+p A.new.test0("dsa")

data/samples/myarray.rb

@@ -29,4 +29,3 @@ p MyArray.new(3, true)
 
 
 
-

data/spec/fixtures/fixture_classes.rb

@@ -52,4 +52,47 @@ class TestAny
   let :my_instance_method, Any do |any| 
     any
   end
-end
+end
+
+class TestSingletonClass
+  include Ov
+  let :my_instance_method, String do |str| 
+    str
+  end
+  
+  class << self
+    include Ov
+    
+    let :my_instance_method, Array, String do |arr, str|
+      arr << str
+      arr
+    end  
+    
+    let :my_instance_method, String do |str| 
+      str
+    end
+  
+    let :my_instance_method, Fixnum do |fixnum|
+      my_instance_method([], my_instance_method("bar"))
+    end
+  end    
+end
+
+module TestModule
+  include Ov
+  extend self
+  
+  let :my_instance_method, Array, String do |arr, str|
+    arr << str
+    arr
+  end  
+  
+  let :my_instance_method, String do |str| 
+    str
+  end
+
+  let :my_instance_method, Fixnum do |fixnum|
+    my_instance_method([], my_instance_method("bar"))
+  end 
+end
+

data/spec/override_spec.rb

@@ -1,5 +1,12 @@
 require 'spec_helper'
 
+class A
+  extend Ov
+  
+  
+end
+
+
 describe Ov do 
   context "instance methods" do 
     context "#my_instance_method" do 
@@ -75,7 +82,60 @@ describe Ov do
       expect{ test.my_instance_method()}.to raise_error(NotImplementError)
     end   
   end 
+     
+  describe "#for module" do
+    context "#my_instance_method" do 
+      let(:test){TestModule}
+      
+      it "return array" do 
+        result = test.my_instance_method(["foo", "bar"], "baz")
+        result.should eq ["foo", "bar", "baz"]
+      end
+
+     it "return string" do 
+        result = test.my_instance_method("baz")
+        result.should eq "baz"
+     end
+
+      it "return overridable method" do
+        result = test.my_instance_method(1)
+        result.should eq ["bar"]
+      end
+    end      
+  end
+  
+  describe "#let class methods" do
+    context "#my_instance_method" do 
+      let(:test){TestSingletonClass}
+      let(:test_ins){TestSingletonClass.new}
+      
+      it "return array" do 
+        result = test.my_instance_method(["foo", "bar"], "baz")
+        result.should eq ["foo", "bar", "baz"]
+      end
+
+      it "return string" do 
+        result = test.my_instance_method("baz")
+        result.should eq "baz"
+      end
+
+      it "return overridable method" do
+        result = test.my_instance_method(1)
+        result.should eq ["bar"]
+      end
+      
+      it "instance return string" do 
+        result = test_ins.my_instance_method("baz")
+        result.should eq "baz"
+      end
+      
+      it "exception when not defined" do 
+        expect{ test_ins.my_instance_method(1,2,3)}.to raise_error(NotImplementError)
+     end
+    end
+  end
 end
 
 
 
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ov
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - fntzr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - lib/ov/ov_method.rb
 - lib/ov/version.rb
 - ov.gemspec
+- samples/class_methods.rb
 - samples/myarray.rb
 - samples/pm.rb
 - samples/rack.rb