panmind-zendesk 1.0.1.3 → 1.0.2

data/README.md

@@ -13,9 +13,13 @@ and the necessary controller and routing code to implement
 Installation
 ------------
 
-    script/plugin install git://github.com/Panmind/zendesk.git
+Via RubyGems:
 
-Gems will follow soon, hopefully after the July 22nd Ruby Social Club in Milan.
+    gem install panmind-zendesk
+
+Or via Rails Plugin:
+
+    rails plugin install git://github.com/Panmind/zendesk.git
 
 
 Configuration
@@ -117,8 +121,7 @@ assets, follow us on GitHub: we plan to release that code as well. :-)
 Compatibility
 -------------
 
-Tested with Rails 2.3.8 with the `rails_xss` plugin installed,
-running under Ruby 1.9.1-p378.
+Tested with Rails 3.0.3 running under Ruby 1.9.2p0.
 
 
 TODO
@@ -128,10 +131,8 @@ TODO
    or redirects to Zendesk won't work: remove relying on this assumption. Cleanly.
  * Clean up configuration by requiring less variables: *convention over configuration*!
  * Configuration of the `logged_in?` method name
- * Remove the `String#force_utf8` patch and its usage
  * Allow options passing to the `zendesk_dropbox_link_to` helper
  * Code documentation
- * Gem
  * Tests (yuck!)
 
 Please fork the project and send us a pull request if you check off any of these items

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rake/rdoctask'
 
-require 'lib/panmind/zendesk'
+require './lib/panmind/zendesk'
 
 begin
   require 'jeweler'
@@ -13,8 +13,8 @@ begin
                                'Zendesk dropbox and the necessary controller and routing ' \
                                'code to implement remote authentication'
 
-    gemspec.authors          = ['Marcello Barnaba']
-    gemspec.email            = 'vjt@openssl.it'
+    gemspec.authors          = ['Fabrizio Regini','Marcello Barnaba']
+    gemspec.email            = 'info@panmind.org'
     gemspec.homepage         = 'http://github.com/Panmind/zendesk'
 
     gemspec.files            = %w( README.md Rakefile rails/init.rb ) + Dir['lib/**/*']
@@ -22,11 +22,11 @@ begin
     gemspec.has_rdoc         = true
 
     gemspec.version          = Panmind::Zendesk::Version
-    gemspec.date             = '2010-11-17'
+    gemspec.date             = '2011-05-16'
 
     gemspec.require_path     = 'lib'
 
-    gemspec.add_dependency('rails', '~> 2.3.8')
+    gemspec.add_dependency('rails', '~> 3.0')
   end
 rescue LoadError
   puts 'Jeweler not available. Install it with: gem install jeweler'

data/lib/panmind/zendesk.rb

@@ -1,4 +1,5 @@
 require 'digest/md5'
+require 'panmind/zendesk/railtie' if defined? Rails
 
 module Panmind
   # Zendesk remote authentication helper for Rails. Implements JS generation,
@@ -12,7 +13,7 @@ module Panmind
   #   - vjt  Wed Jul 21 13:00:42 CEST 2010
   #
   module Zendesk
-    Version = "1.0.1.3"
+    Version = '1.0.2'
 
     class ConfigurationError < StandardError; end
 
@@ -57,8 +58,8 @@ module Panmind
       end
 
       private
-        def token=(token);       @token    = token.force_utf8.freeze rescue nil end
-        def hostname=(hostname); @hostname = hostname.freeze                    end
+        def token=(token);       @token    = token.freeze    rescue nil end
+        def hostname=(hostname); @hostname = hostname.freeze            end
     end
 
     module Helpers
@@ -96,7 +97,7 @@ module Panmind
       end
 
       def zendesk_login
-        name, email = instance_exec(&Zendesk.login).map!(&:force_utf8)
+        name, email = instance_exec(&Zendesk.login)
 
         now  = params[:timestamp] || Time.now.to_i.to_s
         hash = Digest::MD5.hexdigest(name + email + Zendesk.token + now)
