yaddl 0.0.6 → 0.0.7

data/README.md

@@ -4,6 +4,8 @@ This project rocks and uses MIT-LICENSE.
 
 # Usage
 
+`gem 'yaddl'`
+
 ```
 rake yaddl:models
 rake yaddl:migrations
@@ -67,3 +69,200 @@ Legend:
 - !!{ruby_code} - unique ruby_code will be added to model only once
 - if, unless, def, module, class - ruby code blocks (else and elsif are not currently supported at root)
 - include, require, has_many, serialize, etc. - single line ruby methods
+
+---
+
+# Example Yaddl File
+
+/db/photo_gallery.yaddl
+```ruby
+Gallery(name:string)
+  @Describable
+  @Commentable
+
+  User
+
+  *Photo(name:string)
+    @Describable
+    @Commentable
+
+    User
+
+    photographer:User
+    *participant:User
+
+    taken_at:datetime
+
+    -image_src:text
+    -thumb_src:text
+
+    before_save :generate_thumbnail
+    def generate_thumbnail
+      # generate a thumbnail from image_drc for thumb_src
+    end
+
+User(email:string)
+  !!{has_secure_password}
+  name:string
+  email:string
+  password_digest:string
+  attr_accessible :password
+  =to_s{email}
+
+@Describable
+  description:text
+
+@Commentable
+  *Comment
+    @Commentable
+    User
+    approved:boolean
+    def approve!
+      self.update_columns(approved: true)
+    end
+```
+
+# Example Output
+
+### Migrations
+
+/db/schema.rb
+```ruby
+ActiveRecord::Schema.define(version: 20140318005217) do
+
+  create_table "comments", force: true do |t|
+    t.boolean  "approved"
+    t.integer  "gallery_id"
+    t.integer  "photo_id"
+    t.integer  "comment_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "comments", ["comment_id"], name: "index_comments_on_comment_id"
+  add_index "comments", ["gallery_id"], name: "index_comments_on_gallery_id"
+  add_index "comments", ["photo_id"], name: "index_comments_on_photo_id"
+
+  create_table "galleries", force: true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "photos", force: true do |t|
+    t.string   "name"
+    t.datetime "taken_at"
+    t.text     "image_src"
+    t.text     "thumb_src"
+    t.text     "description"
+    t.integer  "gallery_id"
+    t.integer  "photographer_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "photos", ["gallery_id"], name: "index_photos_on_gallery_id"
+  add_index "photos", ["photographer_id"], name: "index_photos_on_photographer_id"
+
+  create_table "users", force: true do |t|
+    t.string   "email"
+    t.string   "name"
+    t.string   "password_digest"
+    t.integer  "gallery_id"
+    t.integer  "photo_id"
+    t.integer  "participants_id"
+    t.integer  "comment_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users", ["comment_id"], name: "index_users_on_comment_id"
+  add_index "users", ["gallery_id"], name: "index_users_on_gallery_id"
+  add_index "users", ["participants_id"], name: "index_users_on_participants_id"
+  add_index "users", ["photo_id"], name: "index_users_on_photo_id"
+
+end
+```
+
+/app/models/photo.rb
+```ruby
+class Photo < ActiveRecord::Base
+  belongs_to :gallery
+  belongs_to :photographer, class_name: "User", dependent: :destroy
+  has_one :user, dependent: :destroy
+  has_many :participants, class_name: "User", dependent: :destroy, foreign_key: :participant_id
+  has_many :comments, dependent: :destroy
+
+  attr_accessible :gallery_id, :photographer_id
+  attr_accessible :name, :taken_at, :image_src, :thumb_src, :description
+
+  accepts_nested_attributes_for :user
+  accepts_nested_attributes_for :participants, :comments
+
+  before_save :generate_thumbnail
+
+  def generate_thumbnail
+    # generate a thumbnail from image_drc for thumb_src
+  end
+end
+```
+
+/app/models/gallery.rb
+```ruby
+class Gallery < ActiveRecord::Base
+  has_one :user, dependent: :destroy
+  has_many :photos, dependent: :destroy
+  has_many :comments, dependent: :destroy
+
+  attr_accessible :name, :description
+
+  accepts_nested_attributes_for :user
+  accepts_nested_attributes_for :photos, :comments
+end
+```
+
+/app/models/comment.rb
+```ruby
+class Comment < ActiveRecord::Base
+  belongs_to :gallery
+  belongs_to :photo
+  belongs_to :comment
+  has_one :user, dependent: :destroy
+  has_many :comments, dependent: :destroy
+
+  attr_accessible :gallery_id, :photo_id, :comment_id
+  attr_accessible :approved
+
+  accepts_nested_attributes_for :user
+  accepts_nested_attributes_for :comments
+
+  def approve!
+    self.update_columns(approved: true)
+  end
+end
+```
+
+/app/models/user.rb
+```ruby
+class User < ActiveRecord::Base
+  belongs_to :gallery
+  belongs_to :photo
+  belongs_to :participants, class_name: "Photo"
+  belongs_to :comment
+  has_many :photographer_photos, class_name: "Photo", foreign_key: :photographer_id, dependent: :destroy
+
+  attr_accessible :gallery_id, :photo_id, :participants_id, :comment_id
+  attr_accessible :email, :name, :password_digest
+
+  accepts_nested_attributes_for :photographer_photos
+
+  has_secure_password
+  attr_accessible :password
+
+  # returns: string
+  def to_s
+    email
+  end
+end
+```

data/lib/yaddl.rb

@@ -109,7 +109,7 @@ class Generator
       model['code']['after'] ||= []
       model['code']['controller'] ||= []
       sc = "rails g model #{name} " + model['attributes'].map{ |k,v| k + ':' + v['type'].sub(/yaml|hash|object|cache/i,"text") }.join(' ') + " " + model['belongs_to'].map{ |k,v| k + ':references' + (v['polymorphic'] ? "{polymorphic}" : "") }.join(' ')
-      puts("migration: cd #{Rails::root} && #{sc} --skip")# unless @quiet
+      puts("migration: cd #{Rails::root} && #{sc} --skip --no-test-framework") unless @quiet
       `cd #{Rails::root} && #{sc} --skip --no-test-framework`
     end if options.include?("--migrations-only")
 
