model_manage 0.1.4 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.6

data/lib/model_manage/active_record.rb

@@ -1,5 +1,3 @@
-if defined?(ActiveRecord::Base)
-
 module ActiveRecord
   class Base
   	def self.inherited(child)
@@ -11,5 +9,3 @@ module ActiveRecord
     end
   end
 end
-
-end

data/lib/model_manage/active_record_rails_erd.rb

@@ -0,0 +1,7 @@
+module ActiveRecord
+  class Base
+    def self.descendants
+      Rails.models
+    end
+  end
+end

data/lib/model_manage/base.rb

@@ -2,23 +2,25 @@ module ModelManage
   module Base
     def self.included(base)
       base.class_eval do
+        extend  ModelManage::ClassMethods
+        forms_field = superclass.forms.dup rescue {}.with_indifferent_access
+        base.const_set :FORMS, forms_field
       end
-
-      def base.forms
+    end
+  end
+  module ClassMethods
+    def forms
         const_get(:FORMS)
-      end
+    end
 
-      def base.key?(key)
+    def key?(key)
         const_get(:KEYS).member? key.to_s
-      rescue
+    rescue
         const_set :KEYS, []
         false
-      end
-
-      forms_field = base.superclass.forms.dup rescue {}.with_indifferent_access
-      base.const_set :FORMS, forms_field
+    end
 
-      def base.field(name, options = {})
+    def field(name, options = {})
         min =   1
 
         validates = {}
@@ -49,9 +51,9 @@ module ModelManage
         end
 
         forms[name] = ::OpenStruct.new(form_attributes)
-      end
+    end
 
-      def base.relation_form_set(name, options = {})
+    def relation_form_set(name, options = {})
         relation_attributes = {
           owner:    self,
           name:     name.to_s,
@@ -59,7 +61,6 @@ module ModelManage
         }.tap{|o| o[:data] = o.dup }
         relation = relations[name.to_s]
         relation.form = OpenStruct.new(relation_attributes)
-      end
     end
   end
 end

data/lib/model_manage/form.rb

@@ -0,0 +1,17 @@
+module ModelManage
+  module Mongoid
+    module ClassMethods
+      def column_for_attribute(attribute_name)
+        self.class.forms[attribute_name.to_s]
+      end
+
+      def content_columns
+        forms.values
+      end
+
+      def reflections
+        relations
+      end
+    end
+  end
+end

data/lib/model_manage/mongoid.rb

@@ -1,9 +1,3 @@
-if defined?(Mongoid::Document)
-
-class Mongoid::Relations::Metadata
-  attr_accessor :form
-end
-
 module Mongoid
   module Document
     def self.included(base)
@@ -15,132 +9,44 @@ module Mongoid
       end
 
       base.class_eval do
+        extend  ModelManage::Mongoid::ClassMethods
         include ModelManage::Base
-        include ModelManage::Mongoid
       end
     end
   end
 end
 
+class Mongoid::Relations::Metadata
+  attr_accessor :form
+end
 
 module ModelManage
   module Mongoid
-    def self.included(base)
-      def base.key(* keys)
+    module ClassMethods
+      def key(* keys)
         const_set :KEYS, keys.map(&:to_s)
         super
       end
-      def base.referenced_in(name, options = {})
+      def referenced_in(name, options = {})
         super
         relation_form_set name, options
       end
-      def base.references_many(name, options = {})
+      def references_many(name, options = {})
         super
         relation_form_set name, options
       end
-      def base.embedded_in(name, options = {})
+      def embedded_in(name, options = {})
         super
         relation_form_set name, options
       end
-      def base.embeds_many(name, options = {})
+      def embeds_many(name, options = {})
         super
         relation_form_set name, options
       end
-      def base.references_and_referenced_in_many(name, options = {})
+      def references_and_referenced_in_many(name, options = {})
         super
         relation_form_set name, options
       end
-
-if defined?(SimpleForm) || defined?(Formtastic)
-      base.class_eval do
-        def column_for_attribute(attribute_name)
-          self.class.forms[attribute_name.to_s]
-        end
-      end
-end
-if defined?(Formtastic)
-      def base.content_columns
-        forms.values
-      end
-
-      def base.reflections
-        relations
-      end
-end
-if defined?(RailsERD)
-      def base.inheritance_column
-        '_type'
-      end
-
-      def base.columns
-        forms.values
-      end
-
-      def base.columns_hash
-        forms
-      end
-
-      def base.descends_from_active_record?
-        Rails.child_models.member? self
-      end
-
-      def base.reflect_on_all_associations(macro = nil)
-        association_reflections = relations.values
-        macro ? relations.select { |reflection| reflection.macro == macro } : association_reflections
-      end
-
-      def base.base_class
-        class_of_active_record_descendant(self)
-      end
-
-      def base.class_of_active_record_descendant(klass)
-        if not Rails.models.member? klass.superclass
-          klass
-        else
-          class_of_active_record_descendant(klass.superclass)
-        end
-      end
-end
-    end
-  end
-end
-
-
-if defined?(RailsERD)
-  module ModelManage
-    module Metadata
-      def options
-        form.data.merge(self)
-      end
-      def active_record
-        form.owner
-      end
-      def check_validity!
-        nil
-      end
-      def belongs_to?
-        [:referenced_in, :embedded_in].member? macro
-      end
-      def collection?
-        not belongs_to?
-      end
-      def through_reflection
-        active_record.relations[ form.options[:through].to_s ]
-      end
-    end
-  end
-
-  class Mongoid::Relations::Metadata
-    include ModelManage::Metadata
-  end
-
-  module ActiveRecord
-    class Base
-      def self.descendants
-        Rails.models
-      end
     end
   end
-end 
-
 end

data/lib/model_manage/mongoid_rails_erd.rb

@@ -0,0 +1,63 @@
+module ModelManage
+  module Metadata
+    def options
+      form.data.merge(self)
+    end
+    def active_record
+      form.owner
+    end
+    def check_validity!
+      nil
+    end
+    def belongs_to?
+      [:referenced_in, :embedded_in].member? macro
+    end
+    def collection?
+      not belongs_to?
+    end
+    def through_reflection
+      active_record.relations[ form.options[:through].to_s ]
+    end
+  end
+
+  module Mongoid
+    module ClassMethods
+      def inheritance_column
+        '_type'
+      end
+
+      def columns
+        forms.values
+      end
+
+      def columns_hash
+        forms
+      end
+
+      def descends_from_active_record?
+        Rails.child_models.member? self
+      end
+
+      def reflect_on_all_associations(macro = nil)
+        association_reflections = relations.values
+        macro ? relations.select { |reflection| reflection.macro == macro } : association_reflections
+      end
+
+      def base_class
+        class_of_active_record_descendant(self)
+      end
+
+      def class_of_active_record_descendant(klass)
+        if not Rails.models.member? klass.superclass
+          klass
+        else
+          class_of_active_record_descendant(klass.superclass)
+        end
+      end
+    end
+  end
+end
+
+class Mongoid::Relations::Metadata
+  include ModelManage::Metadata
+end

data/lib/model_manage.rb

@@ -1,6 +1,15 @@
 require 'ostruct'
-require 'model_manage/mongoid'
-require 'model_manage/active_record'
+
+if defined?(Mongoid::Document)
+  require 'model_manage/form'              if defined?(SimpleForm) || defined?(Formtastic)
+  require 'model_manage/mongoid_rails_erd' if defined?(RailsERD)
+  require 'model_manage/mongoid'   
+end
+
+if defined?(ActiveRecord::Base)
+  require 'model_manage/active_record_rails_erd' if defined?(RailsERD)
+  require 'model_manage/active_record' 
+end
 
 require 'model_manage/rails'
 require 'model_manage/bitfield'

data/model_manage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "model_manage"
-  s.version = "0.1.4"
+  s.version = "0.1.6"
 
   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}"]
-  s.date = "2012-01-01"
+  s.date = "2012-01-17"
   s.description = "\u{30e2}\u{30c7}\u{30eb}\u{3001}\u{30d5}\u{30a3}\u{30fc}\u{30eb}\u{30c9}\u{3068}\u{3044}\u{3063}\u{305f}\u{60c5}\u{5831}\u{3078}\u{7c21}\u{5358}\u{30a2}\u{30af}\u{30bb}\u{30b9}\u{3059}\u{308b}\u{3053}\u{3068}\u{3092}\u{76ee}\u{7684}\u{306b}\u{958b}\u{767a}\u{3057}\u{3066}\u{3044}\u{307e}\u{3059}\u{3002}"
   s.email = "7korobi@gmail.com"
   s.extra_rdoc_files = [
@@ -26,11 +26,12 @@ Gem::Specification.new do |s|
     "lib/.DS_Store",
     "lib/model_manage.rb",
     "lib/model_manage/active_record.rb",
+    "lib/model_manage/active_record_rails_erd.rb",
     "lib/model_manage/base.rb",
     "lib/model_manage/bitfield.rb",
-    "lib/model_manage/formtastic/array_input.rb",
-    "lib/model_manage/formtastic/input_helper.rb",
+    "lib/model_manage/form.rb",
     "lib/model_manage/mongoid.rb",
+    "lib/model_manage/mongoid_rails_erd.rb",
     "lib/model_manage/rails.rb",
     "model_manage.gemspec",
     "test/helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_manage
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-01 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70120811590500 !ruby/object:Gem::Requirement
+  requirement: &70242343742300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120811590500
+  version_requirements: *70242343742300
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70120811589420 !ruby/object:Gem::Requirement
+  requirement: &70242343739620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120811589420
+  version_requirements: *70242343739620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70120811588720 !ruby/object:Gem::Requirement
+  requirement: &70242343732720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70120811588720
+  version_requirements: *70242343732720
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70120811588040 !ruby/object:Gem::Requirement
+  requirement: &70242343731720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70120811588040
+  version_requirements: *70242343731720
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70120811587180 !ruby/object:Gem::Requirement
+  requirement: &70242343729980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120811587180
+  version_requirements: *70242343729980
 description: モデル、フィールドといった情報へ簡単アクセスすることを目的に開発しています。
 email: 7korobi@gmail.com
 executables: []
@@ -83,11 +83,12 @@ files:
 - lib/.DS_Store
 - lib/model_manage.rb
 - lib/model_manage/active_record.rb
+- lib/model_manage/active_record_rails_erd.rb
 - lib/model_manage/base.rb
 - lib/model_manage/bitfield.rb
-- lib/model_manage/formtastic/array_input.rb
-- lib/model_manage/formtastic/input_helper.rb
+- lib/model_manage/form.rb
 - lib/model_manage/mongoid.rb
+- lib/model_manage/mongoid_rails_erd.rb
 - lib/model_manage/rails.rb
 - model_manage.gemspec
 - test/helper.rb
@@ -107,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3390306210837111882
+      hash: -3860435876427644110
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/model_manage/formtastic/array_input.rb

@@ -1,17 +0,0 @@
-module Formtastic
-  module Inputs
-
-    class ArrayInput
-      include Base
-      include Base::Stringish
-      
-      def to_html
-        @object.each do |exp|
-          input_wrapping do
-            label_html <<
-            builder.search_field(method, input_html_options)
-          end
-      end
-    end
-  end
-end

data/lib/model_manage/formtastic/input_helper.rb

@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-module Formtastic
-  module Helpers
-    module InputHelper
-
-      def input(method, options = {})
-        options = options.dup # Allow options to be shared without being tainted by Formtastic
-        options[:as] ||= default_input_type(method, options)
-
-        klass = input_class(options[:as])
-        klass.new(self, template, @object, @object_name, method, options).to_html
-      end
-
-      protected
-
-      def default_input_type(method, options = {}) #:nodoc:
-        if @object
-          return :select  if reflection_for(method)
-
-          return :file    if is_file?(method, options)
-        end
-
-        if column = column_for(method)
-          # Special cases where the column type doesn't map to an input method.
-          case column.type
-          when String, :string
-            return :password  if method.to_s =~ /password/
-            return :country   if method.to_s =~ /country$/
-            return :time_zone if method.to_s =~ /time_zone/
-            return :email     if method.to_s =~ /email/
-            return :url       if method.to_s =~ /^url$|^website$|_url$/
-            return :phone     if method.to_s =~ /(phone|fax)/
-            return :search    if method.to_s =~ /^search$/
-          when Integer, :integer
-            return :select    if reflection_for(method)
-            return :number
-          when Float, Decimal, :float, :decimal
-            return :number
-          when Time, :timestamp
-            return :string
-          when Array
-            return :array
-          end
-
-          # Try look for hints in options hash. Quite common senario: Enum keys stored as string in the database.
-          return :select    if column.type == :string && options.key?(:collection)
-          # Try 3: Assume the input name will be the same as the column type (e.g. string_input).
-          return column.type
-        else
-          return :select    if options.key?(:collection)
-          return :password  if method.to_s =~ /password/
-          return :string
-        end
-      end
-
-      def column_for(method) #:nodoc:
-        @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
-      end
-
-      # Takes the `:as` option and attempts to return the corresponding input class. In the case of
-      # `:as => :string` it will first attempt to find a top level `StringInput` class (to allow the
-      # application to subclass and modify to suit), falling back to `Formtastic::Inputs::StringInput`.
-      #
-      # This also means that the application can define it's own custom inputs in the top level
-      # namespace (eg `DatepickerInput`).
-      #
-      # @param [Symbol] as A symbol representing the type of input to render
-      # @raise [Formtastic::UnknownInputError] An appropriate input class could not be found
-      # @return [Class] An input class constant
-      #
-      # @example Normal use
-      #   input_class(:string) #=> Formtastic::Inputs::StringInput
-      #   input_class(:date) #=> Formtastic::Inputs::DateInput
-      #
-      # @example When a top-level class is found
-      #   input_class(:string) #=> StringInput
-      #   input_class(:awesome) #=> AwesomeInput
-      def input_class(as)
-        @input_classes_cache ||= {}
-        @input_classes_cache[as] ||= begin
-          begin
-            begin
-              custom_input_class_name(as).constantize
-            rescue NameError
-              standard_input_class_name(as).constantize
-            end
-          rescue NameError
-            raise Formtastic::UnknownInputError
-          end
-        end
-      end
-
-      # :as => :string # => StringInput
-      def custom_input_class_name(as)
-        "#{as.to_s.camelize}Input"
-      end
-
-      # :as => :string # => Formtastic::Inputs::StringInput
-      def standard_input_class_name(as)
-        "Formtastic::Inputs::#{as.to_s.camelize}Input"
-      end
-
-    end
-  end
-end