ar2gostruct 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bd7df59cfe124d352522d89953e3864bf627e51
-  data.tar.gz: ad23583822e54f5a17a989020167fe413d8efc5c
+  metadata.gz: 3861f4676a60c926267fc2a6e8ae604b92122f17
+  data.tar.gz: af54f1c63cfac46899a8a48403d7abfb66d4b74f
 SHA512:
-  metadata.gz: 4287b8497964ae331587a301f9c5476e98869cecc514f8a43c93ee553c0b07587f7b9fe4dc293191657b22236829d04f6f329268460973a7a590fd4817a017e4
-  data.tar.gz: 1f5f6256d5c592e707b5d984636181157a16a6e75765e2be7d6b312d21ed1cd2e7eb920a9bc565ff305854b4f71b992635e90a9ca73085b7da484d9d5634a99f
+  metadata.gz: 1a70b09199ff41a98f49d52e0897346955791fb3d6c2e0a1248023afa8001d824bcc34010871687636fd7f8e017a6cbc865d415bfc6966d47137c381610abfd4
+  data.tar.gz: 40a12625a3613330e8dec3a855b831ddafa397ecad0cb60415f6ab520f21b1669420d37eabffb62a35967370c937ddc67eb12f6285ae7360290915ba026cdb6f

data/README.md

@@ -29,9 +29,9 @@ ar2gostruct
 ```
 this will returns
 ```bash
-// app/models/users.rb
+// app/models/user.rb
 // Table name: users
-type Users struct {
+type User struct {
   Id                     int32          `json:"id"`
   Email                  string         `json:"email"`
   EncryptedPassword      string         `json:"encrypted_password"`
@@ -43,6 +43,10 @@ type Users struct {
   LastSignInAt           time.Time      `json:"last_sign_in_at"`
   CurrentSignInIp        string         `json:"current_sign_in_ip"`
   LastSignInIp           string         `json:"last_sign_in_ip"`
+  ConfirmationToken      string         `json:"confirmation_token"`
+  ConfirmedAt            time.Time      `json:"confirmed_at"`
+  ConfirmationSentAt     time.Time      `json:"confirmation_sent_at"`
+  UnconfirmedEmail       string         `json:"unconfirmed_email"`
   CreatedAt              time.Time      `json:"created_at"`
   UpdatedAt              time.Time      `json:"updated_at"`
 }
@@ -54,10 +58,11 @@ If you're using [qbs](https://github.com/coocood/qbs#), Additional options are a
 bundle exec rake ar2gostruct orm=qbs
 # or
 ar2gostruct -o qbs
+# If you prefer plural struct name, "--plural" option is available.
 
-// app/models/users.rb
+// app/models/user.rb
 // Table name: users
-type Users struct {
+type User struct {
   Id                     int32          `json:"id" qbs:"pk,notnull"`
   Email                  string         `json:"email" qbs:"notnull,default:''"`
   EncryptedPassword      string         `json:"encrypted_password" qbs:"notnull,default:''"`
@@ -69,10 +74,15 @@ type Users struct {
   LastSignInAt           time.Time      `json:"last_sign_in_at"`
   CurrentSignInIp        string         `json:"current_sign_in_ip"`
   LastSignInIp           string         `json:"last_sign_in_ip"`
-  CreatedAt              time.Time      `json:"created_at"`
-  UpdatedAt              time.Time      `json:"updated_at"`
+  ConfirmationToken      string         `json:"confirmation_token"`
+  ConfirmedAt            time.Time      `json:"confirmed_at"`
+  ConfirmationSentAt     time.Time      `json:"confirmation_sent_at"`
+  UnconfirmedEmail       string         `json:"unconfirmed_email"`
+  CreatedAt              time.Time      `json:"created_at" qbs:"created"`
+  UpdatedAt              time.Time      `json:"updated_at" qbs:"updated"`
 }
 
+
 ```
 
 Contributing

data/bin/ar2gostruct

@@ -5,7 +5,7 @@ require 'optparse'
 require 'ar2gostruct'
 
 OptionParser.new do |opt|
-  opt.banner = "Usage: annotate [options] [model_file]*"
+  opt.banner = "Usage: ar2gostruct [options]"
 
   opt.on('-v', '--version',
           "Show the current version of this gem") do
@@ -16,6 +16,10 @@ OptionParser.new do |opt|
     ENV['orm'] = orm.to_s
   end
 
+  opt.on('--plural', "Pluralize struct name") do
+    ENV['plural'] = "true"
+  end
+
   opt.on('--model-dir dir',
           "Model files stored in dir rather than app/models") do |dir|
     ENV['model_dir'] = dir.to_s

data/lib/ar2gostruct.rb

@@ -32,7 +32,12 @@ module Ar2gostruct
 
   def self.get_schema_info(klass)
     info = "// Table name: #{klass.table_name}\n"
-    info << "type #{klass.table_name.camelize} struct {\n"
+    if ENV['plural']
+      struct_name = klass.table_name.camelize
+    else
+      struct_name = klass.to_s.tr_s('::', '')
+    end
+    info << "type #{struct_name} struct {\n"
 
     max_size = klass.column_names.collect{|name| name.size}.max + 1
     klass.columns.each do |col|
@@ -56,6 +61,12 @@ module Ar2gostruct
         if col.default
           orm_option << "default:'#{col.default}'"
         end
+        # set timestamp
+        if col.name == "created_at"
+          orm_option << "created"
+        elsif col.name == "updated_at"
+          orm_option << "updated"
+        end
         if orm_option.present?
           tags << "qbs:\"#{orm_option.join(",")}\""
         end
@@ -95,13 +106,11 @@ module Ar2gostruct
   end
 
   def self.convert!
-    annotated = []
     self.get_model_names.each do |m|
       class_name = m.sub(/\.rb$/,'').camelize
       begin
         klass = class_name.split('::').inject(Object){ |klass,part| klass.const_get(part) }
         if klass < ActiveRecord::Base && !klass.abstract_class?
-          annotated << class_name
           self.convert_to_gostruct(klass)
         end
       rescue Exception => e

data/lib/ar2gostruct/version.rb

@@ -1,3 +1,3 @@
 module Ar2gostruct
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar2gostruct
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Tatsuo Kaniwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake