goods 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc907ce0650d82d39c2d077d63492e2ad9b1d4fa
-  data.tar.gz: 69b1b31e9bdfc828364fb7c16dda6c53545b3dfe
+  metadata.gz: 587e410504981ece079d24dbbc15a0408ca54985
+  data.tar.gz: d34b7f6dcbac3169e10ba29fb01bda914c5f0736
 SHA512:
-  metadata.gz: 783ddac11cd0e9ac7648a2dc36c8f34573ad2d5935529e91e95ffd8ed2b9d76b7aedec8fdf63818f1a713facb284270e6b4e34c3dc6d6257ddac6dc341225ada
-  data.tar.gz: 37c18feb8ebe1e7f0108690ee662bb6f869726b1495277250d3fcbbf35a877200d02d3bb009777eac26800dfead0407848dcc75c97f5e8b22ebb93bdaae2a106
+  metadata.gz: b94d34341aaab7c7319c85dd0df6614e1c769acdc9490c27cc00a45e38c80cd237cbd3f0a269c1df1dc65f8cfcc4fbf190083bc4264d459d692771efd881aa57
+  data.tar.gz: 216ac093e960bf563e6262cd0973d5ae5152ff47846c6e7e6051a8aaa4eb0fad5e4668b78a6c872f62348a2c73e028b71199518e22da686dbcc4d2bbffa3fd1d

data/lib/goods/catalog.rb

@@ -19,6 +19,10 @@ module Goods
       @offers.convert_currency(other_currency)
     end
 
+    def date
+      @xml.generation_date
+    end
+
     private
 
     def from_string(xml_string, url, encoding)

data/lib/goods/category.rb

@@ -5,8 +5,8 @@ module Goods
     attr_field :parent_id
     attr_field :name
 
-    def initialize(description)
-      self.description = description
+    def initialize(info_hash)
+      self._info_hash = info_hash
       @parent_at_level = {}
     end
 

data/lib/goods/containable.rb

@@ -12,19 +12,20 @@ module Goods
           if field = instance_variable_get("@#{field_name}")
             field
           else
-            instance_variable_set("@#{field_name}", description[field_name])
+            instance_variable_set("@#{field_name}", _info_hash[field_name])
             instance_variable_get("@#{field_name}")
           end
         end
       end
     end
 
-    def description
-      @description
+    def _info_hash
+      @_info_hash
     end
+    private :_info_hash
 
     def id
-      @id ||= description[:id]
+      @id ||= _info_hash[:id]
     end
 
     def invalid_fields
@@ -47,8 +48,9 @@ module Goods
        invalid_fields << field unless predicate.call(send(field))
     end
 
-    def description=(description)
-      @description = description
+    def _info_hash=(info_hash)
+      @_info_hash = info_hash
     end
+    private :_info_hash=
   end
 end

data/lib/goods/currency.rb

@@ -2,16 +2,16 @@ module Goods
   class Currency
     include Containable
 
-    def initialize(description)
-      self.description = description
+    def initialize(info_hash)
+      self._info_hash = info_hash
     end
 
     def rate
-      @rate ||= description[:rate].to_f
+      @rate ||= _info_hash[:rate].to_f
     end
 
     def plus
-      @plus ||= description[:plus].to_f
+      @plus ||= _info_hash[:plus].to_f
     end
 
     def in(other_currency)

data/lib/goods/offer.rb

@@ -10,10 +10,11 @@ module Goods
     attr_field :name
     attr_field :picture
     attr_field :vendor
+    attr_field :url
 
-    def initialize(description)
-      self.description = description
-      @price = description[:price].to_f
+    def initialize(info_hash)
+      self._info_hash = info_hash
+      @price = _info_hash[:price].to_f
     end
 
     def convert_currency(other_currency)

data/lib/goods/version.rb

@@ -1,3 +1,3 @@
 module Goods
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/goods/xml.rb

@@ -20,6 +20,10 @@ module Goods
       @offers ||= extract_offers
     end
 
+    def generation_date      
+      @generation_date ||= extract_catalog_generation_date
+    end
+
 
     private
 
@@ -32,6 +36,10 @@ module Goods
       catalog_node / "shop"
     end
 
+    def extract_catalog_generation_date
+      Time.parse(catalog_node.attribute("date").value)
+    end
+
     # Categories part
     def categories_node
       shop_node / "categories" / "category"
@@ -45,14 +53,11 @@ module Goods
 
     def category_node_to_hash(category)
       category_hash = {
-        id: category.attribute("id").value,
-        name: category.text
+        id: extract_attribute(category, :id),
+        name: extract_text(category)
       }
-      category_hash[:parent_id] = if category.attribute("parentId")
-                                    category.attribute("parentId").value
-                                  else
-                                    nil
-                                  end
+      category_hash[:parent_id] = extract_attribute(category, "parentId")
+
       category_hash
     end
 
@@ -69,7 +74,7 @@ module Goods
 
     def currency_node_to_hash(currency)
       currency_hash = {
-        id: currency.attribute("id").value
+        id: extract_attribute(currency, "id")
       }
 
       attributes_with_defaults = {
@@ -77,11 +82,7 @@ module Goods
         plus: "0"
       }
       attributes_with_defaults.each do |attr, default|
-        currency_hash[attr] = if currency.attribute(attr.to_s)
-                                currency.attribute(attr.to_s).value
-                              else
-                                default
-                              end
+        currency_hash[attr] = extract_attribute(currency, attr, default)
       end
 
       currency_hash
@@ -100,7 +101,7 @@ module Goods
 
     def offer_node_to_hash(offer)
       offer_hash = {
-        id: offer.attribute("id").value
+        id: extract_attribute(offer, "id")
       }
 
       offer_hash[:available] = if attr = offer.attribute("available")
@@ -117,13 +118,35 @@ module Goods
         name: "name",
         vendor: "vendor",
         model: "model"
-      }.each do |property, node|
-        offer_hash[property] = (el = offer.xpath(node).first) ? el.text.strip : nil
+      }.each do |property, xpath|
+        offer_hash[property] = extract_text(offer, xpath)
       end
 
-      offer_hash[:price] = offer.xpath("price").first.text.to_f
+      offer_hash[:price] = extract_text(offer, "price").to_f
 
       offer_hash
     end
+
+    def extract_attribute(node, attribute, default = nil)
+      if node.attribute(attribute.to_s)
+        node.attribute(attribute.to_s).value.strip
+      else
+        default
+      end
+    end
+
+    def extract_text(node, xpath = nil, default = nil)
+      target = if xpath
+        node.xpath(xpath).first
+      else
+        node
+      end
+
+      if target
+        target.text.strip
+      else
+        default
+      end
+    end
   end
 end

data/spec/fixtures/simple_catalog.xml

@@ -7,14 +7,14 @@
         <url>http://www.magazin.ru/</url>
 
         <currencies>
-            <currency id="RUR" rate="1" plus="0"/>
-            <currency id="USD" rate="30"/>
+            <currency id="RUR" rate=" 1 " plus="0"/>
+            <currency id="USD" rate=" 30 "/>
             <currency id="KZT"/>
         </currencies>
 
         <categories>
-            <category id="1">Оргтехника</category>
-            <category id="10" parentId="1">Принтеры</category>
+            <category id=" 1 ">Оргтехника</category>
+            <category id="10" parentId=" 1 ">Принтеры</category>
             <category id="100" parentId="10">Струйные принтеры</category>
             <category id="101" parentId="10">Лазерные принтеры</category>
 
@@ -29,20 +29,30 @@
         <local_delivery_cost>300</local_delivery_cost>
 
         <offers>
-            <offer id="123" type="vendor.model" bid="13" cbid="20">
+            <offer id=" 123 " type="vendor.model" bid="13" cbid="20">
                 <url>http://magazin.ru/product_page.asp?pid=14344</url>
                 <price>15000</price>
-                <currencyId>RUR</currencyId>
-                <categoryId type="Own">100</categoryId>
+                <currencyId>
+                  RUR
+                </currencyId>
+                <categoryId type="Own">
+                  100
+                </categoryId>
                 <categoryId type="Own">101</categoryId>
-                <picture>http://magazin.ru/img/device1.jpg</picture>
+                <picture>
+                  http://magazin.ru/img/device1.jpg
+                </picture>
                 <picture>http://magazin.ru/img/device2.jpg</picture>
                 <delivery>true</delivery>
                 <local_delivery_cost>300</local_delivery_cost>
                 <typePrefix>Принтер</typePrefix>
-                <vendor>НP</vendor>
+                <vendor>
+                  НP
+                </vendor>
                 <vendorCode>Q7533A</vendorCode>
-                <model>Color LaserJet 3000</model>
+                <model>
+                  Color LaserJet 3000
+                </model>
                 <description>A4, 64Mb, 600x600 dpi, USB 2.0, 29стр/мин ч/б / 15стр/мин цв, лотки на 100л и 250л, плотность до 175г/м, до 60000 стр/месяц </description>
                 <manufacturer_warranty>true</manufacturer_warranty>
                 <country_of_origin>Япония</country_of_origin>
@@ -55,7 +65,9 @@
                 <delivery>true</delivery>
                 <local_delivery_cost>300</local_delivery_cost>
                 <author>Александра Маринина</author>
-                <name>Все не так. В 2 томах. Том 1</name>
+                <name>
+                  Все не так. В 2 томах. Том 1
+                </name>
                 <publisher>ЭКСМО - Пресс</publisher>
                 <series>А. Маринина - королева детектива</series>
                 <year>2009</year>

data/spec/goods/offer_spec.rb

@@ -4,7 +4,7 @@ describe Goods::Offer do
   let(:books) { Goods::Category.new(id: "1", name: "Books") }
   let(:rur) { Goods::Currency.new(id: "RUR", rate: 1, plus: 0) }
   let(:valid_description) do
-    {id: "1", name: "The Lord of The Rings", category_id: "1", currency_id: "RUR", price: 10} 
+    {id: "1", name: "The Lord of The Rings", category_id: "1", currency_id: "RUR", price: 10}
   end
   let(:valid_offer) do
     offer = Goods::Offer.new(valid_description)
@@ -48,6 +48,11 @@ describe Goods::Offer do
     end
   end
 
+  it "should return offer description, not description hash" do
+    offer = Goods::Offer.new(valid_description.merge(description: "Greatest book"))
+    expect(offer.description).to eql("Greatest book")
+  end
+
   it "should have floting point price" do
     expect(Goods::Offer.new(price: 5).price).to be_kind_of(Float)
   end

data/spec/goods/xml_spec.rb

@@ -8,6 +8,7 @@ describe Goods::XML do
   SIMPLE_CATALOG_CATEGORIES_COUNT = 9
   SIMPLE_CATALOG_CURRENCIES_COUNT = 3
   SIMPLE_CATALOG_OFFERS_COUNT = 2
+  SIMPLE_CATALOG_GENERATION_TIME = Time.parse("2010-04-01 17:00")
 
   describe "#initialize" do
     it 'should use Nokogiri for parsing' do
@@ -175,4 +176,10 @@ describe Goods::XML do
       end
     end
   end
+
+  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
 end

data/spec/support/shared_examples_for_containable.rb

@@ -1,5 +1,5 @@
 shared_examples "containable" do
-  [:description, :id, :invalid_fields].each do |prop|
+  [:id, :invalid_fields].each do |prop|
     it "should give access to #{prop}" do
       expect(element).to respond_to(prop)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goods
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Artem Pyanykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler