Skip to content

Commit

Permalink
DRYed up the X_extensions.
Browse files Browse the repository at this point in the history
  • Loading branch information
nelstrom committed Nov 17, 2008
1 parent 4f54c79 commit f584116
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 146 deletions.
70 changes: 0 additions & 70 deletions lib/file_system/model/javascript_extensions.rb
Expand Up @@ -10,81 +10,11 @@ module ClassMethods
def klass_name def klass_name
"Javascript" "Javascript"
end end

def load_files
files = Dir[path + "/**"]
unless files.blank?
records_on_filesystem = []
files.each do |file|
record = find_or_initialize_by_filename(File.basename(file))
puts "Loading #{self.name.downcase} from #{File.basename(file)}"
record.load_file(file)
record.save
records_on_filesystem << record
end
fileless_db_records = records_on_database - records_on_filesystem
fileless_db_records.each { |item| delete_record(item) }
end
end


def extract_name(basename)
name_parts = basename.split(".")
type_or_filter = name_parts.pop
name_parts.pop if name_parts[-1] == "min"
name = name_parts.join(".")
end
end

def load_file(file)
name, mini, type_or_filter = extract_attrs_from_filename(File.basename(file))
content = open(file).read
self.name = name
self.content = content
if respond_to?(:filter_id)
self.filter_id = filters.include?(type_or_filter) ? type_or_filter.camelize : nil
end
if respond_to?(:minify)
self.minify = mini
end
end

def filename
@filename ||= returning String.new do |output|
basename = self.name
extension = case
when respond_to?(:filter_id)
self.filter_id.blank? ? default_content_type : self.filter_id.downcase
when respond_to?(:content_type)
CONTENT_TYPES.invert[self.content_type] || default_content_type
else
default_content_type
end
minify = case
when respond_to?(:minify)
self.minify ? "min" : nil
else nil
end
output << File.join(self.class.path,
[basename, minify, extension].compact.join("."))
end
end end


private private
def default_content_type def default_content_type
"js" "js"
end end

def extract_attrs_from_filename(basename)
name_parts = basename.split(".")
type_or_filter = name_parts.pop
mini = false
if name_parts[-1] == "min"
mini = true
name_parts.pop
end
name = name_parts.join(".")
[name, mini, type_or_filter]
end


end end
70 changes: 0 additions & 70 deletions lib/file_system/model/stylesheet_extensions.rb
Expand Up @@ -10,81 +10,11 @@ module ClassMethods
def klass_name def klass_name
"Stylesheet" "Stylesheet"
end end

def load_files
files = Dir[path + "/**"]
unless files.blank?
records_on_filesystem = []
files.each do |file|
record = find_or_initialize_by_filename(File.basename(file))
puts "Loading #{self.name.downcase} from #{File.basename(file)}"
record.load_file(file)
record.save
records_on_filesystem << record
end
fileless_db_records = records_on_database - records_on_filesystem
fileless_db_records.each { |item| delete_record(item) }
end
end


def extract_name(basename)
name_parts = basename.split(".")
type_or_filter = name_parts.pop
name_parts.pop if name_parts[-1] == "min"
name = name_parts.join(".")
end
end

def load_file(file)
name, mini, type_or_filter = extract_attrs_from_filename(File.basename(file))
content = open(file).read
self.name = name
self.content = content
if respond_to?(:filter_id)
self.filter_id = filters.include?(type_or_filter) ? type_or_filter.camelize : nil
end
if respond_to?(:minify)
self.minify = mini
end
end

def filename
@filename ||= returning String.new do |output|
basename = self.name
extension = case
when respond_to?(:filter_id)
self.filter_id.blank? ? default_content_type : self.filter_id.downcase
when respond_to?(:content_type)
CONTENT_TYPES.invert[self.content_type] || default_content_type
else
default_content_type
end
minify = case
when respond_to?(:minify)
self.minify ? "min" : nil
else nil
end
output << File.join(self.class.path,
[basename, minify, extension].compact.join("."))
end
end end


private private
def default_content_type def default_content_type
"css" "css"
end end


def extract_attrs_from_filename(basename)
name_parts = basename.split(".")
type_or_filter = name_parts.pop
mini = false
if name_parts[-1] == "min"
mini = true
name_parts.pop
end
name = name_parts.join(".")
[name, mini, type_or_filter]
end

end end
6 changes: 0 additions & 6 deletions lib/file_system/model/text_asset_extensions.rb
Expand Up @@ -7,9 +7,6 @@ def self.included(base)
end end


module ClassMethods module ClassMethods
def klass_name
"TextAsset"
end


def load_files def load_files
files = Dir[path + "/**"] files = Dir[path + "/**"]
Expand Down Expand Up @@ -71,9 +68,6 @@ def filename
end end


private private
def default_content_type
super
end


def extract_attrs_from_filename(basename) def extract_attrs_from_filename(basename)
name_parts = basename.split(".") name_parts = basename.split(".")
Expand Down

0 comments on commit f584116

Please sign in to comment.