cheddargetter_client_rails 0.2.1 → 0.2.2

data/Gemfile

@@ -1,10 +1,11 @@
 source "http://rubygems.org"
   gem "activesupport", ">= 2.3.5"
   gem "cheddargetter_client", ">= 0.0.2"
+  gem 'country_select', '>= 1.1.3'
 
 group :development do
+  gem 'debugger'
   gem "rspec"
   gem "bundler"
   gem "jeweler"
-  gem "rcov"
-end
+end

data/Gemfile.lock

@@ -1,18 +1,30 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.7)
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     cheddargetter_client (0.0.2)
       crack
       crack (>= 0.3.2)
       httparty
       httparty (>= 0.10.0)
+    columnize (0.3.6)
+    country_select (1.1.3)
     crack (0.3.2)
-    diff-lcs (1.1.2)
+    debugger (1.3.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.7)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.7)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    httparty (0.10.0)
+    httparty (0.10.2)
       multi_json (~> 1.0)
-      multi_xml
+      multi_xml (>= 0.5.2)
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -22,17 +34,16 @@ GEM
     multi_json (1.5.0)
     multi_xml (0.5.2)
     rake (10.0.3)
-    rcov (0.9.9)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
 
 PLATFORMS
   ruby
@@ -41,6 +52,7 @@ DEPENDENCIES
   activesupport (>= 2.3.5)
   bundler
   cheddargetter_client (>= 0.0.2)
+  country_select (>= 1.1.3)
+  debugger
   jeweler
-  rcov
   rspec

data/Rakefile

@@ -23,6 +23,8 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Brent Wooden"]
 
   gem.add_dependency "cheddargetter_client", ">= 0.0.2"
+  gem.add_dependency 'country_select', '>= 1.1.3'
+
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/cheddargetter_client_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cheddargetter_client_rails"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Wooden"]
-  s.date = "2013-01-25"
+  s.date = "2013-01-28"
   s.description = "Integrates CheddarGetter api with Active Record. Uses cheddargetter_client_ruby."
   s.email = "brent.wooden@gmail.com"
   s.extra_rdoc_files = [
@@ -36,13 +36,11 @@ Gem::Specification.new do |s|
     "lib/generators/cheddargetter/templates/cheddargetter.yml",
     "lib/generators/cheddargetter/templates/cheddargetter_client.rb",
     "lib/rails/naming.rb",
-    "lib/rails/record_identifier.rb",
     "spec/cheddargetter_client_rails/subscription_spec.rb",
     "spec/cheddargetter_client_rails_spec.rb",
     "spec/fixtures/users.yml",
     "spec/generator_spec.rb",
     "spec/naming_spec.rb",
-    "spec/record_identifier_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/BrentW/cheddargetter_client_rails"
@@ -57,28 +55,34 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_runtime_dependency(%q<cheddargetter_client>, [">= 0.0.2"])
+      s.add_runtime_dependency(%q<country_select>, [">= 1.1.3"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<cheddargetter_client>, [">= 0.0.2"])
+      s.add_runtime_dependency(%q<country_select>, [">= 1.1.3"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_dependency(%q<cheddargetter_client>, [">= 0.0.2"])
+      s.add_dependency(%q<country_select>, [">= 1.1.3"])
+      s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<cheddargetter_client>, [">= 0.0.2"])
+      s.add_dependency(%q<country_select>, [">= 1.1.3"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     s.add_dependency(%q<cheddargetter_client>, [">= 0.0.2"])
+    s.add_dependency(%q<country_select>, [">= 1.1.3"])
+    s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<cheddargetter_client>, [">= 0.0.2"])
+    s.add_dependency(%q<country_select>, [">= 1.1.3"])
   end
 end
 

data/lib/cheddargetter_client_rails.rb

@@ -1,13 +1,12 @@
 require 'active_support'
-require 'action_controller/record_identifier'
 require 'cheddargetter_client'
-require 'rails/record_identifier'
 require 'rails/naming'
 
 module CheddargetterClientRails
   autoload :Subscription, 'cheddargetter_client_rails/subscription'
   
   def self.included(base)
+    attr_accessor :has_subscription_options
     base.extend ClassMethods
     
     def subscription
@@ -102,6 +101,8 @@ module CheddargetterClientRails
   
   module ClassMethods
     def has_subscription(args = {})
+      self.class.send(:attr_accessor, :has_subscription_options)
+      self.has_subscription_options = args
       self.customer_code_column = args.delete(:customerCode) || :id
       raise ArgumentError.new("Record does not respond to #{customer_code_column.to_s}.") if !responds_to_customer_code_column?        
       
@@ -118,6 +119,7 @@ module CheddargetterClientRails
       self.shared_columns = shared
       
       attr_accessor :skip_cheddargetter
+      attr_accessible :subscription
       
       validate        :validate_subscription
       after_create    :create_subscription
@@ -126,7 +128,7 @@ module CheddargetterClientRails
     end
 
     def responds_to_customer_code_column?
-      self.instance_methods.include?(customer_code_column.to_s) || 
+      self.instance_methods.include?(customer_code_column.to_sym) || 
       self.column_names.include?(customer_code_column.to_s)      
     end
 

data/lib/cheddargetter_client_rails/subscription.rb

@@ -39,7 +39,9 @@ module CheddargetterClientRails
                   :ccState,
                   :customerCode,
                   :email,
-                  :zip
+                  :zip,
+                  :ccExpirationMonth,
+                  :ccExpirationYear
 
     validates_presence_of :firstName,
                           :lastName,
@@ -47,14 +49,21 @@ module CheddargetterClientRails
                           :planCode
                           #:customerCode, generally we call valid before unique identifier is called
 
-    validates_presence_of :ccNumber,
-                          :ccExpiration,
-                          :zip
-
     validate :unexpired
   
     validate :validates_presence_of_humanized
+
+    validates_presence_of :ccNumber,
+                      :ccExpiration,
+                      :zip, :if => :paid_plan?
   
+    def paid_plan?
+      if planCode
+        plans = CGClient.plans_get
+        !plans.plan(planCode)[:isFree]
+      end
+    end
+
     def unexpired
       if ccExpiration.present?
         month, year = ccExpiration.split("/").collect{|string| string.to_i }
@@ -106,7 +115,7 @@ module CheddargetterClientRails
     end
   
     def new_record?
-      !Subscription.customers_get({:customer_code =>customerCode})
+      !CheddargetterClientRails::Subscription.get(customerCode)
     end
   
     def save
@@ -204,5 +213,33 @@ module CheddargetterClientRails
         val if val.present?
       end.compact.present?
     end
+
+    def ccExpirationMonth=(month)
+      if !expiration_in_valid_format? && expiration_in_valid_year_format?
+        @ccExpiration = month + ccExpiration
+      elsif !expiration_in_valid_format?
+        @ccExpiration = (month + '/')
+      end
+    end
+
+    def ccExpirationYear=(year)
+      if !expiration_in_valid_format? && expiration_in_valid_month_format?
+        @ccExpiration = ccExpiration + year
+      elsif !expiration_in_valid_format?
+        @ccExpiration = ('/' + year)
+      end
+    end
+
+    def expiration_in_valid_format?
+      ccExpiration.match(/^\d\d\/\d\d\d\d$/)
+    end
+
+    def expiration_in_valid_month_format?
+      ccExpiration.match(/^\d\d\/$/)
+    end
+
+    def expiration_in_valid_year_format?
+      ccExpiration.match(/^\/\d\d\d\d$/)
+    end
   end
 end

data/spec/cheddargetter_client_rails/subscription_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe CheddargetterClientRails::Subscription do
+  before { ActiveRecord::Base.stub(:connection).and_return mock(:columns => [], :table_exists? => 'true') }
+
   before {
     class TestUser < ActiveRecord::Base
       attr_accessor :customer_code, :first_name, :last_name, :plan_code, :email
@@ -19,7 +21,6 @@ describe CheddargetterClientRails::Subscription do
     end
   }
   
-  before { ActiveRecord::Base.stub(:connection).and_return mock(:columns => []) }
   
   let(:user)          { TestUser.new }
   let(:subscription)  { CheddargetterClientRails::Subscription.new }
@@ -47,7 +48,7 @@ describe CheddargetterClientRails::Subscription do
     before  { 
       subscription.stub(:add_errors_or_return_valid_response).and_return true
       subscription.should_receive(:add_errors_or_return_valid_response)    
-      CGClient.should_receive(:new_customer) 
+      CGClient.should_receive(:customers_new) 
     }
     
     it      { subject }
@@ -58,7 +59,7 @@ describe CheddargetterClientRails::Subscription do
     before  { 
       subscription.stub(:add_errors_or_return_valid_response).and_return true      
       subscription.should_receive(:add_errors_or_return_valid_response) 
-      CGClient.should_receive(:edit_customer)
+      CGClient.should_receive(:customers_edit)
     }
     
     it      { subject }
@@ -239,4 +240,163 @@ describe CheddargetterClientRails::Subscription do
       it { should be_true }
     end
   end
+
+  describe 'ccExpirationMonth=(month)' do
+    let(:month) { '44' }
+    subject { user.subscription.ccExpiration }
+
+    context "when there is a value in ccExpiration" do
+      context 'when it is already in valid MM/YYYY format' do
+        before { user.subscription.ccExpiration = "44/4444"}
+        before { user.subscription.ccExpirationMonth = month }
+        it { should eq('44/4444')}
+      end
+
+      context 'when it is /YYYY format' do
+        before { user.subscription.ccExpiration = "/4444"}
+        before { user.subscription.ccExpirationMonth = month }
+        it { should eq('44/4444')}
+      end
+
+      context 'when it is in an odd format' do
+        before { user.subscription.ccExpiration = "ase"}
+        before { user.subscription.ccExpirationMonth = month }
+        it { should eq('44/')}        
+      end
+
+      context 'when it is already in valid month format' do
+        before { user.subscription.ccExpiration = "33/"}
+        before { user.subscription.ccExpirationMonth = month }
+        it { should eq('44/')}        
+      end
+    end
+
+    context 'when there is not a value in ccExpiration' do
+      before { user.subscription.ccExpiration = ""}
+      before { user.subscription.ccExpirationMonth = month }
+      it { should eq('44/')}      
+    end
+  end
+
+  describe'ccExpirationYear=(year)' do
+    let(:year) { '4444' }
+    subject { user.subscription.ccExpiration }
+
+    context "when there is a value in ccExpiration" do
+      context 'when it is already in valid MM/YYYY format' do
+        before { user.subscription.ccExpiration = "44/4444"}
+        before { user.subscription.ccExpirationYear = year }
+        it { should eq('44/4444')}
+      end
+
+      context 'when it is in MM/ format' do
+        before { user.subscription.ccExpiration = "44/"}
+        before { user.subscription.ccExpirationYear = year }
+        it { should eq('44/4444')}
+      end
+
+      context 'when it is in an odd format' do
+        before { user.subscription.ccExpiration = "ase"}
+        before { user.subscription.ccExpirationYear = year }
+        it { should eq('/4444')}        
+      end
+
+      context 'when it is already in valid year format' do
+        before { user.subscription.ccExpiration = "/4444"}
+        before { user.subscription.ccExpirationYear = year }
+        it { should eq('/4444')}        
+      end
+    end
+
+    context 'when there is not a value in ccExpiration' do
+      before { user.subscription.ccExpiration = ""}
+      before { user.subscription.ccExpirationYear = year }
+      it { should eq('/4444')}      
+    end
+
+  end
+
+  describe 'expiration_in_valid_format?' do
+    subject { user.subscription.expiration_in_valid_format? }
+    context 'when in valid format' do
+      before { user.subscription.ccExpiration = "44/4444"}
+      it { should be_true }
+    end
+
+    context 'when not in valid format' do
+      context 'with just month' do
+        before { user.subscription.ccExpiration = "44/"}
+        it { should be_false }
+
+      end
+
+      context 'with just year' do
+        before { user.subscription.ccExpiration = "/4444"}
+        it { should be_false }
+      end
+
+      context 'with odd thigns' do
+        before { user.subscription.ccExpiration = "4a/3333"}
+        it { should be_false }
+      end
+
+      context 'when blank' do
+        before { user.subscription.ccExpiration = ""}
+        it { should be_false }
+      end
+    end
+
+  end
+
+  describe 'expiration_in_valid_month_format?' do
+    subject { user.subscription.expiration_in_valid_month_format? }
+
+    context 'when in valid format' do
+      before { user.subscription.ccExpiration = '44/'}
+      it { should be_true }
+    end
+
+    context 'when not in valid_format' do
+      context 'with junk' do
+        before { user.subscription.ccExpiration = 'asefas'}
+        it { should be_false }
+      end
+
+      context 'when blank' do
+        before { user.subscription.ccExpiration = ''}
+        it { should be_false }
+      end
+
+      context 'with full date' do
+        before { user.subscription.ccExpiration = '44/4444'}
+        it { should be_false }
+      end
+    end
+  end
+
+  describe 'expiration_in_valid_year_format?' do
+    subject { user.subscription.expiration_in_valid_year_format? }
+
+    context 'when in valid format' do
+      before { user.subscription.ccExpiration = '/4444'}
+      it { should be_true }
+    end
+
+    context 'when not in valid_format' do
+      context 'with junk' do
+        before { user.subscription.ccExpiration = 'asefas'}
+        it { should be_false }
+      end
+
+      context 'when blank' do
+        before { user.subscription.ccExpiration = ''}
+        it { should be_false }
+      end
+
+      context 'with full date' do
+        before { user.subscription.ccExpiration = '44/4444'}
+        it { should be_false }
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+require 'rubygems'
 require 'rspec'
 require 'active_record'
 require 'cheddargetter_client_rails'
@@ -9,7 +10,7 @@ CGEmail       = "michael@expectedbehavior.com"
 CGProductCode = 'GEM_TEST'
 CGPassword    = "DROlOAeQpWey6J2cqTyEzH"
 CGFreePlanId  = "a6a816c8-6d14-11e0-bcd4-40406799fa1e"
-CGClient      = CheddarGetter::Client.new(:product_code => CGProductCode,
+CGClient      = Cheddargetter::Client.new(:product_code => CGProductCode,
                                :username => CGEmail,
                                :password => CGPassword)
                                
@@ -24,5 +25,5 @@ RSpec.configure do |config|
 end
 
 def stub_cheddargetter
-  CheddarGetter::Client.stub(:new).and_return CGClient
+  Cheddargetter::Client.stub(:new).and_return CGClient
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cheddargetter_client_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,7 +44,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: country_select
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -123,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: country_select
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 description: Integrates CheddarGetter api with Active Record. Uses cheddargetter_client_ruby.
 email: brent.wooden@gmail.com
 executables: []
@@ -150,13 +182,11 @@ files:
 - lib/generators/cheddargetter/templates/cheddargetter.yml
 - lib/generators/cheddargetter/templates/cheddargetter_client.rb
 - lib/rails/naming.rb
-- lib/rails/record_identifier.rb
 - spec/cheddargetter_client_rails/subscription_spec.rb
 - spec/cheddargetter_client_rails_spec.rb
 - spec/fixtures/users.yml
 - spec/generator_spec.rb
 - spec/naming_spec.rb
-- spec/record_identifier_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/BrentW/cheddargetter_client_rails
 licenses:
@@ -173,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3013483079917417626
+      hash: 971876707136878326
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/rails/record_identifier.rb

@@ -1,7 +0,0 @@
-module ActionController::RecordIdentifier
-    def dom_class(record_or_class, prefix = nil)
-      singular = ActiveModel::Naming.singular(record_or_class)
-      value = prefix ? "#{prefix}#{JOIN}#{singular}" : singular
-      value == "cheddargetter_client_rails_subscription" ? "subscription" : value
-    end
-end

data/spec/record_identifier_spec.rb

@@ -1,51 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "RecordIdentifier" do
-  before {
-    class TestUser < ActiveRecord::Base
-      attr_accessor :customer_code, :first_name, :last_name, :plan_code, :email
-
-      def self.column_names
-        []
-      end
-            
-      has_subscription :customerCode => :customer_code,
-                                :firstName    => :first_name, 
-                                :lastName     => :last_name, 
-                                :ccFirstName  => :first_name, 
-                                :ccLastName   => :last_name, 
-                                :planCode     => :plan_code
-                                              
-    end    
-  }
-  
-  before { ActiveRecord::Base.stub(:connection).and_return mock(:columns => []) }
-
-  describe 'dom_class(record)' do
-    subject { ActionController::RecordIdentifier.dom_class(value) }
-    
-    context 'called with class' do
-      context 'called with a CheddargetterClientRails::Subscription class' do
-        let(:value) { CheddargetterClientRails::Subscription }
-        it { should eq("subscription") }
-      end
-    
-      context 'called with other classes' do
-        let(:value) { TestUser }
-        it { should eq("test_user") }        
-      end
-    end
-    
-    context 'called with object' do
-      context 'called with a CheddargetterClientRails::Subscription class' do
-        let(:value) { CheddargetterClientRails::Subscription.new }
-        it { should eq("subscription") }
-      end
-    
-      context 'called with other classes' do
-        let(:value) { TestUser.new }
-        it { should eq("test_user") }        
-      end      
-    end
-  end
-end