redix 0.0.2 → 0.0.3

data/README.rdoc

@@ -13,6 +13,8 @@ This should work on KDE/OSX. For other linux WM:
 
     gem install qtbindings
 
+http://github.com/ryanmelt/qtbindings
+
 
 == Use
 

data/VERSION

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

data/lib/redix.rb

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__)))
 begin
-require 'Qt4'
+  begin
+    require 'Qt4'
+  rescue LoadError
+    require 'korundum4'
+  end
 rescue LoadError
   puts "QT Bindings not found, try `gem install qtbindings`."
+  exit
 end
 require 'redis'
 # APP
@@ -17,10 +22,10 @@ module Redix
 
   def self.boot!
     u = Ui_MainWindow.new
-    w = Qt::MainWindow.new
-    u.setupUi(w)
+ #   w = Qt::MainWindow.new
+    u.setupUi #(w)
     Logic.for(u)
-    w.show
+    u.show
     App.exec
   end
 

data/lib/redix/logic.rb

@@ -1,7 +1,8 @@
 
 module Redix
 
-  class Logic
+  class Logic #< Qt::Widget =/
+    #slots :reload, :help, :connect
 
     class << self
 
@@ -37,9 +38,12 @@ module Redix
       def build_keys
         @u.listWidget.clear
         @u.listWidget.addItems(r.keys.sort)
+        rescue
+        failure  "Could not conect to redis"
+
       end
 
-      def connect_dialog
+      def connect
         c = ConnectDialog.new
         c.setupUi
         redis = "#{r.client.host}:#{r.client.port}/#{r.client.db}"
@@ -49,7 +53,7 @@ module Redix
         c.show
       end
 
-      def about_dialog
+      def help
         a = AboutDialog.new
         a.setupUi
         # a.title.setText("RediX")
@@ -57,13 +61,20 @@ module Redix
         a.show
       end
 
+      def new_key
+        k = NewKeyDialog.new
+        k.setupUi
+        k.show
+      end
+
       def for(u)
         @u = u
         build_keys
         build_dbs
-        u.actionConnect.connect(SIGNAL('triggered()')) { connect_dialog }
+        u.actionNew.connect(SIGNAL('triggered()')) { new_key }
+        u.actionConnect.connect(SIGNAL('triggered()')) { connect }
         u.actionReconnect.connect(SIGNAL('triggered()')) { reconnect }
-        u.actionAbout.connect(SIGNAL('triggered()')) { about_dialog }
+        u.actionAbout.connect(SIGNAL('triggered()')) { help }
         u.actionQuit.connect(SIGNAL('triggered()'), App, SLOT('quit()'))
 
         # Qt::ListWidgetItem.new(u.listWidget)
@@ -79,13 +90,18 @@ module Redix
         comm = @u.lineEdit.text
         @u.lineEdit.clear
         puts "Exec #{comm}"
-        res = eval("r.#{comm}")
-        @u.textBrowser.setHtml(res)# += res
+        res = eval("r.#{comm}") rescue "FAIL"
+        @u.textBrowser.setHtml("=> #{res}")# += res
+
+      rescue Exception => e
+        @u.textBrowser.setHtml e.to_s
       end
 
       def zoom(i)
         key = i.text
-        @u.tableView.model = DataModel.new.for(key)
+        model = DataModel.new.for(key)
+        @u.tableView.model = model
+        @u.tableView.setColumnWidth(0, 400)
       end
     end
 
@@ -95,10 +111,11 @@ module Redix
 
   end
 
-  class DataModel < Qt::AbstractListModel
+  class DataModel < Qt::AbstractTableModel
 
     def for(key)
       r = Logic.r
+      @key = key
       @type = r.type(key)
       @data = case @type
       when "string" then r.get(key)
@@ -106,27 +123,56 @@ module Redix
       when "set" then r.smembers(key)
       else r.sort(key)
       end
-      if @data.respond_to?(:values)
+      if @data.kind_of?(Hash)
         @rows = @data.values
         @header = @data.keys
       else
-        @rows = [@data]
-        @header = [@type]
+        @rows = @data.kind_of?(Array) ? @data : [@data]
+        @header = (0..@rows.size).to_a
       end
 
       self
     end
 
-    def rowCount idx
+    def flags(arg=nil)
+      Qt::ItemIsEditable|Qt::ItemIsEnabled
+    end
+
+    def rowCount idx=nil
       @rows.size
     end
 
+    def columnCount idx=nil
+      1
+    end
+
     def data idx, role = Qt::DisplayRole
       if role == Qt::DisplayRole then Qt::Variant.new @rows[idx.row]
       else Qt::Variant.new
       end
     end
 
+    def setData(mid, var, *args)
+      p "SETDATA #{mid} | #{var}"
+      p mid
+      r = Logic.r
+      t = 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 'set'
+        r.srem(@key, @rows[mid.row])
+        r.sadd(@key, t)
+      end
+      p args
+      self.for(@key)
+    end
+
+    def setHeaderData(*args)
+      p args
+    end
+
     def headerData sec, orient, role = Qt::DisplayRole
       if role == Qt::DisplayRole
          Qt::Variant.new(orient == 2 ? @header[sec] : @type)

data/lib/redix/qtui.rb

@@ -4,51 +4,41 @@
 #
 #
 #
-class Ui_MainWindow
-  attr_reader :actionNew
-  attr_reader :actionOpen
-  attr_reader :actionQuit
-  attr_reader :actionReconnect
-  attr_reader :actionConnect
-  attr_reader :actionHomepage
-  attr_reader :actionAbout
-  attr_reader :centralwidget
-  attr_reader :listWidget
-  attr_reader :tableView
-  attr_reader :lineEdit
-  attr_reader :textBrowser
-  attr_reader :menubar
-  attr_reader :menuFile
-  attr_reader :menuDB
-  attr_reader :menuChange
-  attr_reader :menuHelp
-  attr_reader :statusbar
-  attr_reader :mainWindow
-
-  def setupUi(mainWindow)
-    if mainWindow.objectName.nil?
-      mainWindow.objectName = "mainWindow"
+class Ui_MainWindow < Qt::MainWindow
+  attr_reader :actionNew, :actionOpen, :actionQuit, :actionReconnect, :actionConnect
+  attr_reader :actionHomepage, :actionAbout, :centralwidget, :listWidget
+  attr_reader :tableView, :lineEdit, :textBrowser
+  attr_reader :menubar, :menuKey, :menuDB, :menuChange, :menuHelp
+  attr_reader :statusbar, :mainWindow
+
+  slots :reload, :help, :connect, :new_key
+
+  def setupUi #(self)
+    if self.objectName.nil?
+      self.objectName = "mainWindow"
     end
-    @mainWindow = mainWindow
-    mainWindow.resize(799, 606)
-    @actionNew = Qt::Action.new(mainWindow)
+    @mainWindow = self
+    self.resize(799, 606)
+    @actionNew = Qt::Action.new(self)
     @actionNew.objectName = "actionNew"
-    @actionOpen = Qt::Action.new(mainWindow)
+    @actionInfo = Qt::Action.new(self)
+    @actionInfo.objectName = "actionInfo"
+    @actionOpen = Qt::Action.new(self)
     @actionOpen.objectName = "actionOpen"
-    @actionQuit = Qt::Action.new(mainWindow)
+    @actionQuit = Qt::Action.new(self)
     @actionQuit.objectName = "actionQuit"
 
-    @actionConnect = Qt::Action.new(mainWindow)
+    @actionConnect = Qt::Action.new(self)
     @actionConnect.objectName = "actionConnect"
-    @actionReconnect = Qt::Action.new(mainWindow)
+    @actionReconnect = Qt::Action.new(self)
     @actionReconnect.objectName = "actionReconnect"
 
-    @actionHomepage = Qt::Action.new(mainWindow)
+    @actionHomepage = Qt::Action.new(self)
     @actionHomepage.objectName = "actionHomepage"
-    @actionAbout = Qt::Action.new(mainWindow)
+    @actionAbout = Qt::Action.new(self)
     @actionAbout.objectName = "actionAbout"
 
-    @centralwidget = Qt::Widget.new(mainWindow)
+    @centralwidget = Qt::Widget.new(self)
     @centralwidget.objectName = "centralwidget"
     @listWidget = Qt::ListWidget.new(@centralwidget)
     @listWidget.objectName = "listWidget"
@@ -57,56 +47,82 @@ class Ui_MainWindow
     @tableView.objectName = "tableView"
     @tableView.geometry = Qt::Rect.new(260, 10, 531, 441)
     @tableView.gridStyle = Qt::DotLine
+
     @lineEdit = Qt::LineEdit.new(@centralwidget)
     @lineEdit.objectName = "lineEdit"
     @lineEdit.geometry = Qt::Rect.new(260, 510, 531, 31)
     @textBrowser = Qt::TextBrowser.new(@centralwidget)
     @textBrowser.objectName = "textBrowser"
     @textBrowser.geometry = Qt::Rect.new(260, 460, 531, 41)
-    mainWindow.centralWidget = @centralwidget
-    @menubar = Qt::MenuBar.new(mainWindow)
+    self.centralWidget = @centralwidget
+
+    @menubar = Qt::MenuBar.new(self)
     @menubar.objectName = "menubar"
     @menubar.geometry = Qt::Rect.new(0, 0, 799, 26)
-    @menuFile = Qt::Menu.new(@menubar)
-    @menuFile.objectName = "menuFile"
+    @menuKey = Qt::Menu.new(@menubar)
+    @menuKey.objectName = "menuKey"
     @menuDB = Qt::Menu.new(@menubar)
     @menuDB.objectName = "menuDB"
     @menuChange = Qt::Menu.new(@menuDB)
     @menuChange.objectName = "menuChange"
     @menuHelp = Qt::Menu.new(@menubar)
     @menuHelp.objectName = "menuHelp"
-    mainWindow.setMenuBar(@menubar)
-    @statusbar = Qt::StatusBar.new(mainWindow)
+    self.setMenuBar(@menubar)
+    @statusbar = Qt::StatusBar.new(self)
     @statusbar.objectName = "statusbar"
-    mainWindow.statusBar = @statusbar
+    self.statusBar = @statusbar
 
-    @menubar.addAction(@menuFile.menuAction())
     @menubar.addAction(@menuDB.menuAction())
+    @menubar.addAction(@menuKey.menuAction())
     @menubar.addAction(@menuHelp.menuAction())
-    @menuFile.addAction(@actionNew)
-    @menuFile.addAction(@actionOpen)
-    @menuFile.addSeparator()
-    @menuFile.addAction(@actionQuit)
+    @menuDB.addAction(@actionOpen)
     @menuDB.addAction(@menuChange.menuAction())
     @menuDB.addAction(@actionConnect)
     @menuDB.addAction(@actionReconnect)
     @menuDB.addSeparator()
+    @menuDB.addAction(@actionQuit)
+    @menuKey.addAction(@actionNew)
+    @menuKey.addAction(@actionInfo)
+    @menuKey.addSeparator()
     @menuHelp.addAction(@actionHomepage)
     @menuHelp.addSeparator()
     @menuHelp.addAction(@actionAbout)
 
-    retranslateUi(mainWindow)
 
-    Qt::MetaObject.connectSlotsByName(mainWindow)
+    retranslateUi
+
+    Qt::Shortcut.new(Qt::KeySequence.new(Qt::Key_C.to_i), self, SLOT('connect()'))
+    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()'))
+
+    Qt::MetaObject.connectSlotsByName(self)
   end # setupUi
 
-  def setup_ui(mainWindow)
-    setupUi(mainWindow)
+  def connect
+    Redix::Logic.connect_dialog
+  end
+
+  def new_key
+    Redix::Logic.new_key
+  end
+
+  def reload
+    Redix::Logic.reconnect
+  end
+
+  def help
+    Redix::Logic.about_dialog
+  end
+
+  def setup_ui
+    setupUi
   end
 
