nofxx-pyradise 0.1.1 → 0.2.0

data/README.rdoc

@@ -5,12 +5,8 @@ Fetch/search and store Paraguay's prices!
 
 == Install
 
-* dm-core
-* do_sqlite
-
     sudo gem install nofxx-pyradise
 
-
 == Use
 
 Fetch all:
@@ -25,7 +21,7 @@ List all:
 
 Search for a new 1TB Sata drive:
 
-    pyradise list SATA2%1000
+    pyradise search SATA2%1000
 
     Searching "SATA2%1000"... Order by: name
     ____________________________________________________________
@@ -38,7 +34,7 @@ Search for a new 1TB Sata drive:
 
 View the price oscillation of a item:
 
-    pyradise view <ID>
+    pyradise info <ID>
 
     07/07 =======================| 50
     07/08 ===================| 40

data/Rakefile

@@ -9,8 +9,7 @@ begin
     gem.email = "x@nofxx.com"
     gem.homepage = "http://github.com/nofxx/pyradise"
     gem.authors = ["Marcos Piccinini"]
-    gem.add_dependency 'dm-core'
-    gem.add_dependency 'do_sqlite3'
+    gem.add_dependency 'sequel'
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/pyradise

@@ -8,7 +8,6 @@ begin
   require 'rubygems'
 rescue LoadError
   # no rubygems to load, so we fail silently
-  require 'lib/pyradise'
 end
 
 require 'optparse'
@@ -28,10 +27,14 @@ parser = OptionParser.new do |opts|
   opts.banner = <<BANNER
 Pyradise - PY ftw
 
-Usage: #{File.basename($0)} command [options]
+Usage: #{File.basename($0)} command [args]
 
 Options are:
 
+   fetch        - Get fresh info
+   list/search  - List and filter items
+   info/show    - More info about an item
+
 BANNER
   opts.separator ""
 

data/lib/pyradise.rb

@@ -1,53 +1,104 @@
 require 'rubygems'
 require 'open-uri'
-require 'do_sqlite3'
-require 'dm-core'
-#require "dm-tokyo-adapter"
-require 'pyradise/product'
-require 'pyradise/stat'
+require 'sequel'
 
 #TODO: def init
-HOME = ENV['HOME'] + "/.pyradise/"
-#DataMapper.setup(:default, :adapter => 'tokyo_cabinet', :database => 'data.tct', :path => HOME)
-DataMapper.setup(:default, :adapter => 'sqlite3', :database => HOME + "py.sqlite3")
+HOME = ENV['HOME'] + "/.pyradise"
+FileUtils.mkdir_p HOME unless File.exists? HOME
+
+DB = Sequel.connect("sqlite://#{HOME}/py.sqlite3")
+require 'pyradise/product'
+# require 'pyradise/stat'
 
-unless File.exists? HOME
-  FileUtils.mkdir_p HOME
-  DataMapper.auto_migrate!
+unless DB.table_exists? :products
+  require 'pyradise/migrate'
+  CreatePyradise.apply DB, :up
 end
 
 module Pyradise
 
-  CONF = YAML.load(File.new(HOME + "conf.yml"))
+  CONF = YAML.load(File.new(HOME + "/conf.yml"))
   RATE = CONF[:rate] || 2.1
   TAX = CONF[:tax] || 1.3
 
   class << self
 
     def run! comm, opts
-      send(*comm)
+      if respond_to? comm[0]
+        send(*comm)
+      else
+        puts "Can't do that..."
+        exit
+      end
     end
 
     def fetch
       create fetch_stores
     end
 
+    def list(*query)
+      t = Time.now
+      w = terminal_size[0]
+      s = w - 35
+      puts "Searching #{'"' + query[0] + '"' if query[0]}... Order by: #{query[1] || 'name'}"
+      puts "_" * w
+      prods = Product.filter(:name.like("%#{query[0]}%")).order(query[1] ? query[1].to_sym : :name)
+      prods.each_with_index do |prod, i|
+        name = prod.name.length > s ? prod.name[0..s] + ".." : prod.name
+        out = sprintf("%-6s | %-5s | %-#{w-38}s %-3d |  R$ %d", prod.store, prod.sid,  name,  prod.price, prod.price * RATE * TAX)
+        puts i % 2 == 0 ? bold(out) : out
+      end
+      puts "_" * w
+      puts green("Total: #{prods.all.length} (#{Time.now - t}s)")
+    end
+    alias :search :list
+
+    def info(sid=nil)
+      if !sid
+        puts red("Use: pyradise view <ID>")
+      elsif !prod = Product.filter(:sid => sid.to_i).first
+        puts yellow("Product not found.")
+      else
+        w = terminal_size[0] - 20
+        prices = prod.prices
+        max = prices.values.max.to_f
+        prices.keys.sort.each do |k|
+          rel = "=" * (prices[k]  / max * w)
+          puts "#{Time.at(k).strftime('%M/%d')} #{rel}| #{prices[k]}"
+        end
+      end
+    end
+    alias :show :info
+
+    def clear
+      Product.dataset.delete
+    end
+
+    private
+
     def create txts
       products = []
       for txt in txts
         print "Parsing #{txt[:store]}..."
         c = Product.all.length
-        parse(txt[:txt], txt[:delimiter]).each do |p|
-          if prod = Product.first(:name => p[:name], :store => txt[:store])
-            prod.price = p[:price]
-          else
-            Product.create(p.merge(:store => txt[:store]))
-          end
+        parse(txt[:txt], txt[:delimiter]).each do |t|
+          next if t[:price] == 0
+          create_product(t, txt[:store].to_s)
         end
         puts "#{Product.all.length - c} products created."
       end
     end
 
+    def create_product(t, store)
+      if prod = Product.filter(:name => t[:name], :store => store).first
+        prod.new_price!(t[:price]) if t[:price] != prod.price
+      else
+        Product.create(t.merge(:store => store))
+      end
+      rescue  => e
+      puts "SQLITE Err #{e}, #{t.inspect} - #{store} #{prod}"
+    end
+
     def fetch_stores
       stores = []
       for store in YAML.load(File.new(File.dirname(__FILE__) + '/stores.yml'))[:stores]
@@ -67,52 +118,15 @@ module Pyradise
     def parse(txt, del)
       products = []
       txt.each_line do |l|
-        sid, name, price = l.split(del)
-        next unless price
-        products << { :sid => sid.strip, :name => name.strip.gsub(/\.{2,}/, ""), :price => price.to_i }
+        sid, *info = l.split(del)
+        next if info.length < 2
+        price = info.delete_at(-1).strip.to_i
+        next if price.nil? || price.zero?
+        products << { :sid => sid.strip, :name => info.join("").strip.gsub(/\.{2,}/, ""), :price => price }
       end
       products
     end
 
-    def list(*query)
-      t = Time.now
-      w = terminal_size[0]
-      q = {}
-      q.merge!(:name.like => "%#{query[0]}%") if query[0]
-      q.merge!(:order => [query[1]]) if query[1]
-      puts "Searching #{'"' + query[0] + '"' if query[0]}... Order by: #{query[1] || 'name'}"
-      puts "_" * w
-      prods = q.empty? ? Product.all : Product.all(q)
-      prods.each_with_index do |prod, i|
-        s = w - 35
-        name = prod.name.length > s ? prod.name[0..s] + ".." : prod.name
-        out = sprintf("%-6s | %-5s | %-#{w-38}s %-3d |  R$ %d", prod.store, prod.sid,  name,  prod.price, prod.price * RATE * TAX)
-        puts i % 2 == 0 ? bold(out) : out
-      end
-      puts "_" * w
-      puts green("Total: #{prods.length} (#{Time.now - t}s)")
-    end
-
-    def view(sid=nil)
-      if !sid
-        puts red("Use: pyradise view <ID>")
-      elsif !prod = Product.first(:sid => sid.to_i)
-        puts yellow("Product not found.")
-      else
-        w = terminal_size[0] - 20
-        prices = prod.prices
-        max = prices.values.max.to_f
-        prices.keys.sort.each do |k|
-          rel = "=" * (prices[k]  / max * w)
-          puts "#{Time.at(k).strftime('%M/%d')} #{rel}| #{prices[k]}"
-        end
-      end
-    end
-
-    def clear
-      Product.all.destroy
-    end
-
     #from highliner
     def terminal_size
       `stty size`.split.map { |x| x.to_i }.reverse
