loginator 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 786d218c02c6f8d91065e156d7b6d1f417870fb6
-  data.tar.gz: 3f9fb43095603359294a611e5ceda12214a39a55
+  metadata.gz: e096d117d2fc6ad0d615b29e0c99a28f74e58835
+  data.tar.gz: faab9d2862bdf8a389628ed91978d63be0d25f2c
 SHA512:
-  metadata.gz: e5dbe147241c25a0e2f55a6abbb6ec320d0f0e0f7146a6adec0c40ad474d4c4fd0ec528e0bfbfc4dab9fbc5cb6abe3ef081152f219cd7cee05bbeee95c9b54bf
-  data.tar.gz: 28d1dae5fc3242317d06a335a961718439aa28b54ba4b2f7f0980f03ff250d006c5ea6b9f85a3309cd2fb347a5cb27db4965fb6873b5f1a7f21e66ab638bbba9
+  metadata.gz: daec5f46f2cbc7096182e1316058c1356578bb28080f05a6b526e72dbecd071ed99ff7d4078259237be029b787f952cc40f1be94307f95f2192b3ed75cdd597c
+  data.tar.gz: 271a9200bdf43ba6cfb1c06514f159df266d9474049fd4ac71d3ba6f0ba788de962ca344c274e64ed2102810c9fdf0f0606614da87432120433022c544c191a9

data/lib/loginator/jsonable_struct.rb

@@ -2,7 +2,7 @@ require 'multi_json'
 
 module Loginator
   # Makes a Struct easily serializable and deserializable. Adds the
-  # from_hash class method and to_json instance method to Struct
+  # from_json class method and to_json instance method to Struct
   # classes.
   module JsonableStruct
     def self.included(base)
@@ -11,9 +11,15 @@ module Loginator
 
     # class level mixins
     module ClassMethods #:nodoc
-      def from_hash(hsh)
-        fail(ArgumentError, format('Hash must contain keys: %s', members.join(', '))) unless valid_hash?(hsh)
-        new(*hsh.values)
+      def from_json(json)
+        json_type = json.delete('type')
+        fail(ArgumentError, format('Incorrect message type: %s', json_type)) unless json_type == type
+        fail(ArgumentError, format('Hash must contain keys: %s', members.join(', '))) unless valid_hash?(json)
+        new(*json.values)
+      end
+
+      def type
+        @type ||= name.split('::').last.downcase.freeze
       end
 
       private
@@ -27,7 +33,8 @@ module Loginator
     end #:rubocop:enable documentation
 
     def to_json
-      MultiJson.dump(to_h)
+      MultiJson.dump(to_h.merge(type: self.class.type))
     end
+    alias_method :to_s, :to_json
   end
 end

data/lib/loginator/version.rb

@@ -1,4 +1,4 @@
 # Increment when releasing.
 module Loginator
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
 end

data/lib/loginator.rb

@@ -1,4 +1,6 @@
 require 'loginator/version'
+require 'loginator/request'
+require 'loginator/response'
 
 # Loginator
 module Loginator

data/spec/support/shared/lib/loginator/jsonable_struct_spec.rb

@@ -1,13 +1,13 @@
 shared_examples_for 'jsonable_struct' do
   describe '#to_json' do
     it 'faithfully serializes' do
-      expect(subject.to_json).to eq(MultiJson.dump(subject.to_h))
+      expect(subject.to_json).to eq(MultiJson.dump(subject.to_h.merge(type: described_class.type)))
     end
   end
 
-  describe '.from_hash' do
+  describe '.from_json' do
     it 'faithfully deserializes' do
-      expect(described_class.from_hash(MultiJson.load(subject.to_json))).to eq(subject)
+      expect(described_class.from_json(MultiJson.load(subject.to_json))).to eq(subject)
     end
   end
 end

data/spec/support/shared/lib/loginator/struct_with_defaults_spec.rb

@@ -29,9 +29,9 @@ shared_examples_for 'struct_with_defaults' do
         end
       end
 
-      describe '.from_hash' do
+      describe '.from_json' do
         it 'faithfully deserializes' do
-          expect(described_class.from_hash(MultiJson.load(subject.to_json))).to eq(subject)
+          expect(described_class.from_json(MultiJson.load(subject.to_json))).to eq(subject)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loginator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Greg Poirier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor