Ripped dragonfly out completely

app/models/smithy/asset.rb

@@ -4,26 +4,11 @@ class Asset < ActiveRecord::Base
 
     has_many :images, :dependent => :destroy
 
-    extend ::Dragonfly::Model
-    dragonfly_accessor :file
-    include ::Smithy::Dragonfly::AssetHelper
-
     before_validation :set_name
     before_save :set_file_uid_manually
 
     default_scope -> { order(:name) }
 
-    def file
-      # check for the jquery uploaded file first, just in case one got past the manual check. Also keeps backwards-compatibility
-      if self.uploaded_file_url?
-        dragonfly_attachments[:file].app.datastore = self.class.dragonfly_remote_datastore
-        self.file_url = URI.escape(self.uploaded_file_url)
-      elsif dragonfly_attachments[:file].to_value
-        dragonfly_attachments[:file].app.datastore = self.class.dragonfly_datastore
-      end
-      dragonfly_attachments[:file].to_value
-    end
-
     def file_type
       ext = File.extname(file.name).sub(/^\./, '')
       case ext
@@ -68,16 +53,6 @@ def set_content_types
         set_content_type(self.file, :content_type)
       end
 
-      # this allows dragonfly to take over management of the uploaded file. We are
-      # assuming that jquery-upload and dragonfly are using the same data storage...
-      def set_file_uid_manually
-        if self.uploaded_file_url? # this means it was uploaded via jquery-upload
-          uri = URI.parse(URI.encode(self.uploaded_file_url))
-          self.file_uid = self.uploaded_file_url.sub("#{uri.scheme}://#{uri.host}/", '')
-          self.uploaded_file_url = nil
-        end
-      end
-
       def set_name
         if self.uploaded_file_url?
           self.name = File.basename(self.uploaded_file_url, '.*').titleize unless self.name?

lib/smithy.rb

@@ -3,7 +3,6 @@
 require 'smithy/dependencies'
 # config
 require 'smithy/logger'
-require 'smithy/dragonfly'
 require 'smithy/liquid'
 # content formatting
 require 'smithy/formatter'

lib/smithy/dependencies.rb

@@ -3,7 +3,6 @@
 require 'awesome_nested_set'
 require 'bootstrap-sass'
 require 'awesome_nested_set'
-require 'dragonfly'
 require 'fog'
 require 'font-awesome-sass'
 require 'formtastic'

lib/smithy/liquid/filters/resize.rb

@@ -3,7 +3,7 @@ module Liquid
     module Filters
       module Resize
         def resize(input, resize_string)
-          Smithy::Dragonfly.resize_url(input, resize_string)
+
         end
       end
       ::Liquid::Template.register_filter(Resize)

smithycms.gemspec

@@ -25,8 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'autoprefixer-rails' # for bootstrap-sass
   s.add_dependency 'awesome_nested_set', '~> 3.0.1'
   s.add_dependency 'bootstrap-sass', '~> 3.2.0'
-  s.add_dependency 'dragonfly', '~> 1.0.7'
-  s.add_dependency 'dragonfly-s3_data_store', '~> 1.0.4'
   s.add_dependency 'font-awesome-sass', '~> 4.2'
   s.add_dependency 'fog', '~> 1.20.0'
   s.add_dependency 'formtastic', '~> 2.3.1' # as of writing, formtastic-bootstrap is only compatible with 2.3.x

spec/models/smithy/asset_spec.rb

@@ -48,7 +48,7 @@
     end
   end
 
-  context "when only uploaded_file_url is populated, the" do
+  context "when only uploaded_file_url is populated (aka jquery_file_upload did it), the" do
     subject { create(:asset, :uploaded_file_url => uploaded_file) }
 
     describe '#name' do
@@ -77,19 +77,7 @@
     end
   end
 
-  context "using the FileDataStore" do
-    before do
-      %w(AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_S3_BUCKET).each{|k| ENV[k] = nil }
-      Dragonfly.app.configure do
-        datastore Smithy::Asset.dragonfly_datastore
-      end
-    end
-    it "saves with a file" do
-      create(:asset, :file => file)
-    end
-    it "saves with an uploaded_file_url" do
-      create(:asset, :uploaded_file_url => uploaded_file)
-    end
+  context "saving to local filesystem" do
   end
 
 end