model_manage 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/model_manage/base.rb

@@ -10,57 +10,57 @@ module ModelManage
   end
   module ClassMethods
     def forms
-        const_get(:FORMS)
+      const_get(:FORMS)
     end
 
     def key?(key)
-        const_get(:KEYS).member? key.to_s
+      const_get(:KEYS).member? key.to_s
     rescue
-        const_set :KEYS, []
-        false
+      const_set :KEYS, []
+      false
     end
 
     def field(name, options = {})
-        min =   1
+      super
 
-        validates = {}
-        validates[:in] = options.delete(:in)  || options.delete(:within)
-        if options[:limit] && (! validates[:in])
-          validates[:in] = (min..options.delete(:limit)) 
-        end
+      min =   1
+      validates = {}
+      validates[:in] = options.delete(:in)  || options.delete(:within)
+      if options[:limit] && (! validates[:in])
+        validates[:in] = (min..options.delete(:limit)) 
+      end
 
-        validates[:allow_nil  ] = options.delete(:allow_nil)   || false
-        validates[:allow_blank] = options.delete(:allow_blank) || false
+      validates[:allow_nil  ] = options.delete(:allow_nil)   || false
+      validates[:allow_blank] = options.delete(:allow_blank) || false
 
-        super
-        null_ok = validates[:allow_nil] || validates[:allow_blank]
-        form_attributes = {
-          owner:   self,
-          name:    name.to_s,
-          type:    options[:type] || String,
-          limit:   nil,
-          null:    null_ok,
-          primary: key?(name),
-          scale:   nil
-        }
+      null_ok = validates[:allow_nil] || validates[:allow_blank]
+      form_attributes = {
+        owner:   self,
+        name:    name.to_s,
+        type:    options[:type] || String,
+        limit:   nil,
+        null:    null_ok,
+        primary: key?(name),
+        scale:   nil
+      }
 
-        if validates[:in].present?
-          validates_length_of name, validates
-          form_attributes[:limit] = validates[:in].max
-          form_attributes.merge!(validates)
-        end
+      if validates[:in].present?
+        validates_length_of name, validates
+        form_attributes[:limit] = validates[:in].max
+        form_attributes.merge!(validates)
+      end
 
-        forms[name] = ::OpenStruct.new(form_attributes)
+      forms[name] = OpenStruct.new(form_attributes)
     end
 
     def relation_form_set(name, options = {})
-        relation_attributes = {
-          owner:    self,
-          name:     name.to_s,
-          options:  options
-        }.tap{|o| o[:data] = o.dup }
-        relation = relations[name.to_s]
-        relation.form = OpenStruct.new(relation_attributes)
+      relation_attributes = {
+        owner:    self,
+        name:     name.to_s,
+        options:  options
+      }.tap{|o| o[:data] = o.dup }
+      relation = relations[name.to_s]
+      relation.form = OpenStruct.new(relation_attributes)
     end
   end
 end

data/lib/model_manage/mongoid.rb

@@ -30,22 +30,27 @@ module ModelManage
       def referenced_in(name, options = {})
         super
         relation_form_set name, options
+        forms.delete("#{name}_id")
       end
       def references_many(name, options = {})
         super
         relation_form_set name, options
+        forms.delete("#{name.to_s.singularize}_ids")
       end
       def embedded_in(name, options = {})
         super
         relation_form_set name, options
+        forms.delete("#{name}_id")
       end
       def embeds_many(name, options = {})
         super
         relation_form_set name, options
+        forms.delete("#{name.to_s.singularize}_ids")
       end
       def references_and_referenced_in_many(name, options = {})
         super
         relation_form_set name, options
+        forms.delete("#{name.to_s.singularize}_ids")
       end
     end
   end

data/model_manage.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "model_manage"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["\u{306a}\u{306a}\u{3053}\u{308d}\u{3073}"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_manage
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70242343742300 !ruby/object:Gem::Requirement
+  requirement: &70348961174020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242343742300
+  version_requirements: *70348961174020
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70242343739620 !ruby/object:Gem::Requirement
+  requirement: &70348961173300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242343739620
+  version_requirements: *70348961173300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70242343732720 !ruby/object:Gem::Requirement
+  requirement: &70348961172400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70242343732720
+  version_requirements: *70348961172400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70242343731720 !ruby/object:Gem::Requirement
+  requirement: &70348961171360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70242343731720
+  version_requirements: *70348961171360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70242343729980 !ruby/object:Gem::Requirement
+  requirement: &70348961166780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242343729980
+  version_requirements: *70348961166780
 description: モデル、フィールドといった情報へ簡単アクセスすることを目的に開発しています。
 email: 7korobi@gmail.com
 executables: []
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3860435876427644110
+      hash: 2121809140796983656
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: