delish 0.7.7 → 1.0.0

data/bin/delish

@@ -14,14 +14,9 @@ else
 end
 #}}}
 
-#{{{ Output only and debug
+#{{{ Output only
 unless ARGV[1].nil?
   OUTPUT_ONLY = true
-  unless ARGV[2].nil?
-    DEBUG = true
-  else
-    DEBUG = false
-  end
 else
   OUTPUT_ONLY = false
 end
@@ -30,7 +25,7 @@ end
 require 'delish_bookmark_search.rb'
 include Delish
 
-delish_bookmark_search = Delish_Bookmark_Search.new(string, db)
+delish_bookmark_search = Delish_Bookmark_Search.new(string, db, !OUTPUT_ONLY)
 
 if OUTPUT_ONLY
   delish_bookmark_search.each { |bookmark| puts "#{bookmark[1]}: [#{bookmark[0]}]" }

data/bin/import_delicious

@@ -1,8 +1,6 @@
 #!/usr/bin/ruby
 
 require 'rubygems'
-require 'rexml/document'
-require 'net/https'
 require 'sqlite3'
 
 user = ENV['delish_user']

data/bin/update_delicious

@@ -1,8 +1,6 @@
 #!/usr/bin/ruby
 
 require 'rubygems'
-require 'rexml/document'
-require 'net/https'
 require 'sqlite3'
 
 user = ENV['delish_user']

data/lib/delish_bookmark_search.rb

@@ -22,11 +22,12 @@ module Delish
     #---
     #{{{ initialize(search, database)
     #+++
-    def initialize(search, database)
+    def initialize(search, database, access)
       @db = database
 
       @TAG_SPLIT = ','
       @SPLIT = ':'
+      @ACCESS = access
 
       @search_string = search
       @sss = []
@@ -57,7 +58,7 @@ module Delish
           @submatches = $3.split(@SPLIT)
           self.sub_search_parse
         end
-        self.execute(false)
+        self.execute
       end
     end
     #---
@@ -190,17 +191,17 @@ module Delish
     #---
     #{{{ execute
     #+++
-    def execute(access)
+    def execute
       @sss << @date_greater_or_equal unless @date_greater_or_equal.variables.empty?
       @sss << @date_less_than unless @date_less_than.variables.empty?
 
       @sss.sort! { |a, b| a.order <=> b.order }
 
-      statement, variables = self.build_statement(access)
+      statement, variables = self.build_statement
 
       @results = @db.execute(statement, variables)
 
-      if access
+      if @ACCESS
         hashes = []
         @results.each { |i| hashes << i[1] }
         self.mark_accessed(hashes)
@@ -236,14 +237,14 @@ module Delish
     #+++
 
     #---
-    #{{{ build_statement(access)
+    #{{{ build_statement
     #+++
-    def build_statement(access)
+    def build_statement
       variables = []
 
       statement = "SELECT url"
 
-      unless access
+      unless @ACCESS
         statement += ", description"
       else
         statement += ", posts.hash"

data/lib/import_delish.rb

@@ -1,3 +1,7 @@
+require 'version.rb'
+require 'rexml/document'
+require 'net/https'
+
 module Delish
 
 #{{{
@@ -8,8 +12,7 @@ module Delish
       @user = user
       @pass = pass
       @db   = db
-      # Version should somehow be gotten from GEM
-      @agent = 'delish commandline client 0.7.7'
+      @agent = 'delish commandline client #{Version::STRING}'
     end
     #}}}
 
@@ -108,39 +111,41 @@ module Delish
     end
     #}}}
 
-    # This function is STILL TOO LONG
+    # This function is too nesty
     #{{{ update_bookmarks
     def update_bookmarks(&block)
 
-      if self.update_exists?
+      return unless self.update_exists?
 
-        found = false
-        amount = 10
-        increment = 10
+      found = false
+      amount = 10
+      increment = 10
 
-        # Maximum for del.icio.us api is 100
-        until found == true or amount >= 100
-          self.delicious_communication("/v1/posts/recent?count=#{amount}") do |data|
+      # Maximum for del.icio.us api is 100
+      until found == true or amount >= 100
+        self.delicious_communication("/v1/posts/recent?count=#{amount}") do |data|
 
-            elements = data.elements.to_a("/posts/post")
-            # Remove the ones we already went through
-            elements.slice(increment, amount - increment)
+          # Remove the ones we already went through
+          elements = data.elements.to_a("/posts/post").slice(increment, amount - increment)
 
-            elements.each do |post,i|
-              if post.attributes['time'] <= @last_update
-                found = true
-              else
-                # Output should be able to be surpressed
-                yield(post.attributes['href'], post.attributes['description']) unless block.nil?
-                self.insert_post_xml_helper(post)
-              end
+          elements.each do |post,i|
+            if post.attributes['time'] <= @last_update
+              found = true
+            else
+              yield(post.attributes['href'], post.attributes['description']) unless block.nil?
+              self.insert_post_xml_helper(post)
             end
 
           end
-          amount += increment
+
         end
+
+        amount += increment
+
       end
+
       self.set_last_update
+
     end
 
     #}}}

data/lib/version.rb

@@ -0,0 +1,5 @@
+module Delish
+  module Version
+    STRING = "1.0.0"
+  end
+end

data/test/tests

@@ -1,34 +1,46 @@
 #!/usr/bin/ruby -w
-require '../delish_bookmark_search.rb'
+require '../lib/delish_bookmark_search.rb'
+require '../lib/import_delish.rb'
+include Delish
+require 'rubygems'
 require 'test/unit'
 require 'sqlite3'
 
 @@db = SQLite3::Database.new( "test_db" )
 # username = delish_test
 # pass = 5VRiVVd
-class Delish < Test::Unit::TestCase
+class ImportTest  < Test::Unit::TestCase
+  def test_import
+    import = ImportDelish.new('delish_test', '5VRiVVd', @@db)
+
+
+
+  end
+end
+
+class Delish_Test < Test::Unit::TestCase
 
   def test_basic_search
-    search = Delish_Bookmark_Search.new('readable2', @@db )
+    search = Delish_Bookmark_Search.new('readable2', @@db, false )
     search.each {|i| assert_equal('http://frew.livejournal.com/friends/readable2', i[0]); assert_equal('readable2', i[1]) }
     assert_equal('http://frew.livejournal.com/friends/readable2', search[0][0])
     assert_equal('readable2', search[0][1])
   end
 
   def test_tag_equality_search
-    search = Delish_Bookmark_Search.new('(tzsh,wiki)', @@db )
+    search = Delish_Bookmark_Search.new('(tzsh,wiki)', @@db, false )
     assert_equal('http://zshwiki.org/home/', search[0][0])
     assert_equal('ZshWiki', search[0][1])
   end
 
   def test_tag_starts_with_search
-    search = Delish_Bookmark_Search.new('(svis,fun)', @@db )
+    search = Delish_Bookmark_Search.new('(svis,fun)', @@db, false )
     assert_equal('http://www.drurywriting.com/david/05-SnowmanArt.htm', search[0][0])
     assert_equal('calvin & hobbes snowman art', search[0][1])
   end
 
   def test_tag_inside_search
-    search = Delish_Bookmark_Search.new('(ivi,unn)', @@db )
+    search = Delish_Bookmark_Search.new('(ivi,unn)', @@db, false )
     assert_equal('http://www.bemroses.net/images/curves.jpg', search[2][0])
     assert_equal('Editor Learning Curves', search[2][1])
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: delish
 version: !ruby/object:Gem::Version 
-  version: 0.7.7
-date: 2007-07-09 00:00:00 -06:00
+  version: 1.0.0
+date: 2007-07-13 00:00:00 -06:00
 summary: Allows use of del.icio.us bookmarksfrom the commandline with minimum keystrokes
 require_paths: 
 - lib
@@ -34,7 +34,9 @@ files:
 - bin/update_delicious
 - lib/delish_bookmark_search.rb
 - lib/import_delish.rb
+- lib/version.rb
 - test/tests
+- test/test_db
 - README
 test_files: 
 - test/tests