capsule_crm 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cc2774ab10bd28336dd0d4586a9e580339da8fa
-  data.tar.gz: 993020dd12dc61dcf601e70b111279f7dbf0dd8b
+  metadata.gz: 0e6d24bb7037a3d119bccf9122b99dcc4c637a76
+  data.tar.gz: d3963ea029b318ad0e730ef6d7fd8d37fe42a758
 SHA512:
-  metadata.gz: e8ff0fcca56968b5f6bcf914c2041e758c2f28c3d16107b2a36f61be649ba35c9741c171619f2197d7ca229b746131a68d6e556e8b440b311413c8611c41b646
-  data.tar.gz: 002ed9d4cb89290cf6151e72439c84912f2752e7b6b4a455d4165aa024b01d4d75c0efbf2b08c5ca65bef995ae9e6bdca176a84bfb17fe8c237c8c1e05bc55fb
+  metadata.gz: d7e0f36ec559f8d5473f50050c2751b5ec4e3c91cbd0cd210ba1e65ab2342dc15e961ff3a2792baa346b2e249931a2601bdd96588e234e355cf875614b10a324
+  data.tar.gz: 2afd21361071265d65f897c386dd83d845d835e45edb5be1e9e6ec283486ca1ec10e81764a3ff63a33ada828ec4ba86de2d0cb261a7a9d06861867337e45f731

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format documentation
+--format progress

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.5.0
+
+- Add TaskCategory
+- Upgrade to latest virtus
+
 ## 1.4.0
 
 - Fix bug with contacts, where contact details were being attached to parties as

data/Guardfile

@@ -3,7 +3,7 @@
 
 notification :tmux
 
-guard 'rspec', all_on_start: true, all_after_pass: true, keep_failed: true do
+guard 'rspec', all_on_start: true, all_after_pass: true, failed_mode: :keep do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -17,7 +17,5 @@ end
 
 
 guard 'bundler' do
-  watch('Gemfile')
-  # Uncomment next line if Gemfile contain `gemspec' command
-  # watch(/^.+\.gemspec/)
+  watch(/^.+\.gemspec/)
 end

data/capsule_crm.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('activesupport')
   gem.add_runtime_dependency('faraday')
   gem.add_runtime_dependency('faraday_middleware')
-  gem.add_runtime_dependency('virtus', '~> 0.5.4')
+  gem.add_runtime_dependency('virtus', '~> 1.0.0')
 
   gem.add_development_dependency('coveralls')
   gem.add_development_dependency('cucumber')

data/lib/capsule_crm/address.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Address
-    include Virtus
+    include Virtus.model
     include CapsuleCRM::Serializable
     extend  ActiveModel::Naming
 

data/lib/capsule_crm/associations/belongs_to.rb

@@ -42,7 +42,8 @@ module CapsuleCRM
 
           (class << self; self; end).instance_eval do
             define_method "_for_#{association_name}" do |id|
-              CapsuleCRM::Associations::BelongsToFinder.new(association).call(id)
+              CapsuleCRM::Associations::BelongsToFinder.new(association).
+                call(id)
             end
           end
 

data/lib/capsule_crm/attachment.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Attachment
-    include Virtus
+    include Virtus.model
 
     include ActiveModel::Validations
 

data/lib/capsule_crm/case.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Case
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Conversion

data/lib/capsule_crm/country.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Country
-    include Virtus
+    include Virtus.model
 
     include CapsuleCRM::Serializable
     include CapsuleCRM::Querying::Configuration

data/lib/capsule_crm/currency.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Currency
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Conversion

data/lib/capsule_crm/custom_field.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class CustomField
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Conversion

data/lib/capsule_crm/custom_field_definition.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class CustomFieldDefinition
-    include Virtus
+    include Virtus.model
     include CapsuleCRM::Serializable
     include CapsuleCRM::Gettable
 

data/lib/capsule_crm/email.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Email
-    include Virtus
+    include Virtus.model
     include CapsuleCRM::Serializable
     extend  ActiveModel::Naming
 

data/lib/capsule_crm/history.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class History
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Conversion

data/lib/capsule_crm/milestone.rb

@@ -1,7 +1,7 @@
 module CapsuleCRM
   class Milestone
     include ActiveModel::Validations
-    include Virtus
+    include Virtus.model
 
     include CapsuleCRM::Querying::Configuration
     include CapsuleCRM::Querying::FindAll

data/lib/capsule_crm/opportunity.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Opportunity
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Conversion

data/lib/capsule_crm/participant.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Participant
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Validations

data/lib/capsule_crm/party.rb

@@ -1,5 +1,5 @@
 class CapsuleCRM::Party
-  include Virtus
+  include Virtus.model
 
   include CapsuleCRM::Associations
   include CapsuleCRM::Querying::Findable

data/lib/capsule_crm/phone.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Phone
-    include Virtus
+    include Virtus.model
     include CapsuleCRM::Serializable
     extend  ActiveModel::Naming
 

data/lib/capsule_crm/tag.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Tag
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Conversion

data/lib/capsule_crm/task.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Task
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Conversion
@@ -19,7 +19,6 @@ module CapsuleCRM
     attribute :id, Integer
     attribute :due_date, Date
     attribute :due_date_time, DateTime
-    attribute :category, String
     attribute :description, String
     attribute :detail, String
 
@@ -27,6 +26,8 @@ module CapsuleCRM
     belongs_to :opportunity
     belongs_to :case
     belongs_to :owner, class_name: 'CapsuleCRM::User', serializable_key: :owner
+    belongs_to :category, class_name: 'CapsuleCRM::TaskCategory',
+      serializable_key: :category
 
     validates :id, numericality: { allow_blank: true }
     validates :description, presence: true
@@ -73,12 +74,6 @@ module CapsuleCRM
       self
     end
 
-    # TODO Change this to an embedded association, like custom fields
-    def self.categories
-      CapsuleCRM::Connection.
-        get('/api/task/categories')['taskCategories']['taskCategory']
-    end
-
     def create_url
       if party_id
         "party/#{party_id}/task"

data/lib/capsule_crm/task_category.rb

@@ -0,0 +1,32 @@
+module CapsuleCRM
+  class TaskCategory
+    include Virtus.model
+
+    include ActiveModel::Naming
+    include ActiveModel::Conversion
+    include ActiveModel::Validations
+
+    include CapsuleCRM::Associations
+    include CapsuleCRM::Querying::Configuration
+    include CapsuleCRM::Querying::FindAll
+    include CapsuleCRM::Serializable
+
+    queryable_config do |config|
+      config.plural   = 'task/categories'
+    end
+
+    serializable_config do |config|
+      config.collection_root     = 'taskCategories'
+      config.root                = 'taskCategory'
+      config.attribute_to_assign = :name
+    end
+
+    attribute :name
+
+    validates :name, presence: true
+
+    has_many :tasks
+
+    def id; name; end
+  end
+end

data/lib/capsule_crm/track.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Track
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Conversion

data/lib/capsule_crm/user.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class User
-    include Virtus
+    include Virtus.model
 
     extend  ActiveModel::Naming
     include ActiveModel::Conversion

data/lib/capsule_crm/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCrm
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/lib/capsule_crm/website.rb

@@ -1,6 +1,6 @@
 module CapsuleCRM
   class Website
-    include Virtus
+    include Virtus.model
     include CapsuleCRM::Serializable
 
     extend  ActiveModel::Naming

data/lib/capsule_crm.rb

@@ -42,6 +42,7 @@ require 'capsule_crm/organization'
 require 'capsule_crm/participant'
 require 'capsule_crm/person'
 require 'capsule_crm/milestone'
+require 'capsule_crm/task_category'
 require 'capsule_crm/track'
 require 'capsule_crm/version'
 require 'capsule_crm/faraday/middleware/raise_error'

data/spec/lib/capsule_crm/associations/belongs_to_association_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class CapsuleCRM::BelongsToAssociationTest
-  include Virtus
+  include Virtus.model
 
   attribute :name
 

data/spec/lib/capsule_crm/associations/belongs_to_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class BelongsToTest
-  include Virtus
+  include Virtus.model
   include CapsuleCRM::Associations
 
   belongs_to :person

data/spec/lib/capsule_crm/associations/has_many_association_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class CapsuleCRM::SomeClass
-  include Virtus
+  include Virtus.model
 
   attribute :name
 

data/spec/lib/capsule_crm/associations/has_many_proxy_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class Parent
-  include Virtus
+  include Virtus.model
   include CapsuleCRM::Associations
   include CapsuleCRM::Querying::Configuration
 
@@ -22,7 +22,7 @@ class Parent
 end
 
 class Child
-  include Virtus
+  include Virtus.model
   include CapsuleCRM::Associations
   include CapsuleCRM::Querying::Configuration
   include CapsuleCRM::Serializable

data/spec/lib/capsule_crm/associations_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class CapsuleCRM::AssociationsTest
-  include Virtus
+  include Virtus.model
   include CapsuleCRM::Associations
 
   has_many :whatevers, class_name: 'CapsuleCRM::Party'

data/spec/lib/capsule_crm/custom_field_spec.rb

@@ -50,8 +50,6 @@ describe CapsuleCRM::CustomField do
     end
 
     it 'should have a root element of "customField"' do
-      p described_class.serializable_options
-      p subject
       expect(subject.keys.first).to eql('customField')
     end
   end

data/spec/lib/capsule_crm/serializer_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class SerializableTest
-  include Virtus
+  include Virtus.model
   include CapsuleCRM::Associations
 
   attribute :id, Integer
@@ -11,7 +11,7 @@ class SerializableTest
 end
 
 class SerializableInverse
-  include Virtus
+  include Virtus.model
   include CapsuleCRM::Associations
 end
 

data/spec/lib/capsule_crm/taggable_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 class TaggableItem
   include CapsuleCRM::Taggable
-  include Virtus
+  include Virtus.model
 
   attribute :id
 end
@@ -87,7 +87,7 @@ describe CapsuleCRM::Taggable do
 
   describe '#api_singular_name' do
     it 'turns the class name into appropriate api name' do
-      TaggableItem.new.api_singular_name.should == 'taggableitem' 
+      TaggableItem.new.api_singular_name.should == 'taggableitem'
     end
 
     it 'gives the superclass unless Object to work with Organization/Person subclassing of Party' do

data/spec/lib/capsule_crm/task_category_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe CapsuleCRM::TaskCategory do
+  before { configure }
+
+  it_behaves_like 'listable', '/task/categories', 'categories', 6
+end

data/spec/lib/capsule_crm/task_spec.rb

@@ -74,18 +74,6 @@ describe CapsuleCRM::Task do
     it { should be_persisted }
   end
 
-  describe '.categories' do
-    subject { CapsuleCRM::Task.categories }
-    before do
-      stub_request(:get, /\/api\/task\/categories$/).
-        to_return(body: File.read('spec/support/task_categories.json'))
-    end
-
-    it do
-      expect(subject).to eql(%w(Call Email Follow-up Meeting Milestone Send))
-    end
-  end
-
   describe '#to_capsule_json' do
     let(:task) { Fabricate.build(:task) }
 

data/spec/support/no_categories.json

@@ -0,0 +1,5 @@
+{
+  "taskCategories": {
+    "@size": "0"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsule_crm
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +303,7 @@ files:
 - lib/capsule_crm/tag.rb
 - lib/capsule_crm/taggable.rb
 - lib/capsule_crm/task.rb
+- lib/capsule_crm/task_category.rb
 - lib/capsule_crm/track.rb
 - lib/capsule_crm/user.rb
 - lib/capsule_crm/version.rb
@@ -341,11 +342,13 @@ files:
 - spec/lib/capsule_crm/serializer_spec.rb
 - spec/lib/capsule_crm/tag_spec.rb
 - spec/lib/capsule_crm/taggable_spec.rb
+- spec/lib/capsule_crm/task_category_spec.rb
 - spec/lib/capsule_crm/task_spec.rb
 - spec/lib/capsule_crm/track_spec.rb
 - spec/lib/capsule_crm/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/all_cases.json
+- spec/support/all_categories.json
 - spec/support/all_countries.json
 - spec/support/all_currencies.json
 - spec/support/all_customfields.json
@@ -364,6 +367,7 @@ files:
 - spec/support/helpers.rb
 - spec/support/history.json
 - spec/support/no_cases.json
+- spec/support/no_categories.json
 - spec/support/no_countries.json
 - spec/support/no_currencies.json
 - spec/support/no_customfields.json
@@ -384,7 +388,6 @@ files:
 - spec/support/shared_examples/persistable.rb
 - spec/support/single_person.json
 - spec/support/task.json
-- spec/support/task_categories.json
 homepage: ''
 licenses: []
 metadata: {}
@@ -444,11 +447,13 @@ test_files:
 - spec/lib/capsule_crm/serializer_spec.rb
 - spec/lib/capsule_crm/tag_spec.rb
 - spec/lib/capsule_crm/taggable_spec.rb
+- spec/lib/capsule_crm/task_category_spec.rb
 - spec/lib/capsule_crm/task_spec.rb
 - spec/lib/capsule_crm/track_spec.rb
 - spec/lib/capsule_crm/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/all_cases.json
+- spec/support/all_categories.json
 - spec/support/all_countries.json
 - spec/support/all_currencies.json
 - spec/support/all_customfields.json
@@ -467,6 +472,7 @@ test_files:
 - spec/support/helpers.rb
 - spec/support/history.json
 - spec/support/no_cases.json
+- spec/support/no_categories.json
 - spec/support/no_countries.json
 - spec/support/no_currencies.json
 - spec/support/no_customfields.json
@@ -487,4 +493,3 @@ test_files:
 - spec/support/shared_examples/persistable.rb
 - spec/support/single_person.json
 - spec/support/task.json
-- spec/support/task_categories.json