ruby_do 0.0.2 → 0.0.3

data/Gemfile

@@ -7,6 +7,7 @@ gem "gtk2"
 gem "knjrbfw"
 gem "gettext"
 gem "sqlite3"
+gem "threadded_enumerator"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -44,6 +44,8 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
     sqlite3 (1.3.6)
+    threadded_enumerator (0.0.0)
+      tsafe
     tsafe (0.0.1)
     wref (0.0.4)
 
@@ -60,3 +62,4 @@ DEPENDENCIES
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
   sqlite3
+  threadded_enumerator

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/ruby_do.rb

@@ -1,7 +1,15 @@
 #!/usr/bin/env ruby
 
 require "rubygems"
-require "knjrbfw"
+
+
+#Enable local dev-mode.
+if File.exists?("/home/kaspernj/Dev/Ruby/knjrbfw")
+  require "/home/kaspernj/Dev/Ruby/knjrbfw/lib/knjrbfw.rb"
+else
+  require "knjrbfw"
+end
+
 
 args = {
   :path => "#{Knj::Os.homedir}/.ruby_do",

data/glade/win_properties.glade

@@ -141,9 +141,10 @@
                             <property name="can_focus">False</property>
                             <property name="spacing">4</property>
                             <child>
-                              <object class="GtkTable" id="table1">
+                              <object class="GtkTable" id="tablePlugin">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="n_rows">2</property>
                                 <property name="n_columns">2</property>
                                 <property name="column_spacing">4</property>
                                 <property name="row_spacing">4</property>
@@ -163,6 +164,39 @@
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkLabel" id="label2">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Order no.</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="txtPluginOrderNo">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">•</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                    <signal name="changed" handler="on_txtPluginOrderNo_changed" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>

data/gui/win_main.rb

@@ -37,10 +37,22 @@ class Ruby_do::Gui::Win_main
   
   #Updates the icon, title and description to match the current result (if any).
   def update_res
-    if @cur_res
-      @gui["labActionTitle"].markup = @cur_res.title_html!
-      @gui["labActionDescr"].label = @cur_res.descr_html!
-      @gui["imgActionIcon"].pixbuf = @cur_res.icon_pixbuf!
+    if @results and @enum
+      while @results.length <= @result_i
+        begin
+          @results << @enum.next
+        rescue StopIteration
+          @result_i -= 1
+        end
+      end
+      
+      cur_res = @results[@result_i]
+    end
+    
+    if cur_res
+      @gui["labActionTitle"].markup = "<b>#{@result_i + 1}</b> - " + cur_res.title_html!
+      @gui["labActionDescr"].label = cur_res.descr_html!
+      @gui["imgActionIcon"].pixbuf = cur_res.icon_pixbuf!
     else
       @gui["labActionTitle"].markup = "<b>#{Knj::Web.html(_("Nothing found"))}</b>"
       @gui["labActionDescr"].label = _("Please enter something in the search text-field to do something.")
@@ -53,6 +65,7 @@ class Ruby_do::Gui::Win_main
     Gtk.timeout_remove(@timeout) if @timeout
     @timeout = Gtk.timeout_add(500) do
       self.on_txtSearch_changed_wait
+      @timeout = nil
       false
     end
   end
@@ -61,39 +74,48 @@ class Ruby_do::Gui::Win_main
   def on_txtSearch_changed_wait
     return nil if @gui["window"].destroyed?
     
+    @enum = nil
+    @result_i = 0
+    @results = []
+    
     text = @gui["txtSearch"].text
     words = text.split(/\s+/).map{|ele| ele.downcase}
     
-    if words.empty?
-      @cur_res = nil
-    else
-      @enum = @args[:rdo].plugin.send(:text => text, :words => words)
-      
-      begin
-        @cur_res = @enum.next
-      rescue StopIteration
-        @cur_res = nil
-      end
+    if !words.empty?
+      #Need to use threadded enumerator because of fiber failure otherwise.
+      @enum = Threadded_enumerator.new(:enum => @args[:rdo].plugin.send(:text => text, :words => words))
     end
     
     self.update_res
   end
   
+  def prev_result
+    @result_i -= 1 if @result_i > 0
+    self.update_res
+  end
+  
+  def next_result
+    @result_i += 1
+    self.update_res
+  end
+  
   #This happens when <ENTER> is pressed while the search-textfield has focus.
   def on_txtSearch_activate
     #If enter was pressed before search was executed, then be sure to execute a search first and disable the timeout, so search wont be done two times.
-    if @timeout
+    if @timeout and !@enum and @result_i == 0
       Gtk.timeout_remove(@timeout)
       self.on_txtSearch_changed_wait
     end
     
-    if !@cur_res
+    cur_res = @results[@result_i]
+    
+    if !cur_res
       Knj::Gtk2.msgbox(_("Please search for something in order to activate."))
       return nil
     end
     
     begin
-      res = @cur_res.args[:plugin].execute_result(:res => @cur_res)
+      res = cur_res.execute
       
       if res == :close_win_main
         @gui["window"].destroy
@@ -105,8 +127,16 @@ class Ruby_do::Gui::Win_main
   
   #In order the register <ESCAPE>-presses.
   def on_txtSearch_key_press_event(entry, eventkey)
-    if Gdk::Keyval.to_name(eventkey.keyval) == "Escape"
+    name = Gdk::Keyval.to_name(eventkey.keyval).to_s.downcase
+    
+    if name == "escape"
       @gui["window"].destroy
+    elsif name == "down"
+      self.next_result
+      return true
+    elsif name == "up"
+      self.prev_result
+      return true
     end
   end
   

data/gui/win_properties.rb

@@ -52,17 +52,31 @@ class Ruby_do::Gui::Win_properties
     sel = Knj::Gtk2::Tv.sel(@gui["tvPlugins"])
     model = @args[:rdo].ob.get_by(:Plugin, {"classname" => sel[0]}) if sel
     
-    if model and model[:active].to_i == 1
-      @gui["cbPluginActivate"].active = true
+    if model
+      @gui["tablePlugin"].show
+      
+      if model[:active].to_i == 1
+        @gui["cbPluginActivate"].active = true
+      else
+        @gui["cbPluginActivate"].active = false
+      end
+      
+      @gui["txtPluginOrderNo"].text = model[:order_no].to_s
     else
-      @gui["cbPluginActivate"].active = false
+      @gui["tablePlugin"].hide
     end
     
     self.load_widget
-    
     @gui["boxPluginOptions"].show_all
   end
   
+  def on_txtPluginOrderNo_changed
+    sel = Knj::Gtk2::Tv.sel(@gui["tvPlugins"])
+    model = @args[:rdo].ob.get_by(:Plugin, {"classname" => sel[0]}) if sel
+    return nil if !model
+    model[:order_no] = @gui["txtPluginOrderNo"].text
+  end
+  
   def load_widget
     #Remove plugin-widgets.
     @gui["boxPluginOptions"].children.each do |child|

data/include/database.rb

@@ -16,11 +16,31 @@ class Ruby_do::Database
           {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
           {"name" => "name", "type" => "varchar"},
           {"name" => "classname", "type" => "varchar"},
+          {"name" => "order_no", "type" => "int"},
           {"name" => "active", "type" => "enum", "maxlength" => "'0','1'", "default" => 0}
         ],
         "indexes" => [
           "name",
-          "classname"
+          "classname",
+          "order_no"
+        ]
+      },
+      "Static_result" => {
+        "columns" => [
+          {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
+          {"name" => "plugin_id", "type" => "int"},
+          {"name" => "id_str", "type" => "varchar"},
+          {"name" => "title", "type" => "varchar"},
+          {"name" => "title_lower", "type" => "varchar"},
+          {"name" => "descr", "type" => "text"},
+          {"name" => "data", "type" => "text"},
+          {"name" => "icon_path", "type" => "text"}
+        ],
+        "indexes" => [
+          "plugin_id",
+          "id_str",
+          "title",
+          "title_lower"
         ]
       }
     }

data/include/models.rb

@@ -1,3 +1,6 @@
 class Ruby_do::Models
-  
+  def self.const_missing(name)
+    require "#{File.dirname(__FILE__)}/../models/#{name.to_s.downcase}.rb"
+    return const_get(name)
+  end
 end

data/include/plugin.rb

@@ -1,8 +1,4 @@
 class Ruby_do::Plugin
-  def self.const_missing(name)
-    
-  end
-  
   attr_reader :plugins
   
   def register_plugins
@@ -41,6 +37,8 @@ class Ruby_do::Plugin
           
           plugin.model = model
           model.plugin = plugin
+          
+          plugin.start if plugin.respond_to?(:start)
         rescue NameError => e
           $stderr.puts "Cant loading plugin '#{match[1]}' because of the following."
           $stderr.puts e.inspect
@@ -57,9 +55,44 @@ class Ruby_do::Plugin
   
   def send(args)
     return Enumerator.new do |yielder|
-      @plugins.each do |name, plugin_instance|
-        plugin_model = @args[:rdo].ob.get_by(:Plugin, "classname" => plugin_instance.classname)
-        next if !plugin_model or plugin_model[:active].to_i != 1
+      plugins_active = []
+      @args[:rdo].ob.list(:Plugin, "active" => 1, "orderby" => "order_no") do |plugin|
+        plugins_active << plugin
+      end
+      
+      plugins_active_ids = plugins_active.clone.map{|d| d.id.to_i}
+      found = []
+      
+      #Search for exact static results.
+      @args[:rdo].ob.list(:Static_result, "plugin_id" => plugins_active_ids, "title_lower" => args[:text].to_s.strip.downcase) do |sres|
+        yielder << Ruby_do::Plugin::Result.new(
+          :title => sres[:title],
+          :descr => sres[:descr],
+          :icon => sres[:icon_path],
+          :static_result => true,
+          :sres => sres
+        )
+        
+        found << sres.id
+      end
+      
+      #Search for close static results.
+      @args[:rdo].ob.list(:Static_result, "plugin_id" => plugins_active_ids, "title_lower_search" => args[:text].to_s.strip.downcase, "id_not" => found) do |sres|
+        yielder << Ruby_do::Plugin::Result.new(
+          :title => sres[:title],
+          :descr => sres[:descr],
+          :icon => sres[:icon_path],
+          :static_result => true,
+          :sres => sres
+        )
+        
+        found << sres.id
+      end
+      
+      #Call plugins to get further results.
+      plugins_active.each do |plugin_model|
+        plugin_instance = plugin_model.plugin
+        next if !plugin_instance.respond_to?(:on_search)
         
         begin
           enum = plugin_instance.on_search(args)
@@ -76,7 +109,6 @@ class Ruby_do::Plugin
   
   class Base
     attr_accessor :model
-    
     attr_reader :rdo_plugin_args
     
     def initialize(args)
@@ -95,6 +127,48 @@ class Ruby_do::Plugin
     def title
       name = Knj::Php.ucwords(self.class.name.to_s[15, 999].gsub("_", " "))
     end
+    
+    def static_result_exists?(id_str)
+      sres = self.static_result_get(id_str)
+      
+      if sres
+        return true
+      else
+        return false
+      end
+    end
+    
+    def static_result_get(id_str)
+      return @rdo_plugin_args[:rdo].ob.get_by(:Static_result, "plugin_id" => self.model.id, "id_str" => id_str)
+    end
+    
+    def register_static_result(args)
+      raise "Argument was not a hash." if !args.is_a?(Hash)
+      raise "':id_str' was empty." if args[:id_str].to_s.strip.empty?
+      raise "':title' was empty." if args[:title].to_s.strip.empty?
+      raise "':descr' was empty." if args[:descr].to_s.strip.empty?
+      
+      args[:data] = {} if !args[:data]
+      
+      sres_hash = {
+        :title => args[:title],
+        :title_lower => args[:title].to_s.strip.downcase,
+        :id_str => args[:id_str],
+        :descr => args[:descr],
+        :icon_path => args[:icon_path],
+        :data => Marshal.dump(args[:data])
+      }
+      
+      if sres = self.static_result_get(args[:id_str])
+        sres.update(sres_hash)
+      else
+        sres = @rdo_plugin_args[:rdo].ob.add(:Static_result, sres_hash.merge(
+          :plugin_id => self.model.id,
+        ))
+      end
+      
+      return {:sres => sres}
+    end
   end
   
   class Result
@@ -156,5 +230,14 @@ class Ruby_do::Plugin
         return "[#{_("no description")}]"
       end
     end
+    
+    def execute
+      if @args[:static_result]
+        plugin = @args[:sres].plugin.plugin
+        return plugin.execute_static_result(:sres => @args[:sres])
+      else
+        return @args[:plugin].execute_result(:res => self)
+      end
+    end
   end
 end

data/lib/ruby_do.rb

@@ -10,7 +10,20 @@ class Ruby_do
   def initialize(args = {})
     #Require various used libs.
     require "rubygems"
-    require "knjrbfw"
+    
+    
+    #Enable local dev-mode.
+    if File.exists?("#{File.dirname(__FILE__)}/../../knjrbfw")
+      require "#{File.dirname(__FILE__)}/../../knjrbfw/lib/knjrbfw.rb"
+    else
+      require "knjrbfw"
+    end
+    
+    if File.exists?("#{File.dirname(__FILE__)}/../../threadded_enumerator")
+      require "#{File.dirname(__FILE__)}/../../threadded_enumerator/lib/threadded_enumerator.rb"
+    else
+      require "threadded_enumerator"
+    end
     
     
     #Set arguments (config).

data/models/plugin.rb

@@ -1,3 +1,7 @@
 class Ruby_do::Models::Plugin < Knj::Datarow
+  has_many [
+    {:class => :Static_result, :autodelete => true}
+  ]
+  
   attr_accessor :plugin
 end

data/models/static_result.rb

@@ -0,0 +1,9 @@
+class Ruby_do::Models::Static_result < Knj::Datarow
+  has_one [
+    {:class => :Plugin, :required => true}
+  ]
+  
+  def data
+    return Marshal.load(self[:data])
+  end
+end

data/ruby_do.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_do}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-09}
+  s.date = %q{2012-07-11}
   s.default_executable = %q{ruby_do.rb}
   s.description = %q{A clone of Gnome-Do and Kupfer written in Ruby.}
   s.email = %q{k@spernj.org}
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "include/unix_socket.rb",
     "lib/ruby_do.rb",
     "models/plugin.rb",
+    "models/static_result.rb",
     "ruby_do.gemspec",
     "spec/ruby_do_spec.rb",
     "spec/spec_helper.rb"
@@ -58,6 +59,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<knjrbfw>, [">= 0"])
       s.add_runtime_dependency(%q<gettext>, [">= 0"])
       s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
+      s.add_runtime_dependency(%q<threadded_enumerator>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -68,6 +70,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<knjrbfw>, [">= 0"])
       s.add_dependency(%q<gettext>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<threadded_enumerator>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -79,6 +82,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<knjrbfw>, [">= 0"])
     s.add_dependency(%q<gettext>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<threadded_enumerator>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

metadata

@@ -2,7 +2,7 @@
 name: ruby_do
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-09 00:00:00 +02:00
+date: 2012-07-11 00:00:00 +02:00
 default_executable: ruby_do.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,8 +58,19 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: threadded_enumerator
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,10 +78,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,10 +89,10 @@ dependencies:
         version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,10 +100,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +111,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,7 +122,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 description: A clone of Gnome-Do and Kupfer written in Ruby.
 email: k@spernj.org
 executables: 
@@ -143,6 +154,7 @@ files:
 - include/unix_socket.rb
 - lib/ruby_do.rb
 - models/plugin.rb
+- models/static_result.rb
 - ruby_do.gemspec
 - spec/ruby_do_spec.rb
 - spec/spec_helper.rb
@@ -160,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2248539457086474609
+      hash: -2303673294360816635
       segments: 
       - 0
       version: "0"