grumblr 2.2.0 → 2.3.0

data/Changelog

@@ -1,3 +1,8 @@
+version 2.3.0 (2010-07-04)
+
+  * Fixed layout of video panel
+  * Fixed authentication to work with rest-client 1.6.0
+
 version 2.2.0 (2010-03-03)
 
   * Fixed authentication to work with rest-client 1.3.0+

data/README

@@ -19,7 +19,7 @@ Grumblr is a tool to post messages to your Tumblr blog from GNOME.
     http://libxml.rubyforge.org/
 
   * REST Client
-    http://github.com/adamwiggins/rest-client/
+    http://github.com/archiloque/rest-client
 
 
 === Installation ===

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

data/grumblr.gemspec

@@ -0,0 +1,20 @@
+Gem::Specification.new do |s|
+  s.name = 'grumblr'
+  s.version = File.open('VERSION') { |f| f.read }
+  s.author = 'Paul Philippov'
+  s.description = "Grumblr is a message poster to Tumblr blogs from GNOME"
+  s.email = 'themactep@gmail.com'
+  s.bindir = "bin"
+  s.executables = ['grumblr']
+  s.extra_rdoc_files = ['README', 'LICENSE', 'VERSION', 'Changelog']
+  s.files = Dir.glob("{bin,data,lib,spec}/**/*") + \
+            %w(LICENSE README VERSION Changelog grumblr.gemspec)
+  s.homepage = 'http://themactep.com/grumblr/'
+  s.require_path = "lib"
+  s.rubyforge_project = 'grumblr'
+  s.summary = "Tumblr companion for GNOME"
+  s.has_rdoc = false
+  s.add_dependency "ppds-libs"
+  s.add_dependency "libxml-ruby"
+  s.add_dependency "rest-client", '>= 1.6.0'
+end

data/lib/grumblr/ui.rb

@@ -2,6 +2,7 @@ require 'gtk2'
 
 module Grumblr
 
+  APP_NAME  = 'Grumblr'
   APP_ROOT  = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
   DATA_ROOT = File.join(APP_ROOT, 'data')
   VERSION   = File.open(File.join(APP_ROOT,'VERSION')) { |f| f.read }
@@ -17,9 +18,9 @@ module Grumblr
       self.logo = Gdk::Pixbuf.new(filename, 128, 128)
       
       set_size_request 440, 340
-      set_border_width 4
+      set_border_width 0
       set_allow_shrink false
-      set_title 'Grumblr'
+      set_title Grumblr::APP_NAME
       set_icon self.logo
       set_default_width $cfg.get(:window_width).to_i
       set_default_height $cfg.get(:window_height).to_i
@@ -27,17 +28,19 @@ module Grumblr
       signal_connect(:destroy) { quit }
       signal_connect(:delete_event) { minimize }
       signal_connect(:check_resize) do |widget|
-        x, y = widget.position
-        w, h = widget.size
-        $cfg.set :window_x_pos, x
-        $cfg.set :window_y_pos, y
-        $cfg.set :window_width, w
-        $cfg.set :window_height, h
+        position_x, position_y = widget.position
+        size_w, size_h = widget.size
+        $cfg.set :window_x_pos, position_x
+        $cfg.set :window_y_pos, position_y
+        $cfg.set :window_width, size_w
+        $cfg.set :window_height, size_h
       end
       signal_connect(:window_state_event) do |widget, e|
         case e.event_type
         when Gdk::Event::WINDOW_STATE
           minimize if e.changed_mask.iconified? and e.new_window_state.iconified?
+        else
+          nil
         end
       end
       show
@@ -163,7 +166,7 @@ module Grumblr
         @video_title = Gtk::LabeledEntry.new 'Title (optional)'
 
         page.pack_start video_data, false
-        page.pack_start @video_title, true
+        page.pack_start @video_title, false
       end
 
       page.pack_start @video_embed, false
@@ -217,7 +220,7 @@ module Grumblr
       toolbar.insert 3, item
 
       ### Buttons
-      clear_button = Gtk::Button.new 'Clear'
+      clear_button = Gtk::Button.new ' Clear '
       clear_button.set_focus_on_click false
       clear_button.signal_connect(:clicked) do |widget|
         page = @notebook.get_nth_page @notebook.page
@@ -225,13 +228,13 @@ module Grumblr
         reset_form message_type.downcase
       end
 
-      @private_button = Gtk::ToggleButton.new 'Private'
+      @private_button = Gtk::ToggleButton.new ' Private '
       @private_button.signal_connect(:toggled) do |widget|
         $cfg.set :private, widget.active?
       end
       @private_button.set_active $cfg.get(:private)
 
-      submit_button = Gtk::Button.new 'Send'
+      submit_button = Gtk::Button.new '  Send  '
       submit_button.signal_connect(:released) do |widget|
         post
       end
@@ -251,7 +254,7 @@ module Grumblr
       button_box.pack_start @private_button, false
       button_box.pack_start @tags, true
       button_box.pack_start format_box, false
-      button_box.pack_start submit_button, true
+      button_box.pack_start submit_button, false
 
       ### Layout
       pack_start toolbar, false
@@ -310,9 +313,10 @@ module Grumblr
 
     def collect_data_for(fieldset, message_type)
       data = {}
-      for key in fieldset[message_type]
+      fieldset[message_type].each do |key|
         name = "@#{message_type}_#{key.gsub(/-/,'_')}"
-        if var = instance_variable_get(name)
+        var = instance_variable_get(name)
+        if var
           value = var.get_value
           data.merge!({ key => value })
         end
@@ -334,7 +338,7 @@ module Grumblr
     end
 
     def reset_fields_for(fieldset, message_type)
-      for key in fieldset[message_type]
+      fieldset[message_type].each do |key|
         name = "@#{message_type}_#{key.gsub(/-/,'_')}"
         var = instance_variable_get(name)
         var.clear if var
@@ -451,7 +455,7 @@ module Grumblr
       end
       super
       self.logo          = $gui.logo
-      self.program_name  = 'Grumblr'
+      self.program_name  = Grumblr::APP_NAME
       self.version       = Grumblr::VERSION
       self.copyright     = "Copyright (c)2009, Paul Philippov"
       self.comments      = "Tumblr companion for GNOME"
@@ -483,7 +487,7 @@ module Grumblr
 
     def menu
       menu = Gtk::Menu.new
-      for item in [ ontop, sep, destroy_account, sep, about, sep, quit ]
+      [ ontop, sep, destroy_account, sep, about, sep, quit ].each do |item|
         menu.append item
       end
       menu.show_all
@@ -633,6 +637,7 @@ module Gtk
       self.set_left_margin 5
       self.modify_text Gtk::STATE_NORMAL, PALE
       self.buffer.set_text @label
+
       self.signal_connect(:focus_in_event) do |widget, type|
         if widget.buffer.text == @label
           widget.modify_text Gtk::STATE_NORMAL, DARK
@@ -640,12 +645,14 @@ module Gtk
         end
         report_length
         false
-      end
+     end
+
       self.signal_connect(:focus_out_event) do |widget, type|
         self.clear if widget.buffer.text == ''
         $statusbar.push 0, $app.blog.title
         false
       end
+
       self.signal_connect(:key_release_event) do |widget, type|
         report_length
         false
@@ -654,6 +661,7 @@ module Gtk
 
     def report_length
       $statusbar.push 0, "Length: #{self.buffer.text.chars.count}"
+      self.buffer.text.strip
     end
 
     def get_value

data/lib/ppds/tumblr.rb

@@ -55,13 +55,14 @@ module Ppds
 
     def query(action, data)
       raise 'Cannot authenticate without credentials' unless data[:email] and data[:password]
-      RestClient.post(API_URL + action, data) { |response| response.body }
+      response = RestClient.post(API_URL + action, data)
+      response.to_str
     rescue RestClient::RequestFailed => e
       raise 'Query failed: %s' % e.response.body
     rescue RestClient::RequestTimeout
       raise 'Timeout occured'
-    rescue Exception
-      raise $!
+#    rescue Exception
+#      raise $!
     end
 
     def authenticate(email, password)

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grumblr
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  hash: 3
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Paul Philippov
@@ -9,39 +15,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +00:00
+date: 2010-07-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ppds-libs
-  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: libxml-ruby
-  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: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
+        version: 1.6.0
+  type: :runtime
+  version_requirements: *id003
 description: Grumblr is a message poster to Tumblr blogs from GNOME
 email: themactep@gmail.com
 executables: 
@@ -51,29 +71,29 @@ extensions: []
 extra_rdoc_files: 
 - README
 - LICENSE
-- Changelog
 - VERSION
+- Changelog
 files: 
 - bin/grumblr
-- data/pixmaps/grumblr.png
-- data/pixmaps/video.bmp
-- data/pixmaps/spinner.gif
+- data/grumblr.desktop
 - data/pixmaps/photo.bmp
-- data/pixmaps/link.bmp
+- data/pixmaps/text.bmp
+- data/pixmaps/audio.bmp
 - data/pixmaps/chat.bmp
 - data/pixmaps/quote.bmp
+- data/pixmaps/grumblr.png
 - data/pixmaps/grumblr.svg
-- data/pixmaps/audio.bmp
-- data/pixmaps/text.bmp
-- data/grumblr.desktop
-- lib/grumblr/ui.rb
-- lib/grumblr/core.rb
+- data/pixmaps/link.bmp
+- data/pixmaps/spinner.gif
+- data/pixmaps/video.bmp
 - lib/ppds/tumblr.rb
+- lib/grumblr/core.rb
+- lib/grumblr/ui.rb
 - LICENSE
 - README
-- Rakefile
-- Changelog
 - VERSION
+- Changelog
+- grumblr.gemspec
 has_rdoc: true
 homepage: http://themactep.com/grumblr/
 licenses: []
@@ -84,21 +104,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: grumblr
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Tumblr companion for GNOME

data/Rakefile

@@ -1,51 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
-require 'spec/rake/spectask'
-
-spec = Gem::Specification.new do |s|
-  s.name = 'grumblr'
-  s.version = File.open('VERSION') { |f| f.read }
-  s.has_rdoc = false
-  s.extra_rdoc_files = ['README', 'LICENSE', 'Changelog', 'VERSION']
-  s.summary = "Tumblr companion for GNOME"
-  s.description = "Grumblr is a message poster to Tumblr blogs from GNOME"
-  s.author = 'Paul Philippov'
-  s.email = 'themactep@gmail.com'
-  s.homepage = 'http://themactep.com/grumblr/'
-  s.rubyforge_project = 'grumblr'
-  s.executables = ['grumblr']
-  s.files = Dir.glob("{bin,data,lib,spec}/**/*") + \
-            %w(LICENSE README Rakefile Changelog VERSION)
-  s.require_path = "lib"
-  s.bindir = "bin"
-  s.add_dependency "ppds-libs"
-  s.add_dependency "libxml-ruby"
-  s.add_dependency "rest-client"
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
-end
-
-Rake::RDocTask.new do |rdoc|
-  files =['README', 'LICENSE', 'lib/**/*.rb']
-  rdoc.rdoc_files.add(files)
-  rdoc.main = "README" # page to start on
-  rdoc.title = "grumblr Docs"
-  rdoc.rdoc_dir = 'doc/rdoc' # rdoc output folder
-  rdoc.options << '--line-numbers'
-end
-
-Rake::TestTask.new do |t|
-  t.test_files = FileList['test/**/*.rb']
-end
-
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-end