@@ -108,7 +109,7 @@ module Panmind
           '&timestamp=' + now,
           '&hash='      + hash,
           '&return_to=' + back
-        ].join.force_utf8
+        ].join
 
         redirect_to(Zendesk.auth_url + auth_params)
       end
@@ -136,12 +137,14 @@ module Panmind
         end
     end
 
-    module Routes
-      def zendesk(base, options)
+    module Routing
+      def zendesk(base, options = {})
         return unless Zendesk.enabled?
 
-        self.support base,           :controller => options[:controller], :action => :zendesk_login
-        self.connect "#{base}/exit", :controller => options[:controller], :action => :zendesk_logout
+        scope base.to_s, :controller => options[:controller] do
+          get '',     :action => :zendesk_login,  :as => base.to_sym
+          get 'exit', :action => :zendesk_logout, :as => nil
+        end
       end
     end
 

data/lib/panmind/zendesk/railtie.rb

@@ -0,0 +1,24 @@
+require 'panmind/zendesk'
+
+module Panmind
+  module Zendesk
+
+    if defined? Rails::Railtie
+      class Railtie < Rails::Railtie
+        initializer 'panmind.zendesk.insert_into_action_view' do
+          ActiveSupport.on_load :action_view do
+            Panmind::Zendesk::Railtie.insert
+          end
+        end
+      end
+    end
+
+    class Railtie
+      def self.insert
+        ActionView::Base.instance_eval { include Panmind::Zendesk::Helpers }
+        ActionDispatch::Routing::Mapper.instance_eval { include Panmind::Zendesk::Routing }
+      end
+    end
+
+  end
+end

data/rails/init.rb

@@ -1,5 +1,2 @@
-require 'panmind/zendesk'
-require 'panmind/string_force_utf8_patch'
-
-ActionView::Base.instance_eval { include Panmind::Zendesk::Helpers }
-ActionController::Routing::RouteSet::Mapper.instance_eval { include Panmind::Zendesk::Routes }
+require 'panmind/zendesk/railtie'
+Panmind::Zendesk::Railtie.insert

metadata

@@ -1,22 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: panmind-zendesk
 version: !ruby/object:Gem::Version 
-  hash: 93
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  - 3
-  version: 1.0.1.3
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
+- Fabrizio Regini
 - Marcello Barnaba
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2011-05-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,16 +26,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
-        - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 description: The plugin implements the HTML generation code for the Zendesk dropbox and the necessary controller and routing code to implement remote authentication
-email: vjt@openssl.it
+email: info@panmind.org
 executables: []
 
 extensions: []
@@ -46,8 +43,8 @@ extra_rdoc_files:
 files: 
 - README.md
 - Rakefile
-- lib/panmind/string_force_utf8_patch.rb
 - lib/panmind/zendesk.rb
+- lib/panmind/zendesk/railtie.rb
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/Panmind/zendesk
@@ -63,7 +60,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -72,7 +68,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/panmind/string_force_utf8_patch.rb

@@ -1,29 +0,0 @@
-# Adds a .force_utf8 to the String class: it forces the instance
-# encoding to utf-8 and then normalizes in NFKC form.
-#
-# For now, we're using ActiveSupport because it has proven to be
-# 33% faster than UnicodeUtils.. but in the future you can never
-# know whether the AS::Multibyte::Chars class will be supported.
-#
-# Please read http://www.cl.cam.ac.uk/~mgk25/unicode.html#ucsutf
-# for more information about Unicode Normalization Forms.
-#
-#   - vjt  Wed Jul 21 16:51:25 CEST 2010
-#
-unless 'the string'.respond_to?(:force_utf8)
-  class String
-    if '1.9'.respond_to?(:force_encoding)
-      #require 'unicode_utils/nfkc'
-
-      def force_utf8
-        #force_encoding('UTF-8')
-        #replace UnicodeUtils.nfkc(self)
-        replace ActiveSupport::Multibyte::Chars.new(self).normalize(:kc)
-      end
-    else
-      def force_utf8
-        replace mb_chars.normalize(:kc)
-      end
-    end
-  end
-end