numru 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a715fb989185e9d112bf586b1ac0475ea773982
-  data.tar.gz: 2b570def06cc8697a4c066835dc6c637367f4133
+  metadata.gz: 8aa49fdc1a2913c89900e9490e95f91d4a019fdb
+  data.tar.gz: 7dea6e54ac80ec81c637157b43dbf7d0d87204d7
 SHA512:
-  metadata.gz: 8c84e8f6663e79ace46ab6bd866c3fdfeb0b232c793041656d73a68a0f17f36832d0c8fa9cfc64ca25c069c878179c643a0af2529ad1b222e9e1dfc0a959c2eb
-  data.tar.gz: f2357e77771aafc6574e0d1818533223c5ffea97491d337f40342e599736bcc6d86fbb052fbd3597b01f4007381e756072c19e91a65e433b4563b91b33d7fa5c
+  metadata.gz: b5f9b2e5d9c0ef85a8d748e3c53daecc0913ff84a9569cf4b874e33e058e3c7619ee2cb139cacff028f7041bd3768d3359ba9f161d644421f9b7a1e06c36876a
+  data.tar.gz: 9511612994ef71a501cf2728f818c0f8689e8c9d09d18ee4f6ae4c54e9a8dfe06a6eda795d0141a247d6538ba3dac382e82d4e4c81f2b29e252e54f716a3fbfb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    numru (0.1.3)
+    numru (0.1.4)
       rubypython
 
 GEM

data/README.md

@@ -24,7 +24,34 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+1. Whatever works in NumPy works here. If there's something that doesn't work let me know in the issues.
+```rb
+require 'numru'
+nr = NumRu
+
+> x = nr.array 0..10
+=> array([ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10])
+
+> x = nr.arange(27).reshape 3, 3, 3
+=> array([[[ 0,  1,  2],
+        [ 3,  4,  5],
+        [ 6,  7,  8]],
+
+       [[ 9, 10, 11],
+        [12, 13, 14],
+        [15, 16, 17]],
+
+       [[18, 19, 20],
+        [21, 22, 23],
+        [24, 25, 26]]])
+
+```
+Keyword arguments are not supported. For that use hash.
+```rb
+> x = nr.array [1, 2, 3], dtype: :complex
+=> array([1.+0.j, 2.+0.j, 3.+0.j])
+
+```
 
 ## Development
 

data/lib/numru/version.rb

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

data/lib/numru.rb

@@ -7,13 +7,13 @@ RubyPython.start
 class NumRu
   @@np = RubyPython.import 'numpy'
   @@blt = RubyPython::PyMainClass.send(:new)
-  
+
   attr_accessor :np_obj
-  
+
   def initialize np_obj
     @np_obj = np_obj
   end
-  
+
   def self.return_or_wrap obj
     obj.rubify
   rescue
@@ -38,7 +38,7 @@ class NumRu
     obj = @np_obj.__send__('__getitem__', args)
     NumRu.return_or_wrap obj
   end
-  
+
   def []=(*args)
     args.map! do |i|
       case i
@@ -57,23 +57,30 @@ class NumRu
     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
+
+  def self.preprocess_arg obj
+    case obj
+    when NumRu
+      obj.np_obj
+    when Range
+      @@blt.range(obj.begin, obj.end+1)
+    else
+      obj
+    end
   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
@@ -83,24 +90,24 @@ class NumRu
     end
     arg.to_s
   end
-  
+
   def method_missing(m, *args)
-    args.map! { |i| NumRu.extract_np_obj i }
+    args.map! { |i| NumRu.preprocess_arg i }
     obj = @np_obj.__send__ "#{m}!", *args
     NumRu.return_or_wrap obj
-  end  
-  
+  end
+
   def self.method_missing(m, *args)
-    args.map! { |i| NumRu.extract_np_obj i }
+    args.map! { |i| NumRu.preprocess_arg i }
     obj = @@np.__send__ "#{m}!", *args
     return_or_wrap obj
   end
-  
+
   def to_s
     @np_obj.__str__
   end
-  
+
   def inspect
     @np_obj.__repr__
   end
-end
+end

data/numru.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'pry', '~> 0.11'
-  
-  spec.add_dependency 'rubypython'
+
+  spec.add_dependency 'lokeshh_rubypython'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numru
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - lokeshh
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rubypython
+  name: lokeshh_rubypython
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="