ar2gostruct 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa224af8ae2ec6ea6829496a2e3bdda2539f9a7f
-  data.tar.gz: 9fdc2a6f65cd429b3fef64b817f82dc816dbff90
+  metadata.gz: ed2f1667ec57d8767c34154cba06b76f9acfcca2
+  data.tar.gz: f065da8c5d60b56de535d5863e5ce4ed4f701287
 SHA512:
-  metadata.gz: b95874bb14f79adb8169afc43b97205357e6dd071b960d44e7dd86d73aeb3c3425ceb023bc56d2ad30b082ed931e2bf38d6d74379d5f19b658f5f17a69571e6b
-  data.tar.gz: a6db670082617c894c8ae56e0fd1bf6de5cb5df7d412a8ebf9db58ad6468fbac89559896993cdb644a40b5b70fd1a8af07fb8a87071c66f1611eddc45c87c2aa
+  metadata.gz: 8aafb9b733b11a883bffb1e17c3208c4e5c9056f13830ac3a673c80c651879044e72854c531eff8a84663144abda7e99055d62551c5010530980acfd565b73d4
+  data.tar.gz: d942cb77850cff9743f3b71c26d463466e41a4cbebb09a4dc1a147c6908a38b66f774122d9cf888107e423b93eeddc2586e5cefd82974252085a3487ffa23dab

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.2.1
+ * Add support for Package validator https://github.com/go-validator/validator
+ * Allow multiple orm
+
 ## 0.2.0
  * Add support for GORM ORM https://github.com/jinzhu/gorm
  * Ass support Active Record Associations(has_many, has_one, belongs_to)

data/lib/ar2gostruct/builder/orm/gorm.rb

@@ -16,10 +16,10 @@ module Ar2gostruct
           # set size
           if col.type == :string
             # SQL type
-            if col.sql_type
+            if col.sql_type && /\A\w+\(\d+\)/.match(col.sql_type)
               orm_option << "type:#{col.sql_type}"
             end
-            orm_option << "size:#{col.limit}"
+            orm_option << "size:#{col.limit}" if col.limit
           end
 
           if orm_option.present?

data/lib/ar2gostruct/builder/orm/validator.rb

@@ -0,0 +1,48 @@
+# validator https://github.com/go-validator/validator
+require "ar2gostruct/builder/orm/base"
+module Ar2gostruct
+  module Builder
+    module ORM
+      class Validator < Base
+
+        def get_option(col)
+          orm_option = []
+
+          # not null Constraint
+          orm_option << "nonzero" unless col.null
+
+          validators = self.klass.validators_on col.name
+          
+          validators.each do |validator|
+            orm_option.concat get_validation_rules(validator)
+          end
+
+          if orm_option.present?
+            return "validate:\"#{orm_option.join(TAG_SEPARATOR)}\""
+          else
+            return nil
+          end
+        end
+
+        def get_validation_rules(validator)
+          rules = []
+          case validator.class.to_s
+          # when "ActiveModel::Validations::FormatValidator"
+          #   if validator.options && validator.options[:with]
+          #     rules << "regexp=#{validator.options[:with]}"
+          #   end
+          when "ActiveModel::Validations::LengthValidator"
+            if validator.options
+              rules << "min=#{validator.options[:minimum]}" if validator.options[:maximum]
+              rules << "max=#{validator.options[:maximum]}" if validator.options[:maximum]
+            end
+          end
+          return rules
+        rescue => e
+          []
+        end
+
+      end
+    end
+  end
+end

data/lib/ar2gostruct/converter.rb

@@ -76,13 +76,28 @@ module Ar2gostruct
 
       def get_orm_options(col)
         tags ||= []
-        builder = "Ar2gostruct::Builder::ORM::#{self.orm.upcase}".constantize.new(self.klass)
-        option = builder.get_option col
-        tags << option if option
+        self.orm.split(",").each do |orm_name|
+          builder = get_orm_builder orm_name
+          if builder
+            option = builder.get_option col
+            tags << option if option
+          end
+        end
+        return tags
       rescue => e
         []
       end
 
+      def get_orm_builder(orm_name)
+        prefix = "Ar2gostruct::Builder::ORM::"
+        builder = if Object.const_defined?("#{prefix}#{orm_name.upcase}")
+          "#{prefix}#{orm_name.upcase}"
+        elsif Object.const_defined?("#{prefix}#{orm_name.camelize}")
+          "#{prefix}#{orm_name.camelize}"
+        end
+        return builder.constantize.new(self.klass) if builder
+      end
+
       def get_struct_name
         if self.plural
           self.klass.table_name.camelize

data/lib/ar2gostruct/version.rb

@@ -1,3 +1,3 @@
 module Ar2gostruct
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/ar2gostruct.rb

@@ -42,4 +42,5 @@ require "ar2gostruct/gostruct"
 require "ar2gostruct/builder/association"
 require "ar2gostruct/builder/orm/gorm"
 require "ar2gostruct/builder/orm/qbs"
+require "ar2gostruct/builder/orm/validator"
 require "ar2gostruct/builder/association"

data/spec/ar2gostruct/builder/orm/gorm_spec.rb

@@ -10,7 +10,7 @@ describe "Ar2gostruct::Builder::ORM::GORM" do
       expect(result).to eq("sql:\"not null\"")
       # email
       result = orm_converter.get_option User.columns[1]
-      expect(result).to eq("sql:\"not null;type:varchar(255);size:255\"")
+      expect(result).to eq("sql:\"not null\"")
       # sign_in_count
       result = orm_converter.get_option User.columns[2]
       expect(result).to eq("sql:\"not null\"")

data/spec/ar2gostruct/builder/orm/validator_spec.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe "Ar2gostruct::Builder::ORM::Validator" do
+
+  describe "#get_option" do
+    it "should output Validator format tags" do
+      orm_converter = Ar2gostruct::Builder::ORM::Validator.new User
+      # id
+      result = orm_converter.get_option User.columns[0]
+      expect(result).to eq("validate:\"nonzero\"")
+      # email
+      result = orm_converter.get_option User.columns[1]
+      expect(result).to eq("validate:\"nonzero,min=1,max=120\"")
+      # sign_in_count
+      result = orm_converter.get_option User.columns[2]
+      expect(result).to eq("validate:\"nonzero\"")
+      # current_sign_in_at
+      result = orm_converter.get_option User.columns[3]
+      expect(result).to eq(nil)
+      # last_sign_in_at
+      result = orm_converter.get_option User.columns[4]
+      expect(result).to eq(nil)
+      # current_sign_in_ip
+      result = orm_converter.get_option User.columns[5]
+      expect(result).to eq(nil)
+      # last_sign_in_ip
+      result = orm_converter.get_option User.columns[6]
+      expect(result).to eq(nil)
+      # created_at
+      result = orm_converter.get_option User.columns[7]
+      expect(result).to eq(nil)
+      # updated_at
+      result = orm_converter.get_option User.columns[8]
+      expect(result).to eq(nil)
+    end
+  end
+
+end

data/spec/support/models.rb

@@ -3,6 +3,7 @@ require "active_record"
 class User < ActiveRecord::Base
   has_one :profile
   has_many :projects
+  validates :email, length: { minimum: 1, maximum: 120 }
 end
 
 class Profile < ActiveRecord::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar2gostruct
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tatsuo Kaniwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,6 +90,7 @@ files:
 - lib/ar2gostruct/builder/orm/base.rb
 - lib/ar2gostruct/builder/orm/gorm.rb
 - lib/ar2gostruct/builder/orm/qbs.rb
+- lib/ar2gostruct/builder/orm/validator.rb
 - lib/ar2gostruct/const.rb
 - lib/ar2gostruct/converter.rb
 - lib/ar2gostruct/gostruct.rb
@@ -100,6 +101,7 @@ files:
 - spec/ar2gostruct/builder/association_spec.rb
 - spec/ar2gostruct/builder/orm/gorm_spec.rb
 - spec/ar2gostruct/builder/orm/qbs_spec.rb
+- spec/ar2gostruct/builder/orm/validator_spec.rb
 - spec/db/database.yml
 - spec/db/migrate/0001_create_tables.rb
 - spec/spec_helper.rb
@@ -128,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Generate Go Struct from activerecord models