frenchy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e1a3deb604054b63aafdf5bb1b5a565485a684
-  data.tar.gz: bf9c15219f6fa720530a1598b7adc27ef9242baf
+  metadata.gz: bbd873ca7bf47ce23e6e60450167777221a970c4
+  data.tar.gz: b482ca20c727d4ebad679da013405e15e260bd37
 SHA512:
-  metadata.gz: a97314440955f6d4a7048997c4309e65d95c6d5fa0207d5b01060178cadc51fded78c96d5d8e8db1c8beb199cf976a1d28f9770e33090eb9e6bddc219742b928
-  data.tar.gz: 9f138c7b0812c883307475f06b7c0fd47f51e62602183d5706db3b802aad3c9318571b7ba6eba5e934f9dba297eaad7ded6b2c0c753b115441bb65b881f1115f
+  metadata.gz: e477ae25b9c358cf9ad06d3b1816720ef0da7b81666cda78c0780d9275dd9fabb8592b492a2a251e1e54ed49e8b1146606e431aedae18f42b688f4e9e246116c
+  data.tar.gz: aa04396f718b9523f060e6d29913c2c8601466f580fa9de1855bd6e3f0067d9d6c8f9dd69372edae0b21e01c83fea219065f27b4dbf5f26f3368e112118bd713

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.2
+  - 2.3.0

data/lib/frenchy/client.rb

@@ -106,6 +106,9 @@ module Frenchy
         rescue => ex
           raise Frenchy::InvalidResponse.new(ex, reqinfo, resp)
         end
+      when 400
+        # Explicitly handle bad request errors
+        raise Frenchy::BadRequest.new(nil, reqinfo, resp)
       when 404
         # Explicitly handle not found errors
         raise Frenchy::NotFound.new(nil, reqinfo, resp)

data/lib/frenchy/error.rb

@@ -24,6 +24,7 @@ module Frenchy
     end
   end
 
+  class BadRequest < RequestError; end
   class NotFound < RequestError; end
   class InvalidResponse < RequestError; end
   class ServerError < RequestError; end

data/lib/frenchy/model.rb

@@ -7,7 +7,6 @@ module Frenchy
         self.fields = {}
         self.defaults = {}
       end
-
     end
 
     # Create a new instance of this model with the given attributes
@@ -54,7 +53,6 @@ module Frenchy
     end
 
     module ClassMethods
-
       # Class accessors
       def fields; @fields; end
       def defaults; @defaults; end
@@ -70,6 +68,21 @@ module Frenchy
         end
       end
 
+      # Macro to create a subtype
+      def type(name, &block)
+        klass = Class.new(self) do
+          include Frenchy::Model
+        end
+        const_set(name.to_s.camelize, klass)
+        klass.class_eval(&block)
+      end
+
+      # Macro to create a subtype and associated field
+      def embed(name, options={}, &block)
+        type(name, &block)
+        field(name, options.merge({type: name}))
+      end
+
       # Macro to add a field
       def field(name, options={})
         name = name.to_s
@@ -120,6 +133,10 @@ module Frenchy
           define_method("#{name}=") do |v|
             if v.is_a?(Fixnum)
               set(name, Time.at(v).to_datetime)
+            elsif v.is_a?(DateTime)
+              set(name, v)
+            elsif v.is_a?(Time)
+              set(name, v.to_datetime)
             else
               set(name, DateTime.parse(v))
             end
@@ -146,7 +163,7 @@ module Frenchy
         else
           # Unknown types have their type constantized and initialized with the value. This
           # allows us to support things like other Frenchy::Model classes, ActiveRecord models, etc.
-          klass = (options["class_name"] || type.camelize).constantize
+          klass = const_get(options["class_name"] || type.camelize)
 
           # Fields with many values have a default of [] (unless previously set above)
           if options["many"]

data/lib/frenchy/version.rb

@@ -1,3 +1,3 @@
 module Frenchy
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/lib/frenchy/model_spec.rb

@@ -23,6 +23,21 @@ end
 class Box
   include Frenchy::Model
 
+  class SubclassItem
+    include Frenchy::Model
+
+    field :id, type: "integer"
+  end
+
+  type :subtype_item do
+    field :id, type: "integer"
+  end
+
+  embed :child do
+    field :id, type: "integer"
+    field :name, type: "string"
+  end
+
   key :name
 
   field :id, type: "integer"
@@ -36,6 +51,8 @@ class Box
   field :item, type: "special_item"
   field :items, type: "special_item", many: true
   field :special, type: "special_item", class_name: "SuperSpecialItem"
+  field :subclass, type: "subclass_item"
+  field :subtype, type: "subtype_item"
 end
 
 class SimpleModelDecorator
@@ -149,6 +166,22 @@ describe Frenchy::Model do
     end
 
     describe "time" do
+      it "retains DateTime" do
+        t = DateTime.now
+        v = Box.new(birth: t).birth
+        expect(v.class).to eql(DateTime)
+        expect(v.to_time.to_i).to eql(t.to_time.to_i)
+        expect(v.year).to eql(t.year)
+      end
+
+      it "converts Time to DateTime" do
+        t = Time.now.utc
+        v = Box.new(birth: t).birth
+        expect(v.class).to eql(DateTime)
+        expect(v.to_time.to_i).to eql(t.to_i)
+        expect(v.year).to eql(t.year)
+      end
+
       it "converts unix timestamps to DateTime" do
         v = Box.new(birth: 1234567890).birth
         expect(v.class).to eql(DateTime)
@@ -214,6 +247,25 @@ describe Frenchy::Model do
         expect(v.id).to eql(1)
       end
 
+      it "supports subclass items" do
+        v = Box.new(subclass: {id: 1}).subclass
+        expect(v).to be_an_instance_of(Box::SubclassItem)
+        expect(v.id).to eql(1)
+      end
+
+      it "supports subtype items with type keyword" do
+        v = Box.new(subtype: {id: 2}).subtype
+        expect(v).to be_an_instance_of(Box::SubtypeItem)
+        expect(v.id).to eql(2)
+      end
+
+      it "supports embedded items with embed keyword" do
+        v = Box.new(child: {id: 3, name: "Jane"}).child
+        expect(v).to be_an_instance_of(Box::Child)
+        expect(v.id).to eql(3)
+        expect(v.name).to eql("Jane")
+      end
+
       it "establishes many model relationships" do
         v = Box.new(items: [{id: 1}, {id: 2}]).items
         expect(v).to be_an_instance_of(Frenchy::Collection)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frenchy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Coene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json