varia_model 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77dd327b0e41d985df1a161e39a5147b507e1df5
-  data.tar.gz: 347a99f528442382d89e7766f12492a5b1154522
+  metadata.gz: 457c80c1232f3aeacb043568d15ad03fbba619cd
+  data.tar.gz: edb591454d0f6737f8ea10a41e4d5a8c7db18859
 SHA512:
-  metadata.gz: b2b42df3bd92530a95735c97e6091849d93bd75a321e85027204390087364690f93be687aaa82babec153f139a94cf6ad94be123353ba8ebca33ad911c1f5cb5
-  data.tar.gz: 36ee952987081d8a69f9a9f58d37d5688b0d7caca1657860f8be7a1c6c5ea754c4782847b7de6c838d890864c9449f4aea9f91531af53ea43feeb7c086ff2090
+  metadata.gz: 0839c79c10112b517caed124a2b3b76ee7e682e55ee9e66461068485f9bac4d714c1ffea45f6d124a7cdd8fca9f11c4e55d5e2e82e4960c977327266547bd29e
+  data.tar.gz: 80db8a3d942cdb91b7533f7e9e40a67374d8e75b39ea2a8c8695456d39b5c25faeadde065cacc4f00a4e1d70afd124e85f637b368d5a89e2768cac2b1404de79

data/.travis.yml

@@ -1,7 +1,6 @@
 script: "bundle exec thor spec"
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - jruby-19mode

data/lib/varia_model.rb

@@ -253,10 +253,16 @@ module VariaModel
   # @option options [Class, Symbol, String] :adapter
   #
   # @return [String]
-  def to_json(options = {})
-    JSON.generate(to_hash, options)
+  def to_json(*options)
+    as_json.to_json(*options)
+  end
+
+  # @return [Hash]
+  def as_json(*)
+    opts = {}
+    opts[JSON.create_id] = self.class.name if JSON.create_id
+    to_hash.merge(opts)
   end
-  alias_method :as_json, :to_json
 
   # Convert the object to a hash.
   def to_hash

data/lib/varia_model/version.rb

@@ -1,3 +1,3 @@
 module VariaModel
-  VERSION = "0.2.0"
+  VERSION = "0.3.2"
 end

data/spec/unit/varia_model_spec.rb

@@ -623,27 +623,47 @@ describe VariaModel do
   end
 
   describe "#to_json" do
-    subject do
-      Class.new do
-        include VariaModel
+    class Playa
+      include VariaModel
 
-        attribute 'first_name', type: String
-        attribute 'nick', type: String
-      end.new
+      attribute 'first_name', type: String
+      attribute 'nick', type: String
+    end
+
+    subject do
+      Playa.new
     end
 
     it "returns a JSON string containin the serialized attributes" do
       subject.first_name = "brooke"
       subject.nick = "leblanc"
 
-      expect(subject.to_json).to eql(JSON.dump(first_name: "brooke", nick: "leblanc"))
+      expect(subject.to_json).to eql(JSON.dump(first_name: "brooke", nick: "leblanc", json_class: "Playa"))
     end
 
     it "includes the most recent value for any Procs" do
       subject.first_name = ->{ "seth".capitalize }
       subject.nick = ->{ "name".upcase }
 
-      expect(subject.to_json).to eql(JSON.dump(first_name: "Seth", nick: "NAME"))
+      expect(subject.to_json).to eql(JSON.dump(first_name: "Seth", nick: "NAME", json_class: "Playa"))
+    end
+
+    describe "when JSON.create_id is nil" do
+      before do
+        @_old_create_id = JSON.create_id
+        JSON.create_id = nil
+      end
+
+      after do
+        JSON.create_id = @_old_create_id
+      end
+
+      it "does not include a nil key" do
+        subject.first_name = "brooke"
+        subject.nick = "leblanc"
+
+        expect(subject.to_json).to eql(JSON.dump(first_name: "brooke", nick: "leblanc"))
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: varia_model
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: A mixin to provide objects with magic attribute reading and writing