connie 0.0.1 → 0.1.0

data/Gemfile

@@ -1,4 +1,8 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
-
-gem 'rspec', '>= 2.0.0.beta.20', :group => :test
+group :development do
+  gem "rspec", "~> 2.3.0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.2"
+  gem "rcov", ">= 0"
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 ilpoldo
+Copyright (c) 2009 Leandro Pedroni
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -35,13 +35,37 @@ For example inspecting the names dictionary:
 You receive a quick overview of what this dictionary can generate. To have the dictionary generate something simply:
     Connie[:names].first
 
+===Shorthands
+
+Connie provides a couple of shorthands methods to randomise your data:
+   Connie([:one, :two, :three]) #=> returns randomly selected element of the array
+   Connie.letter                #=> returns a random lowercase letter
+   Connie.letter :uppercase     #=> returns a random uppercse letter
+   Connie?                      #=> returns true or false. Randomly
+   
+===Interpolations
+
+Interpolations happen in a dictionary but allow to reach others through scoping
+    >> Connie[:names].interpolate "Mr. :male :last: :geo.city, :geo.state_short"
+    #=> "Mr. Mark Taylor: Pleasant Hill, NY"
+
+A shorthand method  _i_ is provided for convenience and interpolation is also available through the global method:
+   Connie(':names.male :names.last')
+
 == Extending
 You can extend Dictionaries in two ways:
 
-* Providing word list files either by putting the _word_name_ file into the _dictionary_name_ folder in a folder registered with connie
-* Anywhere in your code by adding instance methods to the Connie::_DictionaryName_ module
+=== Word Lists
+This will ensure that calling the word type a line is randomly picked from word list file
+
+You can provide word list files inside folder registered with connie:
+* by putting the _word_name_ file into the _dictionary_name_ folder
+* by creating a _dictionary_name_._word_name_
 
-The first way will ensure that calling the word type a line is randomly picked from the list; the second is useful to aggregate different words from the lists and present the in different ways:
+=== Methods in the _DictionaryName_ module
+Anywhere in your code by adding instance methods to the Connie::_DictionaryName_ module
+
+It's handy to aggregate different words from the lists and present the in different ways:
 
     # e.g. Extending the names dictionary to return a full name
     module Connie
@@ -53,6 +77,14 @@ The first way will ensure that calling the word type a line is randomly picked f
       end
     end
 
+
+
+To add a folder to Connie's sources just do something like this in your code:
+    Connie.dictionaries_path << 'my/cool/dictionaries'
+
+== What next
+It'd be nice to have an structured dictionary or a weighted one, where some options can occur more often than others (Eg not as many 'Count' as there are 'Dr.' or 'Mr.')
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -1,37 +1,42 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "connie"
-    gem.summary = %Q{Little compact library to synthesise data that does not load big files in memory}
-    gem.description = %Q{Heavily based on Forgery it uses the same word sources. It's built to be a bit more customisable and allows you to define new strategies and styles both using ruby modules or big text lists.}
-    gem.email = "ilpoldo@gmail.com"
-    gem.homepage = "http://github.com/ilpoldo@gmail.com/connie"
-    gem.authors = ["Leandro Pedroni"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "connie"
+  gem.summary = %Q{Little compact library to synthesise data that does not load big files in memory}
+  gem.description = %Q{Heavily based on Forgery it uses the same word sources. It's built to be a bit more customisable and allows you to define new strategies and styles both using ruby modules or big text lists.}
+  gem.email = "ilpoldo@gmail.com"
+  gem.license = "MIT"
+  gem.email = "ilpoldo@gmail.com"
+  gem.authors = ["ilpoldo"]
+  
+  gem.homepage = "http://github.com/ilpoldo/connie"
+  gem.authors = ["Leandro Pedroni"]
+
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'
@@ -39,7 +44,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "connie #{version}"
+  rdoc.title = "examplegem #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/connie.gemspec

@@ -0,0 +1,94 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{connie}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Leandro Pedroni"]
+  s.date = %q{2011-04-11}
+  s.description = %q{Heavily based on Forgery it uses the same word sources. It's built to be a bit more customisable and allows you to define new strategies and styles both using ruby modules or big text lists.}
+  s.email = %q{ilpoldo@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "connie.gemspec",
+    "lib/connie.rb",
+    "lib/connie/connie.rb",
+    "lib/connie/dictionary.rb",
+    "lib/connie/generators.rb",
+    "lib/connie/generators/dictionary.rb",
+    "lib/connie/parser.rb",
+    "lib/dictionaries/creative.rb",
+    "lib/dictionaries/creative/color",
+    "lib/dictionaries/creative/lorem_ipsum_lines",
+    "lib/dictionaries/geo.rb",
+    "lib/dictionaries/geo/city",
+    "lib/dictionaries/geo/country",
+    "lib/dictionaries/geo/language",
+    "lib/dictionaries/geo/province",
+    "lib/dictionaries/geo/province_short",
+    "lib/dictionaries/geo/race",
+    "lib/dictionaries/geo/state",
+    "lib/dictionaries/geo/state_short",
+    "lib/dictionaries/geo/street",
+    "lib/dictionaries/geo/street_suffix",
+    "lib/dictionaries/language/frequency",
+    "lib/dictionaries/names.rb",
+    "lib/dictionaries/names/company",
+    "lib/dictionaries/names/female",
+    "lib/dictionaries/names/female_title",
+    "lib/dictionaries/names/last",
+    "lib/dictionaries/names/male",
+    "lib/dictionaries/names/male_title",
+    "lib/dictionaries/names/suffix",
+    "lib/dictionaries/net/top_level_domain",
+    "lib/dictionaries/numbers.rb",
+    "lib/dictionaries/shopping.shirt_size",
+    "spec/connie_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/test_dictionaries/names/male",
+    "spec/test_dictionaries/numbers/ordinal"
+  ]
+  s.homepage = %q{http://github.com/ilpoldo/connie}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.7.2}
+  s.summary = %q{Little compact library to synthesise data that does not load big files in memory}
+  s.test_files = [
+    "spec/connie_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/connie/connie.rb

@@ -17,10 +17,15 @@ module Connie
     @dictionaries[dictionary.name.to_sym] = dictionary
   end
   
-  # Picks a random line from a text file
-  def self.pick_a_line_from(file_path)
+  # Picks a random line from a text file or a precise line if a number is provided
+  def self.pick_a_line_from(file_path, line_no = false)
     File.open file_path, 'r' do |file|
-      file.inject { |choice, line| rand < 1/file.lineno.to_f ? line.gsub(%r{\s$},'') : choice }
+      unless line_no
+        file.inject { |choice, line| rand < 1/file.lineno.to_f ? line.strip : choice }
+      else
+        line = line_no % (file.lineno - 1) # cycles around the file
+        file.readlines[line_no-1].strip
+      end
     end
   end
   

data/lib/connie/dictionary.rb

@@ -46,7 +46,7 @@ module Connie
       @word_lists.keys.each do |list|
         instance_eval <<-LIST
         def #{list} options={}
-          interpolate Connie.pick_a_line_from @word_lists[:#{list}]
+          interpolate Connie.pick_a_line_from @word_lists[:#{list}], options[:line]
         end
         LIST
       end

data/lib/connie/parser.rb

@@ -5,7 +5,7 @@ module Connie
     attr_accessor :dictionary
     
     @syntax = {# :method or :dictionary.method
-               %r{((?:[\\]+)?\:\w\w+(?:.\w+)?)} => lambda do |dictionary_and_method|
+               %r{((?:[\\]+)?\:[a-z]\w+(?:.\w+)?)} => lambda do |dictionary_and_method|
                 arguments = dictionary_and_method[1..-1].split('.').map &:to_sym
                 case arguments.size
                 when 2 then Connie[arguments[0]].send arguments[1]
@@ -37,9 +37,10 @@ module Connie
     # calls trasform on the tokens marked for interpolation and deals with escaping
     def apply_syntax tokens
       tokens.map do |t|
-        if t[0] && t[0].chr == ':'
+        if t.match '\:[a-z]'
           transform t
         elsif t[0] && t[0].chr == '\\' # some level of escaping is present
+          t.match %r{([\\]+)\:}
           raise 'I don\' speak escapeese yet!'
         else
           t

data/lib/connie.rb

@@ -53,7 +53,13 @@ def Connie(argument, options={})
     end
   when Array
     argument[rand(argument.size)]
+  when Range
+    rand(argument.max-argument.min+1) + argument.min
   else
     raise ArgumentError, 'Connie\'s shorthand expects a string to parse or a symbol or an array'
   end
+end
+
+def Connie?
+  [true,false][rand 2]
 end

data/lib/dictionaries/{creative.lorem_ipsum → creative/lorem_ipsum_lines}

@@ -1,5 +1,4 @@
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-Proin risus.
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Proin risus.
 Praesent lectus.
 Vestibulum quam sapien, varius ut, blandit non, interdum in, ante.
 Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Duis faucibus accumsan odio.

data/lib/dictionaries/creative.rb

@@ -0,0 +1,16 @@
+module Connie
+  module Creative
+    
+    def lorem_ipsum length = 6100
+      result = ""
+      line = 1
+      while result.length < length
+        result << lorem_ipsum_lines(:line => line)
+        line += 1
+      end
+      
+      result
+    end
+    
+  end
+end

data/lib/dictionaries/geo.rb

@@ -0,0 +1,9 @@
+module Connie
+  module Geo
+
+    def full_address
+      "#{Connie(1..500)}, #{street} #{street_suffix} \n #{city}, #{country}"
+    end
+
+  end
+end

data/lib/dictionaries/names/female_title

@@ -0,0 +1,10 @@
+Ms.
+Mrs.
+Dr.
+Honorable
+Mrs.
+Ms.
+Lady
+Countess
+Mrs.
+Miss

data/lib/dictionaries/names/male_title

@@ -0,0 +1,8 @@
+Mr.
+Dr.
+Rev.
+Honorable
+Sir
+Mr.
+Count
+Mr.

data/lib/dictionaries/names.rb

@@ -3,14 +3,30 @@ module Connie
     
     # Returns either a male or a female first name
     def first
-      Connie [true, false] ? male : female
+      Connie? ? male : female
     end
     
     def gender
-      Connie [true ,false] ? 'male' : 'female'
+      Connie? ? 'male' : 'female'
     end
     
-    # TODO: create a gender sensitive title
+    def title
+      Connie? ? male_title : female_title
+    end
+    
+    # Returns an array of same gender name and title
+    def first_with_title
+      Connie? ? [male, male_title] : [female, female_title]
+    end
+    
+    
+    def first_sometimes_with_title
+      if Connie?
+        Connie? ? [male, male_title] : [female, female_title]
+      else
+        Connie? ? [male] : [female]
+      end
+    end
     
   end
 end

data/lib/dictionaries/numbers.rb

@@ -0,0 +1,17 @@
+module Connie
+  module Numbers
+   
+   def telephone
+    Connie(':d{2} :d{7,9}')
+   end
+   
+   def uk_mobile_phone
+     Connie('07 :d{3} :d{6,8}')
+    end
+   
+   def international_telephone
+      Connie('+:d{2} :d{3,5} :d{7,9}')
+   end
+    
+  end
+end

data/spec/connie_spec.rb

@@ -54,7 +54,7 @@ describe Connie, 'api' do
     Connie[:names].misspelled_name.should match(%r{[MN][ab][rs][kl]})
   end
   
-  it "supports recursive calls to generators" do
+  it "doesn't mess up calls between dictionaries" do
     module Connie
       module Geo
         def where
@@ -64,12 +64,12 @@ describe Connie, 'api' do
       
       module Address
         def name_and_where
-          interpolate ":names.first :geo.where"
+          interpolate ":names.first :names.last :geo.where"
         end
       end
     end
     
-    Connie[:address].name_and_where.should match(%r{Mark [A-Za-z]+, [A-Z]{2,2}})
+    Connie[:address].name_and_where.should match(%r{Mark [A-Za-z]+ [A-Za-z ]+, [A-Z]{2,2}})
   end
   
   it "can store possible formats in a dictionary" do
@@ -93,6 +93,11 @@ describe Connie, 'dictionaries' do
     pending
   end
   
+  it "fetches lines in order from the dictionary" do
+    Connie[:numbers].ordinal(:line => 3).should eql('Third')
+    Connie[:numbers].ordinal(:line => 9).should eql('Third')
+  end
+  
   it "should warn in case of double dictionary" do
     pending
   end

data/spec/test_dictionaries/numbers/ordinal

@@ -0,0 +1,6 @@
+First
+Second
+Third
+Fourth
+Fifth
+Sixth

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: connie
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Leandro Pedroni
@@ -15,25 +15,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 +01:00
-default_executable: 
+date: 2011-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  version_requirements: *id001
   name: rspec
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  version_requirements: *id002
+  name: bundler
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
         segments: 
         - 1
+        - 5
         - 2
-        - 9
-        version: 1.2.9
+        version: 1.5.2
+  version_requirements: *id003
+  name: jeweler
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id004
+  name: rcov
+  prerelease: false
   type: :development
-  version_requirements: *id001
 description: Heavily based on Forgery it uses the same word sources. It's built to be a bit more customisable and allows you to define new strategies and styles both using ruby modules or big text lists.
 email: ilpoldo@gmail.com
 executables: []
@@ -44,20 +89,22 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
+- connie.gemspec
 - lib/connie.rb
 - lib/connie/connie.rb
 - lib/connie/dictionary.rb
 - lib/connie/generators.rb
 - lib/connie/generators/dictionary.rb
 - lib/connie/parser.rb
-- lib/dictionaries/creative.color
-- lib/dictionaries/creative.lorem_ipsum
+- lib/dictionaries/creative.rb
+- lib/dictionaries/creative/color
+- lib/dictionaries/creative/lorem_ipsum_lines
+- lib/dictionaries/geo.rb
 - lib/dictionaries/geo/city
 - lib/dictionaries/geo/country
 - lib/dictionaries/geo/language
@@ -72,22 +119,24 @@ files:
 - lib/dictionaries/names.rb
 - lib/dictionaries/names/company
 - lib/dictionaries/names/female
+- lib/dictionaries/names/female_title
 - lib/dictionaries/names/last
 - lib/dictionaries/names/male
+- lib/dictionaries/names/male_title
 - lib/dictionaries/names/suffix
-- lib/dictionaries/names/title
 - lib/dictionaries/net/top_level_domain
+- lib/dictionaries/numbers.rb
 - lib/dictionaries/shopping.shirt_size
 - spec/connie_spec.rb
 - spec/spec_helper.rb
 - spec/test_dictionaries/names/male
-has_rdoc: true
-homepage: http://github.com/ilpoldo@gmail.com/connie
-licenses: []
-
+- spec/test_dictionaries/numbers/ordinal
+homepage: http://github.com/ilpoldo/connie
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -111,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Little compact library to synthesise data that does not load big files in memory

data/.gitignore

@@ -1,23 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-.bundle
-Gemfile.lock

data/lib/dictionaries/names/title

@@ -1,6 +0,0 @@
-Mr
-Ms
-Mrs
-Dr
-Rev
-Honorable