administrate 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 110c076246ab6939cc37da4ede75207b571adf4b
-  data.tar.gz: 78aa661a2b45c16533009ad19fe820b3bb2cd767
+  metadata.gz: 683ee0c8cf867c553a2c367063d9112cd8ff968f
+  data.tar.gz: be6336fc10bc73444eb2d42a5c95f7519252dc42
 SHA512:
-  metadata.gz: 388dc4bfd5a7a92bb8f027790625ca6286afedf90ef37309dac57f735abc7176ff9c394a23f191a79d08442c31a134eaf00bb8226813dc74b438c7ceb4ff373f
-  data.tar.gz: 92b2e3901c5e94ce0597a60ca518fc45f0814bc95ee6d0222839b39e34aad28aad14e96d17ee39270ba7f20304267b10d23b96d9f65a03721543b214920ed1a5
+  metadata.gz: 84a3b33e1464a4aff24661891d7333c71bd1809131994cb7af9993735230e81765fffcf0f90dc861e79fa006a06a26ca8dda37b5a045221b1e6ac13c55d0d669
+  data.tar.gz: ca89ca985db441fb3aa69bf6dfe4e5ddee6d268a1c1b034a64eac8b0a5b0b6bb27986a7f9ed359d4c48fac6c9ce0238edee87ced64bf667f89fefa783ab98c01

data/app/views/fields/form/_has_one.html.erb

@@ -0,0 +1,7 @@
+<%= f.label has_one.permitted_attribute %>
+<%= f.collection_select(
+  has_one.permitted_attribute,
+  has_one.candidate_records,
+  :id,
+  :to_s,
+) %>

data/app/views/fields/index/_has_one.html.erb

@@ -0,0 +1,3 @@
+<% if has_one.data %>
+  <%= link_to has_one.data, [Administrate::NAMESPACE, has_one.data] %>
+<% end %>

data/app/views/fields/show/_has_one.html.erb

@@ -0,0 +1,3 @@
+<% if has_one.data %>
+  <%= link_to has_one.data, [Administrate::NAMESPACE, has_one.data] %>
+<% end %>

data/lib/administrate/base_dashboard.rb

@@ -1,36 +1,18 @@
 require "administrate/fields/belongs_to"
 require "administrate/fields/email"
 require "administrate/fields/has_many"
+require "administrate/fields/has_one"
 require "administrate/fields/image"
 require "administrate/fields/string"
 
 module Administrate
   class BaseDashboard
+    include Administrate
+
     def permitted_attributes
       form_attributes.map do |attr|
-        field_class(attr).permitted_attribute(attr)
+        attribute_types[attr].permitted_attribute(attr)
       end.uniq
     end
-
-    def field_class(attr)
-      field_registry.fetch(attribute_types[attr])
-    end
-
-    private
-
-    def field_registry
-      {
-        belongs_to: Administrate::Field::BelongsTo,
-        boolean: Administrate::Field::String,
-        datetime: Administrate::Field::String,
-        email: Administrate::Field::Email,
-        float: Administrate::Field::String,
-        has_many: Administrate::Field::HasMany,
-        image: Administrate::Field::Image,
-        integer: Administrate::Field::String,
-        string: Administrate::Field::String,
-        text: Administrate::Field::String,
-      }
-    end
   end
 end

data/lib/administrate/fields/base.rb

@@ -1,10 +1,17 @@
+require_relative "deferred"
+
 module Administrate
   module Field
     class Base
-      def initialize(attribute, data, page)
+      def self.with_options(options = {})
+        Deferred.new(self, options)
+      end
+
+      def initialize(attribute, data, page, options = {})
         @attribute = attribute
         @data = data
         @page = page
+        @options = options
       end
 
       def self.permitted_attribute(attr)

data/lib/administrate/fields/deferred.rb

@@ -0,0 +1,20 @@
+module Administrate
+  module Field
+    class Deferred
+      def initialize(klass, options = {})
+        @klass = klass
+        @options = options
+      end
+
+      def new(*args)
+        klass.new(*args, options)
+      end
+
+      delegate :permitted_attribute, to: :klass
+
+      private
+
+      attr_reader :klass, :options
+    end
+  end
+end

