version_serializers 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 490fcc43a11bfb18466b513d939f2e01381ed192
-  data.tar.gz: 9bfb65e62ce824b62609e47ff62734eca8850c1c
+  metadata.gz: 61222ce01c6bd93dbecfdd0ec23bdf0a9e098401
+  data.tar.gz: 5a3c86865658cf77430f7dbe6e0e3113d528c445
 SHA512:
-  metadata.gz: 93bca0c557591028a452eb7b115b2379e40836c10d93e63f0583df691ffa2e57672466bd0332bc9aa3e600fb74b03ded6bedb9fb8f9a4215efb49876394ea301
-  data.tar.gz: bb36276f7ff85803173ba47919d66c9b773aaa84f37bdca1425602e47a58ec63b4a5c45a86aeb2d39d7000dca7852bd80d8d5436df2c62abf15e945a69ea84ca
+  metadata.gz: ae65bd717ce34c546d8c6d1f737869320bfdbe2744f87e6b4de078e3acc310ca06e8c6aa9c08bb767489ac4077e30daf1edc6a3fed6392a15b62b6b2baac4eba
+  data.tar.gz: a25e05d17465dd1bf0da3467459d4b0292d30e82d5294f9aac319ca3f95d45fe2bcadd897f5b6bf5c247c90c1fd3fcb979fc00922e45fc4fa28086c1ab730936

data/.gitignore

@@ -1 +1,2 @@
 pkg
+.byebug_history

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in version_serializer.gemspec
 gemspec
 
+gem "byebug"
 
 gem "rails", github: "rails/rails"
 gem "arel", github: "rails/arel"

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/rack/rack.git
-  revision: 545532b01d332325c913808b7c2047a9256ed551
+  revision: 146c754df01ae768119f2066421b10efd0f0db4f
   specs:
     rack (2.0.0.alpha)
       json
@@ -13,71 +13,67 @@ GIT
 
 GIT
   remote: git://github.com/rails/rails.git
-  revision: f5ab4055b909e7b325304c5a7e414c28bbe441b7
+  revision: 473f63734a55d2a91083a619ce1395dfe32aec8d
   specs:
-    rails (5.0.0.beta1)
-      actioncable (= 5.0.0.beta1)
-      actionmailer (= 5.0.0.beta1)
-      actionpack (= 5.0.0.beta1)
-      actionview (= 5.0.0.beta1)
-      activejob (= 5.0.0.beta1)
-      activemodel (= 5.0.0.beta1)
-      activerecord (= 5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
+    rails (5.0.0.beta2)
+      actioncable (= 5.0.0.beta2)
+      actionmailer (= 5.0.0.beta2)
+      actionpack (= 5.0.0.beta2)
+      actionview (= 5.0.0.beta2)
+      activejob (= 5.0.0.beta2)
+      activemodel (= 5.0.0.beta2)
+      activerecord (= 5.0.0.beta2)
+      activesupport (= 5.0.0.beta2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.beta1)
+      railties (= 5.0.0.beta2)
       sprockets-rails (>= 2.0.0)
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: f5ab4055b909e7b325304c5a7e414c28bbe441b7
+  revision: 473f63734a55d2a91083a619ce1395dfe32aec8d
   specs:
-    actioncable (5.0.0.beta1)
-      actionpack (= 5.0.0.beta1)
-      celluloid (~> 0.17.2)
-      coffee-rails (~> 4.1.0)
-      em-hiredis (~> 0.3.0)
-      faye-websocket (~> 0.10.0)
-      redis (~> 3.0)
+    actioncable (5.0.0.beta2)
+      actionpack (= 5.0.0.beta2)
+      nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.beta1)
-      actionpack (= 5.0.0.beta1)
-      actionview (= 5.0.0.beta1)
-      activejob (= 5.0.0.beta1)
+    actionmailer (5.0.0.beta2)
+      actionpack (= 5.0.0.beta2)
+      actionview (= 5.0.0.beta2)
+      activejob (= 5.0.0.beta2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (5.0.0.beta1)
-      actionview (= 5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
+    actionpack (5.0.0.beta2)
+      actionview (= 5.0.0.beta2)
+      activesupport (= 5.0.0.beta2)
       rack (~> 2.x)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
+    actionview (5.0.0.beta2)
+      activesupport (= 5.0.0.beta2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
+    activejob (5.0.0.beta2)
+      activesupport (= 5.0.0.beta2)
       globalid (>= 0.3.6)
-    activemodel (5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
-    activerecord (5.0.0.beta1)
-      activemodel (= 5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
+    activemodel (5.0.0.beta2)
+      activesupport (= 5.0.0.beta2)
+    activerecord (5.0.0.beta2)
+      activemodel (= 5.0.0.beta2)
+      activesupport (= 5.0.0.beta2)
       arel (~> 7.0)
-    activesupport (5.0.0.beta1)
+    activesupport (5.0.0.beta2)
       concurrent-ruby (~> 1.0)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       method_source
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    railties (5.0.0.beta1)
-      actionpack (= 5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
+    railties (5.0.0.beta2)
+      actionpack (= 5.0.0.beta2)
+      activesupport (= 5.0.0.beta2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -85,56 +81,23 @@ GIT
 PATH
   remote: .
   specs:
-    version_serializers (0.1.4)
+    version_serializers (0.1.5)
       active_model_serializers (>= 0.10.0.rc2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    active_model_serializers (0.10.0.rc3)
+    active_model_serializers (0.10.0.rc4)
       actionpack (>= 4.0)
       activemodel (>= 4.0)
       railties (>= 4.0)
     builder (3.2.2)
-    celluloid (0.17.2)
-      celluloid-essentials
-      celluloid-extras
-      celluloid-fsm
-      celluloid-pool
-      celluloid-supervision
-      timers (>= 4.1.1)
-    celluloid-essentials (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-extras (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-fsm (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-pool (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-supervision (0.20.5)
-      timers (>= 4.1.1)
-    coffee-rails (4.1.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.10.0)
+    byebug (8.2.2)
     concurrent-ruby (1.0.0)
     diff-lcs (1.2.5)
-    em-hiredis (0.3.0)
-      eventmachine (~> 1.0)
-      hiredis (~> 0.5.0)
     erubis (2.7.0)
-    eventmachine (1.0.9)
-    execjs (2.6.0)
-    faye-websocket (0.10.2)
-      eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.5.1)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    hiredis (0.5.2)
-    hitimes (1.2.3)
     i18n (0.7.0)
     json (1.8.3)
     loofah (2.0.3)
@@ -144,8 +107,9 @@ GEM
     method_source (0.8.2)
     mime-types (2.99)
     mini_portile2 (2.0.0)
-    minitest (5.8.3)
-    nokogiri (1.6.7.1)
+    minitest (5.8.4)
+    nio4r (1.2.1)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -155,15 +119,14 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rake (10.5.0)
-    redis (3.2.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
+    rspec-core (3.4.2)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -175,14 +138,12 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.0)
+    sprockets-rails (3.0.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    timers (4.1.1)
-      hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     websocket-driver (0.6.3)
@@ -200,6 +161,7 @@ DEPENDENCIES
   activesupport!
   arel!
   bundler (~> 1.11)
+  byebug
   rack!
   rails!
   railties!

data/lib/version_serializers/controller_additions.rb

@@ -1,7 +1,7 @@
 module VersionSerializer::ControllerAdditions
 
   def serialized_render(resource, opts = {})
-    render VersionSerializer::Versioner.get_rendering_opts(resource, request_version, opts)
+    render VersionSerializer::Versioner.get_rendering_opts(resource, request_version).merge(opts)
   end
 
   def get_serializer_for(class_name)

data/lib/version_serializers/version.rb

@@ -1,3 +1,3 @@
 module VersionSerializer
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/version_serializers/versioner.rb

@@ -7,22 +7,32 @@ module VersionSerializer
       send(:new, version, "#{name}_serializer".classify).get
     end
 
-    def self.get_rendering_opts(resource, version, opts)
+    def self.get_rendering_opts(resource, version)
       resource_class_name = resource.class.to_s
       serializer_key = :serializer
-      if resource.is_a?(ActiveRecord::Relation)
-        resource_class_name = resource_class_name.split("::").tap(&:pop).join("::")
+      if resource.is_a? Enumerable
         serializer_key = :each_serializer
+        if resource.is_a? ActiveRecord::Relation
+          resource_class_name = resource_class_name.split("::").tap(&:pop).join("::")
+        else
+          return { json: resource } if resource.empty?
+          resource_class_name = resource.first.class.to_s
+        end
       end
       serializer_class = get_serializer(resource_class_name, version)
-      opts.merge!(json: resource, serializer_key => serializer_class)
+      { json: resource, serializer_key => serializer_class }
     end
 
     def get
       "V#{request_version}::#{class_name}".constantize
     rescue NameError
       previous_version = request_version.to_i - 1
-      previous_version == 0 ? raise(NameError) : self.class.new(previous_version, class_name).get
+
+      if previous_version == 0
+        raise NameError
+      else
+        self.class.new(previous_version, class_name).get
+      end
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: version_serializers
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ben D'Angelo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock