restpack_serializer 0.2.9 → 0.2.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2M0YjM0NjM5MGExZWY2Y2JiZmJiZGU3ZDBiN2U0NWRkZTBlYWIyNg==
+    NTQyMWM4MjkwMzA1NDc2ZDdhOWU3MzNlZDQzZmM3YWRkNzBlYTNkZA==
   data.tar.gz: !binary |-
-    ZDNiOTQxNTk0ZDM4NDZhZGExZDM3MGVjMTQ5OGUwOGJlYzg0YzQ3YQ==
+    ZjczZTI5ZmJkZDRiNTViY2Y1Y2E2ZTJmNTU5YWIxOTBiZmY3ZjE3NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTQ4MTA0NmI5NDcxOTU3NTgxNWM0MTc3MzJjNzk4ZGYzYzBkZWYzY2I4NGFh
-    YzA4NmRhMDdiYjFhODM2YWYwMzRhNjU1ZDAxNTIxNDNhMzhiODY1ZDE3MzE4
-    M2Y5ZjkzMzU4Y2ZhNGQzOTg1OWEwMGZmYmE1ZjU4YWRiNmFkNzQ=
+    OWY5ZTZjYzY2MGZhNzk3MjkwZmYwMDcyN2NmYmNiZmU4ZjFhNWUyMzYzZmJh
+    OWY1ZGJlMDY3Mjk3NTIyOTU4NDUxMTRkZmZmMDg4MzQ5YThkMzQxMzU0NzRk
+    ZjgyOTkzOGJiYTc2ZDY4YjBlZjBiNjFjODMyMDA0MGRmNWJiMGQ=
   data.tar.gz: !binary |-
-    ZWIyYjkzZTQzNjNhYzFhNmRjZTgyYjBlN2JhNzRjOWQ3N2YxOTg1MWI1ZmQ5
-    NzI5NTk2NTVlYjljM2U0OTMxZjRkYzZmMDM2YTAyNmEzMmYzOTAyNDJhNDM0
-    M2IyOTNhNDdhYmE2NzAyYTk2ZDBkZTNmNzZmM2FjODQ4ZGQzOGQ=
+    ZGI3YzY0ZDI0NWVkODIxOTE0ZTU4OTA4YWU4MzYxMWI3NjQ2MzcyY2ExYzhk
+    MzdkYjJjNjUxYTIxY2I4YzBmM2UzMDRmZDY4Mjc5ZjdmZGEzZDA3YWFkZjQw
+    ZTMxOTU0ODNiZDI1YTI3MDNmNGU5NWE5NTkxNDhlM2M2YzViZmM=

data/.gitignore

@@ -2,3 +2,4 @@
 *.db
 tmp
 /coverage
+Gemfile.lock

data/lib/restpack_serializer/serializable/attributes.rb

@@ -40,7 +40,7 @@ module RestPack::Serializer::Attributes
 
       unless method_defined?(method)
         define_method method do
-          @options[method].nil? || @options[method]
+          @context[method].nil? || @context[method]
         end
       end
     end

data/lib/restpack_serializer/serializable.rb

@@ -16,8 +16,8 @@ module RestPack
 
     class InvalidInclude < Exception; end
 
-    def as_json(model, options = {})
-      @model, @options = model, options
+    def as_json(model, context = {})
+      @model, @context = model, context
 
       data = {}
       if self.class.serializable_attributes.present?
@@ -26,18 +26,31 @@ module RestPack
         end
       end
 
+      add_custom_attributes(data)
       add_links(model, data)
 
       data
     end
 
+    def custom_attributes
+      {}
+    end
+
     private
 
+    def add_custom_attributes(data)
+      custom = custom_attributes
+      data.merge!(custom) if custom
+    end
+
     def add_links(model, data)
       self.class.associations.each do |association|
         if association.macro == :belongs_to
           data[:links] ||= {}
-          data[:links][association.name.to_sym] = model.send(association.foreign_key).to_s
+          foreign_key_value = model.send(association.foreign_key)
+          if foreign_key_value
+            data[:links][association.name.to_sym] = foreign_key_value.to_s
+          end
         end
       end
       data
@@ -48,8 +61,8 @@ module RestPack
     end
 
     module ClassMethods
-      def as_json(model, options = {})
-        new.as_json(model, options)
+      def as_json(model, context = {})
+        new.as_json(model, context)
       end
 
       def model_name

data/lib/restpack_serializer/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Serializer
-    VERSION = '0.2.9'
+    VERSION = '0.2.10'
   end
 end

data/spec/serializable/resource_spec.rb

@@ -37,4 +37,13 @@ describe RestPack::Serializer::Resource do
     # https://github.com/RestPack/restpack_serializer/issues/27
     # https://github.com/json-api/json-api/issues/7
   end
+
+  describe "song with no artist" do
+    let(:song) { FactoryGirl.create(:song, :artist => nil) }
+    let(:resource) { SongSerializer.resource(id: song.id.to_s) }
+
+    it "should not have an artist link" do
+      resource[:songs][0][:links].keys.should_not include(:artist)
+    end
+  end
 end

data/spec/serializable/serializer_spec.rb

@@ -40,21 +40,29 @@ describe RestPack::Serializer do
     end
 
     def include_admin_info?
-      @options[:is_admin?]
+      @context[:is_admin?]
+    end
+
+    def custom_attributes
+      {
+        :custom_key => "custom value for model id #{@model.id}"
+      }
     end
   end
 
   describe ".as_json" do
     it "serializes specified attributes" do
       serializer.as_json(person).should == {
-        id: '123', name: 'Gavin', description: 'This is person #123', href: '/people/123.json'
+        id: '123', name: 'Gavin', description: 'This is person #123',
+        href: '/people/123.json', custom_key: 'custom value for model id 123'
       }
     end
 
     context "with options" do
       it "excludes specified attributes" do
         serializer.as_json(person, { include_description?: false }).should == {
-          id: '123', name: 'Gavin', href: '/people/123.json'
+          id: '123', name: 'Gavin', href: '/people/123.json',
+          custom_key: 'custom value for model id 123'
         }
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -175,7 +175,6 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md

data/Gemfile.lock

@@ -1,102 +0,0 @@
-PATH
-  remote: .
-  specs:
-    restpack_serializer (0.2.9)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
-      will_paginate (~> 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    bump (0.4.1)
-    coderay (1.0.9)
-    colorize (0.5.8)
-    coveralls (0.6.7)
-      colorize
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    database_cleaner (0.9.1)
-    diff-lcs (1.2.3)
-    factory_girl (4.2.0)
-      activesupport (>= 3.0.0)
-    ffi (1.7.0)
-    formatador (0.2.4)
-    growl (1.0.3)
-    guard (1.8.0)
-      formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (2.5.4)
-      guard (>= 1.1)
-      rspec (~> 2.11)
-    i18n (0.6.1)
-    listen (1.0.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.3)
-    method_source (0.8.1)
-    mime-types (1.23)
-    multi_json (1.7.2)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.0.4)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.4)
-    sqlite3 (1.3.7)
-    thor (0.18.1)
-    tzinfo (0.3.37)
-    will_paginate (3.0.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  coveralls
-  database_cleaner (~> 0.9.1)
-  factory_girl (~> 4.2.0)
-  growl (~> 1.0.3)
-  guard-rspec (~> 2.5.4)
-  rake (~> 10.0.3)
-  restpack_serializer!
-  rspec (~> 2.12)
-  sqlite3 (~> 1.3.7)