leander 0.2 → 0.3

data/bin/leander

@@ -4,8 +4,9 @@ require 'optparse'
 require 'optparse/time'
 require 'ostruct'
 
-require 'webpage.rb'
-require 'index.rb'
+require 'leander/webpage.rb'
+require 'leander/index.rb'
+
 
 class Bookmarker
   attr_accessor :index, :options
@@ -15,11 +16,15 @@ class Bookmarker
 		@options = options
 	end
 
-	def operate(query)
+	def operate query
 		if @options.delete 
-			@index.leander_remove(query) 
+			@index.leander_remove query
 		else
-			@index.search(query, @options.show_html, @options.hide_url)
+			results = @index.search query 
+			results.each do |r|
+				puts "#{r[:url].chomp} \t: #{r[:title]}" unless @options.hide_url
+				puts "#{r[:doc]}" if @options.show_html
+			end
 		end
 	end
 

data/bin/leander-server

@@ -0,0 +1,5 @@
+#!/usr/bin/ruby 
+require 'leander/leander-server.rb'
+
+
+LeanderServer.run!

data/lib/{index.rb → leander/index.rb}

@@ -1,7 +1,7 @@
 require 'ferret'
 require 'highline/import'
 
-require 'webpage.rb'
+require 'leander/webpage.rb'
 
 include Ferret
 
@@ -26,12 +26,17 @@ class BmIndex
 		end
 	end
 
-	def search(query, show_html = false, hide_url = false)
+	def search(query)
+		output = []
 		@index.search_each(query) do |id, score|
-			doc =  Nokogiri::HTML.parse(@index[id][:doc])
-			puts @index[id][:url] + "\t" + doc.css('title').inner_text.strip unless hide_url
-
-			if show_html then puts @index[id][:doc] end
+			doc = Nokogiri::HTML.parse(@index[id][:doc])
+			tmp = {}
+			tmp[:url] = index[id][:url]
+			tmp[:title] = doc.css('title').inner_text.strip
+			tmp[:doc] = doc
+			output << tmp
 		end
+
+		return output
 	end
 end

data/lib/leander/leander-server.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/ruby
+
+require 'sinatra/base'
+require 'haml'
+require 'json'
+
+require 'leander/index.rb'
+require 'leander/webpage.rb'
+
+class LeanderServer < Sinatra::Base
+
+	set :root, File.dirname(__FILE__)
+
+	helpers do
+		def niceify(url, title)
+			" <p>#{title}</p><a href=\"#{url}\">#{url}</a>"
+		end
+	end
+
+	get '/write/*' do
+		index = BmIndex.new
+		index.store_webpage Webpage.new params[:splat][0]
+	end
+
+
+	get '/search/:query' do
+		index = BmIndex.new
+		@search_results = index.search params[:query]
+		haml :search, :locals => {:result => @search_results }
+	end
+
+	get '/api/search/:query' do
+		content_type :json
+		index = BmIndex.new
+		@search_results = index.search params[:query].first
+		@search_results.map! { |r| {:url => r[:url], :title => r[:title]} }.flatten
+
+		output = {}
+		@search_results.each_with_index do |r, n| 
+			output[n] = {:result => r}
+		end
+		output.to_json
+	end
+
+
+	get '/' do
+		haml '%div.title Hello world'
+		BmIndex.new
+	end
+
+end

data/lib/leander/views/search.haml

@@ -0,0 +1 @@
+%p.results= result.map { |r| niceify(r[:url], r[:title]) }.join " "

data/lib/{webpage.rb → leander/webpage.rb}

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'open-uri'
 require 'nokogiri'
 
@@ -9,9 +10,6 @@ class Webpage
   end
 
 	def get_title
-		puts @doc.class
-		exit
 		return @doc.css('title').content
 	end
-
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: leander
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Sean Sorrell
@@ -9,51 +14,110 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 -05:00
+date: 2010-05-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ferret
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: highline
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: leander is a command-line webpage clipper
 email: seansorrell@gmail.com
 executables: 
 - leander
+- leander-server
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - README.md
-- lib/index.rb
-- lib/webpage.rb
+- lib/leander/index.rb
+- lib/leander/webpage.rb
+- lib/leander/leander-server.rb
+- bin/leander
+- bin/leander-server
+- lib/leander/views/search.haml
 has_rdoc: true
 homepage: http://github.com/rudle/leander
 licenses: []
@@ -64,21 +128,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: leander is a command-line webpage clipper