amperka 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGYwYjM1ZmQ0OWQ4Y2YzNDdjYWM0ZGZiODBkZmU5OGI1ZDJjNzNlZQ==
+    YWRhNDZhMWVlODQ1YWM1MjYyYzdmY2M0N2FlMDA3OWQzNDRmY2RhMA==
   data.tar.gz: !binary |-
-    NzkwNzcwYzZjYWMxMTRjNzg2ODkzNTFiYWYzMDI0NGExZjhmNjA5OQ==
+    NGNkYjdlMDhmYWE5NzljN2VlMzJkY2E0NGIwNTZlZDM2YWY3YjlmMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWRhOWEzZTZjN2FlZmI4Y2RkZDRmNzNlYzg2MzZiYWVhN2I2ODI1OTAxOTUw
-    M2NjNWZiZDFjMDY0OTI2NTU1YWFkODZmOTU0ODg3YzJmODg4MDc4ODI1Yjdh
-    NWEzMzBlZTJlYzU3YzI2ZWZmNGFlMTNmZmI0OTMxZTE2MGFjM2Y=
+    OTdkYzIzY2UwZTgxZjMyYTQ1N2JlZDI2ZTIwYmYwNGI4NGY4YWExZDBmYzlj
+    OWE2MWFjZjE4ZmY4MDRlOTE3Y2NlNTU3YjcyODJjYzYwY2QyMmIwODhiNzJh
+    NjU3YzlkN2VhOGVmOGU0MjdmOWNhMjNiZjg2YTRiZDVkOGIzYmI=
   data.tar.gz: !binary |-
-    MjkxZDhmNmZjZTY2MjFhMDFmZmY2M2Y5NzU5ZmY0NGI2MTJmOGVlMTBjMGVm
-    YmM0NDgxMWNkY2IyNjU2ZWRiZmFhZjVhZWU2ZDEzZGVlNTJkNGNjODhjMDgy
-    YmY2MDZkZDA3NDRhNmNiODkyODY5N2M5ZjZmMzYxMTU5ZjdlMmI=
+    MmIwZTk2NWQwZTY1MTU3ZDRhZDYyMzQxNmM0YjQ1MGY4MmI2ZjQ3YWMzMzJj
+    ZTBlZjgzYTVlNTNhYjQwNjMyZGQ5NGIzYTk5OWEyYTc2MzQ4OTJlZTRkNmUx
+    NDQ5YTQ4MmY5MDM3YTliMjcxNmQ2OTdkZTQwMDcyZDMzOTJiOGU=

data/lib/amperka/prodb.rb

@@ -1,49 +1,45 @@
 #!/usr/bin/ruby19
 # encoding: UTF-8
 
+require 'yaml'
+
+
 module Amperka
   
   class Products
 
     def self.load root
-      # *TODO*
+      products = []
+      yamls =  Dir.glob "#{root}/**/*.yaml"
+
+      yamls.each do |file|
+        products += load_file file
+      end
+
+      products
     end
 
     def self.load_file path
+      products = []
       file = IO.read path
 
-      bdesc = nil
-      products = []
-      product = {}
+      data = YAML.load file
 
-      lines = file.split "\n"
+      data.each do |product|
+        valid = true 
 
-      lines.each_with_index do |line, index|
-        if /^\s*-\s*$/ =~ line
-          products << product unless product.empty?
-          product = {}
-          bdesc = nil
-          next
+        [ 'Название', 'Пермалинк', 'Кратко', 'Полно' ].each do |key|
+          valid = nil unless product.has_key? key 
         end
 
-        unless bdesc
-          case line
-            when /^\s+Название:\s*.*$/
-              matcha = /^\s+Название:\s*(.*)\s*$/.match line
-              product[:name] = matcha[1]
-            when /^\s+Пермалинк:\s*.*$/
-              matcha = /^\s+Пермалинк:\s*(.*)\s*$/.match line
-              product[:permalink] = matcha[1]
-            when /^\s+Кратко:\s*.*$/
-              matcha = /^\s+Кратко:\s*(.*)\s*$/.match line
-              product[:shortdesc] = matcha[1]
-            when /^\s+Полно:\s*\|\s*$/
-              product[:desc] = ''
-              bdesc = true
-          end
-        else
-          product[:desc] += line.sub(/^\s+/, '') + "\n"
-        end
+        next unless valid
+
+        products << {
+          :name      => product['Название'],
+          :permalink => product['Пермалинк'],
+          :shortdesc => product['Кратко'],
+          :desc      => product['Полно']
+        }
       end
 
       products

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amperka
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Levenkov Artem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies: []
 description: Top Secret
 email: artem@levenkov.org