data/lib/administrate/fields/has_many.rb

@@ -31,7 +31,7 @@ module Administrate
       end
 
       def resource_class_name
-        attribute.to_s.singularize.camelcase
+        @options[:class_name] || attribute.to_s.singularize.camelcase
       end
     end
   end

data/lib/administrate/fields/has_one.rb

@@ -0,0 +1,11 @@
+require_relative "base"
+
+module Administrate
+  module Field
+    class HasOne < BelongsTo
+      def self.permitted_attribute(attr)
+        attr
+      end
+    end
+  end
+end

data/lib/administrate/page/base.rb

@@ -16,7 +16,7 @@ module Administrate
         value = resource.public_send(attribute_name)
 
         dashboard.
-          field_class(attribute_name).
+          attribute_types[attribute_name].
           new(attribute_name, value, page)
       end
 

data/lib/administrate/version.rb

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

data/lib/generators/administrate/dashboard/dashboard_generator.rb

@@ -25,22 +25,47 @@ module Administrate
       end
 
       def field_type(attribute)
-        klass.type_for_attribute(attribute).type ||
+        if klass.type_for_attribute(attribute).type
+          default_field_type
+        else
           association_type(attribute)
+        end
+      end
+
+      def default_field_type
+        "Field::String"
       end
 
       def association_type(attribute)
         reflection = klass.reflections[attribute.to_s]
-        if reflection.collection?
-          :has_many
+        if reflection.has_one?
+          "Field::HasOne"
+        elsif reflection.collection?
+          "Field::HasMany" + has_many_options_string(reflection)
         else
-          :belongs_to
+          "Field::BelongsTo"
         end
       end
 
       def klass
         @klass ||= Object.const_get(class_name)
       end
+
+      def has_many_options_string(reflection)
+        if reflection.class_name != reflection.name.to_s.classify
+          options_string(class_name: reflection.class_name)
+        else
+          ""
+        end
+      end
+
+      def options_string(options)
+        ".with_options(#{inspect_hash_as_ruby(options)})"
+      end
+
+      def inspect_hash_as_ruby(hash)
+        hash.map { |key, value| "#{key}: #{value.inspect}" }.join(", ")
+      end
     end
   end
 end

data/lib/generators/administrate/dashboard/templates/dashboard.rb.erb

@@ -10,7 +10,7 @@ class <%= class_name %>Dashboard < Administrate::BaseDashboard
   # on pages throughout the dashboard.
   def attribute_types
     {<% attributes.each do |attr| %>
-      <%= attr %>: :<%= field_type(attr) %>,<% end %>
+      <%= attr %>: <%= field_type(attr) %>,<% end %>
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Grayson Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neat
@@ -141,16 +141,19 @@ files:
 - app/views/fields/form/_belongs_to.html.erb
 - app/views/fields/form/_email.html.erb
 - app/views/fields/form/_has_many.html.erb
+- app/views/fields/form/_has_one.html.erb
 - app/views/fields/form/_image.html.erb
 - app/views/fields/form/_string.html.erb
 - app/views/fields/index/_belongs_to.html.erb
 - app/views/fields/index/_email.html.erb
 - app/views/fields/index/_has_many.html.erb
+- app/views/fields/index/_has_one.html.erb
 - app/views/fields/index/_image.html.erb
 - app/views/fields/index/_string.html.erb
 - app/views/fields/show/_belongs_to.html.erb
 - app/views/fields/show/_email.html.erb
 - app/views/fields/show/_has_many.html.erb
+- app/views/fields/show/_has_one.html.erb
 - app/views/fields/show/_image.html.erb
 - app/views/fields/show/_string.html.erb
 - app/views/layouts/administrate/application.html.erb
@@ -161,8 +164,10 @@ files:
 - lib/administrate/engine.rb
 - lib/administrate/fields/base.rb
 - lib/administrate/fields/belongs_to.rb
+- lib/administrate/fields/deferred.rb
 - lib/administrate/fields/email.rb
 - lib/administrate/fields/has_many.rb
+- lib/administrate/fields/has_one.rb
 - lib/administrate/fields/image.rb
 - lib/administrate/fields/string.rb
 - lib/administrate/namespace.rb