redline 0.2.0 → 0.3.0

data/.gitignore

@@ -1,5 +1,6 @@
 ## MAC OS
 .DS_Store
+Icon*
 
 ## TEXTMATE
 *.tmproj

data/README.rdoc

@@ -11,7 +11,7 @@ Redline also includes a lightweight manual subscription billing system, if you d
 
 === This software is delivered "as is" without warranty. As with any piece of code, please study it if you include it in your project, especially for such a critical component of your application.
 
-While I believe the tests cover the code well, there may be certain cases that I have not expirienced or predicted. This is a manual billing script, so dreadful things may occur; please help out and add to the tests if you see, or god forbid expirience, any problems.
+While I believe the tests cover the code well, there may be certain cases that I have not experienced or predicted. This is a manual billing script, so dreadful things may occur; please help out and add to the tests if you see, or god forbid experience, any problems.
 
 It is my intention to convert to gateway handled subscriptions, once Braintree adds this functionality to their gem.
 
@@ -56,7 +56,8 @@ If you don't like the default settings or your user needs a field mapping, you c
 
   class User < ActiveRecord::Base
     has_a_braintree_customer do
-      attribute_map :firstname => :first_name, :lastname => :last_name
+      attribute_map :first_name => :firstname, :last_name => :lastname
+      custom_fields :ip_address, :tax_id
     end
 
     has_a_subscription do
@@ -71,10 +72,8 @@ If you don't like the default settings or your user needs a field mapping, you c
  
 * Fork the project.
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/redline/customer/base.rb

@@ -11,7 +11,8 @@ module RedLine
 				before_create  :create_customer
 				before_update  :update_customer
 				before_destroy :delete_customer
-				cattr_accessor :braintree_customer
+				cattr_accessor :braintree_customer_attribute_map
+				cattr_accessor :braintree_customer_custom_fields
 			end
 		end
 	end

data/lib/redline/customer/instance.rb

@@ -3,10 +3,8 @@ module RedLine
 		module InstanceMethods
 			def braintree_customer_attributes
 				wanted_attributes = Braintree::Customer._create_signature.reject{|a| a.is_a? Hash}.reject{|a| a == :id}
-				attributes.symbolize_keys.inject({}) do |rewritten_hash, (original_key, value)|
-					rewritten_hash[self.class.braintree_customer.fetch(original_key, original_key)] = value
-					rewritten_hash
-				end.reject{|key, value| !wanted_attributes.include?(key)}
+				wanted_attributes.inject({}) {|hash, key| hash.merge(key => (self.send(self.class.braintree_customer_attribute_map[key] || key) rescue nil))}.
+					merge(:custom_fields => self.class.braintree_customer_custom_fields.inject({}) {|hash, key| hash.merge(key => (self.send(self.class.braintree_customer_attribute_map[key] || key) rescue nil))})
 			end
 			def customer
 				Braintree::Customer.find(customer_id) if customer_id

data/lib/redline/customer/settings.rb

@@ -2,10 +2,14 @@ module RedLine
 	module Customer
 		module Settings
 			def set_default_customer_options
-				attribute_map {} unless (send :braintree_customer)
+				attribute_map unless (send :braintree_customer_attribute_map)
+				custom_fields unless (send :braintree_customer_custom_fields)
 			end
 			def attribute_map(attributes = {})
-				self.braintree_customer = attributes
+				self.braintree_customer_attribute_map = attributes
+			end
+			def custom_fields(*attributes)
+				self.braintree_customer_custom_fields = attributes
 			end
 		end
 	end

data/redline.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redline}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Daniels"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-03-06}
   s.description = %q{Syncs your AR models with Braintree (Payment Gateway) and offers a lightweight reoccurring billing script}
   s.email = %q{james@marginleft.com}
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jamesdaniels/redline}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Syncs your AR models with Braintree (Payment Gateway) and offers a lightweight reoccurring billing script}
   s.test_files = [
     "spec/billing_spec.rb",

data/spec/customer_spec.rb

@@ -17,7 +17,8 @@ describe User do
 	end
 	
 	it "should have a empty braintree_customer" do
-		User.braintree_customer.should eql({})
+		User.braintree_customer_attribute_map.should eql({})
+		User.braintree_customer_custom_fields.should eql([])
 	end
 	
   it "should inherit the instance methods" do
@@ -25,7 +26,7 @@ describe User do
 		(User.instance_methods & expected_methods).sort.should eql(expected_methods.sort)
 	end
 	it "should have proper braintree attributes" do
-		valid_user.braintree_customer_attributes.should eql({:first_name=>"James", :last_name=>"Daniels", :email=>"james@marginleft.com"})
+		valid_user.braintree_customer_attributes.should eql({:first_name=>"James", :last_name=>"Daniels", :email=>"james@marginleft.com", :custom_fields=>{}})
 	end
 	it "should fire Braintree::Customer.create!" do
 		Braintree::Customer.should_receive('create!').with(valid_user.braintree_customer_attributes).and_return(mock_customer)
@@ -61,7 +62,8 @@ end
 describe ComplexUser do
 	
 	it "should have a empty braintree_customer" do
-		ComplexUser.braintree_customer.should eql({:firstname=>:first_name, :lastname=>:last_name})
+		ComplexUser.braintree_customer_attribute_map.should eql({:first_name=>:firstname, :last_name=>:lastname})
+		ComplexUser.braintree_customer_custom_fields.should eql([:unused_attribute])
 	end
 	it "should have proper braintree attributes" do
 		Braintree::Customer.stub!('_create_signature').and_return([:first_name, :last_name, :email])
@@ -70,7 +72,25 @@ describe ComplexUser do
 			:lastname => 'Daniels', 
 			:email => 'james@marginleft.com', 
 			:unused_attribute => 'unused'
-		).braintree_customer_attributes.should eql({:first_name=>"James", :last_name=>"Daniels", :email=>"james@marginleft.com"})
+		).braintree_customer_attributes.should eql({:first_name=>"James", :last_name=>"Daniels", :email=>"james@marginleft.com", :custom_fields=>{:unused_attribute=>"unused"}})
 	end
 
+end
+
+describe UserWithoutTrial do
+	
+	it "should have a empty braintree_customer" do
+		UserWithoutTrial.braintree_customer_attribute_map.should eql({:first_name=>:firstname, :something=>:firstname, :last_name=>:lastname})
+		UserWithoutTrial.braintree_customer_custom_fields.should eql([:something])
+	end
+	it "should have proper braintree attributes" do
+		Braintree::Customer.stub!('_create_signature').and_return([:first_name, :last_name, :email])
+		UserWithoutTrial.new(
+			:firstname => 'James', 
+			:lastname => 'Daniels', 
+			:email => 'james@marginleft.com', 
+			:unused_attribute => 'unused'
+		).braintree_customer_attributes.should eql({:first_name=>"James", :custom_fields=>{:something=>"James"}, :last_name=>"Daniels", :email=>"james@marginleft.com"})
+	end
+	
 end

data/spec/db/models.rb

@@ -13,7 +13,8 @@ end
 class ComplexUser < ActiveRecord::Base
 	
 	has_a_braintree_customer do
-		attribute_map :firstname => :first_name, :lastname => :last_name
+		attribute_map :first_name => :firstname, :last_name => :lastname
+		custom_fields :unused_attribute
 	end
 	
 	has_a_subscription do
@@ -30,7 +31,8 @@ end
 class UserWithoutTrial < ActiveRecord::Base
 	
 	has_a_braintree_customer do
-		attribute_map :firstname => :first_name, :lastname => :last_name
+		attribute_map :first_name => :firstname, :last_name => :lastname, :something => :firstname
+		custom_fields :something
 	end
 	
 	has_a_subscription do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: redline
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Daniels
@@ -9,49 +14,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -05:00
+date: 2010-03-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: braintree
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Syncs your AR models with Braintree (Payment Gateway) and offers a lightweight reoccurring billing script
 email: james@marginleft.com
 executables: []
@@ -99,18 +114,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Syncs your AR models with Braintree (Payment Gateway) and offers a lightweight reoccurring billing script