forgery 0.3.1 → 0.3.2

data/README.markdown

@@ -92,6 +92,7 @@ Thanks to the authors and contributors:
 * Josh Nichols (technicalpickles)
 * Jeremy Stephens (viking aka crookshanks)
 * Darcy Laycock (Sutto)
+* Lukas Westermann (lwe)
 
 ## Notes
 

data/lib/forgery/file_reader.rb

@@ -4,12 +4,12 @@ class Forgery
 
     # Returns an array of strings containing each line in the dictionary
     def self.read_dictionary(dictionary)
-      read_file(path_to_dictionary(dictionary))
+      read_file(find_file(dictionary, :dictionaries))
     end
 
     # Returns an array of strings containing each line in the format
     def self.read_format(format)
-      read_file(path_to_format(format))
+      read_file(find_file(format, :formats))
     end
 
   protected
@@ -24,46 +24,13 @@ class Forgery
       lines
     end
 
-    # Returns the path to a format. It will return the external path if the
-    # file exists, otherwise it will return the internal path.
-    def self.path_to_format(format)
-      if external_path_to_format(format) && File.exists?(external_path_to_format(format))
-        external_path_to_format(format)
-      else
-        internal_path_to_format(format)
+    # Search a file in all load_paths, starting from last to first, so
+    # last takes precedence over first.
+    def self.find_file(name, folder)
+      Forgery.load_paths.reverse.each do |path|
+        file = "#{path}/#{folder}/#{name}"
+        return file if File.exists?(file)
       end
     end
-
-    # Returns the path to a format outside of forgery
-    def self.external_path_to_format(format)
-      Forgery.rails_root + '/lib/forgery/formats/' + format.to_s if Forgery.rails?
-    end
-
-    # Returns the path to a format inside of forgery
-    def self.internal_path_to_format(format)
-      File.dirname(__FILE__) + '/formats/' + format.to_s
-    end
-
-    # Returns the path to a dictionary. It will return the external path if
-    # the file exists, otherwise it will return the internal path.
-    def self.path_to_dictionary(dictionary)
-      if external_path_to_dictionary(dictionary) && File.exists?(external_path_to_dictionary(dictionary))
-        external_path_to_dictionary(dictionary)
-      else
-        internal_path_to_dictionary(dictionary)
-      end
-    end
-
-    # Returns the path to a dictionary outside of forgery
-    def self.external_path_to_dictionary(dictionary)
-      Forgery.rails_root + '/lib/forgery/dictionaries/' + dictionary.to_s if Forgery.rails?
-    end
-
-    # Returns the path to a dictionary within forgery
-    def self.internal_path_to_dictionary(dictionary)
-      File.dirname(__FILE__) + '/dictionaries/' + dictionary.to_s
-    end
-
   end
-
 end

data/lib/forgery/forgery.rb

@@ -8,6 +8,15 @@ class Forgery
     @@formats ||= Formats.new
   end
 
+  def self.load_paths
+    @@load_paths ||= [File.dirname(__FILE__)]
+  end
+
+  def self.load_from!(path)
+    self.load_paths << File.expand_path(path)
+    Dir["#{self.load_paths.last}/**/*.rb"].uniq.each { |file| require file }
+  end
+
   def self.rails_root
     if defined?(Rails)
       Rails.root.to_s

data/lib/forgery/version.rb

@@ -1,3 +1,3 @@
 class Forgery
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/forgery.rb

@@ -29,8 +29,4 @@ end
 
 # Loading rails forgeries to override current forgery methods and add new
 # forgeries
-if Forgery.rails?
-  Dir[File.expand_path(Forgery.rails_root + '/lib/forgery/**/*.rb')].uniq.each do |file|
-    require file
-  end
-end
+Forgery.load_from! "#{Forgery.rails_root}/lib/forgery" if Forgery.rails?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Nathan Sutton