-  def retranslateUi(mainWindow)
-    mainWindow.windowTitle = Qt::Application.translate("MainWindow", "Redix", nil, Qt::Application::UnicodeUTF8)
+  def retranslateUi
+    self.windowTitle = Qt::Application.translate("MainWindow", "Redix", nil, Qt::Application::UnicodeUTF8)
     @actionNew.text = Qt::Application.translate("MainWindow", "New", nil, Qt::Application::UnicodeUTF8)
+    @actionInfo.text = Qt::Application.translate("MainWindow", "Info", nil, Qt::Application::UnicodeUTF8)
     @actionOpen.text = Qt::Application.translate("MainWindow", "Open", nil, Qt::Application::UnicodeUTF8)
     @actionQuit.text = Qt::Application.translate("MainWindow", "Quit", nil, Qt::Application::UnicodeUTF8)
     @actionConnect.text = Qt::Application.translate("MainWindow", "Connect", nil, Qt::Application::UnicodeUTF8)
@@ -114,14 +130,69 @@ class Ui_MainWindow
     @actionHomepage.text = Qt::Application.translate("MainWindow", "Homepage", nil, Qt::Application::UnicodeUTF8)
     @actionAbout.text = Qt::Application.translate("MainWindow", "About", nil, Qt::Application::UnicodeUTF8)
     @lineEdit.toolTip = Qt::Application.translate("MainWindow", "Run commands", nil, Qt::Application::UnicodeUTF8)
-    @menuFile.title = Qt::Application.translate("MainWindow", "File", nil, Qt::Application::UnicodeUTF8)
+    @menuKey.title = Qt::Application.translate("MainWindow", "Key", nil, Qt::Application::UnicodeUTF8)
     @menuDB.title = Qt::Application.translate("MainWindow", "DB", nil, Qt::Application::UnicodeUTF8)
     @menuChange.title = Qt::Application.translate("MainWindow", "Change", nil, Qt::Application::UnicodeUTF8)
     @menuHelp.title = Qt::Application.translate("MainWindow", "Help", nil, Qt::Application::UnicodeUTF8)
   end # retranslateUi
 
-  def retranslate_ui(mainWindow)
-    retranslateUi(mainWindow)
+  def retranslate_ui
+    retranslateUi
+  end
+
+end
+
+
+class NewKeyDialog < Qt::Dialog
+  attr_reader :data
+  attr_reader :buttonBox
+  attr_reader :input_name
+  attr_reader :input_type
+
+
+  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.orientation = Qt::Horizontal
+    @buttonBox.standardButtons = Qt::DialogButtonBox::Cancel|Qt::DialogButtonBox::Ok
+    @input_name = Qt::LineEdit.new(dialog)
+    @input_name.objectName = "input_name"
+    @input_name.geometry = Qt::Rect.new(70, 20, 311, 22)
+    @label = Qt::Label.new(dialog)
+    @label.objectName = "label"
+    @label.geometry = Qt::Rect.new(20, 23, 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()'))
+    Qt::Object.connect(@buttonBox, SIGNAL('rejected()'), dialog, SLOT('reject()'))
+
+    Qt::MetaObject.connectSlotsByName(dialog)
+  end # setupUi
+
+  def setup_ui(dialog)
+    setupUi(dialog)
+  end
+
+  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_type.text = Qt::Application.translate("Dialog", "Type", nil, Qt::Application::UnicodeUTF8)
+  end # retranslateUi
+
+  def retranslate_ui(dialog)
+    retranslateUi(dialog)
   end
 
 end

data/redix.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redix}
-  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 = ["Marcos Piccinini"]
-  s.date = %q{2010-10-07}
+  s.date = %q{2010-10-08}
   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
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -03:00
+date: 2010-10-08 00:00:00 -03:00
 default_executable: redix
 dependencies: 
 - !ruby/object:Gem::Dependency