capsule_crm 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a971137b1c0c66a676abb680757dd95d181483a
-  data.tar.gz: 9df7cb48de8496c48b9201afa44558e786433ffe
+  metadata.gz: 6c64b18ad5ae22dbcaf9ace0fdd893299911b925
+  data.tar.gz: f684b6a5d8f79d5fb6e5ed275daacd5243621240
 SHA512:
-  metadata.gz: 870dfbbc6202b575235e02ba4a8902dea7bca317b70d2bd7a79fa6e563da3582071133a97b21ef1718556d0e8b4ef196430a7f68d1ff4dc3151dc042084c6264
-  data.tar.gz: bb6fe469ff5993c9e12bcb33444548402bda97112a3ff44fc632e9ba7810bfa2784f4cbd923fd3d500b6d265eac9987547a49b1c9923a36665652185f467c5c7
+  metadata.gz: 19d1fbd6fa1f9a4f024a823cf5262ff7118cedefee045c376e2bfa9a7fffb5578b770e72a7a45cc0b90635244b394780aa59dd1057796f4290848f688459a269
+  data.tar.gz: cb636752bac73d982aab671b6737da532205510e46d902faef671250b761e9481447c8f61c384e5d2703f5aa1c856c2b1358c77648be113e2de71ee2702c019a

data/.travis.yml

@@ -2,8 +2,6 @@ language: ruby
 rvm:
   - 2.1.0
   - 2.0.0
-  - 1.9.3
-  - jruby-19mode
 before_install:
   - gem update --system
   - gem install bundler

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.5.2
+
+- Fix issue with ruby 1.9.3 where incompatible OpenStruct syntax was being used.
+  Also, update tests to actually use OpenStructs not hashes. (@ryanbooker)
+- Fix the update path for organizations. It was missing the org.id part. (@ghiculescu)
+
 ## 1.5.1
 
 - Add ID to email, website, address and phone models to fix bug where they were

data/README.md

@@ -304,7 +304,7 @@ CapsuleCRM::Currency.all
 
 ## Supported Rubies
 
-1.9.3, 2.0, 2.1, jruby-19mode
+2.0.x, 2.1.x
 
 ## Versioning
 
@@ -333,3 +333,5 @@ Many thanks to the following contributers:
 - @srbaker
 - @clod81
 - @danthompson
+- @ryanbooker
+- @ghiculescu

data/lib/capsule_crm/organization.rb

@@ -24,7 +24,7 @@ module CapsuleCRM
 
     persistable_config do |config|
       config.create = lambda { |org| "organisation" }
-      config.update = lambda { |org| "organisation" }
+      config.update = lambda { |org| "organisation/#{org.id}" }
       config.destroy = lambda { |org| "party/#{org.id}" }
     end
 

data/lib/capsule_crm/serializer.rb

@@ -34,26 +34,26 @@ module CapsuleCRM
     end
 
     def root
-      @root ||= options[:root] ||
+      @root ||= options.root ||
         object.class.to_s.demodulize.downcase.singularize.camelize(:lower)
     end
 
     def collection_root
-      @collection_root ||= options[:collection_root] || root.pluralize
+      @collection_root ||= options.collection_root || root.pluralize
     end
 
     private
 
     def include_root?
-      @include_root ||= true unless options[:include_root] == false
+      @include_root ||= true unless options.include_root == false
     end
 
     def additional_methods
-      @additional_methods ||= options[:additional_methods] || []
+      @additional_methods ||= options.additional_methods || []
     end
 
     def excluded_keys
-      @excluded_keys ||= options[:excluded_keys] || []
+      @excluded_keys ||= options.excluded_keys || []
     end
 
     def build_attributes_hash
@@ -80,7 +80,7 @@ module CapsuleCRM
     end
 
     def exclude_id?
-      @exclude_id ||= true unless options[:exclude_id] == false
+      @exclude_id ||= true unless options.exclude_id == false
     end
 
     # TODO OMG, clean this up!

data/lib/capsule_crm/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCrm
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

data/spec/lib/capsule_crm/serializer_spec.rb

@@ -18,7 +18,7 @@ end
 describe CapsuleCRM::Serializer do
   describe '#serialize' do
     let(:options) do
-      {}
+      OpenStruct.new
     end
     let(:serializer) { described_class.new(options) }
     let(:object) do
@@ -36,7 +36,9 @@ describe CapsuleCRM::Serializer do
     end
 
     context 'when exclude_id is false' do
-      before { options.merge!(exclude_id: false) }
+      before do
+        options.exclude_id = false
+      end
 
       it 'should include the ID' do
         expect(subject['serializabletest'].keys).to include('id')
@@ -45,7 +47,7 @@ describe CapsuleCRM::Serializer do
 
     context 'when include_root is false' do
       before do
-        options.merge!(include_root: false)
+        options.include_root = false
       end
 
       it 'should not include the root' do
@@ -57,7 +59,7 @@ describe CapsuleCRM::Serializer do
 
     context 'when additional methods are supplied' do
       before do
-        options.merge!(additional_methods: [:test])
+        options.additional_methods = [:test]
         object.stub(:test).and_return(test_object)
       end
       let(:test_object) { double(to_capsule_json: { foo: :bar }) }
@@ -69,7 +71,7 @@ describe CapsuleCRM::Serializer do
 
     context 'when excluded keys are supplied' do
       before do
-        options.merge!(excluded_keys: [:description])
+        options.excluded_keys = [:description]
       end
 
       it 'should not include the excluded keys in the output' do
@@ -79,7 +81,7 @@ describe CapsuleCRM::Serializer do
 
     context 'when are root element name is supplied' do
       before do
-        options.merge!(root: 'whatever')
+        options.root = 'whatever'
       end
 
       it 'should use the root option as the root key' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsule_crm
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -499,3 +499,4 @@ test_files:
 - spec/support/shared_examples/persistable.rb
 - spec/support/single_person.json
 - spec/support/task.json
+has_rdoc: