letsshop_mapper 0.9.0beta → 1.0.0

data/lib/letsshop_mapper.rb

@@ -1,9 +1,8 @@
 require 'rubygems'
 require 'tempfile'
-require 'rexml/document'
+require 'nokogiri'
 
 module LetsShopMapper
-  autoload :REXML, "letsshop_mapper/patch/rexml"
   autoload :Version, "letsshop_mapper/version"
   autoload :Connection, "letsshop_mapper/connection"
   autoload :Error, "letsshop_mapper/exceptions"

data/lib/letsshop_mapper/connection.rb

@@ -8,7 +8,6 @@ module LetsShopMapper
       attr_reader :server
       attr_reader :key
       attr_reader :response
-
       attr_reader :feed
       attr_reader :tree
       
@@ -16,6 +15,7 @@ module LetsShopMapper
         @server = server
         @key = key
       end
+      
       def connect_and_get()
         uri = "http://#{@server}/search/#{@key}"
         begin
@@ -25,6 +25,7 @@ module LetsShopMapper
           raise LetsShopMapper::RequestBaseSearchException::new
         end
       end
+      
       def find(conditions = {})
         uri = "http://#{@server}/search/#{@key}"
         query = "?"
@@ -50,6 +51,7 @@ module LetsShopMapper
           raise LetsShopMapper::Error::RequestBaseSearchException::new
         end
       end
+      
       def get_tree(category = nil)
         uri = "http://#{@server}/tree/#{@key}"
         id = "#{category}" if category != nil

data/lib/letsshop_mapper/model/base/category.rb

@@ -1,38 +1,41 @@
-include REXML
 module LetsShopMapper
   module Model
     module Base
       class Category
         attr_accessor :id
         attr_accessor :name
-        attr_reader :children
-        attr_reader :filters
+        attr_reader   :children
+        attr_reader   :filters
 
         def initialize()
           @id, @name = nil
           @children = []
           @filters = []
         end
+        
         def recurse(category, par = nil)
-          category.each_child_element do |child|
+          category.children.each do |child|
             if child.name == "category"
               chl = add_category(child)
               par.children << chl
             elsif child.name == "filter"
-              par.filters << Filter::new(child.attributes.get_attribute("value"))
+              par.filters << Filter::new(child['value'])
             end
             recurse(child, chl)
           end
         end
+        
         def add_category(category)
           c = Category::new
-          c.name = category.elements['name'].text
-          c.id = category.elements['name'].attributes.get_attribute("id").value
+          c.name = category.at("name").text
+          c.id = category.at("name")['id']
           return c
         end
+        
         def to_map
           {@name => @children.empty? ? nil : @children.map {|child| child.to_map}}
         end
+        
         def to_s(localtime = true)
           self.to_map.to_yaml
         end

data/lib/letsshop_mapper/model/base/facet.rb

@@ -8,12 +8,9 @@ module LetsShopMapper
         attr_reader :role
         attr_reader :selected
         attr_reader :nhits
-
-        attr_reader :feed
         attr_reader :xml
 
-        def initialize(facet = nil, feed = nil)
-          @feed = feed
+        def initialize(facet = nil)
           @xml = facet
           @title, @type, @filter, @role, @selected, @nhits = nil
           @selected = false
@@ -21,15 +18,15 @@ module LetsShopMapper
         end
 
         def parse(facet)
-          @title = facet.attributes.get_attribute("title").value.split(":")[1]
-          @type = facet.attributes.get_attribute("title").value.split(":")[0]   
-          @filter = Filter::new(facet.attributes.get_attribute("title"))
-          @role = facet.attributes.get_attribute("role").value
-          if facet.attributes.get_attribute("nhits")
-            @nhits = facet.attributes.get_attribute("nhits").value
+          @title = facet['title'].split(":")[1]
+          @type = facet['title'].split(":")[0]
+          @filter = Filter::new(facet['title'])
+          @role = facet['role']
+          if facet['nhits']
+            @nhits = facet['nhits']
           end
-          if facet.attributes.get_attribute("selected")
-            @selected = LetsShopMapper.Boolean(facet.attributes.get_attribute("selected").value)
+          if facet['selected']
+            @selected = LetsShopMapper.Boolean(facet['selected'])
           end
         end
 

data/lib/letsshop_mapper/model/base/filter.rb

@@ -12,11 +12,13 @@ module LetsShopMapper
           @depend = false
           parse(filtr) if filtr
         end
+
         def parse(filtr)
-          @str_value = filtr.value
-          @key = filtr.value.split(":")[0]
-          @value = filtr.value.split(":")[1]
+          @str_value = filtr
+          @key = filtr.split(":")[0]
+          @value = filtr.split(":")[1]
         end
+
         def to_s(localtime = true)
           s  = ''
           s += "Key: #{@key}\n"

data/lib/letsshop_mapper/model/opensearch/entry.rb

@@ -13,47 +13,32 @@ module LetsShopMapper
         attr_reader :thumb
         attr_reader :supplier
         attr_reader :facets
-
-        attr_reader :feed
         attr_reader :xml
 
-        def initialize(entry = nil, feed = nil)
-          @feed = feed
+        def initialize(entry = nil)
           @xml = entry
           @id, @link, @title, @description, @price, @thumb, @supplier = nil
           @facets = []
           parse(entry) if entry
         end
 
-        # parse entry
         def parse(entry)
-          @id = entry.elements["id"].text
-          if (e = entry.elements['link'])
-            @link = e.attribute('href').value
-          end
-          if (e = entry.elements['title']) && e.text
-            @title = e.text
-          end
-          if (e = entry.elements['description']) && e.text
-            @description = e.text
-          end
-          if (e = entry.elements['letsshop/thumb'])
-            @thumb = e.text
-          end
-          if (e = entry.elements['letsshop/price']) && e.text
-            @price = e.text
-            @currency = e.attributes.get_attribute("currency").value
-            @discount = e.attributes.get_attribute("discount").value
-            @older_price = e.attributes.get_attribute("older").value
-          end
-          entry.each_element('Query') do |f|
-            if !f.attributes.get_attribute("title").value.index("supplier:").nil?
-              @supplier =  f.attributes.get_attribute("title").value.gsub("supplier:","")
+          @id = entry.at('id').text
+          @link = entry.at('link')['href']
+          @title = entry.at('title').text
+          @description = entry.at('description').text
+          @thumb =entry.at('letsshop/thumb').text
+          @price = entry.at('letsshop/price').text
+          @currency = entry.at('letsshop/price')['currency']
+          @discount = entry.at('letsshop/price')['discount']
+          @older_price = entry.at('letsshop/price')['older']
+          
+          entry.children.search('Query').each do |f|
+            @facets << Base::Facet::new(f)
+            if !f['title'].index("supplier:").nil?
+              @supplier = f['title'].gsub("supplier:","")
             end
           end
-          entry.each_element('Query') do |e|
-             @facets << Base::Facet::new(e, self)
-          end
         end
 
         def get_facets_by(scope)

data/lib/letsshop_mapper/model/opensearch/feed.rb

@@ -8,9 +8,7 @@ module LetsShopMapper
         attr_reader :startindex
         attr_reader :itemsperpage
         attr_reader :totalresults
-        
         attr_reader :facets
-
         attr_reader :xml
         attr_reader :encoding
 
@@ -22,32 +20,21 @@ module LetsShopMapper
         end
 
         def parse(str)
