mongify-mongoid 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d258f7b7209471b3b095f479cfd6c5ed609a5008
-  data.tar.gz: 3bdf8722185925908dd4925d431495038fbfcc42
+  metadata.gz: 2e6d0ed283fe1c834bddddb20ccfd3fb47f06feb
+  data.tar.gz: 6249ae1db708f6472dc0ef85f812e262b785d407
 SHA512:
-  metadata.gz: 19fc47f468b15c691102f70b5a55aba7b961f0e077dbec524fd9d7f11f2961d32498cac071aaebd58cbc947c0895a32569e0466f0c01be5d874f1fd4466fa5cb
-  data.tar.gz: 8c44b384ed37574af5a5b6a1e7237d77d193f008740e1b9e8d3824c13e469bae3d5a084b99f2d6e79a91f35a30daac4f8ca40e98ea918daa9e3b93cb344791ad
+  metadata.gz: 73272accb607d69e7e035d0cb18c3c4f8e15b15cf4f02536596a1014cdab090d5c3839532c41b87a143b77b0d5a3792a7bc0f884ff0f2d7f913b303359cc4851
+  data.tar.gz: 0e813eb4958e96d90554b638ef8d8fea8d338a1ce4ea87e876e2223820900558ea389b4e46b875a51b9a3ce6156e25a533f3c7d189105c61129771caeab859f3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.4 / 22 JUNE 2014
+
+  * Added Decimal translation
+  * Fixed issue were AS field was being ignored.
+  * Fixed typos
+
 ## 1.0.3 / 16 JUNE 2014
 
   * Fixed issue with during generation of files

data/lib/mongify/mongoid/model.rb

@@ -5,7 +5,7 @@ module Mongify
   module Mongoid
     #
     # Class that will be used to define a mongoid model
-    # 
+    #
     class Model
       #default created at field name
       CREATED_AT_FIELD = 'created_at'
@@ -55,8 +55,8 @@ module Mongify
       end
       alias :name :class_name
 
-      # Adds a field definition to the class, 
-      # e.g: 
+      # Adds a field definition to the class,
+      # e.g:
       #   add_field("field_name", "String", {rename_to: "name"})
       def add_field(name, type, options={})
         options.stringify_keys!
@@ -64,17 +64,18 @@ module Mongify
         check_for_timestamp(name)
         return if EXCLUDED_FIELDS.include?(name.to_s.downcase)
         name = options['rename_to'] if options['rename_to'].present?
+        type = options['as'] if options['as'].present?
         begin
-          @fields[name.to_sym] = Field.new(name, type, options)  
+          @fields[name.to_sym] = Field.new(name, type, options)
         rescue InvalidField => e
-          raise InvalidField, "Unkown field type #{type} for #{name} in #{class_name}"
-        end      
+          raise InvalidField, "Unknown field type #{type} for #{name} in #{class_name}"
+        end
       end
 
-      # Adds a relationship definition to the class, 
-      # e.g: 
+      # Adds a relationship definition to the class,
+      # e.g:
       #   add_relation("embedded_in", "users")
-      #   
+      #
       # @note Embedded relations will overpower related relations
       # @return [Relation] New generated relation
       def add_relation(relation_name, association, options={})
@@ -105,7 +106,7 @@ module Mongify
       #######
       private
       #######
-      
+
       # Checks if given field name is a known timestamp field
       # @return [nil]
       def check_for_timestamp name

data/lib/mongify/mongoid/model/field.rb

@@ -9,6 +9,7 @@ module Mongify
         ACCEPTED_TYPES = [
           "Array",
           "BigDecimal",
+          "Decimal",
           "Boolean",
           "Date",
           "DateTime",
@@ -29,6 +30,7 @@ module Mongify
         TRANSLATION_TYPES = {
           array: "Array",
           bigdecimal: "BigDecimal",
+          decimal: "String",
           boolean: "Boolean",
           date: "Date",
           datetime: "DateTime",
@@ -49,24 +51,23 @@ module Mongify
         attr_accessor :name, :type, :options
 
         def initialize(name, type, options={})
-          type = translate_type(type)
-          check_field_type(type)
           @name = name
-          @type = type
           @options = options
+          @type = translate_type(type)
+          check_field_type(@type)
         end
 
         #######
         private
         #######
-        
+
         # Tries to find a translation for a SQL type to a Mongoid Type
         # @param [String] name Name of type
         # @return [String] Translated field name or the same name if no translation is found
         def translate_type(name)
           TRANSLATION_TYPES[name.to_s.downcase.to_sym] || name
         end
-        
+
         # Raises InvalidField if field type is unknown
         # @param [String] name Name of type
         # @raise InvalidField if name is not an accepted type

data/lib/mongify/mongoid/version.rb

@@ -1,6 +1,6 @@
 module Mongify
   module Mongoid
     #Version number for Mongify-Mongoid
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/spec/lib/mongify/mongoid/model/field_spec.rb

@@ -5,15 +5,22 @@ describe Mongify::Mongoid::Model::Field do
   context "types" do
     context "validation" do
       it "doesn't raise error when valid value" do
-        expect { Mongify::Mongoid::Model::Field.new("first_name", "String") }.to_not raise_error  
+        expect { Mongify::Mongoid::Model::Field.new("first_name", "String") }.to_not raise_error
       end
       it "does raise error on invalid value" do
         expect { Mongify::Mongoid::Model::Field.new("first_name", "Limb") }.to raise_error(Mongify::Mongoid::InvalidField)
       end
     end
 
+    context "decimal" do
+      it "works" do
+        subject = Mongify::Mongoid::Model::Field.new("money", "Decimal")
+        expect(subject.type).to eq "String"
+      end
+    end
+
     context "translation" do
-      [:array, :bigdecimal, :boolean, :date, :datetime, :float, :hash, :integer, :objectid, :binary, :range, :regexp, :string, :symbol, :time, :timewithzone].each do |type|  
+      [:array, :bigdecimal, :decimal, :boolean, :date, :datetime, :float, :hash, :integer, :objectid, :binary, :range, :regexp, :string, :symbol, :time, :timewithzone].each do |type|
         it "for #{type} works" do
           field.send(:translate_type, type).should == Mongify::Mongoid::Model::Field::TRANSLATION_TYPES[type]
         end
@@ -26,6 +33,6 @@ describe Mongify::Mongoid::Model::Field do
         field.send(:translate_type, type).should == type
       end
     end
-    
+
   end
 end

data/spec/lib/mongify/mongoid/model_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Mongify::Mongoid::Model do
   subject(:model) { Mongify::Mongoid::Model.new(:table_name => "users", :class_name => "User") }
-  
+
   describe "initialize" do
     its(:class_name) { should == "User" }
     its(:table_name) { should == "users" }
@@ -28,10 +28,14 @@ describe Mongify::Mongoid::Model do
       model.add_field("user_id", "integer", {references: 'users'})
       model.should_not have_field("user_id")
     end
-    it "raises error if field is unkown" do
+    it "works with as field type" do
+      subject.add_field("money", "Decimal", {as: "Integer"})
+      expect(subject).to have_field("money").of_type("Integer")
+    end
+    it "raises error if field is unknown" do
       expect { model.add_field("user_id", 'limb') }.to raise_error(
-                  Mongify::Mongoid::InvalidField, 
-                  "Unkown field type limb for user_id in #{model.class_name}")
+                  Mongify::Mongoid::InvalidField,
+                  "Unknown field type limb for user_id in #{model.class_name}")
     end
   end
 
@@ -140,7 +144,7 @@ describe Mongify::Mongoid::Model do
         model.add_relation(Mongify::Mongoid::Model::Relation::HAS_MANY, association)
         model.relations.should have(1).relation
       end
-      
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongify-mongoid
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Andrew Kalek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongify