goods 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0011750815867641124fd10b42a9c29157cf738
-  data.tar.gz: cf3a8fd8a6212bd050b38d188b62c32d0804cf43
+  metadata.gz: 4c0db8c61b2a8ee5ea477222bae0025d6ddf665c
+  data.tar.gz: 1f59093e307a69f02c11c7988824bfd90299afb3
 SHA512:
-  metadata.gz: bd2df6ed0f8f557529d6826bee5525df56b7c2a379db0b4485630c6e33d17c759ca56ba9943cb395ac6363a1509f18c3d1b748ef61fe91dcab4a9be0ea8d16f4
-  data.tar.gz: 668f87a2ecc661ab59c7888eb3d7d628d0cf4677f38fa942141883341bd246d1e82ec968673bd868c164d0dd3cf7155267a49f31c8ce0691a92e691c2446b78b
+  metadata.gz: cad7b3a73d0d6d48c4e41bed36bc5d05170fb15954fafc9a5f98d6588867950c40f4240b978f785566097983d1fe162f5fda23aec93dd403b897beb342c2e5fe
+  data.tar.gz: 06c5c8baabc115059afdb01fbae2f870a78d01c86d9569c6ae58afd446c4be3921ed83ce5a5c9232c269852aca8af37f6db876f30dfc7dfbd56cd5d316ec5bfa

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 .DS_Store
 *sublime*
 .idea/
+.floo*

data/goods.gemspec

@@ -24,7 +24,7 @@ DESC
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0.0.beta1"
+  spec.add_development_dependency "rspec", "~> 3.0.0.beta2"
 
   spec.add_runtime_dependency "libxml-ruby"
   spec.add_runtime_dependency "nokogiri"

data/lib/goods/util.rb

@@ -0,0 +1,120 @@
+module Goods
+  module Util
+    class CategoriesGraph
+      attr_reader :vertex_count, :edge_count
+
+      def initialize(categories=[])
+        reset
+        add_categories(categories)
+      end
+
+      def adjacent_categories?(cid1, cid2)
+        vertexes = [
+          vertex_for_category(cid1),
+          vertex_for_category(cid2)
+        ]
+        adjacent?(*vertexes)
+      end
+
+      def topsorted
+        sorted = []
+        on_processed = ->(vertex_num) { sorted.unshift(vertex_num) }
+        dfs(nil, on_processed)
+        sorted.map { |v| category_for_vertex(v) }
+      end
+
+      private
+
+      # Make empty graph
+      def reset
+        @vertex_count = 0
+        @edge_count = 0
+        @adjacency_list = []
+        @vertex_to_category = []
+        @category_to_vertex = {}
+      end
+
+      def add_categories(categories)
+        categories.each { |c| init_category(c) }
+        categories.each { |c| link_category(c) }
+      end
+
+      def init_category(category)
+        return if vertex_for_category(category[:id])
+
+        add_vertex do |vertex_num|
+          set_mapping vertex_num, category
+        end
+      end
+
+      def link_category(category)
+        if category[:parent_id]
+          edge = [
+            vertex_for_category(category[:parent_id]),
+            vertex_for_category(category[:id])
+          ]
+
+          add_edge(*edge)
+        end
+      end
+
+      def add_vertex
+        @adjacency_list.push([])
+        yield @vertex_count if block_given?
+        @vertex_count += 1
+      end
+
+      def add_edge(v_start, v_end)
+        if v_start && v_end
+          @adjacency_list[v_start].push(v_end)
+          @edge_count += 1
+        end
+      end
+
+      def adjacent?(v1, v2)
+        @adjacency_list[v1].include?(v2)
+      end
+
+      def adjacent_for(vertex)
+        @adjacency_list[vertex]
+      end
+
+      def vertex_for_category(category_id)
+        @category_to_vertex[category_id]
+      end
+
+      def category_for_vertex(vertex_num)
+        @vertex_to_category[vertex_num]
+      end
+
+      def set_mapping(vertex_num, category)
+        @vertex_to_category[vertex_num] = category
+        @category_to_vertex[category[:id]] = vertex_num
+      end
+
+      def dfs(on_discovered, on_processed)
+        states = vertex_count.times.map { :undiscovered }
+
+        vertex_count.times.each do |vertex|
+          if states[vertex] == :undiscovered
+            dfs_internal(vertex, states, on_discovered, on_processed)
+          end
+        end
+      end
+
+      def dfs_internal(vertex, states, on_discovered, on_processed)
+        states[vertex] = :discovered
+        on_discovered.call(vertex) if on_discovered
+
+        adjacent_for(vertex).each do |adjacent|
+          if states[adjacent] == :undiscovered
+            dfs_internal(adjacent, states, on_discovered, on_processed)
+          end
+        end
+
+        states[vertex] = :processed
+        on_processed.call(vertex) if on_processed
+      end
+    end
+  end
+end

data/lib/goods/version.rb

@@ -1,3 +1,3 @@
 module Goods
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/goods/xml.rb

@@ -9,7 +9,9 @@ module Goods
     end
 
     def categories
-      @categories ||= extract_categories
+      @categories ||= begin
+        Util::CategoriesGraph.new(extract_categories).topsorted
+      end
     end
 
     def currencies

data/lib/goods.rb

@@ -2,6 +2,7 @@ require 'open-uri'
 require "goods/version"
 require "goods/xml/validator"
 require "goods/xml"
+require "goods/util"
 require "goods/element"
 require "goods/container"
 require "goods/category"

data/spec/goods/util_spec.rb

@@ -0,0 +1,114 @@
+require "spec_helper"
+
+describe Goods::Util::CategoriesGraph do
+  let(:klass) { Goods::Util::CategoriesGraph }
+
+  describe "#initialize" do
+    it "should create empty graph if nothing passed" do
+      graph = klass.new
+      expect(graph.vertex_count).to eql(0)
+      expect(graph.edge_count).to eql(0)
+    end
+
+    it "should create graph with vertice for each category" do
+      graph = klass.new([
+        { id: 1, name: "First" },
+        { id: 2, name: "Second" }
+      ])
+      expect(graph.vertex_count).to eql(2)
+      expect(graph.edge_count).to eql(0)
+    end
+
+    it "should create edge between parent and child category" do
+      normal_categories = [
+        { id: 1, name: "First" },
+        { id: 2, name: "Second", parent_id: 1 }
+      ]
+      reversed_categories = normal_categories.reverse
+
+      [normal_categories, reversed_categories].each do |categories|
+        graph = klass.new(categories)
+        expect(graph.vertex_count).to eql(2)
+        expect(graph.edge_count).to eql(1)
+        expect(graph.adjacent_categories?(1, 2)).to eql(true)
+      end
+    end
+
+    it "should not duplicate categories" do
+      graph = klass.new([
+        { id: 1, name: "Name" },
+        { id: 1, name: "Name" }
+      ])
+
+      expect(graph.vertex_count).to eql(1)
+    end
+  end
+
+  describe "#topsorted" do
+
+    context "with single strongly connected component" do
+      let(:simple_description) {
+        [
+          { id: 1, name: "First" },
+          { id: 2, name: "Second", parent_id: 1 }
+        ]
+      }
+
+      it "if already topsorted should return the same" do
+        graph = klass.new(simple_description)
+        topsorted = graph.topsorted
+        expect(topsorted).to eql(simple_description)
+      end
+
+      it "if not topsorted should topsort" do
+        graph = klass.new(simple_description.reverse)
+        topsorted = graph.topsorted
+        expect(topsorted).to eql(simple_description)
+      end
+    end
+
+    context "with multiple strongly connected component" do
+      let(:complex_description) {
+        [
+          {id: 1, name: 'C0L0N0', level: 0, component: 1},
+          {id: 2, name: 'C0L1N0', parent_id: 1, level: 1, component: 1},
+          {id: 3, name: 'C0L1N1', parent_id: 1, level: 1, component: 1},
+          {id: 4, name: 'C0L1N2', parent_id: 1, level: 1, component: 1},
+          {id: 5, name: 'C0L2N0', parent_id: 2, level: 2, component: 1},
+          {id: 6, name: 'C0L3N0', parent_id: 5, level: 2, component: 1},
+
+          {id: 7, name: 'C1L0N0', level: 0, component: 2},
+          {id: 8, name: 'C1L1N0', parent_id: 7, level: 1, component: 2},
+          {id: 9, name: 'C1L1N1', parent_id: 7, level: 1, component: 2},
+        ]
+      }
+
+      it "if not topsorted should topsort" do
+        graph = klass.new(complex_description.reverse)
+        topsorted = graph.topsorted
+        topsorted.each_with_index do |cat, idx|
+          if cat[:parent_id]
+            expect(
+              topsorted[0, idx].find { |el| el[:id] == cat[:parent_id]}
+            ).not_to be_nil
+          end
+        end
+      end
+    end
+
+    context "with graph with cycles" do
+      let(:cyclic) {
+        [
+          {id: 1, name: "Kili", parent_id: 3},
+          {id: 2, name: "Fili", parent_id: 1},
+          {id: 3, name: "Dili", parent_id: 2}
+        ]
+      }
+
+      it "should not fail" do
+        graph = klass.new(cyclic)  
+        expect(graph.topsorted).not_to be_nil
+      end
+    end
+  end
+end

data/spec/goods/xml_spec.rb

@@ -25,21 +25,32 @@ describe Goods::XML do
 
   describe "#categories" do
     let(:categories) { simple_catalog.categories }
+    let(:root_category) {
+      categories.find { |el| el[:parent_id] == nil }
+    }
+    let(:child_category) {
+      categories.find { |el| el[:parent_id] == root_category[:id]}
+    }
 
     it "should extract all categories" do
       expect(categories.count).to eq(SIMPLE_CATALOG_CATEGORIES_COUNT)
     end
 
-    context "category format" do
-      let(:root_category) { categories[0] }
-      let(:child_category) { categories[1] }
+    it "should have root category" do
+      expect(root_category).not_to be_nil
+    end
 
+    it "should have child category" do
+      expect(child_category).not_to be_nil
+    end
+
+    context "category format" do
       it "should have an id" do
-        expect(root_category[:id]).to eq("1")
+        expect(root_category).to have_key(:id)
       end
 
       it "should have a name" do
-        expect(root_category[:name]).to eq("Оргтехника")
+        expect(root_category[:name]).not_to be_empty
       end
 
       it "should have nil parent_id for root category" do
@@ -47,7 +58,7 @@ describe Goods::XML do
       end
 
       it "should have non-nil parent_id for child_category" do
-        expect(child_category[:parent_id]).to eq("1")
+        expect(child_category[:parent_id]).not_to be_nil
       end
     end
 
@@ -177,8 +188,8 @@ describe Goods::XML do
     end
   end
 
-  describe "#generation_date" do 
-    it "should correctly get yml_catalog date" do      
+  describe "#generation_date" do
+    it "should correctly get yml_catalog date" do
       expect(simple_catalog.generation_date).to eq(SIMPLE_CATALOG_GENERATION_TIME)
     end
   end

data/spec/goods_spec.rb

@@ -11,8 +11,13 @@ describe Goods do
 
     it "should return catalog if valid xml io is passed" do
       expect(Goods::Catalog).to receive(:new).
-        with({io: valid_document, url: "url", encoding: "UTF-8"})
-      Goods.from_io(valid_document, "url", "UTF-8")
+        with({io: valid_document, url: "url", encoding: "UTF-8"}).and_call_original
+
+      catalog = Goods.from_io(valid_document, "url", "UTF-8")
+
+      expect(catalog.categories.size).to be > 0
+      expect(catalog.currencies.size).to be > 0
+      expect(catalog.offers.size).to be > 0
     end
 
     it "should raise error if invalid xml io is passed" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goods
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Artem Pyanykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - lib/goods/element.rb
 - lib/goods/offer.rb
 - lib/goods/offers_list.rb
+- lib/goods/util.rb
 - lib/goods/version.rb
 - lib/goods/xml.rb
 - lib/goods/xml/validator.rb
@@ -121,6 +122,7 @@ files:
 - spec/goods/currency_spec.rb
 - spec/goods/offer_spec.rb
 - spec/goods/offers_list_spec.rb
+- spec/goods/util_spec.rb
 - spec/goods/xml/validator_spec.rb
 - spec/goods/xml_spec.rb
 - spec/goods_spec.rb
@@ -161,6 +163,7 @@ test_files:
 - spec/goods/currency_spec.rb
 - spec/goods/offer_spec.rb
 - spec/goods/offers_list_spec.rb
+- spec/goods/util_spec.rb
 - spec/goods/xml/validator_spec.rb
 - spec/goods/xml_spec.rb
 - spec/goods_spec.rb