@@ -121,6 +135,6 @@ module Pyradise
     def red(txt);      "\e[31m#{txt}\e[0m";    end
     def green(txt);    "\e[32m#{txt}\e[0m";    end
     def yellow(txt);   "\e[33m#{txt}\e[0m";    end
-    def bold(txt);   "\e[2m#{txt}\e[0m";    end
+    def bold(txt);      "\e[2m#{txt}\e[0m";    end
   end
 end

data/lib/pyradise/migrate.rb

@@ -0,0 +1,18 @@
+require 'sequel/extensions/migration'
+
+class CreatePyradise < Sequel::Migration
+  def up
+    create_table :products do
+      primary_key :id
+      varchar :sid
+      varchar :name
+      varchar :store
+      integer :price
+      text    :prices
+    end
+  end
+
+
+  def down() drop_table :products end
+
+end

data/lib/pyradise/product.rb

@@ -1,38 +1,16 @@
-class Product
- include DataMapper::Resource
+class Product < Sequel::Model
 
-  property :id, Serial
-  property :sid, String
-  property :name, String, :nullable => false, :length => (2..20)
-  property :price, Integer
-  property :store, String
-  property :prices, Text
-  # has n, :orders
-
-  # def self.count
-  #   all.length
-  # end
-  # def to_param
-  #   id.to_s
-  # end
-  before :save do
-#    self[:prices] = Marshal.dump({ Time.now.to_i => price })
+  def before_save
     phist = { Time.now.to_i => price }
     self[:prices] = Marshal.dump(prices ? prices.merge(phist) : phist)
-
   end
 
   def prices
     self[:prices] ? Marshal.load(self[:prices]) : nil
   end
 
-  def prices=(price)
-    self[:prices] = Marshal.dump(prices ? prices.merge(price) : price)
+  def new_price!(np)
+    self.update(:prices => Marshal.dump(prices ? prices.merge({Time.now.to_i => np}) : np))
   end
 
-
-  #no idea why..
-  def self.identity_field
-    "product"
-  end
 end

data/lib/stores.yml

@@ -14,7 +14,7 @@
   :albor:
     :url: http://www.alboradainfo.com
     :txt: http://www.alboradainfo.com/lista/lista_alborada.txt
-    :delimiter: !ruby/regexp /\s{3,}/
+    :delimiter: !ruby/regexp /\s{1,}/
 
 # TODO
 # http://www.icompy.com/upload/precios/200907251505270.lista.txt

data/pyradise.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{pyradise}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2009-07-27}
+  s.date = %q{2009-09-13}
   s.default_executable = %q{pyradise}
   s.email = %q{x@nofxx.com}
   s.executables = ["pyradise"]
@@ -23,13 +26,12 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/pyradise",
      "lib/pyradise.rb",
+     "lib/pyradise/migrate.rb",
      "lib/pyradise/product.rb",
-     "lib/pyradise/stat.rb",
      "lib/stores.yml",
      "pyradise.gemspec",
      "script/console",
      "spec/pyradise/product_spec.rb",
-     "spec/pyradise/stat_spec.rb",
      "spec/pyradise_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -41,7 +43,6 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/pyradise_spec.rb",
-     "spec/pyradise/stat_spec.rb",
      "spec/pyradise/product_spec.rb"
   ]
 
@@ -50,14 +51,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, [">= 0"])
-      s.add_runtime_dependency(%q<do_sqlite3>, [">= 0"])
+      s.add_runtime_dependency(%q<sequel>, [">= 0"])
     else
-      s.add_dependency(%q<dm-core>, [">= 0"])
-      s.add_dependency(%q<do_sqlite3>, [">= 0"])
+      s.add_dependency(%q<sequel>, [">= 0"])
     end
   else
-    s.add_dependency(%q<dm-core>, [">= 0"])
-    s.add_dependency(%q<do_sqlite3>, [">= 0"])
+    s.add_dependency(%q<sequel>, [">= 0"])
   end
 end

data/spec/pyradise/product_spec.rb

@@ -1,26 +1,40 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe "Product" do
-  it "should create a product" do
-    Product.create(:sid => "111", :name => "CPU", :price => 1000).should be_true
+
+  before do
+    Product.dataset.delete
+    Time.stub_chain(:now, :to_i).and_return(88)
+    @p = Product.create(:sid => "111", :store => "foo", :name => "CPU", :price => 1000).should be_true
   end
 
-  it "should list products" do
-    Product.all.length.should eql(1)
+  it "should have a price" do
+    @p.price.should eql(1000)
   end
 
-  it "should clean up" do
-    Product.first.destroy
-    Product.all.should be_empty
+  it "should have a store" do
+    @p.store.should eql("foo")
   end
 
-  it "should store all prices" do
-    Time.stub_chain(:now, :to_i).and_return(1)
-    p = Product.create(:name => "foo", :price => 1300)
-    p.prices.should eql({1 => 1300})
-    p.prices = { 2 => 1000 }
-    p.prices.should eql({1 => 1300, 2 => 1000})
+  it "should have prices" do
+    @p.prices.should eql({88=>1000})
   end
 
+  it "should store another price in prices (merge)" do
+    Time.stub_chain(:now, :to_i).and_return(99)
+    @p.price = 1300
+    @p.save
+    @p.prices.should eql({88=>1000, 99=>1300})
+  end
 
+  it "should have a better way to do that.." do
+    Time.stub_chain(:now, :to_i).and_return(99)
+    @p.new_price!(800)
+    @p.prices.should eql({88=>1000, 99=>800})
+  end
+
+  it "should clean up" do
+    Product.all.each(&:destroy)
+    Product.all.should be_empty
+  end
 end

data/spec/pyradise_spec.rb

@@ -13,10 +13,6 @@ describe "Pyradise" do
     Pyradise.fetch.should be_true
   end
 
-  it "should create a home folder" do
-    Pyradise.get_or_create_home.should match("pyradise")
-  end
-
 
 end
 

data/spec/spec_helper.rb

@@ -3,9 +3,14 @@ require 'spec'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'pyradise'
- DataMapper.setup(:default, :adapter => 'sqlite3', :database => HOME + "pytest.sqlite3")
- DataMapper.auto_migrate!
+DB = Sequel.connect("sqlite://#{HOME}/py_test.sqlite3")
+
+unless DB.table_exists? :products
+  require 'pyradise/migrate'
+  CreatePyradise.apply DB, :up
+end
 
 Spec::Runner.configure do |config|
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-pyradise
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,21 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -07:00
+date: 2009-09-13 00:00:00 -07:00
 default_executable: pyradise
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: do_sqlite3
+  name: sequel
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -50,18 +40,16 @@ files:
 - VERSION
 - bin/pyradise
 - lib/pyradise.rb
+- lib/pyradise/migrate.rb
 - lib/pyradise/product.rb
-- lib/pyradise/stat.rb
 - lib/stores.yml
 - pyradise.gemspec
 - script/console
 - spec/pyradise/product_spec.rb
-- spec/pyradise/stat_spec.rb
 - spec/pyradise_spec.rb
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/nofxx/pyradise
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -82,12 +70,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Paraguay gem!
 test_files: 
 - spec/spec_helper.rb
 - spec/pyradise_spec.rb
-- spec/pyradise/stat_spec.rb
 - spec/pyradise/product_spec.rb

data/lib/pyradise/stat.rb

@@ -1,8 +0,0 @@
-class Stat
- include DataMapper::Resource
-
-  property :id, Serial
-  property :key, String
-  property :value, String, :nullable => false, :length => (2..20)
-
-end

data/spec/pyradise/stat_spec.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
-
-describe "Product" do
-  it "should create a product" do
-    Stat.create(:key => "update", :value => Marshal.dump(Time.now))
-#    Stat.first.destroy
-    Stat.all.length.should eql(1)
-  end
-
-  it "should list products" do
-    Stat.all.should_not be_empty
-  end
-end