-          doc = REXML::Document.new(str)
-          @xml = doc.root
-          @encoding = doc.encoding
-          if doc.root.elements['/feed']
-            if (e = doc.root.elements['/feed/title']) && e.text
-              @title = e.text
-            end
-            if (e = doc.root.elements['/feed/link'])
-              @link = e.attribute('href').value
-            end
-            if (e = doc.root.elements['/feed/startIndex']) && e.text
-              @startindex = e.text
-            end
-            if (e = doc.root.elements['/feed/itemsPerPage']) && e.text
-              @itemsperpage = e.text
-            end
-            if (e = doc.root.elements['/feed/totalResults']) && e.text
-              @totalresults = e.text
-            end
+          @xml = Nokogiri::XML(str)
+          @encoding = @xml.encoding
+          if @xml.at('/xmlns:feed')
+            @title = @xml.at('/xmlns:feed/xmlns:title').text
+            @link = @xml.at('/xmlns:feed/xmlns:link')['href']
+            @startindex =  @xml.at('/xmlns:feed/xmlns:startIndex').text
+            @itemsperpage =  @xml.at('/xmlns:feed/xmlns:itemsPerPage').text
+            @totalresults =  @xml.at('/xmlns:feed/xmlns:totalResults').text
             # Facets
-            doc.root.each_element_with_attribute('role', 'subset') do |f|
-              @facets << Base::Facet::new(f, self)
+            @xml.xpath('/xmlns:feed/xmlns:Query[@role="subset"]').each do |f|
+               @facets << Base::Facet::new(f)
             end
             # Entries
-            doc.root.each_element('/feed/entry') do |e|
-               @entries << Entry::new(e, self)
+            @xml.xpath('/xmlns:feed/xmlns:entry').each do |e|
+               @entries << Entry::new(e)
             end
           else
             raise LetsShopMapper::Error::UnknownFeedTypeException::new

data/lib/letsshop_mapper/model/tree/tree.rb

@@ -3,22 +3,21 @@ module LetsShopMapper
     module Tree
       class Tree
         attr_reader :categories
-        
         attr_reader :xml
 
         def initialize(str = nil)
           parse(str) if str
         end
+        
         def parse(str)
-          doc = REXML::Document.new(str)
-          @xml = doc.root
-          if doc.root.elements['/categories']
-            doc.root.each_element('/categories/category') do |c|
+          @xml = Nokogiri::XML(str)
+          if @xml.at('/categories')
+            @xml.xpath('/categories/category').each do |c|
               @categories = Base::Category::new
               @categories.recurse(c, @categories)
             end
-          elsif doc.root.elements['/category']
-            doc.root.each_element('/category') do |c|
+          elsif @xml.at('/category')
+            @xml.xpath('/category').each do |c|
               @categories = Base::Category::new
               @categories.recurse(c, @categories)
             end            
@@ -26,6 +25,7 @@ module LetsShopMapper
             raise LetsShopMapper::Error::UnknownFeedTypeException::new
           end
         end
+        
         def to_s(localtime = true)
           s = @categories.to_s(localtime)
         end

data/lib/letsshop_mapper/version.rb

@@ -1,9 +1,9 @@
 module LetsShopMapper
   module Version
-    MAJOR = 0
-    MINOR = 9
+    MAJOR = 1
+    MINOR = 0
     TINY  = 0
-    BUILD = "beta"
+    BUILD = ""
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end
 end

data/test/letsshop_mapper_test.rb

@@ -111,6 +111,13 @@ module LetsShopMapper
           assert_equal "11", lshopTree.categories.children[0].children[0].children[4].id.split('-')[1]
         end
       end
+      def test_tree_perf
+        config = YAML.load_file('test/letsshop.yml')['development']
+        lshop = LetsShopMapper::Connection::Base::new(config["server"], config["key"])
+        tstart = Time.now.to_f
+        lshop.get_tree()
+        puts "Time elapsed: #{Time.now.to_f-tstart}"
+      end
       def test_tree
         config = YAML.load_file('test/letsshop.yml')['development']
         lshop = LetsShopMapper::Connection::Base::new(config["server"], config["key"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: letsshop_mapper
 version: !ruby/object:Gem::Version 
-  hash: -1139874821
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
-  - 0beta
-  version: 0.9.0beta
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - happun
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +02:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -71,14 +71,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: letsshop_mapper