davetron5000-gliffy 0.9.3 → 0.9.4

data/README.rdoc

@@ -51,6 +51,44 @@ Now you can use the gliffy handle in a controller or a view.  Perhaps you'd make
                    :returnButtonText => 'Back to My Awesome Blog'})) 
     end
 
+It is recommended that you do not expose the Gliffy URLs directly in your views; since each URL can be called one time only and they *must* be called in the order generated, if you were to have, for example, a page with links to images of your Gliffy diagrams, the browser may not request those links in the order that you need.
+
+Instead, create a route like so:
+
+    map.resources :diagrams, :only => [:index,:new,:destroy,:edit,:show]
+
+And implement all Gliffy access in your controller methods
+
+    # diagrams_controller.rb
+    class DiagramsController < ApplicationController
+
+      Mime::Type.register 'image/jpeg', :jpg, [], ["jpeg"] 
+      Mime::Type.register 'image/png', :png, [], ["png"] 
+      Mime::Type.register 'image/svg+xml', :svg, [], ["svg"] 
+
+      def index
+        @diagrams = self.gliffy_handle.folder_documents(APP_CONFIG['gliffy_folder']).sort{|a,b| a.name <=> b.name}
+      end
+
+      def show
+        size = params[:size] || :L
+        respond_to do |format|
+          format.jpg { send_data session[:gliffy].document_get(params[:id],:jpeg,size), :type => "image/jpeg", :disposition => 'inline' }
+          format.png { send_data session[:gliffy].document_get(params[:id],:png,size), :type => "image/png", :disposition => 'inline' }
+          format.svg { send_data session[:gliffy].document_get(params[:id],:svg,size), :type => "image/svg+xml", :filename => params[:id] + ".svg" }
+          format.xml { send_data session[:gliffy].document_get(params[:id],:xml,size), :type => "text/xml", :filename => params[:id] + ".xml" }
+        end
+      end
+
+    # index.html.erb
+    <ul>
+      <% @diagrams.each do |diagram| %>
+        <li><img src="<%= diagram_path(diagram.document_id) %>" /></li>
+      <% end %>
+    </ul>
+ 
+This way, your application has links to your controller and the requests to Gliffy are constructed as the browser makes requests to your application.
+
 == Digging Deeper
 
 If you wish to bypass the high-level API, you can interact with Gliffy directly via the Gliffy::Request class, which allows you to make arbitrary requests against the Gliffy API, but takes care of signing your URLs and all OAuth things that need to be done:

data/bin/gliffy

@@ -18,6 +18,9 @@ flag [:config]
 desc 'Show debug info'
 switch [:debug]
 
+desc 'Show version'
+switch :version
+
 #desc 'Use gob-go instead of the real gliffy (devs only)'
 #switch [:gobgotest]
 
@@ -261,6 +264,10 @@ command :config do |c|
   c.desc 'Force a recreation of your config file, even if it exists'
   c.switch :force
 
+  c.desc 'Forget token (gets a new one next time)'
+  c.long_desc 'Sometimes your token can get corrupted or otherwise become unusable.  Using this will delete it, forcing a new one to be requested next time.'
+  c.switch :forget
+
   c.action do |global_options,options,args|
     if $config.nil? || options[:force]
       puts "What is account ID?"
@@ -286,6 +293,10 @@ command :config do |c|
       else
         puts "Aborted"
       end
+    elsif options[:forget]
+      $config.update_access_token(nil)
+      write_config($config,global_options[:config])
+      puts "Token deleted; if your next request fails, re-create your config with --force or contact Gliffy"
     else
       $stderr.puts "You already have a config; edit it by hand or use --force to recreate"
     end
@@ -293,44 +304,58 @@ command :config do |c|
 end
 
 pre do |global,command,options,args|
-  require 'yaml'
-  message = nil
-  begin
-  $config = File.open(global[:config]) { |f| YAML::load(f) }
-  rescue
-    message = "No config file found at #{global[:config]}\nUse #{$0} config to create one"
-    $config = nil
-  end
-  if $config.nil? && command.name != :config
-    $stderr.puts message if !message.nil?
+  if global[:version]
+    puts "#{$0} v#{Gliffy::GLIFFY_VERSION}"
     false
   else
-    if !command || command.name != :config
-      if global[:gobgotest]
-        puts "Going against gob-go -- developers only!"
-        class HTTPartyAuth
-          def post(url)
-            HTTParty.post(url,:basic_auth => {:username => 'gobgotest' , :password => 'gobgotest'})
+    require 'yaml'
+    message = nil
+    begin
+      $config = File.open(global[:config]) { |f| YAML::load(f) }
+    rescue
+      message = "No config file found at #{global[:config]}\nUse #{$0} config to create one"
+      $config = nil
+    end
+    if $config.nil? && command.name != :config
+      $stderr.puts message if !message.nil?
+      false
+    else
+      if !command || command.name != :config
+        if global[:gobgotest]
+          puts "Going against gob-go -- developers only!"
+          class HTTPartyAuth
+            def post(url)
+              HTTParty.post(url,:basic_auth => {:username => 'gobgotest' , :password => 'gobgotest'})
+            end
           end
+          $handle = Gliffy::Handle.new(
+            'gob-go-stable.gliffy.com/api/1.0',
+            'gob-go-stable.gliffy.com/gliffy',
+            $config,HTTPartyAuth.new)
+        else
+          $handle = Gliffy::Handle.new(
+            'www.gliffy.com/api/1.0',
+            'www.gliffy.com/gliffy',
+            $config)
         end
-        $handle = Gliffy::Handle.new(
-          'gob-go-stable.gliffy.com/api/1.0',
-          'gob-go-stable.gliffy.com/gliffy',
-          $config,HTTPartyAuth.new)
-      else
-        $handle = Gliffy::Handle.new(
-          'www.gliffy.com/api/1.0',
-          'www.gliffy.com/gliffy',
-          $config)
+        token = $handle.update_token
+        $handle.logger.level = Logger::DEBUG if global[:debug]
+        write_config($config,global[:config])
       end
-      token = $handle.update_token
-      $handle.logger.level = Logger::DEBUG if global[:debug]
-      write_config($config,global[:config])
+      true
     end
-    true
   end
 end
 
+on_error do |ex|
+  raise ex
+  #if ex.kind_of? Gliffy::BadAuthorizationException
+  #  puts "Your token is bustedz"
+  #  false
+  #else
+  #  true
+  #end
+end
 def write_config(cred,config)
   File.open(config,'w') do |out|
     YAML.dump(cred,out)

data/lib/gliffy.rb

@@ -1,4 +1,5 @@
 require 'gliffy/handle'
+require 'gliffy/version'
 
 # :include: ../README.rdoc
 module Gliffy

data/lib/gliffy/response.rb

@@ -22,6 +22,12 @@ module Gliffy
       super(message)
     end
   end
+
+  class BadAuthorizationException < Exception
+    def initialize(message)
+      super(message)
+    end
+  end
   # Base class for all response from gliffy
   class Response
     @@normal_error_callback = Proc.new do |response,exception|
@@ -29,10 +35,17 @@ module Gliffy
         message = response.inspect
         if response['response'] && response['response']['error']
           http_status = response['response']['error']['http_status']
-          if http_status = "404"
-            message = "Not Found"
+          # It seems that HTTParty is not able to figure out the http-status when the contents of
+          # the tag is text.  Weird.  This hack seems to work reasonably well.
+          if !http_status
+            http_status = response.body.gsub(/^.*http-status=\"/,'').gsub(/\".*$/,'')
+          end
+          if http_status == '404'
+            message = 'Not Found'
+          elsif http_status == '401'
+            raise BadAuthorizationException.new(response['response']['error'])
           else
-            message = "HTTP Status #{http_status}"
+            message = "HTTP Status #{http_status} : #{response['response']['error']}"
           end
         end
         raise exception.class.new(message)

data/lib/gliffy/version.rb

@@ -0,0 +1,4 @@
+# Generated by rake update_version
+module Gliffy
+  GLIFFY_VERSION = '0.9.4'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: davetron5000-gliffy
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - David Copeland
@@ -57,6 +57,7 @@ files:
 - lib/gliffy/request.rb
 - lib/gliffy/response.rb
 - lib/gliffy/url.rb
+- lib/gliffy/version.rb
 - lib/gliffy.rb
 - bin/gliffy
 - README.rdoc