neuron-client 0.0.3 → 0.0.4

data/Gemfile

@@ -2,3 +2,5 @@ source :rubygems
 
 # Specify your gem's dependencies in neuron-client.gemspec
 gemspec
+
+gem 'rake'

data/lib/neuron-client/ad.rb

@@ -11,7 +11,7 @@ module Neuron
           :redirect_url,
         # video
           :video_api_url, :video_setup_xml, :video_flv_url, 
-          :video_clickthru_url, :video_companion_ad_html,
+          :video_clickthru_url, :video_companion_ad_html, :social_links,
         # caps
           :frequency_cap_limit, :frequency_cap_window, :overall_cap, 
           :daily_cap, :day_partitions, :ideal_impressions_per_hour,
@@ -37,4 +37,4 @@ module Neuron
       end
     end
   end
-end
+end

data/lib/neuron-client/connected.rb

@@ -8,7 +8,7 @@ module Neuron
       end
 
       def attributes
-        self.class.attributes
+        self.class.attributes || []
       end
 
       def to_hash
@@ -24,19 +24,29 @@ module Neuron
       end
 
       def save
-        if new_record?
-          response = self.class.connection.post("#{self.class.resources_name}", {self.class.resource_name => self.to_hash})
-        else
-          response = self.class.connection.put("#{self.class.resources_name}/#{id}", {self.class.resource_name => self.to_hash})
-          self.id = response[self.resource_name]['id']
+        @errors = catch :errors do
+          if new_record?
+            response = self.class.connection.post("#{self.class.resources_name}", {self.class.resource_name => self.to_hash})
+            self.id = response[self.class.resource_name]['id']
+          else
+            response = self.class.connection.put("#{self.class.resources_name}/#{id}", {self.class.resource_name => self.to_hash})
+          end
+          []
         end
+
+        @errors.empty?
       end
 
       def update_attributes(attrs={})
-        response = self.class.connection.put("#{self.class.resources_name}/#{id}", {self.class.resource_name => attrs})
-        attrs.each do |key, value|
-          self.send("#{key}=", value) if self.respond_to?("#{key}=")
+        @errors = catch :errors do
+          response = self.class.connection.put("#{self.class.resources_name}/#{id}", {self.class.resource_name => attrs})
+          attrs.each do |key, value|
+            self.send("#{key}=", value) if self.respond_to?("#{key}=")
+          end
+          []
         end
+
+        @errors.empty?
       end
 
       def destroy
@@ -45,6 +55,7 @@ module Neuron
 
       def self.included(base)
         base.send(:attr_accessor, :id)
+        base.send(:attr_accessor, :errors)
         base.extend(ClassMethods)
       end
 
@@ -97,6 +108,13 @@ module Neuron
         end
 
         def create(attrs={})
+          @errors = catch (:errors) do
+            return create!(attrs)
+          end
+          nil
+        end
+
+        def create!(attrs={})
           response = self.connection.post("#{self.resources_name}", {self.resource_name => attrs})
           self.new(response[self.resource_name])
         end

data/lib/neuron-client/connection.rb

@@ -43,6 +43,8 @@ module Neuron
           case response.code
           when 201
             return (format == :json ? Yajl.load(response.to_str) : response.to_str)
+          when 422
+            throw :errors, Yajl.load(response.to_str) 
           else
             raise "Error : #{response.code} - #{response.to_str}"
           end
@@ -57,6 +59,8 @@ module Neuron
           case response.code
           when 200
             return (format == :json ? Yajl.load(response.to_str) : response.to_str)
+          when 422
+            throw :errors, Yajl.load(response.to_str)
           else
             raise "Error : #{response.code} - #{response.to_str}"
           end

data/lib/neuron-client/version.rb

@@ -1,5 +1,5 @@
 module Neuron
   module Client
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/lib/old_spec.rb

@@ -168,6 +168,132 @@ module Neuron
       end
     end
 
+    describe Connected do
+      class ConnectedTest
+        include Connected
+        resource_name 'connection'
+        resources_name 'connection'
+      end
+
+      before(:each) do
+        @connection = stub(:connection)
+        API.stub(:connection).and_return(@connection)
+      end
+      
+      describe "update_attributes" do
+        it "should return false when errors occur for updated objects" do
+          @connection.should_receive(:put).with("connection/1", {'connection' => {}}) do
+            throw :errors, {:error => "is required"}
+          end 
+
+          ConnectedTest.new(:id => 1).update_attributes({}).should be_false
+        end
+
+        it "should provide access to errors when validation fails" do
+          @connection.should_receive(:put).with("connection/1", {'connection' => {}}) do
+            throw :errors, {:error => "is required"}
+          end 
+
+          c = ConnectedTest.new(:id => 1)
+          c.update_attributes({}).should be_false
+          c.errors.should == {:error => "is required"}
+        end
+
+        it "should return true when errors do not occure for updated objects" do
+          @connection.should_receive(:put).with("connection/1", {'connection' => {}})
+
+          ConnectedTest.new(:id => 1).update_attributes({}).should be_true
+        end
+      end
+
+      describe "save" do
+        it "should return false when errors occur for new objects" do
+          @connection.should_receive(:post).with("connection", {'connection' => {}}) do
+            throw :errors, {:error => "is required"}
+          end 
+
+          ConnectedTest.new.save.should be_false
+        end
+
+        it "should provide access to errors when validation fails" do
+          @connection.should_receive(:post).with("connection", {'connection' => {}}) do
+            throw :errors, {:error => "is required"}
+          end 
+
+          c = ConnectedTest.new
+          c.save.should be_false
+          c.errors.should == {:error => "is required"}
+        end
+
+        it "should return true when errors do not occur for new objects" do
+          @connection.should_receive(:post).with("connection", {'connection' => {}}).and_return({'connection' => {:id => 1}})
+
+          ConnectedTest.new.save.should be_true
+        end 
+
+        it "should return false when errors occur for existing objects" do
+          @connection.should_receive(:put).with('connection/1', {'connection' => {}}) do
+            throw :errors, {:error => "is required"}
+          end 
+
+          ConnectedTest.new(:id => 1).save.should be_false
+        end
+
+        it "should provide access to errors when validation fails" do
+          @connection.should_receive(:put).with("connection/1", {'connection' => {}}) do
+            throw :errors, {:error => "is required"}
+          end 
+
+          c = ConnectedTest.new(:id => 1)
+          c.save.should be_false
+          c.errors.should == {:error => "is required"}
+        end
+
+        it "should return true when errors do not occur for existing objects" do
+          @connection.should_receive(:put).with("connection/1", {'connection' => {}})
+
+          ConnectedTest.new(:id => 1).save.should be_true
+        end
+      end
+
+      describe "create" do
+        it "should return nil when errors occur" do
+          @connection.should_receive(:post).with("connection", {'connection' => {}}) do
+            throw :errors, {:error => "is_required"}
+          end
+
+          ConnectedTest.create({}).should be_nil
+        end
+
+        it "should return the created object when no errors occur" do
+          @connection.should_receive(:post).with("connection", {'connection' => {}}).and_return({'connection' => {:id => 1}})
+
+          ConnectedTest.create({}).should be_a ConnectedTest
+        end
+      end
+
+      describe "create!" do
+        it "should return nil when errors occur" do
+          @connection.should_receive(:post).with("connection", {'connection' => {}}) do
+            throw :errors, {:error => "is_required"}
+          end
+
+          errors = catch(:errors) do
+            ConnectedTest.create!({})
+            nil
+          end
+          errors.should_not be_nil
+          errors.should == {:error => 'is_required'}
+        end
+
+        it "should return the created object when no errors occur" do
+          @connection.should_receive(:post).with("connection", {'connection' => {}}).and_return({'connection' => {:id => 1}})
+
+          ConnectedTest.create!({}).should be_a ConnectedTest
+        end
+      end
+    end
+
     describe Connection do
       before(:each) do
         @connection = Connection.new('http://neuron.admin', "my_api_key")
@@ -209,6 +335,16 @@ module Neuron
             @connection.post("test", {:data => 1})
           end.should raise_error
         end
+
+        it "should throw :errors if validation fails" do
+          FakeWeb.register_uri(:post, "http://neuron.admin/test.json?api_key=my_api_key", :body => Yajl.dump({:my_field => 'is_required'}), :status => ["422", "Errors"])
+          errors = catch(:errors) do
+            value = @connection.post("test", {:data => 1})
+            nil
+          end
+          errors.should_not be_nil
+          errors.should == {'my_field' => 'is_required'}
+        end
       end
 
       describe "put" do
@@ -225,6 +361,16 @@ module Neuron
             @connection.put("test", {:data => 1})
           end.should raise_error
         end
+
+        it "should throw :errors if validation fails" do
+          FakeWeb.register_uri(:put, "http://neuron.admin/test.json?api_key=my_api_key", :body => Yajl.dump({:my_field => 'is_required'}), :status => ["422", "Errors"])
+          errors = catch(:errors) do
+            value = @connection.put("test", {:data => 1})
+            nil
+          end
+          errors.should_not be_nil
+          errors.should == {'my_field' => 'is_required'}
+        end
       end
 
       describe "delete" do

metadata

@@ -1,135 +1,138 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: neuron-client
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - Mark Simoneau
 - Chris Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-01 00:00:00.000000000 -05:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-08-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &2157689420 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157689420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  requirement: &2157688920 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157688920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2157688460 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157688460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &2157688000 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *2157688000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rb-fsevent
-  requirement: &2157687500 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *2157687500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: guard
-  requirement: &2157687040 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *2157687040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: guard-bundler
-  requirement: &2157686580 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2157686580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: guard-rspec
-  requirement: &2157686120 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2157686120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &2157685660 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2157685660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: vcr
-  requirement: &2157685200 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.10.2
   type: :development
   prerelease: false
-  version_requirements: *2157685200
+  version_requirements: *id010
 description: Neuron Admin Client Gem
-email:
+email: 
 - devteam@rmmonline.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -154,32 +157,40 @@ files:
 - spec/lib/old_spec.rb
 - spec/lib/s3_file_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/rmm/neuron-client
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3235199418878311580
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3235199418878311580
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: neuron-client
-rubygems_version: 1.6.2
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: Neuron Admin Client Gem
-test_files:
+test_files: 
 - spec/fixtures/vcr_cassettes/s3_file.yml
 - spec/lib/old_spec.rb
 - spec/lib/s3_file_spec.rb