red_grape 0.0.1 → 0.0.2

data/lib/red_grape/pipe/filter_pipe.rb

@@ -6,13 +6,7 @@ module RedGrape
       def pass(obj, context)
         filter = self.opts.first
         if context.eval :it => obj, &filter
-          if self.last?
-            obj 
-          else
-            context.push_history obj do |ctx|
-              obj.pass_through self.next, ctx
-            end
-          end
+          pass_next context, obj
         else
           nil
         end

data/lib/red_grape/pipe/group_count_pipe.rb

@@ -0,0 +1,17 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class GroupCountPipe < Pipe::Base
+      def pass(obj, context)
+        if self.opts.empty?
+          context.group obj, self.next
+        else
+          self.opts.first[obj] ||= 0
+          self.opts.first[obj] += 1
+        end
+        obj
+      end
+    end
+  end
+end

data/lib/red_grape/pipe/has_pipe.rb

@@ -0,0 +1,24 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class HasPipe < Pipe::Base
+      def pass(obj, context)
+        prop, cond, val = *self.opts
+        cond = case cond
+          when :gt; :>
+          when :lt; :<
+          else; cond
+          end
+        filter = proc{it[prop].send(cond, val)}
+
+        # TODO: same as filter_pipe
+        if context.eval :it => obj, &filter
+          pass_next context, obj
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/red_grape/pipe/if_then_else_pipe.rb

@@ -14,13 +14,7 @@ module RedGrape
             context.eval({:it => obj}, &else_block)
           end
         ret = ret.take if ret.is_a? Pipe::Base
-        if self.last?
-          ret
-        else
-          context.push_history ret do |ctx|
-            ret.pass_through self.next, ctx
-          end
-        end
+        pass_next context, ret
       end
     end
   end

data/lib/red_grape/pipe/in_pipe.rb

@@ -2,29 +2,26 @@ require 'red_grape/pipe/base'
 
 module RedGrape
   module Pipe
+    module In
+      def in(*opts)
+        InPipe.new self, *opts
+      end
+    end
+
     class InPipe < Pipe::Base
       def pipe_name
         @opts.empty? ? super : "#{super}(#{@opts.first})"
       end
 
       def pass(obj, context)
-        case obj
-        when RedGrape::Vertex
-          group =
-            if self.opts.empty?
-              VertexGroup.new obj._in_edges.map(&:source)
-            else
-              label = self.opts.first
-              VertexGroup.new obj._in_edges.find_all{|e| e.label == label}.map(&:source)
-            end
-          if self.last?
-            group
+        group =
+          if self.opts.empty?
+            obj.in_edges.map(&:source)
           else
-            context.push_history obj do |ctx|
-              group.pass_through self.next, ctx
-            end
+            label = self.opts.first
+            obj.in_edges.find_all{|e| e.label == label}.map(&:source)
           end
-        end
+        pass_next context, obj, group
       end
     end
   end

data/lib/red_grape/pipe/in_v_pipe.rb

@@ -0,0 +1,12 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class InVPipe < Pipe::Base
+      def pass(obj, context)
+        target = obj.target
+        pass_next context, obj, target
+      end
+    end
+  end
+end

data/lib/red_grape/pipe/loop_pipe.rb

@@ -3,35 +3,26 @@ require 'red_grape/pipe/base'
 module RedGrape
   module Pipe
     class LoopPipe < Pipe::Base
-      def pass(obj, context) # TODO: 無理やり・・・
-        condition = self.opts.first
-        label = self.opts[1]
+      def pass(obj, context)
+        condition, label = *self.opts
 
-        looped_pipe = self.prev.dup
-        looped_pipe.prev = self.prev.prev
-        (label - 1).times do
-          prev = looped_pipe.prev.dup
-          prev.next = looped_pipe
-          looped_pipe = prev
+        anchor_pipe = self;
+        case label
+        when Integer
+          label.times {anchor_pipe = anchor_pipe.prev}
+        when String, Symbol
+          begin
+            anchor_pipe = anchor_pipe.prev
+          end until anchor_pipe.is_a?(AsPipe) && anchor_pipe.opts.first == label
+        else
+          raise 'label should be an integer or a string.'
         end
-
         context.loops += 1
-        while context.eval :it => obj, &condition
-          pipe = looped_pipe
-          while pipe
-            obj = obj.pass_through pipe, context
-            pipe = pipe.next
-          end
-          context.loops += 1
-        end
-        context.loops = 1
-
-        if self.last?
-          obj
+        if context.eval :it => obj, &condition
+          obj.pass_through anchor_pipe, context
         else
-          context.push_history obj do |ctx|
-            obj.pass_through self.next, ctx
-          end
+          context.loops = 1
+          pass_next context, nil, obj
         end
       end
     end

data/lib/red_grape/pipe/out_e_pipe.rb

@@ -0,0 +1,25 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    module OutE
+      def out_e(*opts)
+        OutEPipe.new self, *opts
+      end
+      alias outE out_e
+    end
+
+    class OutEPipe < Pipe::Base
+      def pass(obj, context)
+        label = self.opts.first
+        label = nil if label.is_a?(Array) && label.empty? # TODO
+        edges = if label
+            obj.out_edges.dup.find_all{|e| e.label == label}
+          else
+            obj.out_edges.dup
+          end
+        pass_next context, obj, edges
+      end
+    end
+  end
+end

data/lib/red_grape/pipe/out_pipe.rb

@@ -14,23 +14,14 @@ module RedGrape
       end
 
       def pass(obj, context)
-        case obj
-        when RedGrape::Vertex
-          group =
-            if self.opts.empty? or self.opts.first.empty? # TODO $B$J$<$+(Blabel$B$K(B[]$B$,F~$C$F$k(B
-              VertexGroup.new obj._out_edges.map(&:target)
-            else
-              label = self.opts.first
-              VertexGroup.new obj._out_edges.find_all{|e| e.label == label}.map(&:target)
-            end
-          if self.last?
-            group
+        group =
+          if self.opts.empty? or self.opts.first.empty? # TODO なぜかlabelに[]が入ってる
+            obj.out_edges.map(&:target)
           else
-            context.push_history obj do |ctx|
-              group.pass_through self.next, ctx
-            end
+            label = self.opts.first
+            obj.out_edges.find_all{|e| e.label == label}.map(&:target)
           end
-        end
+        pass_next context, obj, group
       end
     end
   end

data/lib/red_grape/pipe/paths_pipe.rb

@@ -5,20 +5,32 @@ module RedGrape
   module Pipe
     class PathsPipe < Pipe::Base
       def pass(obj, context)
-        case obj
-        when 'TODO'
-        else
-          context.push_history obj do |ctx|
-            if self.last?
-              #ctx.history.dup
-              PathGroup.new ctx.history
+        context.push_history obj do |ctx|
+          if self.last?
+            history = ctx.history.dup
+            if self.opts.empty?
+              PathGroup.new history
             else
-              # TODO
-              raise 'not implemented'
+              ary = []
+              history.each_with_index do |h, index|
+                prc = self.opts[index]
+                if prc
+                  context.it = h
+                  ary << context.eval(&prc)
+                else
+                  ary << h
+                end
+              end 
+              PathGroup.new ary
             end
+          else
+            # TODO
+            raise 'not implemented'
           end
         end
       end
     end
+
+    PathPipe = PathsPipe
   end
 end

data/lib/red_grape/pipe/property_pipe.rb

@@ -8,17 +8,8 @@ module RedGrape
       end
 
       def pass(obj, context)
-        case obj
-        when RedGrape::Vertex
-          prop = obj[self.opts.first]
-          if self.last?
-            prop
-          else
-            context.push_history obj do |ctx|
-              prop.pass_through self.next, ctx
-            end
-          end
-        end
+        prop = obj[self.opts.first]
+        pass_next context, obj, prop
       end
     end
   end

data/lib/red_grape/pipe/retain_pipe.rb

@@ -0,0 +1,16 @@
+require 'red_grape/pipe/base'
+
+module RedGrape
+  module Pipe
+    class RetainPipe < Pipe::Base
+      def pass(obj, context)
+        if context.aggregated_items(self.opts.first).include? obj
+          obj
+        else
+          nil
+        end
+      end
+    end
+  end
+end
+

data/lib/red_grape/pipe/transform_pipe.rb

@@ -4,17 +4,9 @@ module RedGrape
   module Pipe
     class TransformPipe < Pipe::Base
       def pass(obj, context)
-        case obj
-        when 'TODO'
-        else
-          transformer = self.opts.first
-          val = context.eval :it => obj, &transformer
-          if self.last?
-            val
-          else
-            raise 'not implemented'
-          end
-        end
+        transformer = self.opts.first
+        val = context.eval :it => obj, &transformer
+        pass_next context, val
       end
     end
   end

data/lib/red_grape/property_description.rb

@@ -12,6 +12,8 @@ module RedGrape
       case type
       when 'int', 'integer'
         val.is_a? Integer
+      when 'float'
+        val.is_a? Numeric
       else
         true
       end
@@ -21,6 +23,8 @@ module RedGrape
       case type
       when 'int', 'integer'
         val =~ /^\d+$/
+      when 'float'
+        val =~ /^\d+(\.\d+)?$/
       else
         true
       end
@@ -30,6 +34,8 @@ module RedGrape
       case type
       when 'int', 'integer'
         val.to_i
+      when 'float'
+        val.to_f
       else
         val
       end

data/lib/red_grape/serializer/graphml_serializer.rb

@@ -0,0 +1,73 @@
+require 'nokogiri'
+
+module RedGrape
+  module Serializer
+    class GraphMLSerializer
+      NAMESPACES = {
+        'xmlns' => 'http://graphml.graphdrawing.org/xmlns',
+        'xsi' => 'http://www.w3.org/2001/XMLSchema-instance'
+      }
+      
+      attr_reader :graph
+
+      def initialize(graph)
+        @graph = graph
+      end
+
+      def load(filename)
+        if filename =~ /^<\?xml/
+          parse_xml Nokogiri::XML(filename)
+        else
+          File.open(filename, 'r') do |file|
+            parse_xml Nokogiri::XML(file)
+          end
+        end
+        @graph
+      end
+
+      # assumption: any sub-graph does not exist.
+      def parse_xml(xml)
+        vertices = {}
+        edges = {}
+        property_descriptions = {}
+
+        nodes(xml, 'key').each do |key_elm|
+          defaults = nodes key_elm, 'default'
+          default = defaults.size == 0 ? nil : defaults.first.children.to_s
+          prop = PropertyDescription.new key_elm['attr.name'], key_elm['attr.type'], default
+          (property_descriptions[key_elm['for']] ||= {})[key_elm['id']] = prop
+        end
+        @graph.instance_variable_set :@property_descriptions, property_descriptions
+
+        nodes(xml, 'node').each do |node_elm|
+          vertex = Vertex.new @graph, node_elm['id'], 
+            :property_description => property_descriptions['node']
+          data = nodes node_elm, 'data'
+          data.each do |data_elm|
+            vertex.set_property data_elm['key'], data_elm.children.first.to_s
+          end
+          vertices[vertex.id] = vertex
+        end
+        @graph.instance_variable_set :@vertices, vertices
+
+        nodes(xml, 'edge').each do |edge_elm|
+          edge = Edge.new @graph, edge_elm['id'], edge_elm['source'], edge_elm['target'], 
+            edge_elm['label'], :property_description => property_descriptions['edge']
+          data = nodes edge_elm, 'data'
+          data.each do |data_elm|
+            edge.set_property data_elm['key'], data_elm.children.first.to_s
+          end
+          edges[edge.id] = edge
+        end
+        @graph.instance_variable_set :@edges, edges
+      end
+
+      def nodes(xml, elm)
+        xml.xpath(".//xmlns:#{elm}", NAMESPACES)
+      end
+
+      def save
+      end
+    end
+  end
+end

data/lib/red_grape/vertex.rb

@@ -1,11 +1,15 @@
-require 'red_grape/propertied_object'
+require 'red_grape/element'
 
 module RedGrape
-  class Vertex < PropertiedObject
+  class Vertex < Element
     include RedGrape::Pipe::Out
     include RedGrape::Pipe::OutE
+    include RedGrape::Pipe::In
     include RedGrape::Pipe::SideEffect
     include RedGrape::Pipe::As
+    include RedGrape::Pipe::Fill
+
+    attr_reader :id, :out_edges, :in_edges
 
     def initialize(graph, id, opts={})
       super graph, opts
@@ -14,18 +18,6 @@ module RedGrape
       @in_edges = []
     end
 
-    def _id
-      @id
-    end
-
-    def _in_edges
-      @in_edges
-    end
-
-    def _out_edges
-      @out_edges
-    end
-
     def add_out_edge(edge)
       @out_edges << edge
     end
@@ -35,12 +27,7 @@ module RedGrape
     end
 
     def to_s
-      "v[#{_id}]"
-      #"v[id(#{_id}):#{@property}]"
-    end
-
-    def method_missing(name, *args, &block)
-      self[name.to_s] or raise NoMethodError.new(name.to_s)
+      "v[#{@id}]"
     end
   end
 end

data/lib/red_grape.rb

@@ -1,4 +1,5 @@
-require 'nokogiri'
+require 'ext/object_ext'
+require 'ext/array_ext'
 require 'red_grape/pipe/in_pipe'
 require 'red_grape/pipe/out_pipe'
 require 'red_grape/pipe/property_pipe'
@@ -13,19 +14,27 @@ require 'red_grape/pipe/loop_pipe'
 require 'red_grape/pipe/has_pipe'
 require 'red_grape/pipe/out_e_pipe'
 require 'red_grape/pipe/in_v_pipe'
+require 'red_grape/pipe/aggregate_pipe'
+require 'red_grape/pipe/except_pipe'
+require 'red_grape/pipe/retain_pipe'
+require 'red_grape/pipe/fill_pipe'
+require 'red_grape/pipe/group_count_pipe'
+require 'red_grape/pipe/cap_pipe'
 require 'red_grape/graph'
 
 module RedGrape
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   module_function
+  def set_auto_take(val=true)
+    Pipe.set_auto_take val
+  end
+
   def load_graph(filename)
     Graph.load filename
   end
-end
 
-class Object
-  def pass_through(pipe, context)
-    pipe.pass self, context
+  def create_tinker_graph
+    Graph.create_tinker_graph
   end
 end

data/test/{test_propertied_object.rb → test_element.rb}

@@ -1,12 +1,12 @@
 require 'test/unit'
 require 'red_grape'
-require 'red_grape/propertied_object'
+require 'red_grape/element'
 require 'red_grape/property_description'
 
-class PropertiedObjectTest < Test::Unit::TestCase
+class ElementTest < Test::Unit::TestCase
   def test_new
     g = RedGrape::Graph.new
-    v = RedGrape::PropertiedObject.new g, property_description:{
+    v = RedGrape::Element.new g, property_description:{
       name:RedGrape::PropertyDescription.new('name', 'string'),
       sex:RedGrape::PropertyDescription.new('sex', 'string', 'male'),
       age:RedGrape::PropertyDescription.new('age', 'integer')
@@ -17,7 +17,7 @@ class PropertiedObjectTest < Test::Unit::TestCase
     assert_nil desc[:name].default
     assert_equal 'male', desc[:sex].default
 
-    v = RedGrape::PropertiedObject.new g, property_description:{
+    v = RedGrape::Element.new g, property_description:{
       name:['name', 'string'],
       sex:['sex', 'string', 'male'],
       age:['age', 'integer']
@@ -28,7 +28,7 @@ class PropertiedObjectTest < Test::Unit::TestCase
     assert_nil desc[:name].default
     assert_equal 'male', desc[:sex].default
     
-    v = RedGrape::PropertiedObject.new g, property_description:{
+    v = RedGrape::Element.new g, property_description:{
       name:{name:'name', type:'string'},
       sex:{name:'sex', type:'string', default:'male'},
       age:{name:'age', type:'integer'}

data/test/test_graph.rb

@@ -1,5 +1,4 @@
 require 'test/unit'
-require 'stringio'
 require 'red_grape'
 
 class GraphTest < Test::Unit::TestCase
@@ -10,8 +9,9 @@ class GraphTest < Test::Unit::TestCase
     graph.add_vertex id:3, val:'c'
 
     assert_equal 3, graph.vertex.size
-    assert_equal 1, graph.vertex(1)._id
-    assert_equal 2, graph.vertex(1, 2).size
+    assert_equal 1, graph.vertex(1).id
+    #assert_equal 2, graph.vertex(1, 2).size # TODO
+    assert_equal 3, graph.vertex(1, 2, 3).size
     assert_equal 2, graph.vertex([1, 2]).size
     assert_equal 3, graph.vertex(:all).size
   end
@@ -20,15 +20,15 @@ class GraphTest < Test::Unit::TestCase
     graph = RedGrape::Graph.new
     v1 = graph.add_vertex 1, name:'yasushi'
     v2 = graph.add_vertex 2, name:'ando'
-    e12 = graph.add_edge 1, :fullname, v1, v2
+    e12 = graph.add_edge 1, v1, v2, :fullname
 
-    assert_equal 1, v1._out_edges.size
-    assert_equal 0, v1._in_edges.size
-    assert_equal e12, v1._out_edges.first
+    assert_equal 1, v1.out_edges.size
+    assert_equal 0, v1.in_edges.size
+    assert_equal e12, v1.out_edges.first
 
-    assert_equal 0, v2._out_edges.size
-    assert_equal 1, v2._in_edges.size
-    assert_equal e12, v2._in_edges.first
+    assert_equal 0, v2.out_edges.size
+    assert_equal 1, v2.in_edges.size
+    assert_equal e12, v2.in_edges.first
   end
 
   def test_load
@@ -67,14 +67,5 @@ class GraphTest < Test::Unit::TestCase
     assert_equal 'vadas', graph.edge(4).target.name
     assert_equal 'marko', graph.edge(5).source.name
     assert_equal 'lop', graph.edge(5).target.name
-    
-    graph = RedGrape::Graph.load StringIO.new(data)
-    assert_equal 'marko', graph.vertex(1).name
-    assert_equal 'vadas', graph.vertex(2).name
-    assert_equal 'lop', graph.vertex(3).name
-    assert_equal 'marko', graph.edge(4).source.name
-    assert_equal 'vadas', graph.edge(4).target.name
-    assert_equal 'marko', graph.edge(5).source.name
-    assert_equal 'lop', graph.edge(5).target.name
   end
 end