cheddargetter_client_rails 0.1.8 → 0.1.14

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.14

data/cheddargetter_client_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cheddargetter_client_rails}
-  s.version = "0.1.8"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Wooden"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-05-15}
   s.description = %q{Integrates CheddarGetter api with Active Record. Uses cheddargetter_client_ruby.}
   s.email = %q{brent.wooden@gmail.com}
   s.extra_rdoc_files = [
@@ -31,9 +31,16 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "lib/cheddargetter_client_rails.rb",
     "lib/cheddargetter_client_rails/subscription.rb",
+    "lib/generators/cheddargetter/USAGE",
+    "lib/generators/cheddargetter/cheddargetter_generator.rb",
+    "lib/generators/cheddargetter/templates/cheddargetter.yml",
+    "lib/generators/cheddargetter/templates/cheddargetter_client.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/record_identifier_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/BrentW/cheddargetter_client_rails}

data/lib/cheddargetter_client_rails.rb

@@ -1,5 +1,7 @@
 require 'active_support'
+require 'action_controller/record_identifier'
 require 'cheddargetter_client_ruby'
+require 'rails/record_identifier'
 
 module CheddargetterClientRails
   autoload :Subscription, 'cheddargetter_client_rails/subscription'
@@ -48,7 +50,10 @@ module CheddargetterClientRails
     end
 
     def customer_code_column_value
-      send(self.class.send(:customer_code_column)) if self.class.send(:customer_code_column)
+      if self.class.send(:customer_code_column)
+        value = send(self.class.send(:customer_code_column))
+        value.to_s if value.try(:to_s).present?
+      end 
     end
     
     def build_subscription(attributes_hash)
@@ -76,15 +81,22 @@ module CheddargetterClientRails
   end
   
   module ClassMethods
-    def cheddargetter_billable_on(*args)
-      raise ArgumentError.new('Must supply customer code column.') if args.length < 1
-      self.customer_code_column = args.shift
+    def has_subscription(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?        
       
-      if args.length > 0
-        self.shared_columns = args.shift[:shared_columns]
+      shared = {}
+      shared[:email]      = args.delete(:email)      || :email
+      shared[:firstName]  = args.delete(:firstName)  || :first_name
+      shared[:lastName]   = args.delete(:lastName)   || :last_name
+      shared[:planCode]   = args.delete(:planCode)   || :plan_code
+      
+      args.each do |key, value|
+        shared[key] = value
       end
       
+      self.shared_columns = shared
+      
       attr_accessor :skip_cheddargetter
       
       validate        :validate_subscription
@@ -117,4 +129,4 @@ end
 
 class ActiveRecord::Base
   include CheddargetterClientRails
-end
+end

data/lib/generators/cheddargetter/USAGE

@@ -0,0 +1,11 @@
+Description:
+    The cheddargetter generator creates YAML file in your config
+    directory and an initializer to load this config. The config has a
+    separate section for each environment. Please fill in the YAML with
+    your CheddarGetter account credentials.
+
+Examples:
+    rails generate cheddargetter
+
+        Config: config/cheddargetter.yml
+        Initializer: config/initializers/cheddargetter_client.rb

data/lib/generators/cheddargetter/cheddargetter_generator.rb

@@ -0,0 +1,11 @@
+class CheddargetterGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  def generate_initializer
+    copy_file "cheddargetter_client.rb", "config/initializers/cheddargetter_client.rb"
+  end
+  
+  def generate_config
+    copy_file "cheddargetter.yml", "config/cheddargetter.yml"
+  end
+end

data/lib/generators/cheddargetter/templates/cheddargetter.yml

@@ -0,0 +1,12 @@
+development: &development
+    username: youremail@example.com
+    password: youraccountpassword
+    product_code: YOUR_DEVELOPMENT_PRODUCT_CODE
+
+test:
+    <<: *development
+    product_code: YOUR_TEST_PRODUCT_CODE
+
+production:
+    <<: *development
+    product_code: YOUR_PRODUCTION_PRODUCT_CODE

data/lib/generators/cheddargetter/templates/cheddargetter_client.rb

@@ -0,0 +1,6 @@
+cheddargetter_config = YAML.load_file(File.join(Rails.root, 'config', 'cheddargetter.yml'))[Rails.env]
+CGClient = CheddarGetter::Client.new(
+	:product_code => cheddargetter_config['product_code'],
+	:username			=> cheddargetter_config['username'],
+	:password			=> cheddargetter_config['password']
+)

data/lib/rails/record_identifier.rb

@@ -0,0 +1,7 @@
+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/cheddargetter_client_rails_spec.rb

@@ -5,25 +5,23 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "CheddargetterClientRails" do
   before {
     class TestUser < ActiveRecord::Base
-      attr_accessor :customer_code, :first_name, :last_name, :plan_code
+      attr_accessor :customer_code, :first_name, :last_name, :plan_code, :email
 
       def self.column_names
         []
       end
             
-      cheddargetter_billable_on :customer_code, :shared_columns => {
-                                                  :firstName    => :first_name, 
-                                                  :lastName     => :last_name, 
-                                                  :ccFirstName  => :first_name, 
-                                                  :ccLastName   => :last_name, 
-                                                  :planCode     => :plan_code
-                                                }
-
-
+      has_subscription :customerCode => :customer_code,
+                                :firstName    => :first_name, 
+                                :lastName     => :last_name, 
+                                :ccFirstName  => :first_name, 
+                                :ccLastName   => :last_name, 
+                                :planCode     => :plan_code
+                                              
     end
   }
   
-  before { TestUser.stub(:connection).and_return mock(:columns => []) }
+  before { ActiveRecord::Base.stub(:connection).and_return mock(:columns => []) }
   
   let(:user_class) {
     TestUser
@@ -39,18 +37,20 @@ describe "CheddargetterClientRails" do
   end
   
   describe "inclusion of class methods" do
-    subject { user_class.respond_to?(:cheddargetter_billable_on) }
+    subject { user_class.respond_to?(:has_subscription) }
     
     it { should be_true }
   end
   
-  describe 'cheddargetter_billable_on' do
+  describe 'has_subscription' do
     context 'argument errors' do
       context 'without customer code column' do
         subject {
           class NoCustomerCodeUser < ActiveRecord::Base
-            cheddargetter_billable_on
+            has_subscription
           end
+          NoCustomerCodeUser.stub(:connection).and_return mock(:columns => [])
+          
         }
       
         specify { lambda { subject }.should raise_error(ArgumentError) }
@@ -59,13 +59,34 @@ describe "CheddargetterClientRails" do
       context 'when record does not responsd to customer_code_column' do
         subject {
           class NoCustomerCodeUser < ActiveRecord::Base
-            cheddargetter_billable_on :id
+            has_subscription :id
           end
         }
         specify { lambda { subject }.should raise_error }
       end
     end
     
+    context 'setting default values' do
+      subject { 
+        class DefaultValuesUser < ActiveRecord::Base
+          attr_accessor :id, :email, :first_name, :last_name, :plan_code
+          
+          has_subscription
+        end
+      }
+      
+      specify { lambda { subject }.should_not raise_error }
+      specify { 
+        subject;
+        DefaultValuesUser.shared_columns.should eq({
+          :email => :email, 
+          :firstName => :first_name, 
+          :lastName => :last_name, 
+          :planCode => :plan_code
+        })
+      }
+    end
+    
     context 'setting customer_code_column' do
       subject { user_class.customer_code_column }
       it { should eq(:customer_code) }
@@ -77,7 +98,8 @@ describe "CheddargetterClientRails" do
                       :lastName     => :last_name, 
                       :ccFirstName  => :first_name, 
                       :ccLastName   => :last_name, 
-                      :planCode     => :plan_code
+                      :planCode     => :plan_code,
+                      :email        => :email
                     ) 
       }      
     end
@@ -214,7 +236,7 @@ describe "CheddargetterClientRails" do
             ['customer_code']
           end
           
-          cheddargetter_billable_on :customer_code
+          has_subscription :customerCode => :customer_code
         end                    
       }
       
@@ -240,9 +262,9 @@ describe "CheddargetterClientRails" do
             'TEST_CODE'
           end
           
-          p 'Make not that if method and not column, then it must be declared before cheddargetter_billable_on'
+          p 'Make not that if method and not column, then it must be declared before has_subscription'
                     
-          cheddargetter_billable_on :customer_code
+          has_subscription :customerCode => :customer_code
         end        
       }
       
@@ -263,7 +285,7 @@ describe "CheddargetterClientRails" do
             []
           end
           
-          cheddargetter_billable_on :customer_code       
+          has_subscription :customer_code       
         end           
       }
 
@@ -436,6 +458,11 @@ describe "CheddargetterClientRails" do
       it { should eq('Customer Code') }
     end
     
+    context 'when the customer_code_column is set and it is an integeter' do
+      before { user.customer_code = 12345 }
+      it { should eq('12345') }
+    end
+    
     context 'when customer_code_column is not set' do
       before { user.class.stub(:customer_code_column).and_return nil }
       it { should be_nil }

data/spec/generator_spec.rb

@@ -0,0 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
+
+describe "CheddargetterClientRails" do
+end

data/spec/record_identifier_spec.rb

@@ -0,0 +1,51 @@
+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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cheddargetter_client_rails
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Brent Wooden
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -04:00
+date: 2011-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,9 +134,16 @@ files:
 - features/support/env.rb
 - lib/cheddargetter_client_rails.rb
 - lib/cheddargetter_client_rails/subscription.rb
+- lib/generators/cheddargetter/USAGE
+- lib/generators/cheddargetter/cheddargetter_generator.rb
+- lib/generators/cheddargetter/templates/cheddargetter.yml
+- lib/generators/cheddargetter/templates/cheddargetter_client.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/record_identifier_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/BrentW/cheddargetter_client_rails