@@ -532,7 +532,7 @@ end.join }        <td><%= link_to 'Show', #{name.underscore} %></td>
         @multiline_buffer = line[@multiline_spaces..line.length]
         return
       elsif line.strip =~ /^[a-z_]+ |^acts_as_.*/
-        if line.strip =~ /"^include |^require |^extend |^acts_as_[a-z_]+/
+        if line.strip =~ /^include |^require |^extend |^acts_as_[a-z_]+/
           line = "!top{#{line.strip}}"
         else
           line = "!!{#{line.strip}}"

data/lib/yaddl/version.rb

@@ -1,3 +1,3 @@
 module Yaddl
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/dummy/log/test.log

@@ -416,5 +416,35 @@ YaddlTest: test_create_test_model
    (0.1ms)  begin transaction
 -----------------------
 YaddlTest: test_defined
+-----------------------
+   (0.1ms)  rollback transaction
+   (0.3ms)  begin transaction
+---------------------------------
+YaddlTest: test_create_test_model
+---------------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------
+YaddlTest: test_defined
+-----------------------
+   (0.1ms)  rollback transaction
+   (0.3ms)  begin transaction
+---------------------------------
+YaddlTest: test_create_test_model
+---------------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------
+YaddlTest: test_defined
+-----------------------
+   (0.1ms)  rollback transaction
+   (0.3ms)  begin transaction
+---------------------------------
+YaddlTest: test_create_test_model
+---------------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------
+YaddlTest: test_defined
 -----------------------
    (0.1ms)  rollback transaction

data/test/yaddl_test.rb

@@ -9,15 +9,21 @@ class YaddlTest < ActiveSupport::TestCase
     y = Yaddl::Generator.new
     y.markup = "TestModel(name:string)
   =to_s{name}
-  *RelatedModel"
+  *ChildModel
+  +RelatedModel
+  ReferencedModel"
     y.generate("--no-scaffolds --quiet")
     y.generate("--migrations-only --quiet")
     assert_file "app/models/test_model.rb", "class TestModel < ActiveRecord::Base
-  has_many :related_models, dependent: :destroy
+  belongs_to :related_model
+  has_one :referenced_model, dependent: :destroy
+  has_many :child_models, dependent: :destroy
 
+  attr_accessible :related_model_id
   attr_accessible :name
 
-  accepts_nested_attributes_for :related_models
+  accepts_nested_attributes_for :referenced_model
+  accepts_nested_attributes_for :child_models
 
   # returns: string
   def to_s
@@ -27,9 +33,8 @@ end
 "
 
     assert_file "app/models/related_model.rb", "class RelatedModel < ActiveRecord::Base
-  belongs_to :test_model
+  has_many :test_models, dependent: :nullify
 
-  attr_accessible :test_model_id
 end
 "
 
@@ -45,11 +50,31 @@ TestModel:
       returns: string
       getter: name
   has_many:
-    related_models:
+    child_models:
       dependent: destroy
+      class_names:
+      - ChildModel
+  belongs_to:
+    related_model:
       class_names:
       - RelatedModel
+  has_one:
+    referenced_model:
+      dependent: destroy
+      class_names:
+      - ReferencedModel
+ChildModel:
+  belongs_to:
+    test_model:
+      class_names:
+      - TestModel
 RelatedModel:
+  has_many:
+    test_models:
+      dependent: nullify
+      class_names:
+      - RelatedModel
+ReferencedModel:
   belongs_to:
     test_model:
       class_names:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaddl
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,8 +62,6 @@ files:
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/related_model.rb
-- test/dummy/app/models/test_model.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -85,7 +83,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/db/schema.yaml
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/test.log
@@ -126,8 +123,6 @@ test_files:
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/related_model.rb
-- test/dummy/app/models/test_model.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -149,7 +144,6 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/db/schema.yaml
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/test.log

data/test/dummy/app/models/related_model.rb

@@ -1,5 +0,0 @@
-class RelatedModel < ActiveRecord::Base
-  belongs_to :test_model
-
-  attr_accessible :test_model_id
-end

data/test/dummy/app/models/test_model.rb

@@ -1,12 +0,0 @@
-class TestModel < ActiveRecord::Base
-  has_many :related_models, dependent: :destroy
-
-  attr_accessible :name
-
-  accepts_nested_attributes_for :related_models
-
-  # returns: string
-  def to_s
-    name
-  end
-end

data/test/dummy/db/schema.yaml

@@ -1,21 +0,0 @@
----
-TestModel:
-  attributes:
-    name:
-      type: string
-      primary_ref:
-      - 
-  methods:
-    to_s:
-      returns: string
-      getter: name
-  has_many:
-    related_models:
-      dependent: destroy
-      class_names:
-      - RelatedModel
-RelatedModel:
-  belongs_to:
-    test_model:
-      class_names:
-      - TestModel