goods 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ba028ffc9f2ea9eeec008971060a0b66c2c99ea
-  data.tar.gz: 1e80a10fd4e52f22c57789994592ce09c62added
+  metadata.gz: a0011750815867641124fd10b42a9c29157cf738
+  data.tar.gz: cf3a8fd8a6212bd050b38d188b62c32d0804cf43
 SHA512:
-  metadata.gz: ca29741ba878d8c0a29e43c256737d606ed011babe5f0a73102611c4c9bef3d94ca67276f757240a2649ba285d77bf7a5b012ccdaf2c0f62e480102e9bd2cf2b
-  data.tar.gz: cc1780dca99d100667402dd7b7ac541b545d853232b71af992cffb22ef8c51b8b64c027134e10abb49959091f698476ecc42f96d0ee62df51e19f3074e9bf6d9
+  metadata.gz: bd2df6ed0f8f557529d6826bee5525df56b7c2a379db0b4485630c6e33d17c759ca56ba9943cb395ac6363a1509f18c3d1b748ef61fe91dcab4a9be0ea8d16f4
+  data.tar.gz: 668f87a2ecc661ab59c7888eb3d7d628d0cf4677f38fa942141883341bd246d1e82ec968673bd868c164d0dd3cf7155267a49f31c8ce0691a92e691c2446b78b

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .DS_Store
 *sublime*
+.idea/

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - "2.0.0"
+  - "2.1.0"

data/README.md

