forgery 0.3.12 → 0.4.0

data/README.markdown

@@ -1,132 +1,122 @@
-# Forgery
+Forgery
+=======
 
-The Problem:
-Making meaningful development data for your application.
+**A Problem**:
+It's harder than *absolutely easy* to make meaningful, simple, data for testing and development.
 
-The Solution:
-A fake data generator that does more than just lorem ipsum and random text
-(well, it does those too, but also does much more).
+**A Solution**:
+A fake data generator that provides not only a host of basics and a rememberable syntax, but a customizable library to boot.
 
-Forgery generates fake data from dictionaries, formats, and recipes.  The
-plugin includes a generator providing directories to make your own forgeries.
+Welcome to Forgery, an excellent solution to a problem so hard you didn't know it was there.
 
 
-## Install
+Using
+-----
 
-### Run
+You'll want to read individual Forgery categories for more information, but these are the basics:
 
-    gem install forgery
+~~~ Ruby
+Forgery(:basic).password
+  #=> "b6qZTQEH"
 
-### Rails 2
+Forgery(:internet).email_address
+  #=> "krainboltgreene@crt.net"
 
-    # Add this to your config/environment.rb
-    config.gem 'forgery'
+Forgery(:monetary).money
+  #=> "1.58"
 
-### Rails 3
+Forgery(:lorem_ipsum).words(10)
+  #=> "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam egestas."
 
-    # Add this to your Gemfile
-    gem 'forgery'
+Forgery(:monetary).formatted_money :min => 100, :max => 1000
+  #=> "$923.36"
+~~~
 
-## Rails 2 Generator
+And many many [more]()!
 
-    ruby script/generate forgery
+Alternatively you can write it like this: 
 
-## Rails 3 Generator
+~~~ Ruby
+Forgery::Basic.hex_color
+Forgery::Name.full_name
+Forgery::Personal.shirt_size
+~~~
 
-    rails generate forgery
+In addition, you can always write your own dictionaries and formats, overriding the ones in the gem.
+Fully explained [here]().
 
-In a rails project this generator creates:
 
-* Rails.root/lib/forgery
-* Rails.root/lib/forgery/dictionaries
-* Rails.root/lib/forgery/extensions
-* Rails.root/lib/forgery/forgeries
-* Rails.root/lib/forgery/formats
+Installing
+----------
 
-You can then use these directories to write your own dictionaries, class
-extensions, forgeries, and formats.
+Like any gem, you can install Forgery two ways depending on it's use.
 
+For normal Ruby development, you need simply use:
 
-Forgery will first look here for dictionaries and formats, so you can override
-the ones used in the plugin.
+~~~
+$ gem install forgery
+~~~
 
-See the forgeries in the plugin for examples of how to write your own.
+This will add it to your gem library, just like any normal gem.
+You can then use it like any normal gem library.
+See [examples]() for more.
 
-See which dictionaries each forgery uses to override them with your own.
 
+**Rails 3.x**
 
-The Rails 3 plugin also registers a rake task which can generate new dictionaries
-from html or xml on the web.
+If you're using Rails 3.x you need to do a few extra things (that are probably rote).
+First step is to add it to your `Rails.root/Gemfile`, we also suggest specifying the latest version (found on rubygems):
 
-Writes to '${RAILS_ROOT}/lib/forgery/dictionaries' by default
-(this can be overriden by setting Forgery::FileWriter#write_to!)
+~~~ ruby
+gem 'forgery', '0.3.12'
+~~~
 
-Parameters:
-:dictionary_name  -- the name of your new dictionary file
-:source_url       -- web page containing the data for your dictionary file
-:css_or_xpath     -- css or xpath selector(s) to element(s) containing the desired data
+Then you'll need to run `bundle install` to install and lock in your new gem.
+Next you'll want to run the special Rails 3 generator:
 
-Usage:
-    rake create_dictionary[name_of_file,'http://www.html_or_xml_page.com','li']
-## Examples
+~~~
+$ [bundle exec] rails generate forgery
+~~~
 
-Here I'll supply a few examples of how it works, in general.  See each forgery
-for individual examples.
+**Rails 2.x**
 
-    # Traditional syntax
-    Forgery::Basic.password # => "wYMYvq"
-    Forgery::Basic.password :allow_special => true # => ";Qo^N[T"
-    Forgery::Basic.hex_color # => "#f4d841"
-    
-    Forgery::Monetary.money # => "8.21"
-    Forgery::Monetary.formatted_money # => "$3.25"
-    Forgery::Monetary.money :min => 100, :max => 1000 # => "848.97"
-    
-    # Alternate syntax
-    Forgery(:basic).password # => "b6qZTQEH"
-    Forgery(:basic).password :allow_special => true # => "XlrhV%An"
-    Forgery(:basic).hex_color # => "#46b73f"
-    
-    Forgery(:monetary).money # => "1.58"
-    Forgery(:monetary).formatted_money # => "$3.48"
-    Forgery(:monetary).money :min => 100, :max => 1000 # => "923.36"
+For **Rails 2.x** you'll need to do something a little different, by first editing your `Rails.root/config/environment.rb` and adding this to the configuration block:
 
-## Customization
+~~~ ruby
+config.gem 'forgery'
+~~~
 
-You can utilize the directories generated in /lib to customize the behavior of forgery.
+Then you'll need to run this in your command line:
 
-Examples of each of these components are available in the source.
+~~~
+$ script/generate forgery
+~~~
 
-### Dictionaries
+**Generators**
 
-Dictionaries are files with no extensions.  Entries are separated by new lines.
+This Rails generators will make these directories in your Rails.root directory:
 
-### Forgeries
+~~~ YAML
+- Rails.root/lib/forgery
+- Rails.root/lib/forgery/dictionaries
+- Rails.root/lib/forgery/extensions
+- Rails.root/lib/forgery/forgeries
+- Rails.root/lib/forgery/formats
+~~~
 
-Forgeries are classes that inherit from the Forgery class.  A basic forgery definition is as follows
+You can then use these directories to write your own dictionaries, class extensions, forgeries, and formats.
 
-    class NewForgery < Forgery
-    end
 
-### Extensions
+Contributing
+------------
 
-Extensions are additional methods/functionality that are added to classes (Ruby core or otherwise) that are loaded by Forgery.  Follow standard Ruby practices.
+This is a work in progress and an open source project, so feel free to contribute.
+We'll take pull requests via git or suggestions via the issues tab.
+Any work done on Forgery will get you into the credits list and in our hearts.
 
-### Formats
 
-Formatting for numerical fields.  Each numerical entry corresponds to a # mark.
-
-## DOCUMENTATION
-
-Documentation can be found at [http://sevenwire.github.com/forgery/](http://sevenwire.github.com/forgery/)
-
-## TODO
-
-* Add instanced forgeries for more relative information generation.
-* Add markov chains.
-* Add a way to use probability in forgeries.
-
-## Thanks
+Credits
+-------
 
 Thanks to the authors and contributors:
 
@@ -143,11 +133,29 @@ Thanks to the authors and contributors:
 * SixArm (SixArm)
 * Akira Matsuda (amatsuda)
 
-## Notes
 
-This is a work in progress.  If you find bugs or have forgeries to contribute,
-we'll gladly take them and give credit.
+Licensing
+---------
+
+Copyright (c) 2007 Sevenwire LLC
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-Enjoy.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Nate Sutton (nate@sevenwire.com)
+On that note, have fun!

data/lib/forgery.rb

@@ -9,12 +9,13 @@ require 'forgery/file_writer'
 require 'forgery/dictionaries'
 require 'forgery/formats'
 
-# Loading class extensions
+# Loading extensions
+require 'forgery/extend'
 Dir[current_path + 'forgery/extensions/**/*.rb'].uniq.each do |file|
   require file
 end
 
-# Load the forgery base class
+# Load the forgery base classes
 require 'forgery/forgery'
 
 # Load the forgery version

data/lib/forgery/dictionaries.rb

@@ -8,7 +8,7 @@ class Forgery
 
     def [](key)
       symbolized_key = key.to_sym
-      @dictionaries[symbolized_key] ||= FileReader.read_dictionary(symbolized_key)
+      @dictionaries[symbolized_key] ||= Forgery::Extend(FileReader.read_dictionary(symbolized_key))
     end
 
     def loaded?(key)

data/lib/forgery/extend.rb

@@ -0,0 +1,16 @@
+class Forgery
+  def self.Extend(object)
+    case object
+    when Array
+      Forgery::Extensions::Array.new(object)
+    when Hash
+      Forgery::Extensions::Hash.new(object)
+    when Range
+      Forgery::Extensions::Range.new(object.first, object.last, object.exclude_end?)
+    when String
+      Forgery::Extensions::String.new(object)
+    else
+      object
+    end
+  end
+end

data/lib/forgery/extensions/array.rb

@@ -1,11 +1,22 @@
-class Array
-  def random
-    self[Kernel.rand(size)]
-  end
+class Forgery
+  module Extensions
+    class Array < ::Array
+
+      def unextend
+        to_a
+      end
+
+      # The only forgery extension that returns an extended object
+      def random
+        Forgery::Extend(self[Kernel.rand(size)])
+      end
+
+      def random_subset(len=2)
+        rs = []
+        len.times { rs << random }
+        rs
+      end
 
-  def random_subset(len=2)
-    rs = []
-    len.times { rs << random }
-    rs
+    end
   end
 end

data/lib/forgery/extensions/range.rb

@@ -1,9 +1,19 @@
-class Range
-  def random
-    Integer(first) && Integer(last)
-    raise ArgumentError if first > last
-    Kernel.rand(last - first + (exclude_end? ? 0 : 1)) + first
-  rescue ArgumentError
-    to_a.random
+class Forgery
+  module Extensions
+    class Range < ::Range
+
+      def unextend
+        ::Range.new(first, last, exclude_end?)
+      end
+
+      def random
+        Integer(first) && Integer(last)
+        raise ArgumentError if first > last
+        Kernel.rand(last - first + (exclude_end? ? 0 : 1)) + first
+      rescue ArgumentError
+        Forgery::Extend(to_a).random
+      end
+
+    end
   end
 end

data/lib/forgery/extensions/string.rb

@@ -1,49 +1,49 @@
-class String
-  def to_numbers(replace='#')
-    gsub(/#{replace}/){ Kernel.rand(10) }
-  end
+class Forgery
+  module Extensions
+    class String < ::String
 
-  # Ripped right out of rails
-  if !defined?(Rails.root)
-    def camelize(first_letter = :upper)
-      case first_letter
-      when :upper
-        to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-      when :lower
-        first.downcase + camelize(self)[1..-1]
+      def unextend
+        to_s
       end
-    end
 
-    def underscore
-      to_s.gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
-    end
-
-    if Module.method(:const_get).arity == 1
-      def constantize
-        names = self.split('::')
-        names.shift if names.empty? || names.first.empty?
+      def to_numbers(replace='#')
+        gsub(/#{replace}/){ Kernel.rand(10) }
+      end
 
-        constant = Object
-        names.each do |name|
-          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+      # Ripped right out of rails
+      def camelize(first_letter = :upper)
+        case first_letter
+        when :upper
+          to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+        when :lower
+          first.downcase + camelize(self)[1..-1]
         end
-        constant
       end
-    else
-      def constantize
-        names = self.split('::')
-        names.shift if names.empty? || names.first.empty?
 
-        constant = Object
-        names.each do |name|
-          constant = constant.const_get(name, false) || constant.const_missing(name)
+      if Module.method(:const_get).arity == 1
+        def constantize
+          names = self.split('::')
+          names.shift if names.empty? || names.first.empty?
+
+          constant = Object
+          names.each do |name|
+            constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+          end
+          constant
+        end
+      else
+        def constantize
+          names = self.split('::')
+          names.shift if names.empty? || names.first.empty?
+
+          constant = Object
+          names.each do |name|
+            constant = constant.const_get(name, false) || constant.const_missing(name)
+          end
+          constant
         end
-        constant
       end
+
     end
   end
 end

data/lib/forgery/forgery/address.rb

@@ -9,7 +9,7 @@ class Forgery::Address < Forgery
   #   Forgery(:address).street_name
   #   # => "Fordem"
   def self.street_name
-    dictionaries[:streets].random
+    dictionaries[:streets].random.unextend
   end
 
   # Gets one of the formats from 'street_number_formats' and converts it to
@@ -32,7 +32,7 @@ class Forgery::Address < Forgery
   #   Forgery(:address).street_suffix
   #   # => "Parkway"
   def self.street_suffix
-    dictionaries[:street_suffixes].random
+    dictionaries[:street_suffixes].random.unextend
   end
 
   # Gets a full street address, including street number, street name, and
@@ -55,7 +55,7 @@ class Forgery::Address < Forgery
   #   Forgery(:address).city
   #   # => "Sacramento"
   def self.city
-    dictionaries[:cities].random
+    dictionaries[:cities].random.unextend
   end
 
   # Gets a random state out of the 'states' dictionary.
@@ -66,7 +66,7 @@ class Forgery::Address < Forgery
   #   Forgery(:address).state
   #   # => "Minnesota"
   def self.state
-    dictionaries[:states].random
+    dictionaries[:states].random.unextend
   end
 
   # Gets a random state abbreviation out of the 'state_abbrev' dictionary.
@@ -77,7 +77,7 @@ class Forgery::Address < Forgery
   #   Forgery(:address).state_abbrev
   #   # => "TX"
   def self.state_abbrev
-    dictionaries[:state_abbrevs].random
+    dictionaries[:state_abbrevs].random.unextend
   end
 
   # Gets a random Canadian province or territory out of the 'provinces' dictionary.
@@ -88,7 +88,7 @@ class Forgery::Address < Forgery
   #   Forgery(:address).province
   #   # => "Northwest Territories"
   def self.province
-    dictionaries[:provinces].random
+    dictionaries[:provinces].random.unextend
   end
 
   # Gets a random Canadian province or territory abbreviation out of the 'province_abbrev' dictionary.
@@ -99,7 +99,7 @@ class Forgery::Address < Forgery
   #   Forgery(:address).province_abbrev
   #   # => "NT"
   def self.province_abbrev
-    dictionaries[:province_abbrevs].random
+    dictionaries[:province_abbrevs].random.unextend
   end
 
   # Gets one of the formats from 'zip_formats' and converts it to numbers.
@@ -132,7 +132,7 @@ class Forgery::Address < Forgery
   #   Forgery(:address).country
   #   # => "Romania"
   def self.country
-    dictionaries[:countries].random
+    dictionaries[:countries].random.unextend
   end
 
 
@@ -144,7 +144,7 @@ class Forgery::Address < Forgery
   #   Forgery(:address).continent
   #   # => "Europe"
   def self.continent
-    dictionaries[:continents].random
+    dictionaries[:continents].random.unextend
   end
 
 end

data/lib/forgery/forgery/basic.rb

@@ -2,12 +2,12 @@ require 'digest/sha1'
 
 class Forgery::Basic < Forgery
 
-  HEX_DIGITS = %w{0 1 2 3 4 5 6 7 8 9 a b c d e f}
-  UPPER_ALPHA = ('A'..'Z').to_a
-  LOWER_ALPHA = ('a'..'z').to_a
-  NUMERIC = ('0'..'9').to_a
-  SPECIAL_CHARACTERS = %w{! ' @ # $ % ^ & * ( ) _ + - = [ ] { } ; : " , . / ?}
-  BOOLEAN = [true, false]
+  HEX_DIGITS = Forgery::Extend(%w{0 1 2 3 4 5 6 7 8 9 a b c d e f})
+  UPPER_ALPHA = Forgery::Extend(('A'..'Z').to_a)
+  LOWER_ALPHA = Forgery::Extend(('a'..'z').to_a)
+  NUMERIC = Forgery::Extend(('0'..'9').to_a)
+  SPECIAL_CHARACTERS = Forgery::Extend(%w{! ' @ # $ % ^ & * ( ) _ + - = [ ] { } ; : " , . / ?})
+  BOOLEAN = Forgery::Extend([true, false])
 
   # Gets a random string for use as a password
   #
@@ -66,11 +66,11 @@ class Forgery::Basic < Forgery
   end
 
   def self.color
-    dictionaries[:colors].random
+    dictionaries[:colors].random.unextend
   end
 
   def self.hex_color
-    hex_digits = (1..6).collect { HEX_DIGITS.random}
+    hex_digits = (1..6).collect { HEX_DIGITS.random.unextend}
     "##{hex_digits.join}"
   end
 
@@ -82,7 +82,7 @@ class Forgery::Basic < Forgery
     options = {:at_least => 1,
                :at_most => 10}.merge(options)
 
-    (options[:at_least]..options[:at_most]).random
+    Forgery::Extend((options[:at_least]..options[:at_most])).random
   end
 
   def self.text(options={})
@@ -99,14 +99,14 @@ class Forgery::Basic < Forgery
     allowed_characters += UPPER_ALPHA if options[:allow_upper]
     allowed_characters += NUMERIC if options[:allow_numeric]
     allowed_characters += SPECIAL_CHARACTERS if options[:allow_special]
-    
-    length = options[:exactly] || (options[:at_least]..options[:at_most]).random
 
-    allowed_characters.random_subset(length).join
+    length = options[:exactly] || Forgery::Extend((options[:at_least]..options[:at_most])).random
+
+    Forgery::Extend(allowed_characters).random_subset(length).join
   end
 
   def self.frequency
-    dictionaries[:frequencies].random
+    dictionaries[:frequencies].random.unextend
   end
 
 end

data/lib/forgery/forgery/currency.rb

@@ -5,7 +5,7 @@ class Forgery::Currency < Forgery
   #   Forgery(:currency).description
   #   # => "Australian Dollars"
   def self.description
-    dictionaries[:currency_descriptions].random
+    dictionaries[:currency_descriptions].random.unextend
   end
   
   # Generates a random currency code for a country
@@ -13,7 +13,7 @@ class Forgery::Currency < Forgery
   #   Forgery(:currency).code
   #   # => "AUD"
   def self.code
-    dictionaries[:currency_codes].random
+    dictionaries[:currency_codes].random.unextend
   end
 
 end

data/lib/forgery/forgery/date.rb

@@ -1,38 +1,38 @@
 require 'date'
 
 class Forgery::Date < Forgery
-  DAYS = %w{Sunday Monday Tuesday Wednesday Thursday Friday Saturday}
-  DAYS_ABBR = %w{Sun Mon Tue Wed Thu Fri Sat}
-  MONTHS = %w{January February March April May June July August September October November December}
-  MONTHS_ABBR = %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)
+  DAYS = Forgery::Extend(%w{Sunday Monday Tuesday Wednesday Thursday Friday Saturday})
+  DAYS_ABBR = Forgery::Extend(%w{Sun Mon Tue Wed Thu Fri Sat})
+  MONTHS = Forgery::Extend(%w{January February March April May June July August September October November December})
+  MONTHS_ABBR = Forgery::Extend(%w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec))
 
   def self.day_of_week(options={})
-    options.reverse_merge!(:abbr => false)
+    options = {:abbr => false}.merge(options)
 
     if (options[:abbr])
-      DAYS_ABBR.random
+      DAYS_ABBR.random.unextend
     else
-      DAYS.random
+      DAYS.random.unextend
     end
   end
 
   def self.month(options={})
-    options.reverse_merge!(:abbr => false, :numerical => false)
+    options = {:abbr => false, :numerical => false}.merge(options)
 
     if (options[:numerical])
       1 + rand(12)
     else
       if (options[:abbr])
-        MONTHS_ABBR.random
+        MONTHS_ABBR.random.unextend
       else
-        MONTHS.random
+        MONTHS.random.unextend
       end
     end
 
   end
 
   def self.year(options={})
-    options.reverse_merge!(:future => false, :past => false, :min_delta => 0, :max_delta => 20)
+    options = {:future => false, :past => false, :min_delta => 0, :max_delta => 20}.merge(options)
 
     #Apply our delta to this year
     DateTime.now.year + delta(options)
@@ -43,7 +43,7 @@ class Forgery::Date < Forgery
   end
 
   def self.date(options={})
-    options.reverse_merge!(:future => false, :past => false, :min_delta => 0, :max_delta => 7300)
+    options = {:future => false, :past => false, :min_delta => 0, :max_delta => 7300}.merge(options)
 
     #Apply our delta to today
     ::Date.today + delta(options)

data/lib/forgery/forgery/internet.rb

@@ -5,7 +5,7 @@ class Forgery::Internet < Forgery
   end
 
   def self.top_level_domain
-    dictionaries[:top_level_domains].random
+    dictionaries[:top_level_domains].random.unextend
   end
 
   def self.domain_name
@@ -21,7 +21,7 @@ class Forgery::Internet < Forgery
   end
 
   def self.cctld
-    dictionaries[:country_code_top_level_domains].random
+    dictionaries[:country_code_top_level_domains].random.unextend
   end
 
   def self.ip_v4

data/lib/forgery/forgery/lorem_ipsum.rb

@@ -58,12 +58,13 @@ class Forgery::LoremIpsum < Forgery
   end
 
   def self.paragraphs(quantity=2, options={})
-    options.reverse_merge!(:separator => "\n\n",
+    default_options = {:separator => "\n\n",
                            :wrap => {
                              :start => "",
                              :end => "" },
                            :html => false,
-                           :sentences => 3)
+                           :sentences => 3}
+    options = default_options.merge(options)
     options.merge!(:random_limit => (dictionaries[:lorem_ipsum].length/options[:sentences])-quantity) if quantity.is_a?(Fixnum)
 
     if options[:html]

data/lib/forgery/forgery/name.rb

@@ -1,11 +1,11 @@
 class Forgery::Name < Forgery
 
   def self.last_name
-    dictionaries[:last_names].random
+    dictionaries[:last_names].random.unextend
   end
 
   def self.first_name
-    [dictionaries[:male_first_names], dictionaries[:female_first_names]].random.random
+    [dictionaries[:male_first_names], dictionaries[:female_first_names]].random.random.unextend
   end
 
   def self.full_name
@@ -13,38 +13,38 @@ class Forgery::Name < Forgery
   end
 
   def self.male_first_name
-    dictionaries[:male_first_names].random
+    dictionaries[:male_first_names].random.unextend
   end
 
   def self.female_first_name
-    dictionaries[:female_first_names].random
+    dictionaries[:female_first_names].random.unextend
   end
 
   def self.company_name
-    dictionaries[:company_names].random
+    dictionaries[:company_names].random.unextend
   end
 
   def self.job_title
-    dictionaries[:job_titles].random.sub('#{N}', self.job_title_suffix)
+    dictionaries[:job_titles].random.sub('#{N}', self.job_title_suffix).unextend
   end
 
   def self.job_title_suffix
-    dictionaries[:job_title_suffixes].random
+    dictionaries[:job_title_suffixes].random.unextend
   end
 
   def self.title
-    dictionaries[:name_titles].random
+    dictionaries[:name_titles].random.unextend
   end
 
   def self.suffix
-    dictionaries[:name_suffixes].random
+    dictionaries[:name_suffixes].random.unextend
   end
 
   def self.location
-    dictionaries[:locations].random
+    dictionaries[:locations].random.unextend
   end
 
   def self.industry
-    dictionaries[:industries].random
+    dictionaries[:industries].random.unextend
   end
 end

data/lib/forgery/forgery/personal.rb

@@ -1,7 +1,7 @@
 class Forgery::Personal < Forgery
 
   def self.gender
-    dictionaries[:genders].random
+    dictionaries[:genders].random.unextend
   end
 
   def self.abbreviated_gender
@@ -9,15 +9,15 @@ class Forgery::Personal < Forgery
   end
 
   def self.shirt_size
-    dictionaries[:shirt_sizes].random
+    dictionaries[:shirt_sizes].random.unextend
   end
 
   def self.race
-    dictionaries[:races].random
+    dictionaries[:races].random.unextend
   end
 
   def self.language
-    dictionaries[:languages].random
+    dictionaries[:languages].random.unextend
   end
 
 end

data/lib/forgery/forgery/time.rb

@@ -6,7 +6,7 @@ class Forgery::Time < Forgery
   #   Forgery(:timezone).timezone
   #   # => "Sydney"
   def self.zone
-    dictionaries[:zones].random
+    dictionaries[:zones].random.unextend
   end
 
 end

data/lib/forgery/forgery_api.rb

@@ -1,6 +1,6 @@
 # Alternate Forgery api, see spec/forgery_spec.rb for examples.
 def Forgery(forgery, method=nil, *args)
-  klass = "Forgery::#{forgery.to_s.camelize}".constantize
+  klass = Forgery::Extend("Forgery::#{Forgery::Extend(forgery.to_s).camelize}").constantize
   if method
     klass.send(method, *args)
   else

data/lib/forgery/formats.rb

@@ -8,7 +8,7 @@ class Forgery
 
     def [](key)
       symbolized_key = key.to_sym
-      @formats[symbolized_key] ||= FileReader.read_format(symbolized_key)
+      @formats[symbolized_key] ||= Forgery::Extend(FileReader.read_format(symbolized_key))
     end
 
     def loaded?(key)

data/lib/forgery/version.rb

@@ -1,3 +1,3 @@
 class Forgery
-  VERSION = "0.3.12"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: forgery
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 12
-  version: 0.3.12
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Nathan Sutton
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 -07:00
-default_executable: 
+date: 2011-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -93,8 +92,8 @@ files:
 - lib/forgery/dictionaries/top_level_domains
 - lib/forgery/dictionaries/zones
 - lib/forgery/dictionaries.rb
+- lib/forgery/extend.rb
 - lib/forgery/extensions/array.rb
-- lib/forgery/extensions/hash.rb
 - lib/forgery/extensions/range.rb
 - lib/forgery/extensions/string.rb
 - lib/forgery/file_reader.rb
@@ -123,7 +122,6 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
-has_rdoc: true
 homepage: http://github.com/sevenwire/forgery
 licenses: []
 
@@ -153,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: forgery
-rubygems_version: 1.5.0
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Easy and customizable generation of forged data.

data/lib/forgery/extensions/hash.rb

@@ -1,12 +0,0 @@
-class Hash
-  # Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
-  def reverse_merge(other_hash)
-    other_hash.merge(self)
-  end
-
-  # Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
-  # Modifies the receiver in place.
-  def reverse_merge!(other_hash)
-    replace(reverse_merge(other_hash))
-  end
-end