redix 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/redix/logic.rb

@@ -1,8 +1,8 @@
 
 module Redix
 
-  class Logic #< Qt::Widget =/
-    #slots :reload, :help, :connect
+  class Logic < Qt::Object # =/
+    slots :reload, :help, :connect
 
     class << self
 
@@ -24,6 +24,7 @@ module Redix
       def failure(f)
         @u.statusbar.showMessage(f)
       end
+      alias :message :failure
 
       def build_dbs
         0.upto(15) do |i|
@@ -36,11 +37,13 @@ module Redix
       end
 
       def build_keys
+        all = r.keys.sort
         @u.listWidget.clear
-        @u.listWidget.addItems(r.keys.sort)
-        rescue
+        @u.listWidget.addItems(all)
+        puts r.info
+        message "DB Loaded #{all.size} keys. Used memory #{r.info['used_memory_human']}"
+      rescue
         failure  "Could not conect to redis"
-
       end
 
       def connect
@@ -57,16 +60,32 @@ module Redix
         a = AboutDialog.new
         a.setupUi
         # a.title.setText("RediX")
-        a.textBrowser.setHtml("About <a href='http://github.com/nofxx/redix'>Redix</a>....")
+        a.textBrowser.setHtml("About <a href='http://github.com/nofxx/redix'>Redix</a><p>Marcos Piccinini</p>")
         a.show
       end
 
       def new_key
         k = NewKeyDialog.new
         k.setupUi
+        k.buttonBox.connect(SIGNAL('accepted()')) { create_key(k) }
         k.show
       end
 
+      def create_key(k, type = nil, v = nil)
+
+        unless type
+          type = k.input_type.current_text
+          v = k.input_value.text
+          k = k.input_name.text
+        end
+        case type
+        when 'string' then r.set(k, v)
+        when 'hash' then r.hmset(k, v)
+        when 'list' then r.add(k, v)
+        when 'set' then  r.sadd(k, v)
+        end
+      end
+
       def for(u)
         @u = u
         build_keys
@@ -153,24 +172,21 @@ module Redix
     end
 
     def setData(mid, var, *args)
-      p "SETDATA #{mid} | #{var}"
-      p mid
       r = Logic.r
-      t = var.toString
+      v = var.toString
       case @type
-      when 'string' then r.set(@key, t)
-      when 'hash' then r.hset(@key, @header[mid.row], t)
-      when 'list' then r.lset(@key, mid.row, t)
+      when 'string' then r.set(@key, v)
+      when 'hash' then r.hset(@key, @header[mid.row], v)
+      when 'list' then r.lset(@key, mid.row, v)
       when 'set'
         r.srem(@key, @rows[mid.row])
-        r.sadd(@key, t)
+        r.sadd(@key, v)
       end
-      p args
       self.for(@key)
     end
 
     def setHeaderData(*args)
-      p args
+      p "Set Header -> #{args}"
     end
 
     def headerData sec, orient, role = Qt::DisplayRole

data/lib/redix/qtui.rb

@@ -10,8 +10,10 @@ class Ui_MainWindow < Qt::MainWindow
   attr_reader :tableView, :lineEdit, :textBrowser
   attr_reader :menubar, :menuKey, :menuDB, :menuChange, :menuHelp
   attr_reader :statusbar, :mainWindow
+  KEYS = (0..9)
 
   slots :reload, :help, :connect, :new_key
+  eval(("slots " + (KEYS.map { |i| ":connect#{i}" }.join ", ")))
 
   def setupUi #(self)
     if self.objectName.nil?
@@ -91,7 +93,11 @@ class Ui_MainWindow < Qt::MainWindow
 
     retranslateUi
 
+    # 0-9 Keys Shortcuts
+    KEYS.each { |k| Qt::Shortcut.new(Qt::KeySequence.new(eval("Qt::Key_#{k}").to_i), self, SLOT("connect#{k}()")) }
+
     Qt::Shortcut.new(Qt::KeySequence.new(Qt::Key_C.to_i), self, SLOT('connect()'))
+    Qt::Shortcut.new(Qt::KeySequence.new(Qt::Key_N.to_i), self, SLOT('new_key()'))
     Qt::Shortcut.new(Qt::KeySequence.new(Qt::Key_F1.to_i), self, SLOT('help()'))
     Qt::Shortcut.new(Qt::KeySequence.new(Qt::Key_F2.to_i), self, SLOT('new_key()'))
     Qt::Shortcut.new(Qt::KeySequence.new(Qt::Key_F5.to_i), self, SLOT('reload()'))
@@ -99,20 +105,28 @@ class Ui_MainWindow < Qt::MainWindow
     Qt::MetaObject.connectSlotsByName(self)
   end # setupUi
 
-  def connect
-    Redix::Logic.connect_dialog
+  def connect(db = nil)
+    Redix::Logic.connect
   end
 
   def new_key
     Redix::Logic.new_key
   end
 
