addresslogic 1.1.2 → 1.1.3

data/.gitignore

@@ -0,0 +1,9 @@
+.DS_Store
+.swp
+*.log
+*.sqlite3
+pkg/*
+coverage/*
+doc/*
+benchmarks/*
+

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 1.1.3
+
+* Include into Object so that we can use this in any class we want.
+
 == 1.1.2
 
 * Update defaults to use changes in 1.1.1

data/README.rdoc

@@ -28,10 +28,14 @@ Granted the above is probably easier without using AddressLogic, but it will pur
 
 == Install and use
 
-As a gem:
+Install from rubyforge
 
   $ sudo gem install addresslogic
 
+Install from github:
+
+  $ sudo gem install binarylogic-addresslogic
+
 Or as a plugin
 
   $ sudo script/plugin install git://github.com/binarylogic/addresslogic.git
@@ -50,7 +54,7 @@ You can specify the fields too:
 
 == Helpful links
 
-*	<b>Documentation:</b> http://addresslogic.rubyforge.org
+*	<b>Documentation:</b> http://rdoc.info/projects/binarylogic/addresslogic
 
 
 Copyright (c) 2009 Ben Johnson of [Binary Logic](http://www.binarylogic.com), released under the MIT license

data/Rakefile

@@ -1,20 +1,41 @@
-ENV['RDOCOPT'] = "-S -f html -T hanna"
+require 'rubygems'
+require 'rake'
 
-require "rubygems"
-require "hoe"
-require File.dirname(__FILE__) << "/lib/addresslogic/version"
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "addresslogic"
+    gem.summary = "Creates a meaningful array of address parts for easy displaying."
+    gem.email = "bjohnson@binarylogic.com"
+    gem.homepage = "http://github.com/binarylogic/addresslogic"
+    gem.authors = ["Ben Johnson of Binary Logic"]
+    gem.rubyforge_project = "addresslogic"
+  end
+  Jeweler::RubyforgeTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
 
-Hoe.new("Addresslogic", Addresslogic::Version::STRING) do |p|
-  p.name = "addresslogic"
-  p.rubyforge_name = "addresslogic"
-  p.author = "Ben Johnson of Binary Logic"
-  p.email  = 'bjohnson@binarylogic.com'
-  p.summary = "Easily display addresses."
-  p.description = "Easily display addresses."
-  p.url = "http://github.com/binarylogic/addresslogic"
-  p.history_file = "CHANGELOG.rdoc"
-  p.readme_file = "README.rdoc"
-  p.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc"]
-  p.remote_rdoc_dir = ''
-  p.test_globs = ["test/*/test_*.rb", "test/*_test.rb", "test/*/*_test.rb"]
-end
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 1
+:minor: 1
+:patch: 3

data/addresslogic.gemspec

@@ -0,0 +1,52 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{addresslogic}
+  s.version = "1.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ben Johnson of Binary Logic"]
+  s.date = %q{2009-08-15}
+  s.email = %q{bjohnson@binarylogic.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG.rdoc",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "addresslogic.gemspec",
+     "init.rb",
+     "lib/addresslogic.rb",
+     "rails/init.rb",
+     "test/addresslogic_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/binarylogic/addresslogic}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{addresslogic}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Creates a meaningful array of address parts for easy displaying.}
+  s.test_files = [
+    "test/addresslogic_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/lib/addresslogic.rb

@@ -1,5 +1,3 @@
-require 'activerecord'
-
 # = Address Logic
 #
 # This is a simple module that you can include into any classm as long as it has a street1, street2, city, state, zip, and country (optional)
@@ -14,7 +12,6 @@ require 'activerecord'
 #
 # This adds a sigle method: address_parts. More on this method below...
 module Addresslogic
-  
   def self.included(base)
     base.extend ClassMethods
   end
@@ -42,7 +39,7 @@ module Addresslogic
     # * <tt>only:</tt> fields you want included in the result
     # * <tt>except:</tt> any fields you want excluded from the result
     def address_parts(*args)
-      options = args.extract_options!
+      options = args.last.is_a?(Hash) ? args.pop : {}
       options[:only] = [options[:only]] if options[:only] && !options[:only].is_a?(Array)
       options[:except] = [options[:except]] if options[:except] && !options[:except].is_a?(Array)
       fields = args[0] || address_parts_fields
@@ -54,7 +51,7 @@ module Addresslogic
           has_sub_array = field.find { |item| item.is_a?(Array) }
           separator = has_sub_array ? ", " : " "
           sub_parts = address_parts(field, level + 1, options).join(separator)
-          next if sub_parts.blank?
+          next if sub_parts.empty?
           parts << sub_parts
         else
           next if !respond_to?(field)
@@ -74,4 +71,4 @@ module Addresslogic
   end
 end
 
-ActiveRecord::Base.send(:include, Addresslogic)
+Object.send(:include, Addresslogic)

data/rails/init.rb

@@ -1,2 +1 @@
-require "addresslogic/version"
 require "addresslogic"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: addresslogic
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,40 +9,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-14 00:00:00 -04:00
+date: 2009-08-15 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.12.2
-    version: 
-description: Easily display addresses.
+dependencies: []
+
+description: 
 email: bjohnson@binarylogic.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- Manifest.txt
-- CHANGELOG.rdoc
+- LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - CHANGELOG.rdoc
-- MIT-LICENSE
-- Manifest.txt
+- LICENSE
 - README.rdoc
 - Rakefile
+- VERSION.yml
+- addresslogic.gemspec
 - init.rb
 - lib/addresslogic.rb
-- lib/addresslogic/version.rb
 - rails/init.rb
-- test/test_addresslogic.rb
+- test/addresslogic_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/binarylogic/addresslogic
@@ -50,8 +41,7 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -69,9 +59,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: addresslogic
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Easily display addresses.
-test_files: []
-
+summary: Creates a meaningful array of address parts for easy displaying.
+test_files: 
+- test/addresslogic_test.rb
+- test/test_helper.rb

data/Manifest.txt

@@ -1,11 +0,0 @@
-CHANGELOG.rdoc
-MIT-LICENSE
-Manifest.txt
-README.rdoc
-Rakefile
-init.rb
-lib/addresslogic.rb
-lib/addresslogic/version.rb
-rails/init.rb
-test/test_addresslogic.rb
-test/test_helper.rb

data/lib/addresslogic/version.rb

@@ -1,56 +0,0 @@
-module Addresslogic
-  # = Version
-  #
-  # A class for describing the current version of a library. The version
-  # consists of three parts: the +major+ number, the +minor+ number, and the
-  # +tiny+ (or +patch+) number.
-  class Version
-    
-    include Comparable
-  
-    # A convenience method for instantiating a new Version instance with the
-    # given +major+, +minor+, and +tiny+ components.
-    def self.[](major, minor, tiny)
-      new(major, minor, tiny)
-    end
-
-    attr_reader :major, :minor, :tiny
-
-    # Create a new Version object with the given components.
-    def initialize(major, minor, tiny)
-      @major, @minor, @tiny = major, minor, tiny
-    end
-
-    # Compare this version to the given +version+ object.
-    def <=>(version)
-      to_i <=> version.to_i
-    end
-
-    # Converts this version object to a string, where each of the three
-    # version components are joined by the '.' character. E.g., 2.0.0.
-    def to_s
-      @to_s ||= [@major, @minor, @tiny].join(".")
-    end
-
-    # Converts this version to a canonical integer that may be compared
-    # against other version objects.
-    def to_i
-      @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
-    end
-    
-    def to_a
-      [@major, @minor, @tiny]
-    end
-
-    MAJOR = 1
-    MINOR = 1
-    TINY  = 2
-
-    # The current version as a Version instance
-    CURRENT = new(MAJOR, MINOR, TINY)
-    # The current version as a String
-    STRING = CURRENT.to_s
-    
-  end
-  
-end