rubysierung 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 875fa267b870b098ff0ed94d788a09f105aad733
-  data.tar.gz: 9845df8afc589de503809d09963258c6560aa5a6
+  metadata.gz: 038d493ea5841626de91eeb6f134e7718fb6acf6
+  data.tar.gz: 1122c17da2a242e1cd6d8596ebe7f921e5b6feeb
 SHA512:
-  metadata.gz: 04528c6d13c3314c3b732f08219accd7429258fda266b8d4e755971a49668e741ed570c787ec0e58bd526b5342e70e5292ed261b00de57608cab8683a17111f3
-  data.tar.gz: 86922f0ee69b148d298b1781fb4e048009de92b762ce698ba0fd0e686afe61ac9f3f09ea50db680c6a91d133952427cc003c5499fe1825531319db096644129f
+  metadata.gz: 36b229c7d8aff827db09a889c841d125b97ffaa4566170cd1815502c9db22a8eee24abf8d9f30afa49888cd6bd9cca9d1ab9b0b88c66ab796ed976727c2c7eb2
+  data.tar.gz: 83169296e36c106e58ea7bdb9f04828241db5baeb1686cafa6f7a3877fbdc09f90047766575970fd00ee7a53ec82654d46e690324a6b16ae641c01689af16f02

data/README.md

@@ -25,6 +25,8 @@ Or install it yourself as:
 
 ## Usage
 
+## Have a look at all available types in ./lib/rubysierung/types
+
 ```ruby
 require 'CallBaecker'
 require 'rubysierung'
@@ -41,7 +43,7 @@ class Example
 
   # add custom Types
   # [TypeClass, StandartDuckTypeAsSymbol, StrictDuckTypeAsSymbol]# TODO change to proper name
-  @__type_add.call([CustomTyp, :to_s, :to_int])
+  @__add_type[CustomTyp, :to_s, :to_str]
 
   # define foo to respond to :to_s and bar to :to_i
   def one(foo: String, bar: Integer)
@@ -74,10 +76,6 @@ def one(foo:, bar:)
 end
 ```
 
-## Roadmap
-* add all Standard Types
-* add feature to add a default argument for a specified Type
-
 ## Contributing
 
 1. Fork it ( https://github.com/doodzik/rubysierung/fork )

data/lib/rubysierung/error.rb

@@ -0,0 +1,4 @@
+module Rubysierung::Error
+  class Standard < StandardError; end
+  class Strict   < StandardError; end
+end

data/lib/rubysierung/types.rb

@@ -1,4 +1,35 @@
+
+module Rubysierung::Types
+  @types = [
+  # Type ,     Standard, Strict
+    [String,   :to_s,    :to_str],
+    [Integer,  :to_i,    :to_int],
+    [Array,    :to_a,    :to_ary],
+    [Complex,  :to_c,    :to_c],
+    [Float,    :to_f,    :to_f],
+    [Hash,     :to_h,    :to_hash],
+    [Rational, :to_r,    :to_r],
+    #[Enum,    :to_enum, :to_enum],
+    [IO,       :to_io,   :to_io],
+    [Proc,     :to_proc, :to_proc],
+    #[Path,    :to_path, :to_path],
+    #[JSON,    :to_json, :to_json],
+    [Symbol,   :to_sym,  :to_sym],
+    [Thread,   :join,    :join]
+  ]
+
+  class << self
+    attr_reader :types
+  end
+end
+
+# Make Strict types accessible in Global namespace 
 module Strict
-  class String;end
-  class Integer;end
 end
+
+strictEval = ""
+
+Rubysierung::Types.types.map { |types| strictEval += "class #{types[0]} ;end;" }
+Strict.module_eval strictEval
+
+strictEval = nil

data/lib/rubysierung/version.rb

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

data/lib/rubysierung.rb

@@ -1,20 +1,15 @@
 require "rubysierung/version"
 require 'rubysierung/types'
-
+require 'rubysierung/error'
 
 module Rubysierung
-  module Error 
-    class Standard < StandardError; end
-    class Strict   < StandardError; end
-  end
-
   def self.extended(base)
     base.instance_variable_set :@__types_show, -> () do
       puts @__types
     end
 
-    base.instance_variable_set :@__type_add, -> (type) do
-      @__types << type
+    base.instance_variable_set :@__add_type, -> (klass, standard, strict) do
+      @__types << [klass, standard, strict]
     end
 
     base.instance_variable_set :@__before_hook, -> (i,ii, callee) do
@@ -24,24 +19,18 @@ module Rubysierung
 
     base.instance_variable_set :@__setup_instance_method, -> (_self, name) do
       file, line = _self.instance_method(name.to_sym).source_location
-      @__error_data[:method_object] = _self.name
-      @__error_data[:method_file] = file
-      @__error_data[:method_name] = name
-      @__error_data[:method_line] = line -1
+      set_error_data(_self: self, name: name, method_object: _self.name, file: file, line: line - 1)
       get_default_hash_from_fileline(file: file, line: line-1)
     end
 
     base.instance_variable_set :@__setup_class_method, -> (_self, name) do
       file, line = _self.method(name.to_sym).source_location
-      @__error_data[:method_object] = _self.name
-      @__error_data[:method_file] = file
-      @__error_data[:method_name] = name
-      @__error_data[:method_line] = line -1
+      set_error_data(_self: self, name: name, method_object: _self.name, file: file, line: line - 1)
       get_default_hash_from_fileline(file: file, line: line-1)
     end
   end
 
-  @__types = [[String, :to_s, :to_str], [Integer, :to_i, :to_int]]
+  @__types = Rubysierung::Types.types
   @__error_data = {}
   class << self
     def get_default_hash_from_fileline(file:, line:)
@@ -65,19 +54,17 @@ module Rubysierung
     def convert(klass:, value:)
       strict = 0
       @__types.map do |type|
-        strict ,klass = get_kind(klass: klass)
+        strict, klass = get_kind(klass: klass)
         begin
           if klass == type[0]
             return value.send(type[1+strict])
           end
         rescue NoMethodError
+          # return argument, param, duck_type, calle/receiver -> file, line
           if strict == 0
             raise Rubysierung::Error::Standart, "Rubysierung::Error::Standart: Class:#{klass}, DuckType:#{type[2]}, Method:#{@__error_data[:method_object]}:#{@__error_data[:method_file]}#{@__error_data[:method_name]}:#{@__error_data[:method_line]} -- called on #{@__error_data[:caller]} with #{@__error_data[:var_sym]}:#{value} of #{value.class} doesn't respond to #{type[2]}"
-
           else
-      # return argument, param, duck_type, calle/receiver -> file, line
             raise Rubysierung::Error::Strict, "Rubysierung::Error::Strict: Class:#{klass}, DuckType:#{type[2]}, Method:#{@__error_data[:method_object]}:#{@__error_data[:method_file]}#{@__error_data[:method_name]}:#{@__error_data[:method_line]} -- called on #{@__error_data[:caller]} with #{@__error_data[:var_sym]}:#{value} of #{value.class} doesn't respond to #{type[2]}"
-    
           end
         end
       end
@@ -92,5 +79,14 @@ module Rubysierung
         [0, klass]
       end
     end
+
+    def set_error_data(_self:, name:, method_object:, file:, line:)
+      err_data = _self.instance_variable_get :@__error_data
+      err_data[:method_object] = method_object
+      err_data[:method_file]   = file
+      err_data[:method_name]   = name
+      err_data[:method_line]   = line
+      _self.instance_variable_set :@__error_data, err_data
+    end
   end
 end

data/test/test_rubysierung.rb

@@ -9,7 +9,7 @@ class Setup
   extend Rubysierung
   include CallBaecker
 
-  @__type_add.call([CustomTyp, :to_s, :to_str])
+  @__add_type[CustomTyp, :to_s, :to_str]
 
   def example1(foo: String, bar: Integer)
     [foo, bar]
@@ -32,6 +32,11 @@ class Setup
   def self.example5(foo: Strict::String, bar: Integer)
     [foo, bar]
   end
+
+  # Default
+  # def self.example6(foo: Default.new(String, 'bar'), bar: Default.new(String, 'foo'))
+  #   [foo, bar]
+  # end
 end
 
 class RubysierungTest < Minitest::Test
@@ -97,4 +102,10 @@ class RubysierungTest < Minitest::Test
       assert_equal(true, true)
     end
   end
+
+  # def test_example_6_default_value
+  #   foo, bar = Setup.example5(bar: 'bar')
+  #   assert_equal('bar', bar)
+  #   assert_equal('bar', foo)
+  # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysierung
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - doodzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,7 @@ files:
 - README.md
 - Rakefile
 - lib/rubysierung.rb
+- lib/rubysierung/error.rb
 - lib/rubysierung/types.rb
 - lib/rubysierung/version.rb
 - rubysierung.gemspec