@@ -1,4 +1,6 @@
-# Goods
+# Goods 
+
+[![Build Status](https://travis-ci.org/ArtemPyanykh/goods.png?branch=master)](https://travis-ci.org/ArtemPyanykh/goods)
 
 The purpose of this gem is to provide simple, yet reliable solution for parsing
 YML (Yandex Market Language) files, with clean and convenient interface,

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/goods/catalog.rb

@@ -3,8 +3,8 @@ module Goods
     attr_reader :categories, :currencies, :offers
 
     def initialize(params)
-      if params[:string]
-        from_string(params[:string], params[:url], params[:encoding])
+      if params[:io]
+        from_io(params[:io], params[:url], params[:encoding])
       else
         raise ArgumentError, "should provide either :string or :url param"
       end
@@ -25,9 +25,8 @@ module Goods
 
     private
 
-    def from_string(xml_string, url, encoding)
-      @xml_string = xml_string
-      @xml = XML.new(xml_string, url, encoding)
+    def from_io(xml_io, url, encoding)
+      @xml = XML.new(xml_io, url, encoding)
       @categories = CategoriesList.new(@xml.categories)
       @currencies = CurrenciesList.new(@xml.currencies)
       @offers = OffersList.new(@categories, @currencies, @xml.offers)

data/lib/goods/version.rb

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

data/lib/goods/xml/validator.rb

@@ -9,14 +9,14 @@ module Goods
         @error = nil
       end
 
-      def valid?(xml)
-        validate(xml)
+      def valid?(xml_io)
+        validate(xml_io)
         error.nil?
       end
 
-      def validate(xml)
+      def validate(xml_io)
         @error = nil
-        document = LibXML::XML::Document.string(xml)
+        document = LibXML::XML::Document.io(xml_io)
 
         # Should silence STDERR, because libxml2 spews validation error
         # to standard error stream

data/lib/goods/xml.rb

@@ -4,8 +4,8 @@ module Goods
   class XML
     class InvalidFormatError < StandardError; end
 
-    def initialize(string, url = nil, encoding = nil)
-      @xml_source = Nokogiri::XML::Document.parse(string, url, encoding)
+    def initialize(io, url = nil, encoding = nil)
+      @xml_source = Nokogiri::XML::Document.parse(io, url, encoding)
     end
 
     def categories
@@ -105,10 +105,11 @@ module Goods
       }
 
       offer_hash[:available] = if attr = offer.attribute("available")
-                                 !! (attr.value =~ /true/)
-                               else
-                                 true
-                               end
+        !! (attr.value =~ /true/)
+      else
+        true
+      end
+
       {
         url: "url",
         currency_id: "currencyId",

data/lib/goods.rb

@@ -13,30 +13,31 @@ require "goods/currencies_list"
 require "goods/catalog"
 
 module Goods
-  def self.from_string(xml_string, url=nil, encoding=nil)
-    validator = XML::Validator.new
-    if validator.valid? xml_string
-      Catalog.new(string: xml_string, url: url, encoding: encoding)
-    else
-      raise XML::InvalidFormatError, validator.error
-    end
+  def self.from_string(xml_string, encoding=nil)
+    from_io(StringIO.new(xml_string), nil, encoding)
   end
 
   def self.from_url(url, encoding=nil)
-    xml_string = self.load url
-    from_string(xml_string, url, encoding)
+    from_io(load(url), url, encoding)
   end
 
   def self.from_file(file, encoding=nil)
-    xml_string = self.load file
-    from_string(xml_string, nil, encoding)
+    from_io(load(file), nil, encoding)
   end
 
   private
 
   def self.load(source)
-    open(source) do |f|
-      f.read
+    open source
+  end
+
+  def self.from_io(xml_io, url=nil, encoding=nil)
+    validator = XML::Validator.new
+    if validator.valid? xml_io
+      xml_io.rewind
+      Catalog.new(io: xml_io, url: url, encoding: encoding)
+    else
+      raise XML::InvalidFormatError, validator.error
     end
   end
 end

data/spec/goods/catalog_spec.rb

@@ -2,13 +2,14 @@ require 'spec_helper'
 
 describe Goods::Catalog do
   describe "#initialize" do
-    it "should call #from_string when string is passed" do
-      expect_any_instance_of(Goods::Catalog).to receive(:from_string).
-        with("string", "url", "UTF-8").once
-      Goods::Catalog.new(string: "string", url: "url", encoding: "UTF-8")
+    it "should call #from_io when io is passed" do
+      catalog_io = StringIO.new("string")
+      expect_any_instance_of(Goods::Catalog).to receive(:from_io).
+        with(catalog_io, "url", "UTF-8").once
+      Goods::Catalog.new(io: catalog_io, url: "url", encoding: "UTF-8")
     end
 
-    it "should raise error when none of 'string', 'url', 'file' params is passed" do
+    it "should raise error when no io is passed" do
       expect{ Goods::Catalog.new({}) }.to raise_error(ArgumentError)
     end
   end
@@ -21,18 +22,18 @@ describe Goods::Catalog do
     end
 
     [Goods::XML, Goods::CategoriesList, Goods::CurrenciesList, Goods::OffersList].each do |part|
-    it "should create #{part}" do
+      it "should create #{part}" do
         expect(part).to receive(:new).and_return(NullObject.new).once
-        Goods::Catalog.new(string: "xml")
+        Goods::Catalog.new(io: StringIO.new("xml"))
       end
     end
   end
 
   describe "#prune" do
-    let(:xml) {
-      File.read(File.expand_path("../../fixtures/simple_catalog.xml", __FILE__))
+    let(:xml_io) {
+      open File.expand_path("../../fixtures/simple_catalog.xml", __FILE__)
     }
-    let(:catalog) { Goods::Catalog.new string: xml}
+    let(:catalog) { Goods::Catalog.new io: xml_io}
 
     it "should prune offers and categories" do
       level = 2
@@ -43,9 +44,7 @@ describe Goods::Catalog do
 
     it "should replace categories of offers" do
       catalog.prune(0)
-      expect(catalog.offers.find("123").category).to be(
-        catalog.categories.find("1")
-      )
+      expect(catalog.offers.find("123").category).to be(catalog.categories.find("1"))
     end
 
     it "should remove categories affected by prunning" do

data/spec/goods/xml/validator_spec.rb

@@ -1,8 +1,8 @@
 require "spec_helper"
 
 describe Goods::XML::Validator do
-  let(:valid_document) { File.read(File.expand_path("../../../fixtures/simple_catalog.xml", __FILE__)) }
-  let(:invalid_document) { File.read(File.expand_path("../../../fixtures/empty_catalog.xml", __FILE__)) }
+  let(:valid_document) { open File.expand_path("../../../fixtures/simple_catalog.xml", __FILE__) }
+  let(:invalid_document) { open File.expand_path("../../../fixtures/empty_catalog.xml", __FILE__) }
 
   describe "#valid?" do
     it "should return true if document is valid according to dtd" do

data/spec/goods_spec.rb

@@ -5,40 +5,50 @@ describe Goods do
     expect(Goods::VERSION).to_not be_nil
   end
 
-  describe ".from_string" do
-    let(:valid_document) { File.read(File.expand_path("../fixtures/simple_catalog.xml", __FILE__)) }
-    let(:invalid_document) { File.read(File.expand_path("../fixtures/empty_catalog.xml", __FILE__)) }
+  describe ".from_io" do
+    let(:valid_document) { open File.expand_path("../fixtures/simple_catalog.xml", __FILE__) }
+    let(:invalid_document) { open File.expand_path("../fixtures/empty_catalog.xml", __FILE__) }
 
-    it "should return catalog if valid xml file is passed" do
+    it "should return catalog if valid xml io is passed" do
       expect(Goods::Catalog).to receive(:new).
-        with({string: valid_document, url: "url", encoding: "UTF-8"})
-      Goods.from_string(valid_document, "url", "UTF-8")
+        with({io: valid_document, url: "url", encoding: "UTF-8"})
+      Goods.from_io(valid_document, "url", "UTF-8")
     end
 
-    it "should raise error if invalid file is passed" do
-      expect { Goods.from_string(invalid_document) }.to raise_error(Goods::XML::InvalidFormatError)
+    it "should raise error if invalid xml io is passed" do
+      expect { Goods.from_io(invalid_document) }.to raise_error(Goods::XML::InvalidFormatError)
     end
   end
 
   describe ".from_file" do
-    it "should load file and call .from_string" do
+    it "should load file and call .from_io" do
       params = {
         file: "file", string: "string", url: nil, encoding: "UTF-8"
       }
       expect(Goods).to receive(:load).with(params[:file]) { params[:string] }
-      expect(Goods).to receive(:from_string).with(params[:string], nil, params[:encoding])
+      expect(Goods).to receive(:from_io).with(params[:string], nil, params[:encoding])
       Goods.from_file params[:file], params[:encoding]
     end
   end
 
   describe ".from_url" do
-    it "should load remote page and call .from_string" do
+    it "should load remote page and call .from_io" do
       params = {
         string: "string", url: "url", encoding: "UTF-8"
       }
       expect(Goods).to receive(:load).with(params[:url]) { params[:string] }
-      expect(Goods).to receive(:from_string).with(params[:string], params[:url], params[:encoding])
+      expect(Goods).to receive(:from_io).with(params[:string], params[:url], params[:encoding])
       Goods.from_url params[:url], params[:encoding]
     end
   end
+
+  describe ".from_string" do
+    it "should load string and call .from_io" do
+      params = {
+        string: "string", encoding: "UTF-8"
+      }
+      expect(Goods).to receive(:from_io)
+      Goods.from_string params[:string], params[:encoding]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goods
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Artem Pyanykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,6 +92,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md