binarylogic-addresslogic 1.2.0 → 1.2.1

data/CHANGELOG.rdoc

@@ -1,4 +1,9 @@
-== 1.1.4
+== 1.2.1
+
+* Use addresslogic_options class level accessor
+* Change :composition_namespace to :namespace
+
+== 1.2.0
 
 * Added :composition_namespace option.
 

data/VERSION.yml

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

data/addresslogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{addresslogic}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   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.date = %q{2009-08-16}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/addresslogic.rb

@@ -5,22 +5,24 @@ module Addresslogic
   end
   
   module ClassMethods
-    attr_accessor :address_parts_fields
+    attr_accessor :addresslogic_options
     
     # Mixes in useful methods for handling addresses.
     #
     # === Options
     #
     # * <tt>fields:</tt> array of fields (default: [:street1, :street2, [:city, [:state, :zip]], :country])
-    # * <tt>composition_namespace:</tt> prefixes fields names with this, great for use with composed_of in ActiveRecord.
+    # * <tt>namespace:</tt> prefixes fields names with this, great for use with composed_of in ActiveRecord.
     def apply_addresslogic(options = {})
-      n = options[:composition_namespace]
-      self.address_parts_fields = options[:fields] || [
+      n = options[:namespace]
+      options[:fields] ||= [
         "#{n}street1".to_sym,
         "#{n}street2".to_sym,
         ["#{n}city".to_sym, ["#{n}state".to_sym, "#{n}zip".to_sym]],
         "#{n}country".to_sym
       ]
+      self.addresslogic_options = options
+      
       include Addresslogic::InstanceMethods
     end
   end
@@ -42,7 +44,7 @@ module Addresslogic
       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] || self.class.address_parts_fields
+      fields = args[0] || self.class.addresslogic_options[:fields]
       level = args[1] || 0
       
       parts = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binarylogic-addresslogic
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-15 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: []