ungarbled 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d896ae85d1fa346dc64269b2df2cb69878a135
-  data.tar.gz: 8f0750558d7ddd24e974baee5cff8a2d8d60c579
+  metadata.gz: 41b9d7ddfc8b9f5abe8cff9e027d645514a1f3b8
+  data.tar.gz: 3bdcd1c984c9f22906fc03109309a1308e63f864
 SHA512:
-  metadata.gz: da7b3c16ad71a6c4d71aa0d4a9c8542dfe79e16c27019fb347d8c519168637f69a40fda5ae057af85f9206cd5a3925e654f25e924c1ec74ad8dbae92aded0dce
-  data.tar.gz: ca3cd7894d45a534e9c92e92f6c62b2da96a5831262c73556309f3ca2a1ee6536b9a5a46e6a40e8bd0e7da29a7003441e7e0e4bf02659affe6fcaa397238a0c7
+  metadata.gz: 89cb02b3c412e644265ea7ca458142a15641026786732cf10f7f1ec11332f812792154e9eec220c46c701ffa0a59c7ddbcda1247420894cd2eba2a66ba9d424f
+  data.tar.gz: d29c3140abf4ed99e91d7592954bd85e671d92b21487ff55155d7ae211b09fed98c2c63b8cc3f5d65018ad19e2f01b70d3da95ea0ae458f7b70cd0e9034674bf

data/Rakefile

@@ -1,19 +1,5 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-# RDoc
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Ungarbled'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'rubygems'
+require 'bundler/setup'
 
 Bundler::GemHelper.install_tasks
 
@@ -29,3 +15,9 @@ Rake::TestTask.new do |t|
 end
 
 task default: 'test'
+
+# Appraisal
+if !ENV['APPRAISAL_INITIALIZED'] && !ENV['TRAVIS']
+  require 'appraisal'
+  task default: :appraisal
+end

data/lib/ungarbled/action_controller_ext.rb

@@ -6,18 +6,40 @@ module Ungarbled
   module ActionControllerExt
     extend ActiveSupport::Concern
 
+    SEND_FILE_HEADERS_PROC = lambda do |options|
+      if !::Rails.configuration.ungarbled.disable_auto_encode &&
+         options[:filename]
+        options[:filename] = encode_filename(options[:filename])
+      end
+
+      if defined?(send_file_headers_without_encode_filename!)
+        send_file_headers_without_encode_filename!(options)
+      else
+        super
+      end
+    end
+
     included do
       helper_method :encode_filename
       helper_method :encode_filename_for_zip_item
+      define_method :send_file_headers_with_encode_filename!, &SEND_FILE_HEADERS_PROC
       alias_method_chain :send_file_headers!, :encode_filename
     end
 
+    def self.prepended(mod)
+      class << mod
+        define_method :send_file_headers!, &SEND_FILE_HEADERS_PROC
+      end
+      mod.helper_method :encode_filename
+      mod.helper_method :encode_filename_for_zip_item
+    end
+
     private
 
     def filename_encoder(options)
       @filename_encoder ||= Ungarbled::Encoder.new(browser)
       lang = options[:lang] ||
-                 Rails.configuration.ungarbled.default_lang
+             Rails.configuration.ungarbled.default_lang
       @filename_encoder.tap { |e| e.lang = lang }
     end
 
@@ -28,15 +50,5 @@ module Ungarbled
     def encode_filename_for_zip_item(filename, options = {})
       filename_encoder(options).encode_for_zip_item(filename)
     end
-
-    private
-
-    def send_file_headers_with_encode_filename!(options)
-      if !::Rails.configuration.ungarbled.disable_auto_encode &&
-         options[:filename]
-        options[:filename] = encode_filename(options[:filename])
-      end
-      send_file_headers_without_encode_filename!(options)
-    end
   end
 end

data/lib/ungarbled/encoder/ja.rb

@@ -4,11 +4,16 @@ module Ungarbled
   class Encoder
     class Ja < Base
       def encode_for_zip_item(filename)
-        if @browser.windows? && !@browser.windows8?
-          filename.encode('cp932', invalid: :replace)
+        if @browser.respond_to?(:windows?)
+          if @browser.windows? && !@browser.windows8?
+            return filename.encode('cp932', invalid: :replace)
+          end
         else
-          super
+          if @browser.platform.windows? && !@browser.platform.windows8?
+            return filename.encode('cp932', invalid: :replace)
+          end
         end
+        super
       end
     end
   end

data/lib/ungarbled/middleware.rb

@@ -12,10 +12,23 @@ module Ungarbled
 
     def call(env)
       req = Rack::Request.new(env)
-      browser = Browser.new(
-        ua: req.user_agent,
-        accept_language: req.env['HTTP_ACCEPT_LANGUAGE']
-      )
+      # Argument changes depending on version of browser
+      browser =
+        ##  Browser.method(:new).parameters
+        ##  => [[:rest]]
+        if Browser.method(:new).parameters.flatten.count == 1
+          browser = Browser.new(
+            ua: req.user_agent,
+            accept_language: req.env['HTTP_ACCEPT_LANGUAGE']
+          )
+        else
+          ## Browser.method(:new).parameters.flatten
+          ## => [:req, :user_agent, :keyrest, :kwargs]
+          browser = Browser.new(
+            req.user_agent,
+            accept_language: req.env['HTTP_ACCEPT_LANGUAGE']
+          )
+        end
       encoder = Ungarbled::Encoder.new(browser, @options)
       status, headers, res = @app.call(env)
       disposition = headers[DISPOSITION_KEY]

data/lib/ungarbled/railtie.rb

@@ -9,7 +9,11 @@ module Ungarbled
     config.ungarbled.default_lang = :ja
 
     initializer 'ungarbled' do
-      ::ActionController::Base.send :include, Ungarbled::ActionControllerExt
+      if defined?(Module.prepend)
+        ::ActionController::Base.send :prepend, Ungarbled::ActionControllerExt
+      else
+        ::ActionController::Base.send :include, Ungarbled::ActionControllerExt
+      end
     end
   end
 end

data/lib/ungarbled/version.rb

@@ -1,3 +1,3 @@
 module Ungarbled
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ungarbled
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - yukihiro hara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,34 +68,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: pry-meta
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-rails-capybara
+  name: minitest-capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -160,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ungarble filename for downloads.