numru 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f5c42c4a6670682ec3160d69931e3a711e3f343
-  data.tar.gz: 3d41e1128d695249d6ebd3a5b40671f2ff2796a6
+  metadata.gz: 9a715fb989185e9d112bf586b1ac0475ea773982
+  data.tar.gz: 2b570def06cc8697a4c066835dc6c637367f4133
 SHA512:
-  metadata.gz: 512e168425f6b89bdb3acd76f076778d16e382a332110f608f3b92933636a9f625e42f7f43c0cbbf2bcc363c273f2b0f1eae848bfab1ef5e3b75f2b2a96be895
-  data.tar.gz: 31ac0374c60f60a714a21e26f231b97a8c1365eeb4e4d5834a80b9717b00f86dac5f2bc9e7cf5e8f847b65caca14b637b1aa9312073eb9e859e89dd7461cf9e8
+  metadata.gz: 8c84e8f6663e79ace46ab6bd866c3fdfeb0b232c793041656d73a68a0f17f36832d0c8fa9cfc64ca25c069c878179c643a0af2529ad1b222e9e1dfc0a959c2eb
+  data.tar.gz: f2357e77771aafc6574e0d1818533223c5ffea97491d337f40342e599736bcc6d86fbb052fbd3597b01f4007381e756072c19e91a65e433b4563b91b33d7fa5c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    NumRu (0.1.1)
+    numru (0.1.3)
       rubypython
 
 GEM
@@ -37,8 +37,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  NumRu!
   bundler (~> 1.16)
+  numru!
   pry (~> 0.11)
   rake (~> 10.0)
   rspec (~> 3.0)

data/README.md

@@ -20,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install NumRu
+    $ gem install numru
 
 ## Usage
 

data/lib/numru/version.rb

@@ -1,3 +1,3 @@
 module Numru
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/numru.rb

@@ -1,10 +1,4 @@
 require "numru/version"
-
-# module Numru
-#   # Your code goes here...
-# end
-
-
 require 'rubypython'
 
 RubyPython.start
@@ -21,13 +15,9 @@ class NumRu
   end
   
   def self.return_or_wrap obj
-    # if obj.respond_to? :class
-    #   obj
-    # elsif obj.__class__.__name__ == 'ndarray'
-      NumRu.new obj
-    # else
-    #   obj
-    # end
+    obj.rubify
+  rescue
+    NumRu.new obj
   end
 
   def [](*args)
@@ -38,6 +28,9 @@ class NumRu
         @@blt.slice(i.begin, last)
       when NumRu
         i.np_obj
+      when String
+        a, b, c = i.split(':').map { |x| x == '' ? nil : x.to_i }
+        @@blt.slice(a, b, c)
       else
         i
       end
@@ -46,6 +39,41 @@ class NumRu
     NumRu.return_or_wrap obj
   end
   
+  def []=(*args)
+    args.map! do |i|
+      case i
+      when Range
+        last = i.end == -1 ? nil : i.end + 1
+        @@blt.slice(i.begin, last)
+      when NumRu
+        i.np_obj
+      when String
+        a, b, c = i.split(':').map { |x| x == '' ? nil : x.to_i }
+        @@blt.slice(a, b, c)
+      else
+        i
+      end
+    end
+    obj = @np_obj.__send__('__setitem__', args[0..-2], args[-1])
+    NumRu.return_or_wrap obj
+  end
+  
+  def self.extract_np_obj obj
+    obj.respond_to?(:class) && obj.class == NumRu ? obj.np_obj : obj
+  end
+  
+  def ==(arg)
+    @np_obj.__send__('__eq__', NumRu.extract_np_obj(arg))
+  end
+  
+  def < arg
+    @np_obj.__send__('__lt__', NumRu.extract_np_obj(arg))
+  end
+  
+  def > arg
+    @np_obj.__send__('__gt__', NumRu.extract_np_obj(arg))
+  end
+  
   def self.arg_to_s arg
     case arg
     when Hash
@@ -57,13 +85,13 @@ class NumRu
   end
   
   def method_missing(m, *args)
-    args.map! { |i| i.respond_to?(:class) && i.class == NumRu ? i.np_obj : i }
+    args.map! { |i| NumRu.extract_np_obj i }
     obj = @np_obj.__send__ "#{m}!", *args
     NumRu.return_or_wrap obj
   end  
   
   def self.method_missing(m, *args)
-    args.map! { |i| i.respond_to?(:class) && i.class == NumRu ? i.np_obj : i }
+    args.map! { |i| NumRu.extract_np_obj i }
     obj = @@np.__send__ "#{m}!", *args
     return_or_wrap obj
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numru
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - lokeshh