file_column_with_s3 0.1.9 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0482bce566504b5f4172787d578a64cf71f37294
+  data.tar.gz: e77a7c13b7bb686225cd8a0786c62abd9ffdd07e
+SHA512:
+  metadata.gz: 853f2abd43b2a722fe7ea52423dbe68f234a849a12ea876c263a0bb1eb02dd5992ff64bb023e1d51683f8e115b07aa20360747591f6abed421b89878a101dc5a
+  data.tar.gz: 134232b045d69995b655e043156ca5c95c6ba2ca6ecb9ee14647c6a596d9fb33d046e9ea279d330126775a77fc0da155d7b4d20dba9a00896a9a287ac1516b44

data/lib/file_column.rb

@@ -609,7 +609,7 @@ module FileColumn # :nodoc:
 
     # default options. You can override these with +file_column+'s +options+ parameter
     DEFAULT_OPTIONS = {
-      :root_path => File.join(RAILS_ROOT, "public"),
+      :root_path => File.join(Rails.root.to_s, "public"),
       :web_root => "",
       :mime_extensions => MIME_EXTENSIONS,
       :extensions => EXTENSIONS,

data/lib/file_column_helper.rb

@@ -72,7 +72,7 @@ module FileColumnHelper
       end
     end
 
-    context_path = absolute ? ActionController::Base.relative_url_root.to_s : nil
+    context_path = absolute ? get_relative_url_for_rails(Rails::VERSION::MAJOR) : nil
     object.send("#{method}_download_url", context_path, subdir, store_url_for_options)
 
   end
@@ -142,4 +142,10 @@ module FileColumnHelper
       url_for_file_column(object, method, subdir, store_url_for_options)
     end
   end
+
+  private
+  def get_relative_url_for_rails(rails_version)
+    (rails_version == 2 ? ActionController::Base.relative_url_root : Rails.application.config.action_controller.relative_url_root).to_s
+  end
+
 end

data/lib/test_case.rb

@@ -70,14 +70,14 @@ class Test::Unit::TestCase
   #    # ...
   #  end
   def setup_fixture_files
-    tmp_path = File.join(RAILS_ROOT, "test", "tmp", "file_column")
-    file_fixtures = Dir.glob File.join(RAILS_ROOT, "test", "fixtures", "file_column", "*")
+    tmp_path = File.join(Rails.root.to_s, "test", "tmp", "file_column")
+    file_fixtures = Dir.glob File.join(Rails.root.to_s, "test", "fixtures", "file_column", "*")
     
     FileUtils.mkdir_p tmp_path unless File.exists?(tmp_path)
     FileUtils.cp_r file_fixtures, tmp_path
   end
   
-  # Removes the directory "RAILS_ROOT/test/tmp/file_column/" so the files
+  # Removes the directory "/test/tmp/file_column/" so the files
   # copied on test startup are removed. Call this in your unit test's +teardown+
   # method.
   #
@@ -89,7 +89,7 @@ class Test::Unit::TestCase
   #    # ...
   #  end
   def teardown_fixture_files
-    FileUtils.rm_rf File.join(RAILS_ROOT, "test", "tmp", "file_column")
+    FileUtils.rm_rf File.join(Rails.root.to_s, "test", "tmp", "file_column")
   end
   
   private
@@ -120,5 +120,5 @@ end
 # in tests but rather into the directory "/test/tmp/file_column".
 if RAILS_ENV == "test"
   FileColumn::ClassMethods::DEFAULT_OPTIONS[:root_path] =
-    File.join(RAILS_ROOT, "test", "tmp", "file_column")
+    File.join(Rails.root.to_s, "test", "tmp", "file_column")
 end

data/test/abstract_unit.rb

@@ -13,6 +13,37 @@ RAILS_ENV = ""
 
 $: << "../lib"
 
+module Rails
+  @root = File.dirname(__FILE__)
+
+  class << self
+    attr_accessor :root
+  end
+
+  def self.application
+    Application.new
+  end
+
+  class Application
+    def config
+      Configuration.new
+    end
+
+    class Configuration
+      def action_controller
+        action_controller = ActiveSupport::OrderedOptions.new
+        action_controller.relative_url_root = '/foo/bar'
+        return action_controller
+      end
+    end
+  end
+
+  class VERSION
+    MAJOR = (ENV['RAILS_VERSION'] || '3').to_i
+  end
+end
+
+
 require 'file_column'
 require 'file_column_helper'
 require 'file_compat'

data/test/file_column_helper_test.rb

@@ -6,7 +6,6 @@ class UrlForFileColumnTest < Test::Unit::TestCase
 
   def setup
     Entry.file_column :image
-    ActionController::Base.relative_url_root = nil
     @request = RequestMock.new
   end
 
@@ -112,7 +111,6 @@ class UrlForFileColumnWithContextPathTest < Test::Unit::TestCase
   def test_relative_url_root_not_modified
     e = Entry.new(:image => upload(f("skanthak.png")))
     url_for_file_column(e, "image", :absolute => true)
-
-    assert_equal "/foo/bar", ActionController::Base.relative_url_root
+    assert_equal "/foo/bar", get_relative_url_for_rails(Rails::VERSION::MAJOR)
   end
 end

metadata

@@ -1,130 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: file_column_with_s3
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 9
-  version: 0.1.9
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Mingle SaaS team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-07-28 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-02-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mingle-storage
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 0
-        - 11
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.0.11
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
-        version: 2.3.8
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.11
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: aws-sdk
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 5
-        - 11
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.5.11
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.11
 description: 
 email: mingle.saas@thoughtworks.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- CHANGELOG
+- README
 - Rakefile
-- lib/file_column/validations.rb
 - lib/file_column.rb
+- lib/file_column/validations.rb
 - lib/file_column_helper.rb
 - lib/file_compat.rb
 - lib/magick_file_column.rb
 - lib/rails_file_column.rb
 - lib/test_case.rb
+- s3_env.example
 - test/abstract_unit.rb
 - test/connection.rb
 - test/file_column_helper_test.rb
@@ -137,42 +123,27 @@ files:
 - test/fixtures/skanthak.png
 - test/magick_test.rb
 - test/magick_view_only_test.rb
-- README
-- CHANGELOG
-- s3_env.example
-has_rdoc: true
 homepage: https://github.com/ThoughtWorksStudios/file_column
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: File attachment library for ruby
 test_files: []
-