mousetrap 0.4.1 → 0.4.2

data/Rakefile

@@ -12,8 +12,8 @@ begin
     gem.authors = ["Jon Larkowski", "Sandro Turriate", "Wolfram Arnold", "Corey Grusden"]
     gem.add_dependency 'httparty', '>= 0.4.2'
     gem.add_development_dependency "activesupport", '>= 2.3.3'
-    gem.add_development_dependency "rspec", '>= 1.2.8'
-    gem.add_development_dependency 'thoughtbot-factory_girl', '>= 1.2.2'
+    gem.add_development_dependency "rspec", '>= 1.2.9'
+    gem.add_development_dependency 'factory_girl', '>= 1.2.3'
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/mousetrap/customer.rb

@@ -138,10 +138,12 @@ module Mousetrap
 
     def update
       if subscription
-        self.class.put_resource 'customers', 'edit', code, attributes_for_api_with_subscription
+        response = self.class.put_resource 'customers', 'edit', code, attributes_for_api_with_subscription
       else
-        self.class.put_resource 'customers', 'edit-customer', code, attributes_for_api
+        response = self.class.put_resource 'customers', 'edit-customer', code, attributes_for_api
       end
+
+      raise response['error'] if response['error']
     end
   end
 end

data/mousetrap.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mousetrap}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Larkowski", "Sandro Turriate", "Wolfram Arnold", "Corey Grusden"]
@@ -68,18 +68,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0.4.2"])
       s.add_development_dependency(%q<activesupport>, [">= 2.3.3"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.8"])
-      s.add_development_dependency(%q<thoughtbot-factory_girl>, [">= 1.2.2"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<factory_girl>, [">= 1.2.3"])
     else
       s.add_dependency(%q<httparty>, [">= 0.4.2"])
       s.add_dependency(%q<activesupport>, [">= 2.3.3"])
-      s.add_dependency(%q<rspec>, [">= 1.2.8"])
-      s.add_dependency(%q<thoughtbot-factory_girl>, [">= 1.2.2"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<factory_girl>, [">= 1.2.3"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0.4.2"])
     s.add_dependency(%q<activesupport>, [">= 2.3.3"])
-    s.add_dependency(%q<rspec>, [">= 1.2.8"])
-    s.add_dependency(%q<thoughtbot-factory_girl>, [">= 1.2.2"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<factory_girl>, [">= 1.2.3"])
   end
 end

data/spec/integration/spike.rb

@@ -40,6 +40,24 @@ end
 #create_customer
 
 destroy_all_customers
+customer = Factory :new_customer
+customer.save
+api_customer = Mousetrap::Customer[customer.code]
+puts api_customer.to_yaml
+puts '-' * 80
+
+customer_only_fields = Mousetrap::Customer.new \
+  :first_name => 'first',
+  :last_name => 'last',
+  :company => 'company',
+  :email => 'random@example.com',
+  :code => customer.code
+
+customer_only_fields.save
+
+api_customer = Mousetrap::Customer[customer.code]
+puts api_customer.to_yaml
+
 
 #code = "rvhljmvenp@example.com"
 #api_customer = Mousetrap::Customer[code]

data/spec/mousetrap/customer_spec.rb

@@ -188,8 +188,7 @@ describe Mousetrap::Customer do
           # We don't send code for existing API resources.
           attributes_for_api.delete(:code)
 
-          @customer.class.should_receive(:put_resource).with(
-            'customers', 'edit', @customer.code, attributes_for_api)
+          @customer.class.should_receive(:put_resource).with('customers', 'edit', @customer.code, attributes_for_api).and_return({:id => 'some_id'})
           @customer.save
         end
       end
@@ -204,8 +203,7 @@ describe Mousetrap::Customer do
           attributes_for_api.delete(:subscription)
           @customer.subscription = nil
 
-          @customer.class.should_receive(:put_resource).with(
-            'customers', 'edit-customer', @customer.code, attributes_for_api)
+          @customer.class.should_receive(:put_resource).with('customers', 'edit-customer', @customer.code, attributes_for_api).and_return({:id => 'some_id'})
           @customer.save
         end
       end
@@ -251,7 +249,7 @@ describe Mousetrap::Customer do
         @customer.send :create
       end
 
-      it "raises error is CheddarGetter reports one" do
+      it "raises error if CheddarGetter reports one" do
         @customer.class.stub :post_resource => {'error' => 'some error message'}
         expect { @customer.send(:create) }.to raise_error('some error message')
       end
@@ -275,6 +273,31 @@ describe Mousetrap::Customer do
         @customer.send(:create).should == { :some => :response }
       end
     end
+
+    describe "#update" do
+      context "when there's a subscription instance" do
+        let(:customer) { Mousetrap::Customer.new :code => 'some code' }
+
+        it "puts the customer with subscription when there's a subscription instance" do
+          customer.stub :subscription => stub
+          customer.stub :attributes_for_api_with_subscription => 'some attributes with subscription'
+          customer.class.should_receive(:put_resource).with('customers', 'edit', 'some code', 'some attributes with subscription').and_return({:id => 'some_id'})
+          customer.send :update
+        end
+
+        it "puts just the customer when no subscription instance" do
+          customer.stub :subscription => nil
+          customer.stub :attributes_for_api => 'some attributes'
+          customer.class.should_receive(:put_resource).with('customers', 'edit-customer', 'some code', 'some attributes').and_return({:id => 'some_id'})
+          customer.send :update
+        end
+
+        it "raises error if CheddarGetter reports one" do
+          customer.class.stub :put_resource => {'error' => 'some error message'}
+          expect { customer.send(:update) }.to raise_error('some error message')
+        end
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mousetrap
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jon Larkowski
@@ -43,17 +43,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.8
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-factory_girl
+  name: factory_girl
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.2.3
     version: 
 description: CheddarGetter API Client in Ruby
 email: jonlarkowski@gmail.com