cheddargetter_client_rails 0.1.27 → 0.2.0

data/Gemfile

@@ -1,10 +1,10 @@
 source "http://rubygems.org"
   gem "activesupport", ">= 2.3.5"
-  gem "cheddargetter_client_ruby", ">= 0"
+  gem "cheddargetter_client", ">= 0.0.2"
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.0"
-  gem "rcov", ">= 0"
+  gem "rspec"
+  gem "bundler"
+  gem "jeweler"
+  gem "rcov"
 end

data/Gemfile.lock

@@ -2,20 +2,29 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.7)
-    cheddargetter_client_ruby (0.3.1)
-      httparty (>= 0.4.3)
-      httparty (>= 0.4.3)
-    crack (0.1.8)
+    cheddargetter_client (0.0.2)
+      crack
+      crack (>= 0.3.2)
+      httparty
+      httparty (>= 0.10.0)
+    crack (0.3.2)
     diff-lcs (1.1.2)
     git (1.2.5)
-    httparty (0.7.7)
-      crack (= 0.1.8)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    httparty (0.10.0)
+      multi_json (~> 1.0)
+      multi_xml
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+      rdoc
+    json (1.7.6)
+    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)
@@ -30,8 +39,8 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 2.3.5)
-  bundler (~> 1.0.0)
-  cheddargetter_client_ruby
-  jeweler (~> 1.6.0)
+  bundler
+  cheddargetter_client (>= 0.0.2)
+  jeweler
   rcov
-  rspec (~> 2.3.0)
+  rspec

data/Rakefile

@@ -21,6 +21,8 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Integrates CheddarGetter api with Active Record. Uses cheddargetter_client_ruby.}
   gem.email = "brent.wooden@gmail.com"
   gem.authors = ["Brent Wooden"]
+
+  gem.add_dependency "cheddargetter_client", ">= 0.0.2"
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -38,12 +40,3 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "cheddargetter_client_rails #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.1.27
+0.2.0

data/cheddargetter_client_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cheddargetter_client_rails"
-  s.version = "0.1.27"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Wooden"]
@@ -56,26 +56,29 @@ 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_ruby>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_runtime_dependency(%q<cheddargetter_client>, [">= 0.0.2"])
+      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"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_dependency(%q<cheddargetter_client_ruby>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_dependency(%q<cheddargetter_client>, [">= 0.0.2"])
+      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"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    s.add_dependency(%q<cheddargetter_client_ruby>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+    s.add_dependency(%q<cheddargetter_client>, [">= 0.0.2"])
+    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"])
   end
 end
 

data/lib/cheddargetter_client_rails/subscription.rb

@@ -49,20 +49,12 @@ module CheddargetterClientRails
 
     validates_presence_of :ccNumber,
                           :ccExpiration,
-                          :zip, :if => :paid_plan?
+                          :zip
 
     validate :unexpired
   
     validate :validates_presence_of_humanized
   
-    def paid_plan?
-      !free_plan?
-    end
-  
-    def free_plan?
-      planCode == 'FREE_PLAN'
-    end
-  
     def unexpired
       if ccExpiration.present?
         month, year = ccExpiration.split("/").collect{|string| string.to_i }
@@ -86,7 +78,7 @@ module CheddargetterClientRails
     end
   
     def self.get(customer_code)
-      response = CGClient.get_customer(:code => customer_code)
+      response = CGClient.customers_get(:customer_code => customer_code)
 
       if response.errors.blank?
         build_from_response(response)
@@ -114,7 +106,7 @@ module CheddargetterClientRails
     end
   
     def new_record?
-      !Subscription.get(customerCode)
+      !Subscription.customers_get({:customer_code =>customerCode})
     end
   
     def save
@@ -128,8 +120,8 @@ module CheddargetterClientRails
     end
   
     def create
-      response = CGClient.new_customer(
-        :code      => customerCode,
+      response = CGClient.customers_new(
+        :customer_code      => customerCode,
         :firstName => firstName,
         :lastName  => lastName,
         :email     => email,
@@ -162,8 +154,8 @@ module CheddargetterClientRails
     end
 
     def update
-      response = CGClient.edit_customer(
-        {:code      => customerCode},
+      response = CGClient.customers_edit(
+        {:customer_code      => customerCode},
         {
           :firstName => firstName,
           :lastName  => lastName,
@@ -184,7 +176,7 @@ module CheddargetterClientRails
   
     def destroy
       raise "Invalid customer code" if customerCode.blank?
-      response = CGClient.delete_customer({ :code => customerCode })
+      response = CGClient.customers_delete({ :code => customerCode })
     
       add_errors_or_return_valid_response(response)    
     end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cheddargetter_client_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.5
 - !ruby/object:Gem::Dependency
-  name: cheddargetter_client_ruby
+  name: cheddargetter_client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,55 +42,55 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rcov
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cheddargetter_client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: Integrates CheddarGetter api with Active Record. Uses cheddargetter_client_ruby.
 email: brent.wooden@gmail.com
 executables: []
@@ -157,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3234761378258639115
+      hash: 534158962696064419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: