scaruby 0.0.2 → 0.0.3

data/lib/scaruby/converter.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+
+require 'scaruby/seq'
+require 'scaruby/map'
+
+module Enumerable
+  def to_scaruby
+    Scaruby::Seq.new(self)
+  end
+end
+
+class Hash
+  def to_scaruby
+    Scaruby::Map.new(self)
+  end
+end
+
+class Object
+  def to_option
+    Scaruby::Option.new(self)
+  end
+end

data/lib/scaruby/core_ext/enumerable.rb

@@ -3,7 +3,6 @@
 require 'scaruby/seq'
 
 module Enumerable
-
   def method_missing(name, *args, &block)
     result = Scaruby::Seq.new(self).send(name, *args, &block)
     if result.is_a?(Scaruby::Seq) then

data/lib/scaruby/map.rb

@@ -1,7 +1,13 @@
 # -*- encoding: utf-8 -*-
 
 module Scaruby
-  class Map
+  class Map < Hash
+
+    def each(&block)
+      @hash.each do |k,v|
+        yield k, v
+      end
+    end
 
     def self.empty
       {}

data/lib/scaruby/seq.rb

@@ -2,6 +2,13 @@
 
 module Scaruby
   class Seq
+    include Enumerable
+
+    def each(&block)
+      @array.each do |e|
+        yield e
+      end
+    end
   
     def self.apply(enumerable)
       Seq.new(enumerable)
@@ -32,7 +39,7 @@ module Scaruby
     end
   
     def count(&predicate)
-      filter(&predicate).size
+      @array.count(&predicate)
     end
   
     def diff(that)
@@ -81,13 +88,7 @@ module Scaruby
     end
 
     def exists(&predicate)
-      @array.inject(false) {|found,e| 
-        if found then 
-          true 
-        else 
-          yield e 
-        end
-      }
+      @array.any?(&predicate)
     end
 
     def filter(&predicate)
@@ -138,13 +139,7 @@ module Scaruby
     end
 
     def forall(&predicate)
-      @array.inject(true) {|all_matched,e|
-        if ! all_matched then
-          false
-        else
-          yield e
-        end
-      }
+      @array.all?(&predicate)
     end
 
     def foreach(&block)
@@ -238,11 +233,12 @@ module Scaruby
     end
 
     def partition(&predicate)
-      Seq.new(@array.inject([[],[]]) {|z,x|
-        if yield x then 
-          [z[0].push(x),z[1]]
-        else 
-          [z[0],z[1].push(x)] 
+      Seq.new(@array.chunk(&predicate).inject([[],[]]) {|z, matched_and_elm|
+        matched, elm = matched_and_elm[0], matched_and_elm[1][0]
+        if matched then
+          [z[0].push(elm), z[1]]
+        else
+          [z[0],z[1].push(elm)]
         end
       })
     end

data/lib/scaruby/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
 module Scaruby
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
 

data/readme.md

@@ -46,9 +46,29 @@ irb(main):026:0> Map.new({123=>'abc',23=>'bc',345=>'cde'}).filter {|k,v| k.to_s.
 => {123=>"abc", 345=>"cde"}
 ```
 
-You can extend Ruby with Scaruby. If the method is missing, the method in Scaruby will be invoked.
+`scaruby/converter` might be useful.
 
-Already defined methods (i.e. flat_map, find and so on) are never replaced.
+```ruby
+irb(main):001:0> require 'scaruby/converter'
+=> true
+irb(main):002:0> 'abc'.to_option.is_defined
+=> true
+irb(main):003:0> 'abc'.to_option.get_or_else('zzz')
+=> "abc"
+irb(main):004:0> nil.to_option.is_defined
+=> false
+irb(main):005:0> [1,2,3].to_scaruby.foreach do |e| puts e end
+1
+2
+3
+=> [1, 2, 3]
+```
+
+It is also possible to extend Ruby with Scaruby. 
+
+If the method is missing, the method in Scaruby will be invoked.
+
+In this case, the methods already defined (i.e. flat_map, find and so on) are never replaced.
 
 ```ruby
 irb(main):015:0> require 'scaruby/core_ext'
@@ -70,4 +90,6 @@ irb(main):027:0> {123=>'abc',23=>'bc',345=>'cde'}.filter {|k,v| k.to_s.size == 3
 
 MIT License
 
+https://github.com/seratch/scaruby/blob/master/LICENSE.txt
+
 

data/spec/scaruby/converter_spec.rb

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+require 'scaruby/converter'
+
+describe Enumerable do
+  it 'has #to_scaruby' do
+    [1,2,3].to_scaruby.filter {|e| e > 1 }.to_a.should eq([2,3])
+  end
+end
+
+describe Hash do
+  it 'has #to_scaruby' do
+    {123=>'abc',2=>'b',34=>'cd'}.to_scaruby.filter {|k,v| 
+      k.to_s.length == 1
+    }.to_hash.should eq({2=>'b'})
+  end
+end
+
+describe Object do
+  it 'has #to_option' do
+    'abc'.to_option.is_defined.should eq(true)
+    'abc'.to_option.get_or_else('zzz').should eq('abc')
+    nil.to_option.is_defined.should eq(false)
+    nil.to_option.get_or_else('zzz').should eq('zzz')
+  end
+end
+

data/spec/scaruby/core_ext/enumerable_spec.rb

@@ -2,7 +2,7 @@
 
 require 'scaruby/core_ext'
 
-describe Seq do
+describe Enumerable do
 
   one_to_five = 1.upto 5
   one_to_five_shuffled = one_to_five.sort_by {rand}

data/spec/scaruby/core_ext/hash_spec.rb

@@ -2,7 +2,7 @@
 
 require 'scaruby/core_ext'
 
-describe Map do
+describe Hash do
 
   hash = {123 => 'abc', 234 => 'bcd', 345 => 'cde', 4 => 'd', 56 => 'ef', 7 => 'g', 89 => 'hi' }
 

data/spec/scaruby/map_spec.rb

@@ -10,6 +10,20 @@ describe Map do
     map = Map.new({1 => 'a', 2 => 'b'})
     map.should_not eq(nil)
   end 
+
+  # as a sub type of Hash
+  it 'has #each' do
+    expected_key = 1
+    expected_value = 10
+    Map.new({1=>10,2=>20}).each do |k,v|
+      k.should eq(expected_key)
+      v.should eq(expected_value)
+      expected_key += 1
+      expected_value += 10
+    end
+  end
+
+  # defined
   it 'has #contains' do
     Map.new(hash).contains(123).should eq(true)
     Map.new(hash).contains(999).should eq(false)

data/spec/scaruby/seq_spec.rb

@@ -17,6 +17,21 @@ describe Seq do
     rescue ArgumentError
     end
   end
+
+  # as a sub type of Enumerable
+  it 'has #each' do
+    expected = 0
+    Seq.new([0,1,2,3]).each do |e|
+      e.should eq(expected)
+      expected += 1
+    end
+  end
+  it 'has #all?' do
+    Seq.new([1,2,3]).all? {|e| e < 4 }.should eq(true)
+    Seq.new([1,2,3]).all? {|e| e > 2 }.should eq(false)
+  end
+
+  # defined 
   it 'has #to_a' do
     Seq.new(one_to_five).to_a.should eq([1,2,3,4,5])
   end

metadata

@@ -2,7 +2,7 @@
 name: scaruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kazuhiro Sera
@@ -29,6 +29,7 @@ files:
 - Rakefile
 - lib/scaruby.rb
 - lib/scaruby/appliable_proc.rb
+- lib/scaruby/converter.rb
 - lib/scaruby/core_ext.rb
 - lib/scaruby/core_ext/enumerable.rb
 - lib/scaruby/core_ext/hash.rb
@@ -39,6 +40,7 @@ files:
 - lib/scaruby/version.rb
 - readme.md
 - scaruby.gemspec
+- spec/scaruby/converter_spec.rb
 - spec/scaruby/core_ext/enumerable_spec.rb
 - spec/scaruby/core_ext/hash_spec.rb
 - spec/scaruby/map_spec.rb
@@ -73,6 +75,7 @@ signing_key:
 specification_version: 3
 summary: Scala API in Ruby
 test_files: 
+- spec/scaruby/converter_spec.rb
 - spec/scaruby/core_ext/enumerable_spec.rb
 - spec/scaruby/core_ext/hash_spec.rb
 - spec/scaruby/map_spec.rb