+  def method_missing(*args)
+    if args.join =~ /^connect/
+      Redix::Logic.reconnect(args.join.scan(/\d/)[0].to_i)
+    else
+      super
+    end
+  end
+
   def reload
     Redix::Logic.reconnect
   end
 
   def help
-    Redix::Logic.about_dialog
+    Redix::Logic.help
   end
 
   def setup_ui
@@ -142,37 +156,55 @@ class Ui_MainWindow < Qt::MainWindow
 
 end
 
-
+#
+#
+#  New Key
+#
+#
+#
 class NewKeyDialog < Qt::Dialog
   attr_reader :data
   attr_reader :buttonBox
   attr_reader :input_name
   attr_reader :input_type
+  attr_reader :input_value
 
 
   def updateData(new)
     @data = new
   end
+
   def setupUi(dialog = self)
 
     @buttonBox = Qt::DialogButtonBox.new(dialog)
     @buttonBox.objectName = "buttonBox"
-    @buttonBox.geometry = Qt::Rect.new(30, 100, 341, 32)
+    @buttonBox.geometry = Qt::Rect.new(30, 130, 341, 32)
     @buttonBox.orientation = Qt::Horizontal
     @buttonBox.standardButtons = Qt::DialogButtonBox::Cancel|Qt::DialogButtonBox::Ok
+
+    @input_type = Qt::ComboBox.new(dialog)
+    @input_type.objectName = "input_type"
+    @input_type.geometry = Qt::Rect.new(70, 20, 311, 22)
+    @input_type.addItems(["string", "list", "set", "zset", "hash", "channel"])
+    @label_type = Qt::Label.new(dialog)
+    @label_type.objectName = "label_type"
+    @label_type.geometry = Qt::Rect.new(20, 23, 61, 21)
+
+
     @input_name = Qt::LineEdit.new(dialog)
     @input_name.objectName = "input_name"
-    @input_name.geometry = Qt::Rect.new(70, 20, 311, 22)
+    @input_name.geometry = Qt::Rect.new(70, 50, 311, 22)
     @label = Qt::Label.new(dialog)
     @label.objectName = "label"
-    @label.geometry = Qt::Rect.new(20, 23, 61, 21)
+    @label.geometry = Qt::Rect.new(20, 53, 61, 21)
+
+    @input_value = Qt::LineEdit.new(dialog)
+    @input_value.objectName = "input_value"
+    @input_value.geometry = Qt::Rect.new(70, 80, 311, 22)
+    @label_value = Qt::Label.new(dialog)
+    @label_value.objectName = "label_value"
+    @label_value.geometry = Qt::Rect.new(20, 83, 61, 21)
 
-    @input_type = Qt::LineEdit.new(dialog)
-    @input_type.objectName = "input_type"
-    @input_type.geometry = Qt::Rect.new(70, 50, 311, 22)
-    @label_type = Qt::Label.new(dialog)
-    @label_type.objectName = "label_type"
-    @label_type.geometry = Qt::Rect.new(20, 53, 61, 21)
 
     retranslateUi(dialog)
     Qt::Object.connect(@buttonBox, SIGNAL('accepted()'), dialog, SLOT('accept()'))
@@ -187,8 +219,9 @@ class NewKeyDialog < Qt::Dialog
 
   def retranslateUi(dialog)
     dialog.windowTitle = Qt::Application.translate("Dialog", "New Key", nil, Qt::Application::UnicodeUTF8)
-    @label.text = Qt::Application.translate("Dialog", "Name", nil, Qt::Application::UnicodeUTF8)
+    @label.text = Qt::Application.translate("Dialog", "Key", nil, Qt::Application::UnicodeUTF8)
     @label_type.text = Qt::Application.translate("Dialog", "Type", nil, Qt::Application::UnicodeUTF8)
+    @label_value.text = Qt::Application.translate("Dialog", "Value", nil, Qt::Application::UnicodeUTF8)
   end # retranslateUi
 
   def retranslate_ui(dialog)
@@ -197,6 +230,12 @@ class NewKeyDialog < Qt::Dialog
 
 end
 
+#
+#
+#  Connect
+#
+#
+#
 class ConnectDialog < Qt::Dialog
   attr_reader :data
   attr_reader :buttonBox
@@ -254,7 +293,12 @@ class ConnectDialog < Qt::Dialog
 
 end
 
-
+#
+#
+#  About
+#
+#
+#
 class AboutDialog < Qt::Dialog
   attr_reader :data
   attr_reader :title

data/redix.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redix}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-10-08}
+  s.date = %q{2010-10-21}
   s.default_executable = %q{redix}
   s.description = %q{QT GUI for Redis Beta}
   s.email = %q{x@nofxx.com}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -03:00
+date: 2010-10-21 00:00:00 -02:00
 default_executable: redix
 dependencies: 
 - !ruby/object:Gem::Dependency